Diff for /loncom/interface/lonpreferences.pm between versions 1.98 and 1.123

version 1.98, 2007/04/13 13:39:32 version 1.123, 2008/05/28 23:50:53
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 189  sub texenginechanger { Line 189  sub texenginechanger {
     my %userenv = &Apache::lonnet::get('environment',['texengine']);      my %userenv = &Apache::lonnet::get('environment',['texengine']);
     my $texengine=$userenv{'texengine'};      my $texengine=$userenv{'texengine'};
   
     my $pref=&mt('Preferred method to display Math');  
     my %mathchoices=('' => 'Default',      my %mathchoices=('' => 'Default',
      'tth' => 'TeX to HTML',       'tth' => 'tth (TeX to HTML)',
      #'ttm' => 'TeX to MathML',       #'ttm' => 'TeX to MathML',
      'jsMath' => 'jsMath',       'jsMath' => 'jsMath',
      'mimetex' => 'Convert to Images'       'mimetex' => 'mimetex (Convert to Images)'
                      );                       );
     my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',      my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
      %mathchoices);       %mathchoices);
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();      my $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my $change=&mt('Change');      my %lt=&Apache::lonlocal::texthash(
     $r->print(<<ENDLSCREEN);        'headline' => 'Change Math Preferences',
 <br />        'preftxt'  => 'Preferred method to display Math',
         'change'   => 'Change',
         'exmpl'    => 'Examples',
         'jsmath'   => 'jsMath:',
         'tth'      => 'tth (TeX to HTML):',
         'mimetex'  => 'mimetex (Convert to Images):',
       );
   
       $r->print(<<ENDLSCREEN);
   <h2>$lt{'headline'}</h2>
 <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_texengine" />  <input type="hidden" name="action" value="verify_and_change_texengine" />
 <p>$pref: $selectionbox</p>  <p>
 <p><input type="submit" value="$change" /></p>  $lt{'preftxt'}:<br />
 </form>  $selectionbox <input type="submit" value="$lt{'change'}" />
 Examples:  
 <p> TeX to HTML <br />   
 <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" hieght="200"></iframe>  
 </p>  </p>
 <p>jsMath <br />   </form>
   <br />
   <hr />
   $lt{'exmpl'}
   
   <h3>$lt{'jsmath'}</h3> 
   <p>
 $jsMath_start  $jsMath_start
 <script type="text/javascript">  <script type="text/javascript">
 if (jsMath.nofonts == 1) {  if (jsMath.nofonts == 1) {
     document.writeln      document.writeln
         ('<center><div style="padding: 10; border-style: solid; border-width:3;'          ('<div style="padding: 10; border-style: solid; border-width:3;'
  +' border-color: #DD0000; background-color: #FFF8F8; width: 75%; text-align: left">'   +' border-color: #DD0000; background-color: #FFF8F8; width: 75%; text-align: left">'
  +'<small><font color="#AA0000"><b>Warning:</b> '   +'<small><font color="#AA0000"><b>Warning:</b> '
  +'It looks like you don\\\'t have the TeX math fonts installed. '   +'It looks like you don\\\'t have the TeX math fonts installed. '
Line 227  if (jsMath.nofonts == 1) { Line 237  if (jsMath.nofonts == 1) {
  +'needed fonts.  In the meantime, jsMath will do the best it can '   +'needed fonts.  In the meantime, jsMath will do the best it can '
  +'with the fonts you have, but it may not be pretty and some equations '   +'with the fonts you have, but it may not be pretty and some equations '
  +'may not be rendered correctly. '   +'may not be rendered correctly. '
  +'</font></small></div></center>');   +'</font></small></div>');
 }  }
 </script>  </script>
 <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" hieght="200"></iframe>  <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
   </p>
   
   <h3>$lt{'mimetex'}</h3>
   <p>
   <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="100"></iframe>
 </p>  </p>
 <p> Convert to Images <br />  
 <br />  <h3>$lt{'tth'}</h3>
 <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" hieght="200"></iframe>  <p>
   <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="200"></iframe>
 </p>  </p>
 ENDLSCREEN  ENDLSCREEN
     if ($env{'environment.texengine'} ne 'jsMath') {      if ($env{'environment.texengine'} ne 'jsMath') {
Line 252  sub verify_and_change_texengine { Line 267  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 415  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 424  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 482  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 510  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 523  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 526  sub iconchanger { Line 547  sub iconchanger {
         ('environment',['icons']);          ('environment',['icons']);
     my $iconic='checked="checked"';      my $iconic='checked="checked"';
     my $classic='';      my $classic='';
       my $onlyicon='';
     if ($userenv{'icons'} eq 'classic') {      if ($userenv{'icons'} eq 'classic') {
        $classic='checked="checked"';         $classic='checked="checked"';
        $iconic='';         $iconic='';
     }      }
     my $useicons=&mt('Use icons');      if ($userenv{'icons'} eq 'iconsonly') {
     my $usebuttons=&mt('Use classic buttons');         $onlyicon='checked="checked"';
          $iconic='';
       }
       my $useicons=&mt('Use icons and text');
       my $usebuttons=&mt('Use buttons and text');
       my $useicononly=&mt('Use icons only');
     my $change=&mt('Change');      my $change=&mt('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_icons" />  <input type="hidden" name="action" value="verify_and_change_icons" />
 <label><input type="radio" name="menumode" value="iconic" $iconic /> $useicons</label><br />  <label><input type="radio" name="menumode" value="iconic" $iconic /> $useicons</label><br />
 <label><input type="radio" name="menumode" value="classic" $classic /> $usebuttons</label><br />  <label><input type="radio" name="menumode" value="classic" $classic /> $usebuttons</label><br />
   <label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $useicononly</label><br />
 <input type="submit" value="$change" />  <input type="submit" value="$change" />
 </form>  </form>
 ENDSCREEN  ENDSCREEN
Line 550  sub verify_and_change_icons { Line 578  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));
 }  }
   
 ################################################################  ################################################################
   #                     Clicker Subroutines                      #
   ################################################################
   
   sub clickerchanger {
       my $r = shift;
       my $user       = $env{'user.name'};
       my $domain     = $env{'user.domain'};
       my %userenv = &Apache::lonnet::get
           ('environment',['clickers']);
       my $clickers=$userenv{'clickers'};
       $clickers=~s/\,/\n/gs;
       my $text=&mt('Enter response device ("clicker") numbers');
       my $change=&mt('Register');
       my $helplink=&Apache::loncommon::help_open_topic('Clicker_Registration',&mt('Locating your clicker ID'));
       $r->print(<<ENDSCREEN);
   <form name="prefs" action="/adm/preferences" method="post">
   <input type="hidden" name="action" value="verify_and_change_clicker" />
   <label>$text $helplink<br />
   <textarea name="clickers" rows="5" cols="20">$clickers</textarea>
   </label>
   <input type="submit" value="$change" />
   </form>
   ENDSCREEN
   }
   
   sub verify_and_change_clicker {
       my $r = shift;
       my $user       = $env{'user.name'};
       my $domain     = $env{'user.domain'};
       my $newclickers  = $env{'form.clickers'};
       $newclickers=~s/[^\w\:\-]+/\,/gs;
       $newclickers=~tr/a-z/A-Z/;
       $newclickers=~s/[\:\-]+/\-/g;
       $newclickers=~s/\,+/\,/g;
       $newclickers=~s/^\,//;
       $newclickers=~s/\,$//;
       &Apache::lonnet::put('environment',{'clickers' => $newclickers});
       &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
       $r->print(&mt('Registering clickers: [_1]',$newclickers));
   }
   
   ################################################################
   #               Domcoord Access Subroutines                    #
   ################################################################
   
   sub domcoordchanger {
       my $r = shift;
       my $user       = $env{'user.name'};
       my $domain     = $env{'user.domain'};
       my %userenv = &Apache::lonnet::get
           ('environment',['domcoord.author']);
       my $constchecked='';
       if ($userenv{'domcoord.author'} eq 'blocked') {
          $constchecked='checked="checked"';
       }
       my $text=&mt('By default, the Domain Coordinator can enter your construction space.');
       my $construction=&mt('Block access to construction space');
       my $change=&mt('Change');
       $r->print(<<ENDSCREEN);
   <form name="prefs" action="/adm/preferences" method="post">
   <input type="hidden" name="action" value="verify_and_change_domcoord" />
   $text<br />
   <label><input type="checkbox" name="construction" $constchecked />$construction</label><br />
   <input type="submit" value="$change" />
   </form>
   ENDSCREEN
   }
   
   sub verify_and_change_domcoord {
       my $r = shift;
       my $user       = $env{'user.name'};
       my $domain     = $env{'user.domain'};
       my %domcoord=('domcoord.author' => '');
       if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; }
       &Apache::lonnet::put('environment',\%domcoord);
       &Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}});
       $r->print(&mt('Registering Domain Coordinator access restrictions.'));
   }
   
   #################################################################
   ##                      Lock Subroutines                        #
   #################################################################
   
   sub lockwarning {
       my $r = shift;
       my $title=&mt('Action locked');
       my $texttop=&mt('LON-CAPA is currently performing the following actions:');
       my $textbottom=&mt('Changing roles or logging out may result in data corruption.');
       my ($num,%which)=&Apache::lonnet::get_locks();
       my $which='';
       foreach my $id (keys %which) {
          $which.='<li>'.$which{$id}.'</li>';
       }
       my $change=&mt('Override');
       $r->print(<<ENDSCREEN);
   <form name="prefs" action="/adm/preferences" method="post">
   <input type="hidden" name="action" value="verify_and_change_locks" />
   <h1>$title</h1>
   $texttop
   <ul>
   $which
   </ul>
   $textbottom
   <input type="submit" value="$change" />
   </form>
   ENDSCREEN
   }
   
   sub verify_and_change_lockwarning {
       my $r = shift;
       &Apache::lonnet::remove_all_locks();
       $r->print(&mt('Cleared locks.'));
   }
   
   
   ################################################################
 #         Message Forward                                      #  #         Message Forward                                      #
 ################################################################  ################################################################
   
 sub msgforwardchanger {  sub msgforwardchanger {
     my $r = shift;      my ($r,$message) = @_;
     my $user       = $env{'user.name'};      my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};      my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get('environment',['msgforward','notification','critnotification']);      my %userenv = &Apache::lonnet::get('environment',['msgforward','notification','critnotification','notifywithhtml']);
     my $msgforward=$userenv{'msgforward'};      my $msgforward=$userenv{'msgforward'};
     my $notification=$userenv{'notification'};      my %lt = &Apache::lonlocal::texthash(
     my $critnotification=$userenv{'critnotification'};                                            all   => 'All',
     my $forwardingHelp = Apache::loncommon::help_open_topic("Prefs_Forwarding",                                            crit  => 'Critical only',
     "What are forwarding ".                                            reg   => 'Non-critical only',
     "and notification ".                                            foad  => 'Forwarding Address(es)',
     "addresses");                                            noti  => 'Notification E-mail Address(es)', 
     my $criticalMessageHelp = Apache::loncommon::help_open_topic("Course_Critical_Message",                                            foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',
  "What are critical messages");                                            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',
                                             email => 'The e-mail address entered in row ',
                                             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", 
                                             prme => 'Back to preferences menu',
                                           );
       my $forwardingHelp = &Apache::loncommon::help_open_topic("Prefs_Forwarding");
       my $notificationHelp = &Apache::loncommon::help_open_topic("Prefs_Notification");
       my $criticalMessageHelp = &Apache::loncommon::help_open_topic("Course_Critical_Message");
       my @allow_html = split(/,/,$userenv{'notifywithhtml'});
       my %allnot = &get_notifications(\%userenv);
       my $validatescript = &Apache::lonhtmlcommon::javascript_valid_email();
       my $jscript = qq|
   <script type="text/javascript">
   function validate() {
       for (var i=0; i<document.prefs.numnotify.value; i++) {
           var checkaddress = 0;
           var addr = document.prefs.elements['address_'+i].value;
           var rownum = i+1;
           if (i < document.prefs.numnotify.value-1) {
               if (document.prefs.elements['modify_notify_'+i].checked) {
                   checkaddress = 1;
               }
           } else {
               if (document.prefs.elements['add_notify_'+i].checked == true) { 
                   checkaddress = 1;
               }
           }
           if (checkaddress == 1)  {
               var addr = document.prefs.elements['address_'+i].value;
               if (validmail(document.prefs.elements['address_'+i]) == false) {
                   var multimsg = '';
                   if (addr.indexOf(",") >= 0) {
                       multimsg = "\\n($lt{'toen'}).";
                   }
                   alert("$lt{'email'} "+rownum+" ('"+addr+"') $lt{'notv'}."+multimsg);
                   return;
               }
           }
       }
       document.prefs.submit();
   }
   
   function address_changes (adnum) {
        if (!document.prefs.elements['del_notify_'+adnum].checked) { 
            document.prefs.elements['modify_notify_'+adnum].checked = true;
        }   
   }
   
   function new_address(adnum) {
        document.prefs.elements['add_notify_'+adnum].checked = true;
   }
   
   function delete_address(adnum) {
        if (document.prefs.elements['del_notify_'+adnum].checked) {
             document.prefs.elements['modify_notify_'+adnum].checked = false;
        }
   }
   
   function modify_address(adnum) {
       if (document.prefs.elements['modify_notify_'+adnum].checked) {
           document.prefs.elements['del_notify_'+adnum].checked = false;
       }
   } 
   
   $validatescript
   </script>
   |;
     $r->print(<<ENDMSG);      $r->print(<<ENDMSG);
 $forwardingHelp <br />  $jscript
   $message
   <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" />
 New Forwarding Address(es) (<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 />
 New Message Notification Email Address(es) (<tt>joe\@doe.com,jane\@doe.edu,...</tt>):  <h3>$lt{'noti'} $notificationHelp</h3>
 <input type="text" size="40" value="$notification" name="notification" /><hr />  $lt{'mnot'} ($lt{'mnot_exmpl'}):<br />
 New Critical Message Notification Email Address(es) (<tt>joe\@doe.com,jane\@doe.edu,...</tt>):  
 <input type="text" size="40" value="$critnotification" name="critnotification" />$criticalMessageHelp<hr />  
 <input type="submit" value="Change" />  
 </form>  
 ENDMSG  ENDMSG
       my @sortforwards = sort (keys(%allnot));
       my $output = &Apache::loncommon::start_data_table().
                    &Apache::loncommon::start_data_table_header_row().
                    '<th>&nbsp;</th>'.
                    '<th>'.&mt('Action').'</th>'.
                    '<th>'.&mt('Notification address').'</th><th>'.
                    &mt('Types of message for which notification is sent').
                    $criticalMessageHelp.'</th><th>'.
                    &mt('Excerpt retains HTML tags in message').'</th>'.
                    &Apache::loncommon::end_data_table_header_row();
       my $num = 0;
       my $counter = 1;
       foreach my $item (@sortforwards) {
           $output .= &Apache::loncommon::start_data_table_row().
                      '<td><b>'.$counter.'</b></td>'.
                      '<td><span class="LC_nobreak"><label>'.
                      '<input type="checkbox" name="modify_notify_'.
                      $num.'" onclick="javscript:modify_address('."'$num'".')" />'.
                      &mt('Modify').'</label></span>&nbsp;&nbsp; '.
                      '<span class="LC_nobreak"><label>'.
                      '<input type="checkbox" name="del_notify_'.$num.
                      '" onclick="javscript:delete_address('."'$num'".')" />'.
                      &mt('Delete').'</label></span></td>'.
                      '<td><input type="text" value="'.$item.'" name="address_'.
                      $num.'" onFocus="javascript:address_changes('."'$num'".
                      ')" /></td><td>';
           my %chk;
           if (defined($allnot{$item}{'crit'})) {
               if (defined($allnot{$item}{'reg'})) {
                   $chk{'all'} = 'checked="checked" ';
               } else {
                   $chk{'crit'} = 'checked="checked" ';
               }
           } else {
               $chk{'reg'} = 'checked="checked" ';
           }
           foreach my $type ('all','crit','reg') {
               $output .= '<span class="LC_nobreak"><label>'.
                          '<input type="radio" name="notify_type_'.$num. 
                          '" value="'.$type.'" '.$chk{$type}.
                          ' onchange="javascript:address_changes('."'$num'".')" />'.
                          $lt{$type}.'</label></span>&nbsp;';
           }
           my $htmlon = '';
           my $htmloff = '';
           if (grep/^\Q$item\E/,@allow_html) {
               $htmlon = 'checked="checked" '; 
           } else {
               $htmloff = 'checked="checked" ';
           }
           $output .= '</td><td><label><input type="radio" name="html_'.$num.
                      '" value="1" '.$htmlon.
                      ' onchange="javascript:address_changes('."'$num'".')" />'.
                      &mt('Yes').'</label>&nbsp;'.
                      '<label><input type="radio" name="html_'.$num.'" value="0" '.
                      $htmloff. ' onchange="javascript:address_changes('."'$num'".
   ')" />'.
                      &mt('No').'</label></td>'.
                      &Apache::loncommon::end_data_table_row();
           $num ++;
           $counter ++;
       }
       my %defchk = (
                      all => 'checked="checked" ',
                      crit => '',
                      reg => '',
                    );
       $output .= &Apache::loncommon::start_data_table_row().
                  '<td><b>'.$counter.'</b></td>'.
                  '<td><span class="LC_nobreak"><label>'.
                  '<input type="checkbox" name="add_notify_'.$num.
                  '" value="1" />'.&mt('Add new address').'</label></span></td>'.
                  '<td><input type="text" value="" name="address_'.$num.
                  '" onFocus="javascript:new_address('."'$num'".')" /></td><td>';
       foreach my $type ('all','crit','reg') {
           $output .= '<span class="LC_nobreak"><label>'.
                      '<input type="radio" name="notify_type_'.$num.
                      '" value="'.$type.'" '.$defchk{$type}.'/>'.
                      $lt{$type}.'</label></span>&nbsp;';
       }
       $output .= '</td><td><label><input type="radio" name="html_'.$num.
                  '" value="1" />'.&mt('Yes').'</label>&nbsp;'.
                  '<label><input type="radio" name="html_'.$num.'" value="0" '.
                  ' checked="checked" />'.
                  &mt('No').'</label></td>'.
                  &Apache::loncommon::end_data_table_row().
                  &Apache::loncommon::end_data_table();
       $num ++;
       $r->print($output);
       $r->print(qq|
   <br /><hr />
   <input type="hidden" name="numnotify" value="$num" />
   <input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
   <input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />
   </form>
   |);
   
   }
   
   sub get_notifications {
       my ($userenv) = @_;
       my %allnot;
       my @critnot = split(/,/,$userenv->{'critnotification'});
       my @regnot = split(/,/,$userenv->{'notification'});
       foreach my $item (@critnot) {
           $allnot{$item}{crit} = 1;
       }
       foreach my $item (@regnot) {
           $allnot{$item}{reg} = 1;
       }
       return %allnot;
 }  }
   
 sub verify_and_change_msgforward {  sub verify_and_change_msgforward {
Line 602  sub verify_and_change_msgforward { Line 923  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.='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.='Set new message forwarding to '.$newscreen.'<br />';          $message .= &mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.'
                       .'<br />';
     } else {      } else {
         &Apache::lonnet::del('environment',['msgforward']);          &Apache::lonnet::del('environment',['msgforward']);
         &Apache::lonnet::delenv('environment\.msgforward');          &Apache::lonnet::delenv('environment\.msgforward');
         $message.='Reset message forwarding<br />';          $message.= &mt("Set message forwarding to 'off'.").'<br />';
     }      }
     my $notification=$env{'form.notification'};      my $critnotification;
       my $notification;
       my $notify_with_html;
       my $lastnotify = $env{'form.numnotify'}-1;
       my $totaladdresses = 0;
       for (my $i=0; $i<$env{'form.numnotify'}; $i++) {
           if ((!defined($env{'form.del_notify_'.$i})) &&  
              ((($i==$lastnotify) && ($env{'form.add_notify_'.$lastnotify} == 1)) ||
               ($i<$lastnotify))) {
               if (defined($env{'form.address_'.$i})) {
                   if ($env{'form.notify_type_'.$i} eq 'all') {
                       $critnotification .= $env{'form.address_'.$i}.',';
                       $notification .= $env{'form.address_'.$i}.',';
                   } elsif ($env{'form.notify_type_'.$i} eq 'crit') {
                       $critnotification .= $env{'form.address_'.$i}.',';
                   } elsif ($env{'form.notify_type_'.$i} eq 'reg') {
                       $notification .= $env{'form.address_'.$i}.','; 
                   }
                   if ($env{'form.html_'.$i} eq '1') {
       $notify_with_html .= $env{'form.address_'.$i}.',';      
                   }
                   $totaladdresses ++;
               }
           }
       }
       $critnotification =~ s/,$//;
       $critnotification=~s/\s//gs;
       $notification =~ s/,$//;
     $notification=~s/\s//gs;      $notification=~s/\s//gs;
       $notify_with_html =~ s/,$//;
       $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.='Set message notification address to '.$notification.'<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.='Reset message notification<br />';          $message.=&mt("Set non-critical message notification to 'off'.").'<br />';
     }      }
     my $critnotification=$env{'form.critnotification'};  
     $critnotification=~s/\s//gs;  
     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.='Set critical message notification address to '.$critnotification;          $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.='Reset critical message notification<br />';          $message.=&mt("Set critical message notification to 'off'.").'<br />';
     }      }
     $r->print(<<ENDVCMSG);      if ($critnotification || $notification) {
 $message          if ($notify_with_html) {
 ENDVCMSG              &Apache::lonnet::put('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>.';
           } else {
               &Apache::lonnet::del('environment',['notifywithhtml']);
               &Apache::lonnet::delenv('environment\.notifywithhtml');
               if ($totaladdresses == 1) {
                   $message.=&mt("Set notification address to receive excerpts with html stripped.");
               } else {
                   $message.=&mt("Set all notification addresses to receive excerpts with html stripped.");
               }
           }
       } else {
           &Apache::lonnet::del('environment',['notifywithhtml']);
           &Apache::lonnet::delenv('environment\.notifywithhtml');
       }
       if ($message) {
           $message .= '<br /><hr />';
       }
       &Apache::loncommon::flush_email_cache($user,$domain);
       &msgforwardchanger($r,$message);
 }  }
   
 ################################################################  ################################################################
