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

Diff for /loncom/interface/lonpreferences.pm between versions 1.92 and 1.97

version 1.92, 2006/06/22 23:30:33 version 1.97, 2007/03/07 16:24:08
Line 42  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 279  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 307  sub rolesprefchanger { Line 310  sub rolesprefchanger {
         my %frozen_roles =          my %frozen_roles =
                &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});                 &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
                   
         my %role_text = &rolespref_get_role_text(keys(%recent_roles));          my %role_text = &rolespref_get_role_text([keys(%recent_roles)]);
         my @sorted_roles = sort {$role_text{$a} cmp $role_text{$b}} keys(%role_text);          my @sorted_roles = sort {$role_text{$a} cmp $role_text{$b}} keys(%role_text);
   
         $roles_check_list .=          $roles_check_list .=
     &Apache::loncommon::start_data_table().      &Apache::loncommon::start_data_table().
     &Apache::loncommon::start_data_table_header_row().      &Apache::loncommon::start_data_table_header_row().
     "<th>".&mt('Freeze Role')."</th>".      "<th>".&mt('Freeze '.$role)."</th>".
     "<th>".&mt('Role')."</td>".      "<th>".&mt($role)."</td>".
     &Apache::loncommon::end_data_table_header_row().      &Apache::loncommon::end_data_table_header_row().
     "\n";      "\n";
  my $count;   my $count;
