[BACK]Return to lonpreferences.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonpreferences.pm between versions 1.107 and 1.117

version 1.107, 2007/07/05 21:37:38 version 1.117, 2008/03/24 04:56:22
Line 123  sub verify_and_change_wysiwyg { Line 123  sub verify_and_change_wysiwyg {
     my $r = shift;      my $r = shift;
     my $newsetting=$env{'form.wysiwyg'};      my $newsetting=$env{'form.wysiwyg'};
     &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});      &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});
     &Apache::lonnet::appenv('environment.wysiwygeditor' => $newsetting);      &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting});
     $r->print('<p>'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'</p>');      $r->print('<p>'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'</p>');
 }  }
   
Line 167  sub verify_and_change_languages { Line 167  sub verify_and_change_languages {
     my $message='';      my $message='';
     if ($newlanguage) {      if ($newlanguage) {
         &Apache::lonnet::put('environment',{'languages' => $newlanguage});          &Apache::lonnet::put('environment',{'languages' => $newlanguage});
         &Apache::lonnet::appenv('environment.languages' => $newlanguage);          &Apache::lonnet::appenv({'environment.languages' => $newlanguage});
         $message='Set new preferred languages to '.$newlanguage;          $message=&mt('Set new preferred languages to ').'<tt>"'.$newlanguage.'"</tt>.';
     } else {      } else {
         &Apache::lonnet::del('environment',['languages']);          &Apache::lonnet::del('environment',['languages']);
         &Apache::lonnet::delenv('environment\.languages');          &Apache::lonnet::delenv('environment\.languages');
         $message='Reset preferred language';          $message=&mt('Reset preferred language.');
     }      }
     $r->print(<<ENDVCSCREEN);      $r->print(<<ENDVCSCREEN);
 $message  $message
Line 252  sub verify_and_change_texengine { Line 252  sub verify_and_change_texengine {
     my $newtexengine  = $env{'form.texengine'};      my $newtexengine  = $env{'form.texengine'};
     $newtexengine=~s/[^\-\w]//g;      $newtexengine=~s/[^\-\w]//g;
     if ($newtexengine eq 'ttm') {      if ($newtexengine eq 'ttm') {
  &Apache::lonnet::appenv('browser.mathml' => 1);   &Apache::lonnet::appenv({'browser.mathml' => 1});
     } else {      } else {
  if ($env{'environment.texengine'} eq 'ttm') {   if ($env{'environment.texengine'} eq 'ttm') {
     &Apache::lonnet::appenv('browser.mathml' => 0);      &Apache::lonnet::appenv({'browser.mathml' => 0});
  }   }
     }      }
     my $message='';      my $message='';
     if ($newtexengine) {      if ($newtexengine) {
         &Apache::lonnet::put('environment',{'texengine' => $newtexengine});          &Apache::lonnet::put('environment',{'texengine' => $newtexengine});
         &Apache::lonnet::appenv('environment.texengine' => $newtexengine);          &Apache::lonnet::appenv({'environment.texengine' => $newtexengine});
         $message='Set new preferred math display to '.$newtexengine;          $message=&mt('Set new preferred math display to ').'<tt>"'.$newtexengine.'"</tt>.';
     } else {      } else {
         &Apache::lonnet::del('environment',['texengine']);          &Apache::lonnet::del('environment',['texengine']);
         &Apache::lonnet::delenv('environment\.texengine');          &Apache::lonnet::delenv('environment\.texengine');
         $message='Reset preferred math display.';          $message=&mt('Reset preferred math display.');
     }      }
   
   
Line 400  sub verify_and_change_rolespref { Line 400  sub verify_and_change_rolespref {
     my $message='<hr />';      my $message='<hr />';
     if ($hotlist_flag) {      if ($hotlist_flag) {
         &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});          &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});
         &Apache::lonnet::appenv('environment.recentroles' => $hotlist_flag);          &Apache::lonnet::appenv({'environment.recentroles' => $hotlist_flag});
         $message=&mt('Recent '.$role.'s Hotlist is Enabled');          $message=&mt('Recent '.$role.'s Hotlist is Enabled');
     } else {      } else {
         &Apache::lonnet::del('environment',['recentroles']);          &Apache::lonnet::del('environment',['recentroles']);
Line 409  sub verify_and_change_rolespref { Line 409  sub verify_and_change_rolespref {
     }      }
     if ($hotlist_n) {      if ($hotlist_n) {
         &Apache::lonnet::put('environment',{'recentrolesn' => $hotlist_n});          &Apache::lonnet::put('environment',{'recentrolesn' => $hotlist_n});
         &Apache::lonnet::appenv('environment.recentrolesn' => $hotlist_n);          &Apache::lonnet::appenv({'environment.recentrolesn' => $hotlist_n});
         if ($hotlist_flag) {          if ($hotlist_flag) {
             $message.="<br />".              $message.="<br />".
  &mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";   &mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";
Line 467  sub screennamechanger { Line 467  sub screennamechanger {
         ('environment',['screenname','nickname']);          ('environment',['screenname','nickname']);
     my $screenname=$userenv{'screenname'};      my $screenname=$userenv{'screenname'};
     my $nickname=$userenv{'nickname'};      my $nickname=$userenv{'nickname'};
       my %lt = &Apache::lonlocal::texthash(
                                             text_screenname  => 'New screenname (shown if you post anonymously):',
                                             text_nickname  => 'New nickname (shown if you post non-anonymously):',
                                             text_submit => 'Change',
                                           );
     $r->print(<<ENDSCREEN);      $r->print(<<ENDSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">  <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_screenname" />  <input type="hidden" name="action" value="verify_and_change_screenname" />
 <br />New screenname (shown if you post anonymously):  <br />$lt{'text_screenname'}
 <input type="text" size="20" value="$screenname" name="screenname" />  <input type="text" size="20" value="$screenname" name="screenname" />
 <br />New nickname (shown if you post non-anonymously):  <br />$lt{'text_nickname'}
 <input type="text" size="20" value="$nickname" name="nickname" />  <input type="text" size="20" value="$nickname" name="nickname" />
 <input type="submit" value="Change" />  <br />
   <input type="submit" value="$lt{'text_submit'}" />
 </form>  </form>
 ENDSCREEN  ENDSCREEN
 }  }
Line 489  sub verify_and_change_screenname { Line 495  sub verify_and_change_screenname {
     my $message='';      my $message='';
     if ($newscreen) {      if ($newscreen) {
         &Apache::lonnet::put('environment',{'screenname' => $newscreen});          &Apache::lonnet::put('environment',{'screenname' => $newscreen});
         &Apache::lonnet::appenv('environment.screenname' => $newscreen);          &Apache::lonnet::appenv({'environment.screenname' => $newscreen});
         $message='Set new screenname to '.$newscreen;          $message=&mt('Set new screenname to ').'<tt>"'.$newscreen.'."</tt>.';
     } else {      } else {
         &Apache::lonnet::del('environment',['screenname']);          &Apache::lonnet::del('environment',['screenname']);
         &Apache::lonnet::delenv('environment\.screenname');          &Apache::lonnet::delenv('environment\.screenname');
         $message='Reset screenname';          $message=&mt('Reset screenname.');
     }      }
 # Nickname  # Nickname
     $message.='<br />';      $message.='<br />';
Line 502  sub verify_and_change_screenname { Line 508  sub verify_and_change_screenname {
     $newscreen=~s/[^ \w]//g;      $newscreen=~s/[^ \w]//g;
     if ($newscreen) {      if ($newscreen) {
         &Apache::lonnet::put('environment',{'nickname' => $newscreen});          &Apache::lonnet::put('environment',{'nickname' => $newscreen});
         &Apache::lonnet::appenv('environment.nickname' => $newscreen);          &Apache::lonnet::appenv({'environment.nickname' => $newscreen});
         $message.='Set new nickname to '.$newscreen;          $message.=&mt('Set new nickname to ').'<tt>"'.$newscreen.'"</tt>.';
     } else {      } else {
         &Apache::lonnet::del('environment',['nickname']);          &Apache::lonnet::del('environment',['nickname']);
         &Apache::lonnet::delenv('environment\.nickname');          &Apache::lonnet::delenv('environment\.nickname');
         $message.='Reset nickname';          $message.=&mt('Reset nickname.');
     }      }
     &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);      &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
     $r->print(<<ENDVCSCREEN);      $r->print(<<ENDVCSCREEN);
Line 557  sub verify_and_change_icons { Line 563  sub verify_and_change_icons {
     my $newicons  = $env{'form.menumode'};      my $newicons  = $env{'form.menumode'};
   
     &Apache::lonnet::put('environment',{'icons' => $newicons});      &Apache::lonnet::put('environment',{'icons' => $newicons});
     &Apache::lonnet::appenv('environment.icons' => $newicons);      &Apache::lonnet::appenv({'environment.icons' => $newicons});
     $r->print(&mt('Set menu mode to [_1].',$newicons));      $r->print(&mt('Set menu mode to [_1].',$newicons));
 }  }
   
Line 575  sub clickerchanger { Line 581  sub clickerchanger {
     $clickers=~s/\,/\n/gs;      $clickers=~s/\,/\n/gs;
     my $text=&mt('Enter response device ("clicker") numbers');      my $text=&mt('Enter response device ("clicker") numbers');
     my $change=&mt('Register');      my $change=&mt('Register');
     my $helplink=&Apache::loncommon::help_open_topic('Clicker_Registration', 'Locating your clicker ID');      my $helplink=&Apache::loncommon::help_open_topic('Clicker_Registration',&mt('Locating your clicker ID'));
     $r->print(<<ENDSCREEN);      $r->print(<<ENDSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">  <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_clicker" />  <input type="hidden" name="action" value="verify_and_change_clicker" />
 <label>$text $helplink<br />  <label>$text $helplink<br />
 <textarea name="clickers" rows="5" cols="10">$clickers</textarea>  <textarea name="clickers" rows="5" cols="20">$clickers</textarea>
 </label>  </label>
 <input type="submit" value="$change" />  <input type="submit" value="$change" />
 </form>  </form>
Line 592  sub verify_and_change_clicker { Line 598  sub verify_and_change_clicker {
     my $user       = $env{'user.name'};      my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};      my $domain     = $env{'user.domain'};
     my $newclickers  = $env{'form.clickers'};      my $newclickers  = $env{'form.clickers'};
     $newclickers=~s/\W+/\,/gs;      $newclickers=~s/[^\w\:\-]+/\,/gs;
     $newclickers=~tr/a-z/A-Z/;      $newclickers=~tr/a-z/A-Z/;
       $newclickers=~s/[\:\-]+/\-/g;
       $newclickers=~s/\,+/\,/g;
     $newclickers=~s/^\,//;      $newclickers=~s/^\,//;
     $newclickers=~s/\,$//;      $newclickers=~s/\,$//;
     &Apache::lonnet::put('environment',{'clickers' => $newclickers});      &Apache::lonnet::put('environment',{'clickers' => $newclickers});
     &Apache::lonnet::appenv('environment.clickers' => $newclickers);      &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
     $r->print(&mt('Registering clickers: [_1]',$newclickers));      $r->print(&mt('Registering clickers: [_1]',$newclickers));
 }  }
   
Line 616  sub msgforwardchanger { Line 624  sub msgforwardchanger {
                                           crit  => 'Critical only',                                            crit  => 'Critical only',
                                           reg   => 'Non-critical only',                                            reg   => 'Non-critical only',
                                           foad  => 'Forwarding Address(es)',                                            foad  => 'Forwarding Address(es)',
                                           mnot  => 'Message Notification Email Address(es)',                                            noti  => 'Notification E-mail Address(es)', 
                                             foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',
                                             mnot  => 'Email Address(es) which should be notified about new LON-CAPA messages', # old: 'Message Notification Email Address(es)',
                                             mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',
                                           chg   => 'Change',                                            chg   => 'Change',
                                           email => 'The e-mail address entered in row ',                                            email => 'The e-mail address entered in row ',
                                           notv => 'is not a valid e-mail address',                                            notv => 'is not a valid e-mail address',
                                           toen => "To enter multiple addresses, enter one address at a time, click 'Change' and then add the next one",                                             toen => "To enter multiple addresses, enter one address at a time, click 'Change' and then add the next one", 
                                           prme => 'Back to preferences menu',                                            prme => 'Back to preferences menu',
                                         );                                          );
     my $forwardingHelp = Apache::loncommon::help_open_topic("Prefs_Forwarding",      my $forwardingHelp = &Apache::loncommon::help_open_topic("Prefs_Forwarding");
     "What are forwarding ".      my $notificationHelp = &Apache::loncommon::help_open_topic("Prefs_Notification");
     "and notification ".      my $criticalMessageHelp = &Apache::loncommon::help_open_topic("Course_Critical_Message");
     "addresses");  
     my $criticalMessageHelp = Apache::loncommon::help_open_topic("Course_Critical_Message",  
  "What are critical messages");  
     my @allow_html = split(/,/,$userenv{'notifywithhtml'});      my @allow_html = split(/,/,$userenv{'notifywithhtml'});
     my %allnot = &get_notifications(\%userenv);      my %allnot = &get_notifications(\%userenv);
     my $validatescript = &Apache::lonhtmlcommon::javascript_valid_email();      my $validatescript = &Apache::lonhtmlcommon::javascript_valid_email();
Line 655  function validate() { Line 663  function validate() {
                 if (addr.indexOf(",") >= 0) {                  if (addr.indexOf(",") >= 0) {
                     multimsg = "\\n($lt{'toen'}).";                      multimsg = "\\n($lt{'toen'}).";
                 }                  }
                 alert("$lt{'email'} "+rownum+": '"+addr+"' $lt{'notv'}."+multimsg);                  alert("$lt{'email'} "+rownum+" ('"+addr+"') $lt{'notv'}."+multimsg);
                 return;                  return;
             }              }
         }          }
Line 691  $validatescript Line 699  $validatescript
     $r->print(<<ENDMSG);      $r->print(<<ENDMSG);
 $jscript  $jscript
 $message  $message
 $forwardingHelp  <h3>$lt{'foad'} $forwardingHelp</h3>
 <form name="prefs" action="/adm/preferences" method="post">  <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_msgforward" />  <input type="hidden" name="action" value="verify_and_change_msgforward" />
 $lt{'foad'} (<tt>user:domain,user:domain,...</tt>):  $lt{'foad'} ($lt{'foad_exmpl'}):
 <input type="text" size="40" value="$msgforward" name="msgforward" /><hr />  <input type="text" size="40" value="$msgforward" name="msgforward" /><br />
 $criticalMessageHelp  <h3>$lt{'noti'} $notificationHelp</h3>
 $lt{'mnot'} (<tt>joe\@doe.com</tt>):<br />  $lt{'mnot'} ($lt{'mnot_exmpl'}):<br />
 ENDMSG  ENDMSG
     my @sortforwards = sort (keys(%allnot));      my @sortforwards = sort (keys(%allnot));
     my $output = &Apache::loncommon::start_data_table().      my $output = &Apache::loncommon::start_data_table().
Line 705  ENDMSG Line 713  ENDMSG
                  '<th>&nbsp;</th>'.                   '<th>&nbsp;</th>'.
                  '<th>'.&mt('Action').'</th>'.                   '<th>'.&mt('Action').'</th>'.
                  '<th>'.&mt('Notification address').'</th><th>'.                   '<th>'.&mt('Notification address').'</th><th>'.
                  &mt('Types of message to forward to this address').'</th><th>'.                   &mt('Types of message for which notification is sent').
                    $criticalMessageHelp.'</th><th>'.
                  &mt('Excerpt retains HTML tags in message').'</th>'.                   &mt('Excerpt retains HTML tags in message').'</th>'.
                  &Apache::loncommon::end_data_table_header_row();                   &Apache::loncommon::end_data_table_header_row();
     my $num = 0;      my $num = 0;
Line 788  ENDMSG Line 797  ENDMSG
     $num ++;      $num ++;
     $r->print($output);      $r->print($output);
     $r->print(qq|      $r->print(qq|
 <hr />  <br /><hr />
 <input type="hidden" name="numnotify" value="$num" />  <input type="hidden" name="numnotify" value="$num" />
 <input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />  <input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
 <input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />  <input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />
Line 825  sub verify_and_change_msgforward { Line 834  sub verify_and_change_msgforward {
     if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {      if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
                $newscreen.=$msuser.':'.$msdomain.',';                 $newscreen.=$msuser.':'.$msdomain.',';
    } else {     } else {
                $message.= &mt('No such user: ').$msuser.':'.$msdomain.'<br>';                 $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br>';
            }             }
         }          }
     }      }
     $newscreen=~s/\,$//;      $newscreen=~s/\,$//;
     if ($newscreen) {      if ($newscreen) {
         &Apache::lonnet::put('environment',{'msgforward' => $newscreen});          &Apache::lonnet::put('environment',{'msgforward' => $newscreen});
         &Apache::lonnet::appenv('environment.msgforward' => $newscreen);          &Apache::lonnet::appenv({'environment.msgforward' => $newscreen});
         $message .= &mt('Set message forwarding to: ').'<tt>'.$newscreen.          $message .= &mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.'
                     '</tt><br />';                      .'<br />';
     } else {      } else {
         &Apache::lonnet::del('environment',['msgforward']);          &Apache::lonnet::del('environment',['msgforward']);
         &Apache::lonnet::delenv('environment\.msgforward');          &Apache::lonnet::delenv('environment\.msgforward');
Line 873  sub verify_and_change_msgforward { Line 882  sub verify_and_change_msgforward {
     $notify_with_html =~ s/\s//gs;      $notify_with_html =~ s/\s//gs;
     if ($notification) {      if ($notification) {
         &Apache::lonnet::put('environment',{'notification' => $notification});          &Apache::lonnet::put('environment',{'notification' => $notification});
         &Apache::lonnet::appenv('environment.notification' => $notification);          &Apache::lonnet::appenv({'environment.notification' => $notification});
         $message.=&mt('Set non-critical message notification address(es) to: ').'<tt>'.$notification.'</tt><br />';          $message.=&mt('Set non-critical message notification address(es) to ').'<tt>"'.$notification.'"</tt>.<br />';
     } else {      } else {
         &Apache::lonnet::del('environment',['notification']);          &Apache::lonnet::del('environment',['notification']);
         &Apache::lonnet::delenv('environment\.notification');          &Apache::lonnet::delenv('environment\.notification');
         $message.=&mt("Non-critical message notification set to 'off'.").'<br />';          $message.=&mt("Set non-critical message notification to 'off'.").'<br />';
     }      }
     if ($critnotification) {      if ($critnotification) {
         &Apache::lonnet::put('environment',{'critnotification' => $critnotification});          &Apache::lonnet::put('environment',{'critnotification' => $critnotification});
         &Apache::lonnet::appenv('environment.critnotification' => $critnotification);          &Apache::lonnet::appenv({'environment.critnotification' => $critnotification});
         $message.=&mt('Set critical message notification address(es) to: ').'<tt>'.$critnotification.'</tt><br />';          $message.=&mt('Set critical message notification address(es) to ').'<tt>"'.$critnotification.'"</tt>.<br />';
     } else {      } else {
         &Apache::lonnet::del('environment',['critnotification']);          &Apache::lonnet::del('environment',['critnotification']);
         &Apache::lonnet::delenv('environment\.critnotification');          &Apache::lonnet::delenv('environment\.critnotification');
         $message.=&mt("Critical message notification set to 'off'.").'<br />';          $message.=&mt("Set critical message notification to 'off'.").'<br />';
     }      }
     if ($critnotification || $notification) {      if ($critnotification || $notification) {
         if ($notify_with_html) {          if ($notify_with_html) {
             &Apache::lonnet::put('environment',{'notifywithhtml' => $notify_with_html});              &Apache::lonnet::put('environment',{'notifywithhtml' => $notify_with_html});
             &Apache::lonnet::appenv('environment.notifywithhtml' => $notify_with_html);              &Apache::lonnet::appenv({'environment.notifywithhtml' => $notify_with_html});
             $message.=&mt('Set address(es) to receive excerpts with html retained: ').'<tt>'.$notify_with_html.'</tt>';              $message.=&mt('Set address(es) to receive excerpts with html retained ').'<tt>"'.$notify_with_html.'"</tt>.';
         } else {          } else {
             &Apache::lonnet::del('environment',['notifywithhtml']);              &Apache::lonnet::del('environment',['notifywithhtml']);
             &Apache::lonnet::delenv('environment\.notifywithhtml');              &Apache::lonnet::delenv('environment\.notifywithhtml');
Line 910  sub verify_and_change_msgforward { Line 919  sub verify_and_change_msgforward {
     if ($message) {      if ($message) {
         $message .= '<br /><hr />';          $message .= '<br /><hr />';
     }      }
       &Apache::loncommon::flush_email_cache($user,$domain);
     &msgforwardchanger($r,$message);      &msgforwardchanger($r,$message);
 }  }
   
Line 1007  sub verify_and_change_colors { Line 1017  sub verify_and_change_colors {
         my $entry='color.'.$function.'.'.$item;          my $entry='color.'.$function.'.'.$item;
  if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {   if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
     &Apache::lonnet::put('environment',{$entry => $color});      &Apache::lonnet::put('environment',{$entry => $color});
     &Apache::lonnet::appenv('environment.'.$entry => $color);      &Apache::lonnet::appenv({'environment.'.$entry => $color});
     $message.='Set '.$colortypes{$item}.' to '.$color.'<br />';      $message.=&mt('Set '.$colortypes{$item}.' to ').'<tt>"'.$color.'"</tt>.<br />';
  } else {   } else {
     &Apache::lonnet::del('environment',[$entry]);      &Apache::lonnet::del('environment',[$entry]);
     &Apache::lonnet::delenv('environment\.'.$entry);      &Apache::lonnet::delenv('environment\.'.$entry);
     $message.='Reset '.$colortypes{$item}.'<br />';      $message.=&mt('Reset '.$colortypes{$item}.'.').'<br />';
  }   }
     }      }
     my $now = time;      my $now = time;
     &Apache::lonnet::put('environment',{'color.timestamp' => $now});      &Apache::lonnet::put('environment',{'color.timestamp' => $now});
     &Apache::lonnet::appenv('environment.color.timestamp' => $now);      &Apache::lonnet::appenv({'environment.color.timestamp' => $now});
   
     $r->print(<<ENDVCCOL);      $r->print(<<ENDVCCOL);
 $message  $message
Line 1046  sub passwordchanger { Line 1056  sub passwordchanger {
             $defdom = $r->dir_config('lonDefDomain');              $defdom = $r->dir_config('lonDefDomain');
             my %data = &Apache::lonnet::tmpget($mailtoken);              my %data = &Apache::lonnet::tmpget($mailtoken);
             if (keys(%data) == 0) {              if (keys(%data) == 0) {
                 $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid.  Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a <a href="/adm/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'));                  $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a <a href="/adm/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'));
                 return;                  return;
             }              }
             if (defined($data{time})) {              if (defined($data{time})) {
Line 1155  sub jscript_send { Line 1165  sub jscript_send {
 sub client_form {  sub client_form {
     my ($caller,$hexkey,$currentpass,$defdom) = @_;      my ($caller,$hexkey,$currentpass,$defdom) = @_;
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
                 'email' => 'EMail Address',                  'email' => 'E-mail Address',
                 'username' => 'Username',                  'username' => 'Username',
                 'domain' => 'Domain',                  'domain' => 'Domain',
                 'currentpass' => 'Current Password',                  'currentpass' => 'Current Password',
Line 1176  sub client_form { Line 1186  sub client_form {
      <input type="text" name="uname" size="15" />       <input type="text" name="uname" size="15" />
      <input type="hidden" name="currentpass" value="$currentpass" />       <input type="hidden" name="currentpass" value="$currentpass" />
     </td></tr>      </td></tr>
 <tr><td class="LC_preferences_labeltext"><label for="udom">$lt{'udom'}</label>:</td>  <tr><td class="LC_preferences_labeltext"><label for="udom">$lt{'domain'}</label>:</td>
     <td>      <td>
 |;  |;
         $output .= &Apache::loncommon::select_dom_form($defdom,'udom').'          $output .= &Apache::loncommon::select_dom_form($defdom,'udom').'
Line 1315  ENDERROR Line 1325  ENDERROR
     #      #
     if ($caller eq 'reset_by_email') {      if ($caller eq 'reset_by_email') {
         my %data = &Apache::lonnet::tmpget($mailtoken);          my %data = &Apache::lonnet::tmpget($mailtoken);
           if (keys(%data) == 0) {
               &passwordchanger($r,
                            '<span class="LC_error">'.
                            &mt('Could not verify current authentication.').'  '.
                            &mt('Please try again.').'</span>',$caller,$mailtoken);
               return 1;
           }
         if ($currentpass ne $data{'temppasswd'}) {          if ($currentpass ne $data{'temppasswd'}) {
             &passwordchanger($r,              &passwordchanger($r,
                          '<span class="LC_error">'.                           '<span class="LC_error">'.
                          &mt('Could not verify current authentication').'.  '.                           &mt('Could not verify current authentication.').'  '.
                          &mt('Please try again').'.</span>',$caller,$mailtoken);                           &mt('Please try again.').'</span>',$caller,$mailtoken);
             return 1;              return 1;
         }          }
     }       } 
     if ($newpass1 ne $newpass2) {      if ($newpass1 ne $newpass2) {
  &passwordchanger($r,   &passwordchanger($r,
  '<span class="LC_error">'.   '<span class="LC_error">'.
  &mt('The new passwords you entered do not match').'.  '.   &mt('The new passwords you entered do not match.').'  '.
  &mt('Please try again').'.</span>',$caller,$mailtoken);   &mt('Please try again.').'</span>',$caller,$mailtoken);
  return 1;   return 1;
     }      }
     if (length($newpass1) < 7) {      if (length($newpass1) < 7) {
  &passwordchanger($r,   &passwordchanger($r,
  '<span class="LC_error">'.   '<span class="LC_error">'.
  &mt('Passwords must be a minimum of 7 characters long').'.  '.   &mt('Passwords must be a minimum of 7 characters long.').'  '.
  &mt('Please try again').'</span>.',$caller,$mailtoken);   &mt('Please try again.').'</span>',$caller,$mailtoken);
  return 1;   return 1;
     }      }
     #      #
Line 1346  ENDERROR Line 1363  ENDERROR
     if ($badpassword) {      if ($badpassword) {
  # I can't figure out how to enter bad characters on my browser.   # I can't figure out how to enter bad characters on my browser.
  my $errormessage ='<span class="LC_error">'.   my $errormessage ='<span class="LC_error">'.
            &mt('The password you entered contained illegal characters').'.<br />'.             &mt('The password you entered contained illegal characters.').'<br />'.
            &mt('Valid characters are').(<<"ENDERROR");             &mt('Valid characters are').(<<"ENDERROR");
 : space and <br />  : space and <br />
 <pre>  <pre>
Line 1367  ENDERROR Line 1384  ENDERROR
     } else {      } else {
  # error error: run in circles, scream and shout   # error error: run in circles, scream and shout
         $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".          $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
                   &mt('Please make sure your old password was entered correctly').'.');                    &mt('Please make sure your old password was entered correctly.'));
         return 1;          return 1;
     }      }
     return;      return;
Line 1487  sub verify_and_change_discussion { Line 1504  sub verify_and_change_discussion {
     if (defined($env{'form.discdisp'}) ) {      if (defined($env{'form.discdisp'}) ) {
         my $newdisp  = $env{'form.newdisp'};          my $newdisp  = $env{'form.newdisp'};
         if ($newdisp eq 'unread') {          if ($newdisp eq 'unread') {
             $message .='In discussions: only new posts will be displayed.<br />';              $message .=&mt('In discussions: only new posts will be displayed.').'<br />';
             &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});              &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
             &Apache::lonnet::appenv('environment.discdisplay' => $newdisp);              &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
         } else {          } else {
             $message .= 'In discussions: all posts will be displayed.<br />';              $message .= &mt('In discussions: all posts will be displayed.').'<br />';
             &Apache::lonnet::del('environment',['discdisplay']);              &Apache::lonnet::del('environment',['discdisplay']);
             &Apache::lonnet::delenv('environment\.discdisplay');              &Apache::lonnet::delenv('environment\.discdisplay');
         }          }
Line 1499  sub verify_and_change_discussion { Line 1516  sub verify_and_change_discussion {
     if (defined($env{'form.discmark'}) ) {      if (defined($env{'form.discmark'}) ) {
         my $newmark = $env{'form.newmark'};          my $newmark = $env{'form.newmark'};
         if ($newmark eq 'ondisp') {          if ($newmark eq 'ondisp') {
            $message.='In discussions: new posts will be cease to be identified as "new" after display.<br />';             $message.=&mt('In discussions: new posts will be cease to be identified as "NEW" after display.').'<br />';
             &Apache::lonnet::put('environment',{'discmarkread' => $newmark});              &Apache::lonnet::put('environment',{'discmarkread' => $newmark});
             &Apache::lonnet::appenv('environment.discmarkread' => $newmark);              &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
         } else {          } else {
             $message.='In discussions: posts will be identified as "new" until marked as read by the reader.<br />';              $message.=&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.').'<br />';
             &Apache::lonnet::del('environment',['discmarkread']);              &Apache::lonnet::del('environment',['discmarkread']);
             &Apache::lonnet::delenv('environment\.discmarkread');              &Apache::lonnet::delenv('environment\.discmarkread');
         }          }
Line 1566  sub verify_and_change_coursepage { Line 1583  sub verify_and_change_coursepage {
     if ($newdisp eq 'firstres') {      if ($newdisp eq 'firstres') {
         $message .= $lt{'ywbt'}.'<br />';          $message .= $lt{'ywbt'}.'<br />';
         &Apache::lonnet::put('environment',{'course_init_display' => $newdisp});          &Apache::lonnet::put('environment',{'course_init_display' => $newdisp});
         &Apache::lonnet::appenv('environment.course_init_display' => $newdisp);          &Apache::lonnet::appenv({'environment.course_init_display' => $newdisp});
     } else {      } else {
         $message .= $lt{'apwb'}.'<br />';          $message .= $lt{'apwb'}.'<br />';
         &Apache::lonnet::del('environment',['course_init_display']);          &Apache::lonnet::del('environment',['course_init_display']);
Line 1658  sub handler { Line 1675  sub handler {
     push (@Options,({ action   => 'changemsgforward',      push (@Options,({ action   => 'changemsgforward',
                       linktext => 'Change Message Forwarding and Notification Email Addresses',                        linktext => 'Change Message Forwarding and Notification Email Addresses',
                       href     => '/adm/preferences',                        href     => '/adm/preferences',
                       help     => 'Prefs_Forwarding',                        help     => 'Prefs_Messages',
                       breadcrumb =>                         breadcrumb => 
                           { href => '/adm/preferences?action=changemsgforward',                            { href => '/adm/preferences?action=changemsgforward',
                             text => 'Change Message Forwarding'},                              text => 'Change Message Forwarding/Notification'},
                       subroutine => \&msgforwardchanger,                        subroutine => \&msgforwardchanger,
                       },                        },
                     { action => 'verify_and_change_msgforward',                      { action => 'verify_and_change_msgforward',
                         help   => 'Prefs_Messages',
                       breadcrumb =>                         breadcrumb => 
                           { href => '/adm/preferences?action=changemsgforward',                            { href => '/adm/preferences?action=changemsgforward',
                             text => 'Change Message Forwarding'},                              text => 'Change Message Forwarding/Notification'},
                       printmenu => 'no',                        printmenu => 'no',
                       subroutine => \&verify_and_change_msgforward }));                        subroutine => \&verify_and_change_msgforward }));
     my $aboutmeaction=      my $aboutmeaction=
Line 1921  sub toggle_debug { Line 1939  sub toggle_debug {
     if ($env{'user.debug'}) {      if ($env{'user.debug'}) {
         &Apache::lonnet::delenv('user\.debug');          &Apache::lonnet::delenv('user\.debug');
     } else {      } else {
         &Apache::lonnet::appenv('user.debug' => 1);          &Apache::lonnet::appenv({'user.debug' => 1});
     }      }
 }  }
   
Removed from v.1.107  
changed lines
  Added in v.1.117

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>