Line 737  sub verify_and_change_colors { Line 1106  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 776  sub passwordchanger { Line 1145  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 884  sub jscript_send { Line 1253  sub jscript_send {
   
 sub client_form {  sub client_form {
     my ($caller,$hexkey,$currentpass,$defdom) = @_;      my ($caller,$hexkey,$currentpass,$defdom) = @_;
       my %lt=&Apache::lonlocal::texthash(
                   'email' => 'E-mail Address',
                   'username' => 'Username',
                   'domain' => 'Domain',
                   'currentpass' => 'Current Password',
                   'newpass' => 'New Password',
                   'confirmpass' => 'Confirm Password',
                   'changepass' => 'Change Password');
   
     my $output = qq|      my $output = qq|
 <form name="client" >  <form name="client" >
 <table>  <table>
 |;  |;
     if ($caller eq 'reset_by_email') {      if ($caller eq 'reset_by_email') {
         $output .= qq|          $output .= qq|
 <tr><td align="right"> E-mail address:                        </td>  <tr><td class="LC_preferences_labeltext"><label for="email">$lt{'email'}</label>:</td>
     <td><input type="text" name="email" size="30" /> </td></tr>      <td><input type="text" name="email" size="30" /> </td></tr>
 <tr><td align="right"> Username:                        </td>  <tr><td class="LC_preferences_labeltext"><label for="uname">$lt{'username'}</label>:</td>
     <td>      <td>
      <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 align="right"> Domain:                               </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 906  sub client_form { Line 1284  sub client_form {
 ';  ';
     } else {      } else {
         $output .= qq|          $output .= qq|
 <tr><td align="right"> Current password:                      </td>  <tr><td class="LC_preferences_labeltext"><label for="currentpass">$lt{'currentpass'}</label></td>
     <td><input type="password" name="currentpass" size="10"/> </td></tr>      <td><input type="password" name="currentpass" size="10"/> </td></tr>
 |;  |;
     }      }
     $output .= <<"ENDFORM";      $output .= <<"ENDFORM";
 <tr><td align="right"> New password:                          </td>  <tr><td class="LC_preferences_labeltext"><label for="newpass_1">$lt{'newpass'}</label></td>
     <td><input type="password" name="newpass_1" size="10"  /> </td></tr>      <td><input type="password" name="newpass_1" size="10"  /> </td></tr>
 <tr><td align="right"> Confirm password:                      </td>  <tr><td class="LC_preferences_labeltext"><label for="newpass_2">$lt{'confirmpass'}</label></td>
     <td><input type="password" name="newpass_2" size="10"  /> </td></tr>      <td><input type="password" name="newpass_2" size="10"  /> </td></tr>
 <tr><td colspan="2" align="center">  <tr><td colspan="2" align="center">
     <input type="button" value="Change Password" onClick="send();">      <input type="button" value="$lt{'changepass'}" onClick="send();">
 </table>  </table>
 <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />  <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />
 <input type="hidden" name="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />  <input type="hidden" name="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />
Line 967  sub verify_and_change_password { Line 1345  sub verify_and_change_password {
         if ($user ne '' && $domain ne '') {          if ($user ne '' && $domain ne '') {
             $homeserver = &Apache::lonnet::homeserver($user,$domain);              $homeserver = &Apache::lonnet::homeserver($user,$domain);
             if ($homeserver eq 'no_host') {              if ($homeserver eq 'no_host') {
         &passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>".          &passwordchanger($r,"<p>\n<span class='LC_error'>".
                          "Invalid username and/or domain .\n</p>",                           &mt("Invalid username and/or domain")."</span>\n</p>",
                          $caller,$mailtoken);                           $caller,$mailtoken);
                 return 1;                  return 1;
             }              }
         } else {          } else {
             &passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>".              &passwordchanger($r,"<p>\n<span class='LC_error'>".
                              "Username and Domain were blank.\n</p>",                               &mt("Username and domain were blank")."</span>\n</p>",
                              $caller,$mailtoken);                               $caller,$mailtoken);
             return 1;              return 1;
         }          }
Line 987  sub verify_and_change_password { Line 1365  sub verify_and_change_password {
     # Check for authentication types that allow changing of the password.      # Check for authentication types that allow changing of the password.
     if ($currentauth !~ /^(unix|internal):/) {      if ($currentauth !~ /^(unix|internal):/) {
         if ($caller eq 'reset_by_email') {          if ($caller eq 'reset_by_email') {
             &passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>".              &passwordchanger($r,"<p>\n<span class='LC_error'>".
                              "Authentication type for this user can not be changed by this mechanism..\n</p>",                               &mt("Authentication type for this user can not be changed by this mechanism").
                                "</span>\n</p>",
                               $caller,$mailtoken);                                $caller,$mailtoken);
             return 1;              return 1;
         } else {          } else {
Line 1004  sub verify_and_change_password { Line 1383  sub verify_and_change_password {
     unless (defined($currentpass) &&       unless (defined($currentpass) && 
     defined($newpass1)    &&       defined($newpass1)    && 
     defined($newpass2)    ){      defined($newpass2)    ){
  &passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>".   &passwordchanger($r,"<p>\n<span class='LC_error'>".
  "One or more password fields were blank.\n</p>",$caller,$mailtoken);   &mt("One or more password fields were blank").
                            "</span>\n</p>",$caller,$mailtoken);
  return;   return;
     }      }
     # Get the keys      # Get the keys
Line 1017  sub verify_and_change_password { Line 1397  sub verify_and_change_password {
         if ($caller eq 'reset_by_email') {          if ($caller eq 'reset_by_email') {
             $tryagain_text = &mt('Please try again later.');              $tryagain_text = &mt('Please try again later.');
         }          }
           my $unable=&mt("Unable to retrieve saved token for password decryption");
  $r->print(<<ENDERROR);   $r->print(<<ENDERROR);
 <p>  <p>
 <font color="#ff0000">ERROR:</font> Unable to retrieve stored token for  <span class="LC_error">$unable.  $tryagain_text</span>
 password decryption.  $tryagain_text  
 </p>  </p>
 ENDERROR  ENDERROR
         # Probably should log an error here          # Probably should log an error here
Line 1034  ENDERROR Line 1414  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,
                          '<font color="#ff0000">ERROR:</font>'.                           '<span class="LC_error">'.
                          'Could not verify current authentication.  '.                           &mt('Could not verify current authentication.').'  '.
                          'Please try again.',$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,
  '<font color="#ff0000">ERROR:</font>'.   '<span class="LC_error">'.
  'The new passwords you entered do not match.  '.   &mt('The new passwords you entered do not match.').'  '.
  'Please try again.',$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,
  '<font color="#ff0000">ERROR:</font>'.   '<span class="LC_error">'.
  'Passwords must be a minimum of 7 characters long.  '.   &mt('Passwords must be a minimum of 7 characters long.').'  '.
  'Please try again.',$caller,$mailtoken);   &mt('Please try again.').'</span>',$caller,$mailtoken);
  return 1;   return 1;
     }      }
     #      #
Line 1064  ENDERROR Line 1451  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 = <<"ENDERROR";   my $errormessage ='<span class="LC_error">'.
 <font color="#ff0000">ERROR:</font>             &mt('The password you entered contained illegal characters.').'<br />'.
 The password you entered contained illegal characters.<br />             &mt('Valid characters are').(<<"ENDERROR");
 Valid characters are: space and <br />  : space and <br />
 <pre>  <pre>
 !&quot;\#$%&amp;\'()*+,-./0123456789:;&lt;=&gt;?\@  !&quot;\#$%&amp;\'()*+,-./0123456789:;&lt;=&gt;?\@
 ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{|}~  ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{|}~
 </pre>  </pre></span>
 ENDERROR  ENDERROR
         &passwordchanger($r,$errormessage,$caller,$mailtoken);          &passwordchanger($r,$errormessage,$caller,$mailtoken);
         return 1;          return 1;
Line 1082  ENDERROR Line 1469  ENDERROR
  ($user,$domain,$currentpass,$newpass1,$homeserver,$caller);   ($user,$domain,$currentpass,$newpass1,$homeserver,$caller);
     # Inform the user the password has (not?) been changed      # Inform the user the password has (not?) been changed
     if ($result =~ /^ok$/) {      if ($result =~ /^ok$/) {
  $r->print(<<"ENDTEXT");   $r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
 <h3>The password for $user was successfully changed</h3>  
 ENDTEXT  
     } else {      } else {
  # error error: run in circles, scream and shout   # error error: run in circles, scream and shout
         $r->print(<<ENDERROR);          $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
 <h3><font color="#ff0000">The password for $user was not changed</font></h3>                    &mt('Please make sure your old password was entered correctly.'));
 Please make sure your old password was entered correctly.  
 ENDERROR  
         return 1;          return 1;
     }      }
     return;      return;
Line 1194  END Line 1577  END
     $r->print(<<"END");      $r->print(<<"END");
 <br />  <br />
 <br />  <br />
 <input type="submit" name="sub" value="Store Changes" />  <input type="submit" name="sub" value="Save Changes" />
 <br />  <br />
 <br />  <br />
 Note: $lt{'thde'}  Note: $lt{'thde'}
Line 1210  sub verify_and_change_discussion { Line 1593  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 1222  sub verify_and_change_discussion { Line 1605  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 1289  sub verify_and_change_coursepage { Line 1672  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 1381  sub handler { Line 1764  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 => 'yes',                        printmenu => 'no',
                       subroutine => \&verify_and_change_msgforward }));                        subroutine => \&verify_and_change_msgforward }));
     my $aboutmeaction=      my $aboutmeaction=
         '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';          '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
Line 1510  sub handler { Line 1894  sub handler {
     }      }
   
     push (@Options,({ action   => 'changeicons',      push (@Options,({ action   => 'changeicons',
                       linktext => 'Change How Main Menu is Displayed',                        linktext => 'Change How Menus are Displayed',
                       href     => '/adm/preferences',                        href     => '/adm/preferences',
                       subroutine => \&iconchanger,                        subroutine => \&iconchanger,
                       breadcrumb =>                        breadcrumb =>
Line 1525  sub handler { Line 1909  sub handler {
                       printmenu => 'yes',                        printmenu => 'yes',
                       }));                        }));
   
       push (@Options,({ action   => 'changeclicker',
                         linktext => 'Register Response Devices ("Clickers")',
                         href     => '/adm/preferences',
                         subroutine => \&clickerchanger,
                         breadcrumb =>
                             { href => '/adm/preferences?action=changeclicker',
                               text => 'Register Clicker'},
                         },
                       { action   => 'verify_and_change_clicker',
                         subroutine => \&verify_and_change_clicker,
                         breadcrumb =>
                             { href => '/adm/preferences?action=changeclicker',
                               text => 'Register Clicker'},
                         printmenu => 'yes',
                         }));
      if ($env{'user.adv'}) {
         push (@Options,({ action   => 'changedomcoord',
                           linktext => 'Restrict Domain Coordinator Access',
                           href     => '/adm/preferences',
                           subroutine => \&domcoordchanger,
                           breadcrumb =>
                               { href => '/adm/preferences?action=changedomcoord',
                                 text => 'Restrict Domain Coordinator Access'},
                         },
                         { action   => 'verify_and_change_domcoord',
                           subroutine => \&verify_and_change_domcoord,
                           breadcrumb =>
                               { href => '/adm/preferences?action=changedomcoord',
                                 text => 'Restrict Domain Coordinator Access'},
                           printmenu => 'yes',
                         }));
       }
   
       push (@Options,({ action   => 'lockwarning',
                         subroutine => \&lockwarning,
                         breadcrumb =>
                             { href => '/adm/preferences?action=lockwarning',
                               text => 'Lock Warnings'},
                         },
                       { action   => 'verify_and_change_locks',
                         subroutine => \&verify_and_change_lockwarning,
                         breadcrumb =>
                             { href => '/adm/preferences?action=lockwarning',
                               text => 'Lockwarnings'},
                         printmenu => 'yes',
                         }));
   
   
     if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})      if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
  || &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'   || &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
     .$env{'request.course.sec'})) {      .$env{'request.course.sec'})) {
Line 1544  sub handler { Line 1976  sub handler {
                        }));                         }));
     }      }
   
     if ($env{'user.name'} =~ /^(albertel|fox|foxr|koretemey|korte|hallmat3|turtle|raeburn)$/) {      if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
         push (@Options,({ action => 'debugtoggle',          push (@Options,({ action => 'debugtoggle',
                           printmenu => 'yes',                            printmenu => 'yes',
                           subroutine => \&toggle_debug,                            subroutine => \&toggle_debug,
Line 1627  sub toggle_debug { Line 2059  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.98  
changed lines
  Added in v.1.123


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