--- loncom/interface/lonpreferences.pm 2009/09/10 16:33:38 1.125.4.5
+++ loncom/interface/lonpreferences.pm 2009/10/09 01:44:26 1.125.4.7
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.125.4.5 2009/09/10 16:33:38 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.125.4.7 2009/10/09 01:44:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,6 +42,7 @@ use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonlocal;
use Apache::lonnet;
+use LONCAPA::lonauthcgi();
use LONCAPA();
#
@@ -1290,6 +1291,8 @@ sub jscript_send {
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;
+ this.document.pserver.elements.email.value =
+ this.document.client.elements.email.value;
|;
}
$ output .= qq|
@@ -1372,6 +1375,7 @@ sub server_form {
+
|;
}
@@ -1524,14 +1528,17 @@ ENDERROR
}
} else {
# error error: run in circles, scream and shout
- $message = &Apache::lonhtmlcommon::confirm_success(
- &mt("The password for user [_1] was not changed.",''.$user.'').' '.&mt('Please make sure your old password was entered correctly.'),1);
if ($caller eq 'reset_by_email') {
- $r->print($message.'
');
+ if (!$result) {
+ return 1;
+ } else {
+ return $result;
+ }
} else {
+ $message = &Apache::lonhtmlcommon::confirm_success(
+ &mt("The password for user [_1] was not changed.",''.$user.'').' '.&mt('Please make sure your old password was entered correctly.'),1);
$r->print(&Apache::loncommon::confirmwrapper($message));
}
- return 1;
}
return;
}
@@ -2066,13 +2073,11 @@ sub handler {
|| ($printmenu eq 'not_on_error' && !$error) )
&& (!$env{'form.returnurl'})) {
my $optionlist = '