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

version 1.84, 2006/05/08 18:50:27 version 1.99, 2007/04/17 18:28:44
Line 33 Line 33
 package Apache::lonpreferences;  package Apache::lonpreferences;
   
 use strict;  use strict;
   use LONCAPA;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::File;  use Apache::File;
 use Crypt::DES;  use Crypt::DES;
Line 41  use Apache::loncommon(); Line 42  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use LONCAPA();
   
 #  #
 # Write lonnet::passwd to do the call below.  # Write lonnet::passwd to do the call below.
Line 107  sub wysiwygchanger { Line 109  sub wysiwygchanger {
     my $switchoff=&mt('Disable WYSIWYG editor');      my $switchoff=&mt('Disable WYSIWYG editor');
     my $switchon=&mt('Enable WYSIWYG editor');      my $switchon=&mt('Enable WYSIWYG editor');
     $r->print(<<ENDLSCREEN);      $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="POST">  <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="set_wysiwyg" />  <input type="hidden" name="action" value="set_wysiwyg" />
 <br />  <br />
 <label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />  <label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
Line 147  sub languagechanger { Line 149  sub languagechanger {
     my $selectionbox=&Apache::loncommon::select_form($language,'language',      my $selectionbox=&Apache::loncommon::select_form($language,'language',
      %langchoices);       %langchoices);
     $r->print(<<ENDLSCREEN);      $r->print(<<ENDLSCREEN);
 <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_languages" />  <input type="hidden" name="action" value="verify_and_change_languages" />
 <br />$pref: $selectionbox  <br />$pref: $selectionbox
 ENDLSCREEN  ENDLSCREEN
Line 201  sub texenginechanger { Line 203  sub texenginechanger {
     $r->print(<<ENDLSCREEN);      $r->print(<<ENDLSCREEN);
 <br />  <br />
   
 <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>$pref: $selectionbox</p>
 <p><input type="submit" value="$change" /></p>  <p><input type="submit" value="$change" /></p>
Line 278  ENDVCSCREEN Line 280  ENDVCSCREEN
 ################################################################  ################################################################
 sub rolesprefchanger {  sub rolesprefchanger {
     my $r = shift;      my $r = shift;
       my $role    = ($env{'user.adv'} ? 'Role' : 'Course');
       my $lc_role = ($env{'user.adv'} ? 'role' : 'course');
     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      my %userenv = &Apache::lonnet::get
Line 297  sub rolesprefchanger { Line 301  sub rolesprefchanger {
  $options .= "<option $select>$i</option>\n";   $options .= "<option $select>$i</option>\n";
     }      }
   
     $r->print(<<ENDSCREEN);  # Get list of recent roles and display with checkbox in front
 <p>Some LON-CAPA users have a long list of roles. The Recent Roles Hotlist      my $roles_check_list = '';
 feature keeps track of the last N roles which have been      my $role_key='';
 visited and places a table of these at the top of the roles page.      if ($env{'environment.recentroles'}) {
 People with very few roles should leave this feature disabled.          my %recent_roles =
 </p>                 &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});
           my %frozen_roles =
                  &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
           
           my %role_text = &rolespref_get_role_text([keys(%recent_roles)]);
           my @sorted_roles = sort {$role_text{$a} cmp $role_text{$b}} keys(%role_text);
   
           $roles_check_list .=
       &Apache::loncommon::start_data_table().
       &Apache::loncommon::start_data_table_header_row().
       "<th>".&mt('Freeze '.$role)."</th>".
       "<th>".&mt($role)."</td>".
       &Apache::loncommon::end_data_table_header_row().
       "\n";
    my $count;
           foreach $role_key (@sorted_roles) {
               my $checked = "";
               my $value = $recent_roles{$role_key};
               if ($frozen_roles{$role_key}) {
                   $checked = "checked=\"checked\"";
               }
       $count++;
               $roles_check_list .=
    &Apache::loncommon::start_data_table_row().
    '<td class="LC_table_cell_checkbox">'.
    "<input type=\"checkbox\" $checked name=\"freezeroles\"".
    " id=\"freezeroles$count\" value=\"$role_key\" /></td>".
    "<td><label for=\"freezeroles$count\">".
    "$role_text{$role_key}</label></td>".
    &Apache::loncommon::end_data_table_row(). "\n";
           }
           $roles_check_list .= "</table>\n";
       }
   
       $r->print('
   <p>'.&mt('Some LON-CAPA users have a long list of '.$lc_role.'s. The Recent '.$role.'s Hotlist feature keeps track of the last N '.$lc_role.'s which have been visited and places a table of these at the top of the '.$lc_role.'s page. People with very few '.$lc_role.'s should leave this feature disabled.').'
   </p>
 <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_rolespref" />  <input type="hidden" name="action" value="verify_and_change_rolespref" />
 <br /><label>Enable Recent Roles Hotlist:  <br /><label>'.&mt('Enable Recent '.$role.'s Hotlist:').'
 <input type="checkbox" $checked name="recentroles" value="true" /></label>  <input type="checkbox" '.$checked.' name="recentroles" value="true" /></label>
 <br />Number of roles in Hotlist:  <br />'.&mt('Number of '.$role.'s in Hotlist:').'
 <select name="recentrolesn" size="1">  <select name="recentrolesn" size="1">
 $options  '.$options.'
 </select>  </select>
   <p>'.&mt('This list below can be used to <q>freeze</q> '.$lc_role.'s on your screen. Those marked as frozen will not be removed from the list, even if they have not been used recently.').'
   </p>
   '.$roles_check_list.'
 <br />  <br />
 <input type="submit" value="Change" />  <input type="submit" value="'.&mt('Change').'" />
 </form>  </form>');
 ENDSCREEN  }
   
   sub rolespref_get_role_text {
   # Get a line of text for each role
       my ($roles) = @_;
       my %roletext = ();
   
       foreach my $item (@$roles) {
   # get course information
           my ($role,$rest) = split(/\./, $item);
           my $trole = "";
           $trole = &Apache::lonnet::plaintext($role);
           my ($tdomain,$other,$tsection)= split(/\//,Apache::lonnet::declutter($rest));
           my $tother = '-';
           if ($role =~ /^(cc|st|in|ta|ep|cr)/ ) {
               my %newhash=&Apache::lonnet::coursedescription($tdomain."_".$other);
               $tother = " - ".$newhash{'description'};
           } elsif ($role =~ /dc/) {
               $tother = "";
           } else {
               $tother = " - $other";
           }
    
           my $section="";
           if ($tsection) {
               $section = " - Section/Group: $tsection";
           }
           $roletext{$item} = $tdomain." - ".$trole.$tother.$section;
       }
       return %roletext;
 }  }
   
 sub verify_and_change_rolespref {  sub verify_and_change_rolespref {
     my $r = shift;      my $r = shift;
       my $role = ($env{'user.adv'} ? 'Role' : 'Course');
     my $user       = $env{'user.name'};      my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};      my $domain     = $env{'user.domain'};
 # Recent Roles Hotlist Flag  # Recent Roles Hotlist Flag
     my $hotlist_flag  = $env{'form.recentroles'};      my $hotlist_flag  = $env{'form.recentroles'};
     my $hotlist_n  = $env{'form.recentrolesn'};      my $hotlist_n  = $env{'form.recentrolesn'};
     my $message='';      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='Recent Roles Hotlist is Enabled';          $message=&mt('Recent '.$role.'s Hotlist is Enabled');
     } else {      } else {
         &Apache::lonnet::del('environment',['recentroles']);          &Apache::lonnet::del('environment',['recentroles']);
         &Apache::lonnet::delenv('environment\.recentroles');          &Apache::lonnet::delenv('environment\.recentroles');
         $message='Recent Roles Hotlist is Disabled';          $message=&mt('Recent '.$role.'s Hotlist is Disabled');
     }      }
     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 />Display $hotlist_n Most Recent Roles\n";              $message.="<br />".
    &mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";
           }
       }
   
   # Get list of froze roles and list of recent roles
       my @freeze_list = &Apache::loncommon::get_env_multiple('form.freezeroles');
       my %freeze = ();
       my %roletext = ();
   
       foreach my $key (@freeze_list) {
           $freeze{$key}='1';
       }
   
       my %recent_roles =
           &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});
       my %frozen_roles =
           &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
       my %role_text = &rolespref_get_role_text([keys(%recent_roles)]);
   
   # Unset any roles that were previously frozen but aren't in list
       foreach my $role_key (sort(keys(%recent_roles))) {
           if (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) {
       $message .= "<br />".&mt('Unfreezing '.$role.': [_1]',$role_text{$role_key})."\n";
       &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
           }
       }
   
   # Freeze selected roles
       foreach my $role_key (@freeze_list) {
           if (!$frozen_roles{$role_key}) {
                $message .= "<br />".&mt('Freezing '.$role.': [_1]',$role_text{$role_key})."\n";
                &Apache::lonhtmlcommon::store_recent('roles',
                                             $role_key,' ',1);
         }          }
     }      }
       $message .= "<hr /><br />\n";
   
     $r->print(<<ENDRPSCREEN);      $r->print(<<ENDRPSCREEN);
 $message  $message
