Diff for /loncom/interface/lonpreferences.pm between versions 1.99 and 1.110

version 1.99, 2007/04/17 18:28:44 version 1.110, 2008/01/17 16:37:28
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 526  sub iconchanger { Line 532  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 555  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', '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                                      #
 ################################################################  ################################################################
   
 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',
                                             crit  => 'Critical only',
                                             reg   => 'Non-critical only',
                                             foad  => 'Forwarding 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',
                                             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 $forwardingHelp = Apache::loncommon::help_open_topic("Prefs_Forwarding",
     "What are forwarding ".      &mt("What are forwarding and notification addresses?"));
     "and notification ".  
     "addresses");  
     my $criticalMessageHelp = Apache::loncommon::help_open_topic("Course_Critical_Message",      my $criticalMessageHelp = Apache::loncommon::help_open_topic("Course_Critical_Message",
  "What are critical messages");   &mt("What are critical messages?"));
       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
   $forwardingHelp
 <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" /><hr />
 New Message Notification Email Address(es) (<tt>joe\@doe.com,jane\@doe.edu,...</tt>):  $criticalMessageHelp
 <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 to forward to this address').'</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|
   <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 833  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>';
            }             }
         }          }
     }      }
Line 610  sub verify_and_change_msgforward { Line 841  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.='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 738  sub verify_and_change_colors { Line 1017  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 776  sub passwordchanger { Line 1055  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 1028  sub verify_and_change_password { Line 1307  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 stored token for password decryption");          my $unable=&mt("Unable to retrieve saved token for password decryption");
  $r->print(<<ENDERROR);   $r->print(<<ENDERROR);
 <p>  <p>
 <span class="LC_error">$unable.  $tryagain_text</span>  <span class="LC_error">$unable.  $tryagain_text</span>
Line 1048  ENDERROR Line 1327  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 1076  ENDERROR Line 1355  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 1097  ENDERROR Line 1376  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 1201  END Line 1480  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 1217  sub verify_and_change_discussion { Line 1496  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 1229  sub verify_and_change_discussion { Line 1508  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 1398  sub handler { Line 1677  sub handler {
                       breadcrumb =>                         breadcrumb => 
                           { href => '/adm/preferences?action=changemsgforward',                            { href => '/adm/preferences?action=changemsgforward',
                             text => 'Change Message Forwarding'},                              text => 'Change Message Forwarding'},
                       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 1517  sub handler { Line 1796  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 1532  sub handler { Line 1811  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.99  
changed lines
  Added in v.1.110


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