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

Diff for /loncom/interface/lonpreferences.pm between versions 1.103 and 1.114

version 1.103, 2007/05/08 18:26:54 version 1.114, 2008/03/03 11:29:57
Line 168  sub verify_and_change_languages { Line 168  sub verify_and_change_languages {
     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 262  sub verify_and_change_texengine { Line 262  sub verify_and_change_texengine {
     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 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 490  sub verify_and_change_screenname { Line 496  sub verify_and_change_screenname {
     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 503  sub verify_and_change_screenname { Line 509  sub verify_and_change_screenname {
     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 562  sub verify_and_change_icons { Line 568  sub verify_and_change_icons {
 }  }
   
 ################################################################  ################################################################
   #                     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));
   }
   
   ################################################################
 #         Message Forward                                      #  #         Message Forward                                      #
 ################################################################  ################################################################
   
Line 576  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 you entered',                                            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();
     my $jscript = qq|      my $jscript = qq|
 <script type="text/javascript">  <script type="text/javascript">
 function validate() {  function validate() {
     var checkaddress = 0;  
     for (var i=0; i<document.prefs.numnotify.value; i++) {      for (var i=0; i<document.prefs.numnotify.value; i++) {
           var checkaddress = 0;
         var addr = document.prefs.elements['address_'+i].value;          var addr = document.prefs.elements['address_'+i].value;
           var rownum = i+1;
         if (i < document.prefs.numnotify.value-1) {          if (i < document.prefs.numnotify.value-1) {
             if (document.prefs.elements['del_notify_'+i].value == false) {              if (document.prefs.elements['modify_notify_'+i].checked) {
                 checkaddress = 1;                  checkaddress = 1;
             }               }
         } else {          } else {
             if (document.prefs.elements['add_notify_'+i].checked == true) {               if (document.prefs.elements['add_notify_'+i].checked == true) { 
                 checkaddress = 1;                  checkaddress = 1;
             }              }
         }          }
         if (checkaddress== 1) {          if (checkaddress == 1)  {
             var addr = document.prefs.elements['address_'+i].value;              var addr = document.prefs.elements['address_'+i].value;
             if (validmail(document.prefs.elements['address_'+i]) == false) {              if (validmail(document.prefs.elements['address_'+i]) == false) {
                 alert("$lt{'email'}: "+addr+" $lt{'notv'}.\\n($lt{'toen'}).");                  var multimsg = '';
                   if (addr.indexOf(",") >= 0) {
                       multimsg = "\\n($lt{'toen'}).";
                   }
                   alert("$lt{'email'} "+rownum+" ('"+addr+"') $lt{'notv'}."+multimsg);
                 return;                  return;
             }              }
         }          }
     }      }
     document.prefs.submit();      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  $validatescript
 </script>  </script>
 |;  |;
     $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().
                  &Apache::loncommon::start_data_table_header_row().                   &Apache::loncommon::start_data_table_header_row().
                    '<th>&nbsp;</th>'.
                  '<th>'.&mt('Action').'</th>'.                   '<th>'.&mt('Action').'</th>'.
                  '<th>'.&mt('Notification address').'</th><th>'.                   '<th>'.&mt('Notification address').'</th><th>'.
                  &mt('Messages to forward').'</th><th>'.                   &mt('Types of message for which notification is sent').
                  &mt('Excerpt retains HTML tags included in message').'</th>'.                   $criticalMessageHelp.'</th><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;
       my $counter = 1;
     foreach my $item (@sortforwards) {      foreach my $item (@sortforwards) {
         $output .= &Apache::loncommon::start_data_table_row().          $output .= &Apache::loncommon::start_data_table_row().
                    '<td><input type="checkbox" name="del_notify_'.$num.'" />'.                     '<td><b>'.$counter.'</b></td>'.
                    &mt('Delete').'</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_'.                     '<td><input type="text" value="'.$item.'" name="address_'.
                    $num.'" /></td><td>';                     $num.'" onFocus="javascript:address_changes('."'$num'".
                      ')" /></td><td>';
         my %chk;          my %chk;
         if (defined($allnot{$item}{'crit'})) {          if (defined($allnot{$item}{'crit'})) {
             if (defined($allnot{$item}{'reg'})) {              if (defined($allnot{$item}{'reg'})) {
Line 659  ENDMSG Line 746  ENDMSG
         foreach my $type ('all','crit','reg') {          foreach my $type ('all','crit','reg') {
             $output .= '<span class="LC_nobreak"><label>'.              $output .= '<span class="LC_nobreak"><label>'.
                        '<input type="radio" name="notify_type_'.$num.                          '<input type="radio" name="notify_type_'.$num. 
                        '" value="'.$type.'" '.$chk{$type}.'/>'.$lt{$type}.'</label></span>&nbsp;';                         '" value="'.$type.'" '.$chk{$type}.
                          ' onchange="javascript:address_changes('."'$num'".')" />'.
                          $lt{$type}.'</label></span>&nbsp;';
         }          }
         my $htmlon = '';          my $htmlon = '';
         my $htmloff = '';          my $htmloff = '';
Line 669  ENDMSG Line 758  ENDMSG
             $htmloff = 'checked="checked" ';              $htmloff = 'checked="checked" ';
         }          }
         $output .= '</td><td><label><input type="radio" name="html_'.$num.          $output .= '</td><td><label><input type="radio" name="html_'.$num.
                    '" value="1" '.$htmlon.'/>'.&mt('Yes').'</label>&nbsp;'.                     '" value="1" '.$htmlon.
                      ' onchange="javascript:address_changes('."'$num'".')" />'.
                      &mt('Yes').'</label>&nbsp;'.
                    '<label><input type="radio" name="html_'.$num.'" value="0" '.                     '<label><input type="radio" name="html_'.$num.'" value="0" '.
                    $htmloff.'/>'.&mt('No').'</label></td>'.                     $htmloff. ' onchange="javascript:address_changes('."'$num'".
   ')" />'.
                      &mt('No').'</label></td>'.
                    &Apache::loncommon::end_data_table_row();                     &Apache::loncommon::end_data_table_row();
         $num ++;          $num ++;
           $counter ++;
     }      }
     my %defchk = (      my %defchk = (
                    all => 'checked="checked" ',                     all => 'checked="checked" ',
Line 681  ENDMSG Line 775  ENDMSG
                    reg => '',                     reg => '',
                  );                   );
     $output .= &Apache::loncommon::start_data_table_row().      $output .= &Apache::loncommon::start_data_table_row().
                '<td><input type="checkbox" name="add_notify_'.$num.'" />'.                 '<td><b>'.$counter.'</b></td>'.
                &mt('Add').'</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.                 '<td><input type="text" value="" name="address_'.$num.
                '" /></td><td>';                 '" onFocus="javascript:new_address('."'$num'".')" /></td><td>';
     foreach my $type ('all','crit','reg') {      foreach my $type ('all','crit','reg') {
         $output .= '<span class="LC_nobreak"><label>'.          $output .= '<span class="LC_nobreak"><label>'.
                    '<input type="radio" name="notify_type_'.$num.                     '<input type="radio" name="notify_type_'.$num.
Line 701  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 738  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>';
            }             }
         }          }
     }      }
Line 746  sub verify_and_change_msgforward { Line 842  sub verify_and_change_msgforward {
     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 757  sub verify_and_change_msgforward { Line 853  sub verify_and_change_msgforward {
     my $notification;      my $notification;
     my $notify_with_html;      my $notify_with_html;
     my $lastnotify = $env{'form.numnotify'}-1;      my $lastnotify = $env{'form.numnotify'}-1;
       my $totaladdresses = 0;
     for (my $i=0; $i<$env{'form.numnotify'}; $i++) {      for (my $i=0; $i<$env{'form.numnotify'}; $i++) {
         if ((!defined($env{'form.del_notify_'.$i})) &&            if ((!defined($env{'form.del_notify_'.$i})) &&  
            ((($i==$lastnotify) && (defined($env{'form.add_notify_'.$lastnotify}))) ||             ((($i==$lastnotify) && ($env{'form.add_notify_'.$lastnotify} == 1)) ||
             ($i<$lastnotify))) {              ($i<$lastnotify))) {
             if (defined($env{'form.address_'.$i})) {              if (defined($env{'form.address_'.$i})) {
                 if ($env{'form.notify_type_'.$i} eq 'all') {                  if ($env{'form.notify_type_'.$i} eq 'all') {
Line 773  sub verify_and_change_msgforward { Line 870  sub verify_and_change_msgforward {
                 if ($env{'form.html_'.$i} eq '1') {                  if ($env{'form.html_'.$i} eq '1') {
     $notify_with_html .= $env{'form.address_'.$i}.',';            $notify_with_html .= $env{'form.address_'.$i}.',';      
                 }                  }
                   $totaladdresses ++;
             }              }
         }          }
     }      }
Line 785  sub verify_and_change_msgforward { Line 883  sub verify_and_change_msgforward {
     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');
             $message.=&mt("Set all notification address(es) to receive excerpts with html stripped.").'<br />';              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 {      } else {
         &Apache::lonnet::del('environment',['notifywithhtml']);          &Apache::lonnet::del('environment',['notifywithhtml']);
Line 817  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 915  sub verify_and_change_colors { Line 1018  sub verify_and_change_colors {
  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;
Line 953  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 1225  ENDERROR Line 1328  ENDERROR
         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 1253  ENDERROR Line 1356  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 1274  ENDERROR Line 1377  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 1394  sub verify_and_change_discussion { Line 1497  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 1406  sub verify_and_change_discussion { Line 1509  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 1565  sub handler { Line 1668  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 1709  sub handler { Line 1813  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=changeicons',
                               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 (&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'})) {
Removed from v.1.103  
changed lines
  Added in v.1.114

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