Line 362  sub screennamechanger { Line 468  sub screennamechanger {
     my $screenname=$userenv{'screenname'};      my $screenname=$userenv{'screenname'};
     my $nickname=$userenv{'nickname'};      my $nickname=$userenv{'nickname'};
     $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 />New screenname (shown if you post anonymously):
 <input type="text" size="20" value="$screenname" name="screenname" />  <input type="text" size="20" value="$screenname" name="screenname" />
Line 410  ENDVCSCREEN Line 516  ENDVCSCREEN
 }  }
   
 ################################################################  ################################################################
   #                     Icon Subroutines                         #
   ################################################################
   sub iconchanger {
       my $r = shift;
       my $user       = $env{'user.name'};
       my $domain     = $env{'user.domain'};
       my %userenv = &Apache::lonnet::get
           ('environment',['icons']);
       my $iconic='checked="checked"';
       my $classic='';
       if ($userenv{'icons'} eq 'classic') {
          $classic='checked="checked"';
          $iconic='';
       }
       my $useicons=&mt('Use icons');
       my $usebuttons=&mt('Use classic buttons');
       my $change=&mt('Change');
       $r->print(<<ENDSCREEN);
   <form name="prefs" action="/adm/preferences" method="post">
   <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="classic" $classic /> $usebuttons</label><br />
   <input type="submit" value="$change" />
   </form>
   ENDSCREEN
   }
   
   sub verify_and_change_icons {
       my $r = shift;
       my $user       = $env{'user.name'};
       my $domain     = $env{'user.domain'};
       my $newicons  = $env{'form.menumode'};
   
       &Apache::lonnet::put('environment',{'icons' => $newicons});
       &Apache::lonnet::appenv('environment.icons' => $newicons);
       $r->print(&mt('Set menu mode to [_1].',$newicons));
   }
   
   ################################################################
 #         Message Forward                                      #  #         Message Forward                                      #
 ################################################################  ################################################################
   
