Diff for /loncom/interface/lonpreferences.pm between versions 1.125.2.3 and 1.125.2.4

version 1.125.2.3, 2009/03/21 04:41:50 version 1.125.2.4, 2009/10/09 13:09:01
Line 1248  sub jscript_send { Line 1248  sub jscript_send {
                    this.document.client.elements.uname.value;                     this.document.client.elements.uname.value;
         this.document.pserver.elements.udom.value =          this.document.pserver.elements.udom.value =
                    this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;                     this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
           this.document.pserver.elements.email.value =
                      this.document.client.elements.email.value;
 |;  |;
     }      }
     $ output .= qq|      $ output .= qq|
Line 1332  sub server_form { Line 1334  sub server_form {
 <input type="hidden" name="token"   value="$mailtoken" />  <input type="hidden" name="token"   value="$mailtoken" />
 <input type="hidden" name="uname"   value="" />  <input type="hidden" name="uname"   value="" />
 <input type="hidden" name="udom"   value="" />  <input type="hidden" name="udom"   value="" />
   <input type="hidden" name="email"   value="" />
   
 |;  |;
     }      }
Line 1478  ENDERROR Line 1481  ENDERROR
  $r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");   $r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
     } 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>".          if ($caller eq 'reset_by_email') {
                   &mt('Please make sure your old password was entered correctly.'));              if (!$result) {
         return 1;                  return 1;
               } else {
                   return $result;
               }
           } else {
               $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.'));
           }
     }      }
     return;      return;
 }  }

Removed from v.1.125.2.3  
changed lines
  Added in v.1.125.2.4


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