version 1.125.4.3, 2009/08/13 17:55:44
|
version 1.125.4.6, 2009/10/08 21:15:19
|
Line 1290 sub jscript_send {
|
Line 1290 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 1372 sub server_form {
|
Line 1374 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 1516 ENDERROR
|
Line 1519 ENDERROR
|
# Inform the user the password has (not?) been changed |
# Inform the user the password has (not?) been changed |
my $message; |
my $message; |
if ($result =~ /^ok$/) { |
if ($result =~ /^ok$/) { |
$message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'<i>')); |
$message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'</i>')); |
if ($caller eq 'reset_by_email') { |
if ($caller eq 'reset_by_email') { |
$r->print($message.'<br />'); |
$r->print($message.'<br />'); |
} else { |
} else { |
Line 1524 ENDERROR
|
Line 1527 ENDERROR
|
} |
} |
} else { |
} else { |
# error error: run in circles, scream and shout |
# error error: run in circles, scream and shout |
$message = &Apache::lonhtmlcommon::confirm_success( |
|
&mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1); |
|
if ($caller eq 'reset_by_email') { |
if ($caller eq 'reset_by_email') { |
$r->print($message.'<br />'); |
if (!$result) { |
|
return 1; |
|
} else { |
|
return $result; |
|
} |
} else { |
} else { |
|
$message = &Apache::lonhtmlcommon::confirm_success( |
|
&mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1); |
$r->print(&Apache::loncommon::confirmwrapper($message)); |
$r->print(&Apache::loncommon::confirmwrapper($message)); |
} |
} |
return 1; |
|
} |
} |
return; |
return; |
} |
} |
Line 1554 sub discussionchanger {
|
Line 1560 sub discussionchanger {
|
} |
} |
} |
} |
if (defined($userenv{'discmarkread'})) { |
if (defined($userenv{'discmarkread'})) { |
unless ($userenv{'discdisplay'} eq '') { |
unless ($userenv{'discmarkread'} eq '') { |
$discmark = $userenv{'discmarkread'}; |
$discmark = $userenv{'discmarkread'}; |
} |
} |
} |
} |
Line 1644 sub verify_and_change_discussion {
|
Line 1650 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 .=&mt('In discussions: only new posts will be displayed.').'<br />'; |
$message .= &Apache::lonhtmlcommon::confirm_success(&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 .= &mt('In discussions: all posts will be displayed.').'<br />'; |
$message .= &Apache::lonhtmlcommon::confirm_success(&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'); |
} |
} |