Line 338  sub rolesprefchanger { Line 341  sub rolesprefchanger {
     }      }
   
     $r->print('      $r->print('
 <p>'.&mt('Some LON-CAPA users have a long list of roles. The Recent Roles Hotlist feature keeps track of the last N roles which have been visited and places a table of these at the top of the roles page. People with very few roles should leave this feature disabled.').'  <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>  </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>'.&mt('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 />'.&mt('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> roles on your screen. Those marked as frozen will not be removed from the list, even if they have not been used recently.').'  <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>  </p>
 '.$roles_check_list.'  '.$roles_check_list.'
 <br />  <br />
Line 364  sub rolespref_get_role_text { Line 367  sub rolespref_get_role_text {
     foreach my $item (@$roles) {      foreach my $item (@$roles) {
 # get course information  # get course information
         my ($role,$rest) = split(/\./, $item);          my ($role,$rest) = split(/\./, $item);
         my $trole = &Apache::lonnet::plaintext($role);          my $trole = "";
           $trole = &Apache::lonnet::plaintext($role);
         my ($tdomain,$other,$tsection)= split(/\//,Apache::lonnet::declutter($rest));          my ($tdomain,$other,$tsection)= split(/\//,Apache::lonnet::declutter($rest));
         my $tother = '-';          my $tother = '-';
         if ($role =~ /cc|st|in|ta/ ) {          if ($role =~ /^(cc|st|in|ta|ep|cr)/ ) {
             my %newhash=&Apache::lonnet::coursedescription($tdomain."_".$other);              my %newhash=&Apache::lonnet::coursedescription($tdomain."_".$other);
             $tother = " - ".$newhash{'description'};              $tother = " - ".$newhash{'description'};
         } elsif ($role =~ /dc/) {          } elsif ($role =~ /dc/) {
Line 387  sub rolespref_get_role_text { Line 391  sub rolespref_get_role_text {
   
 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
Line 396  sub verify_and_change_rolespref { Line 401  sub verify_and_change_rolespref {
     if ($hotlist_flag) {      if ($hotlist_flag) {
         &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});          &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});
         &Apache::lonnet::appenv('environment.recentroles' => $hotlist_flag);          &Apache::lonnet::appenv('environment.recentroles' => $hotlist_flag);
         $message=&mt('Recent 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=&mt('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 />".              $message.="<br />".
  &mt('Display [_1] Most Recent Roles',$hotlist_n)."\n";   &mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";
         }          }
     }      }
   
Line 429  sub verify_and_change_rolespref { Line 434  sub verify_and_change_rolespref {
 # Unset any roles that were previously frozen but aren't in list  # Unset any roles that were previously frozen but aren't in list
     foreach my $role_key (sort(keys(%recent_roles))) {      foreach my $role_key (sort(keys(%recent_roles))) {
         if (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) {          if (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) {
     $message .= "<br />".&mt('Unfreezing Role: [_1]',$role_text{$role_key})."\n";      $message .= "<br />".&mt('Unfreezing '.$role.': [_1]',$role_text{$role_key})."\n";
     &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);      &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
         }          }
     }      }
Line 437  sub verify_and_change_rolespref { Line 442  sub verify_and_change_rolespref {
 # Freeze selected roles  # Freeze selected roles
     foreach my $role_key (@freeze_list) {      foreach my $role_key (@freeze_list) {
         if (!$frozen_roles{$role_key}) {          if (!$frozen_roles{$role_key}) {
              $message .= "<br />".&mt('Freezing Role: [_1]',$role_text{$role_key})."\n";               $message .= "<br />".&mt('Freezing '.$role.': [_1]',$role_text{$role_key})."\n";
              &Apache::lonhtmlcommon::store_recent('roles',               &Apache::lonhtmlcommon::store_recent('roles',
                                           $role_key,' ',1);                                            $role_key,' ',1);
         }          }
Line 552  sub verify_and_change_msgforward { Line 557  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 717  ENDVCCOL Line 722  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 741  sub passwordchanger { Line 773  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 754  sub passwordchanger { Line 787  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 776  sub passwordchanger { Line 827  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">  
 <input type="hidden" name="logtoken"    value="$logtoken" />  
 <input type="hidden" name="action"      value="verify_and_change_pass" />  
 <input type="hidden" name="currentpass" value="" />  
 <input type="hidden" name="newpass_1"   value="" />  
 <input type="hidden" name="newpass_2"   value="" />  
 </form>  
   
   sub client_form {
       my ($caller,$hexkey,$currentpass,$defdom) = @_;
       my $output = qq|
 <form name="client" >  <form name="client" >
 <table>  <table>
   |;
       if ($caller eq 'reset_by_email') {
           $output .= qq|
   <tr><td align="right"> E-mail address:                        </td>
       <td><input type="text" name="email" size="30" /> </td></tr>
   <tr><td align="right"> Username:                        </td>
       <td>
        <input type="text" name="uname" size="15" />
        <input type="hidden" name="currentpass" value="$currentpass" />
       </td></tr>
   <tr><td align="right"> Domain:                               </td>
       <td>
   |;
           $output .= &Apache::loncommon::select_dom_form($defdom,'udom').'
      </td>
   </tr>
   ';
       } else {
           $output .= qq|
 <tr><td align="right"> Current password:                      </td>  <tr><td align="right"> Current password:                      </td>
     <td><input type="password" name="currentpass" size="10"/> </td></tr>      <td><input type="password" name="currentpass" size="10"/> </td></tr>
   |;
       }
       $output .= <<"ENDFORM";
 <tr><td align="right"> New password:                          </td>  <tr><td align="right"> New password:                          </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 align="right"> Confirm password:                      </td>
Line 807  $errormessage Line 879  $errormessage
 <tr><td colspan="2" align="center">  <tr><td colspan="2" align="center">
     <input type="button" value="Change Password" onClick="send();">      <input type="button" value="Change Password" 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<font color='#ff0000'>ERROR</font>".
                            "Invalid username and/or domain .\n</p>",
                            $caller,$mailtoken);
                   return 1;
               }
           } else {
               &passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>".
                                "Username and Domain were blank.\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<font color='#ff0000'>ERROR</font>".
                                "Authentication type for this user can not be changed by this mechanism..\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 838  sub verify_and_change_password { Line 966  sub verify_and_change_password {
     defined($newpass1)    &&       defined($newpass1)    && 
     defined($newpass2)    ){      defined($newpass2)    ){
  &passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>".   &passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>".
  "Password data was blank.\n</p>");   "One or more password fields were blank.\n</p>",$caller,$mailtoken);
  return;   return;
     }      }
     # Get the keys      # Get the keys
Line 846  sub verify_and_change_password { Line 974  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.');
           }
  $r->print(<<ENDERROR);   $r->print(<<ENDERROR);
 <p>  <p>
 <font color="#ff0000">ERROR:</font> Unable to retrieve stored token for  <font color="#ff0000">ERROR:</font> Unable to retrieve stored token for
 password decryption.  Please log out and try again.  password decryption.  $tryagain_text
 </p>  </p>
 ENDERROR  ENDERROR
         # Probably should log an error here          # Probably should log an error here
Line 860  ENDERROR Line 992  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,
                            '<font color="#ff0000">ERROR:</font>'.
                            'Could not verify current authentication.  '.
                            'Please try again.',$caller,$mailtoken);
               return 1;
           }
       } 
     if ($newpass1 ne $newpass2) {      if ($newpass1 ne $newpass2) {
  &passwordchanger($r,   &passwordchanger($r,
  '<font color="#ff0000">ERROR:</font>'.   '<font color="#ff0000">ERROR:</font>'.
  'The new passwords you entered do not match.  '.   'The new passwords you entered do not match.  '.
  'Please try again.');   'Please try again.',$caller,$mailtoken);
  return 1;   return 1;
     }      }
     if (length($newpass1) < 7) {      if (length($newpass1) < 7) {
  &passwordchanger($r,   &passwordchanger($r,
  '<font color="#ff0000">ERROR:</font>'.   '<font color="#ff0000">ERROR:</font>'.
  'Passwords must be a minimum of 7 characters long.  '.   'Passwords must be a minimum of 7 characters long.  '.
  'Please try again.');   'Please try again.',$caller,$mailtoken);
  return 1;   return 1;
     }      }
     #      #
Line 883  ENDERROR Line 1025  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 = <<"ENDERROR";
 <font color="#ff0000">ERROR:</font>  <font color="#ff0000">ERROR:</font>
 The password you entered contained illegal characters.<br />  The password you entered contained illegal characters.<br />
 Valid characters are: space and <br />  Valid characters are: space and <br />
Line 892  Valid characters are: space and <br /> Line 1034  Valid characters are: space and <br />
 ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{|}~  ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{|}~
 </pre>  </pre>
 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(<<"ENDTEXT");
 <h2>The password for $user was successfully changed</h2>  <h3>The password for $user was successfully changed</h3>
 ENDTEXT  ENDTEXT
     } else {      } else {
  # error error: run in circles, scream and shout   # error error: run in circles, scream and shout
         $r->print(<<ENDERROR);          $r->print(<<ENDERROR);
 <h2><font color="#ff0000">The password for $user was not changed</font></h2>  <h3><font color="#ff0000">The password for $user was not changed</font></h3>
 Please make sure your old password was entered correctly.  Please make sure your old password was entered correctly.
 ENDERROR  ENDERROR
         return 1;          return 1;
Line 1196  sub handler { Line 1340  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 1280  sub handler { Line 1424  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',
                       }));                        }));
   
Removed from v.1.92  
changed lines
  Added in v.1.97

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