Line 430  sub msgforwardchanger { Line 575  sub msgforwardchanger {
   
     $r->print(<<ENDMSG);      $r->print(<<ENDMSG);
 $forwardingHelp <br />  $forwardingHelp <br />
 <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>):  New Forwarding Address(es) (<tt>user:domain,user:domain,...</tt>):
 <input type="text" size="40" value="$msgforward" name="msgforward" /><hr />  <input type="text" size="40" value="$msgforward" name="msgforward" /><hr />
Line 451  sub verify_and_change_msgforward { Line 596  sub verify_and_change_msgforward {
     my $message='';      my $message='';
     foreach (split(/\,/,$env{'form.msgforward'})) {      foreach (split(/\,/,$env{'form.msgforward'})) {
  my ($msuser,$msdomain)=split(/[\@\:]/,$_);   my ($msuser,$msdomain)=split(/[\@\:]/,$_);
         $msuser=~s/\W//g;          $msuser = &LONCAPA::clean_username($msuser);
         $msdomain=~s/\W//g;          $msdomain = &LONCAPA::clean_domain($msdomain);
         if (($msuser) && ($msdomain)) {          if (($msuser) && ($msdomain)) {
     if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {      if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
                $newscreen.=$msuser.':'.$msdomain.',';                 $newscreen.=$msuser.':'.$msdomain.',';
Line 561  sub colorschanger { Line 706  sub colorschanger {
 <input type="hidden" name="pres_type" />  <input type="hidden" name="pres_type" />
 <input type="hidden" name="pres_value" />  <input type="hidden" name="pres_value" />
 </form>  </form>
 <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_colors" />  <input type="hidden" name="action" value="verify_and_change_colors" />
 $start_data_table  $start_data_table
 $chtable  $chtable
Line 606  sub verify_and_change_colors { Line 751  sub verify_and_change_colors {
   
     $r->print(<<ENDVCCOL);      $r->print(<<ENDVCCOL);
 $message  $message
 <form name="client" action="/adm/preferences" method="POST">  <form name="client" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="changecolors" />  <input type="hidden" name="action" value="changecolors" />
 </form>  </form>
 ENDVCCOL  ENDVCCOL
Line 616  ENDVCCOL Line 761  ENDVCCOL
 #            password handler subroutines            #  #            password handler subroutines            #
 ######################################################  ######################################################
 sub passwordchanger {  sub passwordchanger {
       my ($r,$errormessage,$caller,$mailtoken) = @_;
     # This function is a bit of a mess....      # This function is a bit of a mess....
     # Passwords are encrypted using londes.js (DES encryption)      # Passwords are encrypted using londes.js (DES encryption)
     my $r = shift;  
     my $errormessage = shift;  
     $errormessage = ($errormessage || '');      $errormessage = ($errormessage || '');
     my $user       = $env{'user.name'};      my ($user,$domain,$currentpass,$defdom);
     my $domain     = $env{'user.domain'};      if ((!defined($caller)) || ($caller eq 'preferences')) {
     my $homeserver = $env{'user.home'};          $user = $env{'user.name'};
           $domain = $env{'user.domain'};
           if (!defined($caller)) {
               $caller = 'preferences';
           }
       } elsif ($caller eq 'reset_by_email') {
               $defdom = $r->dir_config('lonDefDomain');
               my %data = &Apache::lonnet::tmpget($mailtoken);
               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.'));
                   return;
               }
               if (defined($data{time})) {
                   if (time - $data{'time'} < 7200) {
                       $user = $data{'username'};
                       $domain = $data{'domain'};
                       $currentpass = $data{'temppasswd'};
                   } else {
                       $r->print(&mt('Sorry, the token generated when you requested a password reset has expired.').'<br />');
                       return;
                   }
               } else {
                   $r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />');
                   return;
               }
      } else {
           $r->print(&mt('Page requested in unexpected context').'<br />');
           return;
       }
     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);      my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
     # Check for authentication types that allow changing of the password.      # Check for authentication types that allow changing of the password.
     return if ($currentauth !~ /^(unix|internal):/);      return if ($currentauth !~ /^(unix|internal):/);
Line 640  sub passwordchanger { Line 812  sub passwordchanger {
        .$ukey_npass2 . $lkey_npass2,         .$ukey_npass2 . $lkey_npass2,
        $lonhost);         $lonhost);
     # Hexify the keys for output as javascript variables      # Hexify the keys for output as javascript variables
     $ukey_cpass = hex($ukey_cpass);      my %hexkey;
     $lkey_cpass = hex($lkey_cpass);      $hexkey{'ukey_cpass'}  = hex($ukey_cpass);
     $ukey_npass1= hex($ukey_npass1);      $hexkey{'lkey_cpass'}  = hex($lkey_cpass);
     $lkey_npass1= hex($lkey_npass1);      $hexkey{'ukey_npass1'} = hex($ukey_npass1);
     $ukey_npass2= hex($ukey_npass2);      $hexkey{'lkey_npass1'} = hex($lkey_npass1);
     $lkey_npass2= hex($lkey_npass2);      $hexkey{'ukey_npass2'} = hex($ukey_npass2);
       $hexkey{'lkey_npass2'} = hex($lkey_npass2);
     # Output javascript to deal with passwords      # Output javascript to deal with passwords
     # Output DES javascript      # Output DES javascript
     {      {
Line 653  sub passwordchanger { Line 826  sub passwordchanger {
  my $jsh=Apache::File->new($include."/londes.js");   my $jsh=Apache::File->new($include."/londes.js");
  $r->print(<$jsh>);   $r->print(<$jsh>);
     }      }
       $r->print(&jscript_send($caller));
     $r->print(<<ENDFORM);      $r->print(<<ENDFORM);
   $errormessage
   
   <p>
   <!-- We separate the forms into 'server' and 'client' in order to
        ensure that unencrypted passwords will not be sent out by a
        crappy browser -->
   ENDFORM
       $r->print(&server_form($logtoken,$caller,$mailtoken));
       $r->print(&client_form($caller,\%hexkey,$currentpass,$defdom));
   
       #
       return;
   }
   
   sub jscript_send {
       my ($caller) = @_;
       my $output = qq|
 <script language="JavaScript">  <script language="JavaScript">
   
     function send() {      function send() {
Line 675  sub passwordchanger { Line 866  sub passwordchanger {
         initkeys();          initkeys();
         this.document.pserver.elements.newpass_2.value          this.document.pserver.elements.newpass_2.value
             =crypted(this.document.client.elements.newpass_2.value);              =crypted(this.document.client.elements.newpass_2.value);
   |;
       if ($caller eq 'reset_by_email') {
           $output .= qq|
           this.document.pserver.elements.uname.value =
                      this.document.client.elements.uname.value;
           this.document.pserver.elements.udom.value =
                      this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
   |;
       }
       $ output .= qq|
         this.document.pserver.submit();          this.document.pserver.submit();
     }      }
   
 </script>  </script>
 $errormessage  |;
   }
 <p>  
 <!-- We separate the forms into 'server' and 'client' in order to  
      ensure that unencrypted passwords will not be sent out by a  
      crappy browser -->  
   
 <form name="pserver" action="/adm/preferences" method="POST">  sub client_form {
 <input type="hidden" name="logtoken"    value="$logtoken" />      my ($caller,$hexkey,$currentpass,$defdom) = @_;
 <input type="hidden" name="action"      value="verify_and_change_pass" />      my %lt=&Apache::lonlocal::texthash(
 <input type="hidden" name="currentpass" value="" />                  'email' => 'EMail Address',
 <input type="hidden" name="newpass_1"   value="" />                  'username' => 'Username',
 <input type="hidden" name="newpass_2"   value="" />                  'domain' => 'Domain',
 </form>                  'currentpass' => 'Current Password',
                   'newpass' => 'New Password',
                   'confirmpass' => 'Confirm Password',
                   'changepass' => 'Change Password');
   
       my $output = qq|
 <form name="client" >  <form name="client" >
 <table>  <table>
 <tr><td align="right"> Current password:                      </td>  |;
       if ($caller eq 'reset_by_email') {
           $output .= qq|
   <tr><td class="LC_preferences_labeltext"><label for="email">$lt{'email'}</label>:</td>
       <td><input type="text" name="email" size="30" /> </td></tr>
   <tr><td class="LC_preferences_labeltext"><label for="uname">$lt{'username'}</label>:</td>
       <td>
        <input type="text" name="uname" size="15" />
        <input type="hidden" name="currentpass" value="$currentpass" />
       </td></tr>
   <tr><td class="LC_preferences_labeltext"><label for="udom">$lt{'udom'}</label>:</td>
       <td>
   |;
           $output .= &Apache::loncommon::select_dom_form($defdom,'udom').'
      </td>
   </tr>
   ';
       } else {
           $output .= qq|
   <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>
 <tr><td align="right"> New password:                          </td>  |;
       }
       $output .= <<"ENDFORM";
   <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="$ukey_cpass" />  <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />
 <input type="hidden" name="lkey_cpass"  value="$lkey_cpass" />  <input type="hidden" name="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />
 <input type="hidden" name="ukey_npass1" value="$ukey_npass1" />  <input type="hidden" name="ukey_npass1" value="$hexkey->{'ukey_npass1'}" />
 <input type="hidden" name="lkey_npass1" value="$lkey_npass1" />  <input type="hidden" name="lkey_npass1" value="$hexkey->{'lkey_npass1'}" />
 <input type="hidden" name="ukey_npass2" value="$ukey_npass2" />  <input type="hidden" name="ukey_npass2" value="$hexkey->{'ukey_npass2'}" />
 <input type="hidden" name="lkey_npass2" value="$lkey_npass2" />  <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
 </form>  </form>
 </p>  </p>
 ENDFORM  ENDFORM
     #      return $output;
     return;  }
   
   sub server_form {
       my ($logtoken,$caller,$mailtoken) = @_;
       my $action = '/adm/preferences';
       if ($caller eq 'reset_by_email') {
           $action = '/adm/resetpw';
       }
       my $output = qq|
   <form name="pserver" action="$action" method="post">
   <input type="hidden" name="logtoken"    value="$logtoken" />
   <input type="hidden" name="currentpass" value="" />
   <input type="hidden" name="newpass_1"   value="" />
   <input type="hidden" name="newpass_2"   value="" />
       |;
       if ($caller eq 'reset_by_email') {
           $output .=  qq|
   <input type="hidden" name="token"   value="$mailtoken" />
   <input type="hidden" name="uname"   value="" />
   <input type="hidden" name="udom"   value="" />
   
   |;
       }
       $output .= qq|
   <input type="hidden" name="action" value="verify_and_change_pass" />
   </form>
   |;
       return $output;
 }  }
   
 sub verify_and_change_password {  sub verify_and_change_password {
     my $r = shift;      my ($r,$caller,$mailtoken) = @_;
     my $user       = $env{'user.name'};      my ($user,$domain,$homeserver);
     my $domain     = $env{'user.domain'};      if ($caller eq 'reset_by_email') {
     my $homeserver = $env{'user.home'};          $user       = $env{'form.uname'};
           $domain     = $env{'form.udom'};
           if ($user ne '' && $domain ne '') {
               $homeserver = &Apache::lonnet::homeserver($user,$domain);
               if ($homeserver eq 'no_host') {
           &passwordchanger($r,"<p>\n<span class='LC_error'>".
                            &mt("Invalid username and/or domain")."</span>\n</p>",
                            $caller,$mailtoken);
                   return 1;
               }
           } else {
               &passwordchanger($r,"<p>\n<span class='LC_error'>".
                                &mt("Username and domain were blank")."</span>\n</p>",
                                $caller,$mailtoken);
               return 1;
           }
       } else {
           $user       = $env{'user.name'};
           $domain     = $env{'user.domain'};
           $homeserver = $env{'user.home'};
       }
     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);      my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
     # Check for authentication types that allow changing of the password.      # Check for authentication types that allow changing of the password.
     return if ($currentauth !~ /^(unix|internal):/);      if ($currentauth !~ /^(unix|internal):/) {
           if ($caller eq 'reset_by_email') {
               &passwordchanger($r,"<p>\n<span class='LC_error'>".
                                &mt("Authentication type for this user can not be changed by this mechanism").
                                "</span>\n</p>",
                                 $caller,$mailtoken);
               return 1;
           } else {
               return;
           }
       }
     #      #
     my $currentpass = $env{'form.currentpass'};       my $currentpass = $env{'form.currentpass'}; 
     my $newpass1    = $env{'form.newpass_1'};       my $newpass1    = $env{'form.newpass_1'}; 
Line 736  sub verify_and_change_password { Line 1014  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'>".
  "Password data was blank.\n</p>");   &mt("One or more password fields were blank").
                            "</span>\n</p>",$caller,$mailtoken);
  return;   return;
     }      }
     # Get the keys      # Get the keys
Line 745  sub verify_and_change_password { Line 1024  sub verify_and_change_password {
     my $tmpinfo = Apache::lonnet::reply('tmpget:'.$logtoken,$lonhost);      my $tmpinfo = Apache::lonnet::reply('tmpget:'.$logtoken,$lonhost);
     if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {      if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
         # I do not a have a better idea about how to handle this          # I do not a have a better idea about how to handle this
           my $tryagain_text = &mt('Please log out and try again.');
           if ($caller eq 'reset_by_email') {
               $tryagain_text = &mt('Please try again later.');
           }
           my $unable=&mt("Unable to retrieve stored 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.  Please log out and try again.  
 </p>  </p>
 ENDERROR  ENDERROR
         # Probably should log an error here          # Probably should log an error here
Line 759  ENDERROR Line 1042  ENDERROR
     $currentpass = &des_decrypt($ckey ,$currentpass);      $currentpass = &des_decrypt($ckey ,$currentpass);
     $newpass1    = &des_decrypt($n1key,$newpass1);      $newpass1    = &des_decrypt($n1key,$newpass1);
     $newpass2    = &des_decrypt($n2key,$newpass2);      $newpass2    = &des_decrypt($n2key,$newpass2);
     #       #
       if ($caller eq 'reset_by_email') {
           my %data = &Apache::lonnet::tmpget($mailtoken);
           if ($currentpass ne $data{'temppasswd'}) {
               &passwordchanger($r,
                            '<span class="LC_error">'.
                            &mt('Could not verify current authentication').'.  '.
                            &mt('Please try again').'.</span>',$caller,$mailtoken);
               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.');   &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.');   &mt('Please try again').'</span>.',$caller,$mailtoken);
  return 1;   return 1;
     }      }
     #      #
Line 782  ENDERROR Line 1075  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.
  &passwordchanger($r,<<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);
           return 1;
     }      }
     #       # 
     # Change the password (finally)      # Change the password (finally)
     my $result = &Apache::lonnet::changepass      my $result = &Apache::lonnet::changepass
  ($user,$domain,$currentpass,$newpass1,$homeserver);   ($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>");
 <h2>The password for $user was successfully changed</h2>  
 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>".
 <h2><font color="#ff0000">The password for $user was not changed</font></h2>                    &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 876  sub discussionchanger { Line 1167  sub discussionchanger {
     }      }
           
     $r->print(<<"END");      $r->print(<<"END");
 <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_discussion" />  <input type="hidden" name="action" value="verify_and_change_discussion" />
 <br />  <br />
 $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol>   $lt{'sdpf'}<br /> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol> 
 <br />  <br />
 <br />  <br />
 END  END
Line 926  sub verify_and_change_discussion { Line 1217  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 .='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 .= '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 938  sub verify_and_change_discussion { Line 1229  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.='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.='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 979  sub coursedisplaychanger { Line 1270  sub coursedisplaychanger {
   
     $r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role').'</b>&nbsp;'.&mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"<i>What's New</i>").'<br /><br />');      $r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role').'</b>&nbsp;'.&mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"<i>What's New</i>").'<br /><br />');
     $r->print(<<ENDLSCREEN);      $r->print(<<ENDLSCREEN);
 <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_coursepage" />  <input type="hidden" name="action" value="verify_and_change_coursepage" />
 <br />  <br />
 <label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />  <label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />
Line 1003  sub verify_and_change_coursepage { Line 1294  sub verify_and_change_coursepage {
     my $newdisp  = $env{'form.newdisp'};      my $newdisp  = $env{'form.newdisp'};
     $message = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';      $message = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';
     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']);
         &Apache::lonnet::delenv('environment\.course_init_display');          &Apache::lonnet::delenv('environment\.course_init_display');
     }      }
Line 1095  sub handler { Line 1386  sub handler {
                       }));                        }));
   
     push (@Options,({ action   => 'changemsgforward',      push (@Options,({ action   => 'changemsgforward',
                       linktext => 'Change Message Forwarding and Notification Addresses',                        linktext => 'Change Message Forwarding and Notification Email Addresses',
                       href     => '/adm/preferences',                        href     => '/adm/preferences',
                       help     => 'Prefs_Forwarding',                        help     => 'Prefs_Forwarding',
                       breadcrumb =>                         breadcrumb => 
Line 1179  sub handler { Line 1470  sub handler {
                       printmenu => 'yes',                        printmenu => 'yes',
                       subroutine => \&verify_and_change_discussion, }                        subroutine => \&verify_and_change_discussion, }
                     ));                      ));
                          
       my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
     push (@Options,({ action   => 'changerolespref',      push (@Options,({ action   => 'changerolespref',
                       linktext => 'Change Roles Page Preferences',                        linktext => 'Change '.$role.' Page Preferences',
                       href     => '/adm/preferences',                        href     => '/adm/preferences',
                       subroutine => \&rolesprefchanger,                        subroutine => \&rolesprefchanger,
                       breadcrumb =>                        breadcrumb =>
                           { href => '/adm/preferences?action=changerolespref',                            { href => '/adm/preferences?action=changerolespref',
                             text => 'Change Roles Pref'},                              text => 'Change '.$role.' Page Pref'},
                       },                        },
                     { action   => 'verify_and_change_rolespref',                      { action   => 'verify_and_change_rolespref',
                       subroutine => \&verify_and_change_rolespref,                        subroutine => \&verify_and_change_rolespref,
                       breadcrumb =>                        breadcrumb =>
                           { href => '/adm/preferences?action=changerolespref',                            { href => '/adm/preferences?action=changerolespref',
                             text => 'Change Roles Preferences'},                              text => 'Change '.$role.' Page Preferences'},
                       printmenu => 'yes',                        printmenu => 'yes',
                       }));                        }));
   
Line 1211  sub handler { Line 1503  sub handler {
                             text => 'Change Math Preferences'},                              text => 'Change Math Preferences'},
                       printmenu => 'yes',                        printmenu => 'yes',
                       }));                        }));
   
       if ($env{'environment.remote'} eq 'off') {
    push (@Options,({ action => 'launch',
     linktext => 'Launch Remote Control',
     href => '/adm/remote?url=/adm/preferences',
         }));
       } else {
    push (@Options,({ action => 'collapse',
     linktext => 'Collapse Remote Control',
     href => '/adm/remote?url=/adm/preferences',
         }));
       }
   
       push (@Options,({ action   => 'changeicons',
                         linktext => 'Change How Main Menu is Displayed',
                         href     => '/adm/preferences',
                         subroutine => \&iconchanger,
                         breadcrumb =>
                             { href => '/adm/preferences?action=changeicons',
                               text => 'Change Main Menu'},
                         },
                       { action   => 'verify_and_change_icons',
                         subroutine => \&verify_and_change_icons,
                         breadcrumb =>
                             { href => '/adm/preferences?action=changeicons',
                               text => 'Change Main Menu'},
                         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 1277  sub handler { Line 1598  sub handler {
         foreach my $option(@Options) {          foreach my $option(@Options) {
             my $optiontext = '';              my $optiontext = '';
             if (exists($option->{'href'})) {              if (exists($option->{'href'})) {
                 $optiontext .=    $option->{'href_args'}{'action'}=$option->{'action'};
                     '<a href="'.$option->{'href'}.   $optiontext .= 
                     '?action='.$option->{'action'}.'">'.                      '<a href="'.&add_get_param($option->{'href'},
          $option->{'href_args'}).'">'.
                     &mt($option->{'linktext'}).'</a>';                      &mt($option->{'linktext'}).'</a>';
             }              }
             if (exists($option->{'text'})) {              if (exists($option->{'text'})) {

Removed from v.1.84  
changed lines
  Added in v.1.99


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