version 1.225, 2018/04/27 20:14:16
|
version 1.226, 2018/04/27 21:39:42
|
Line 1511 sub server_form {
|
Line 1511 sub server_form {
|
} |
} |
|
|
sub verify_and_change_password { |
sub verify_and_change_password { |
my ($r,$caller,$mailtoken) = @_; |
my ($r,$caller,$mailtoken,$ended) = @_; |
my ($user,$domain,$homeserver); |
my ($user,$domain,$homeserver); |
my ($blocked,$blocktext) = |
my ($blocked,$blocktext) = |
&Apache::loncommon::blocking_status('passwd'); |
&Apache::loncommon::blocking_status('passwd'); |
Line 1656 ENDERROR
|
Line 1656 ENDERROR
|
$r->print($message.'<br />'); |
$r->print($message.'<br />'); |
} else { |
} else { |
&print_main_menu($r, $message); |
&print_main_menu($r, $message); |
|
if (ref($ended)) { |
|
$$ended = 1; |
|
} |
} |
} |
} else { |
} else { |
# error error: run in circles, scream and shout |
# error error: run in circles, scream and shout |
Line 1670 ENDERROR
|
Line 1673 ENDERROR
|
&mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1); |
&mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1); |
$message=&Apache::loncommon::confirmwrapper($message); |
$message=&Apache::loncommon::confirmwrapper($message); |
&print_main_menu($r, $message); |
&print_main_menu($r, $message); |
|
if (ref($ended)) { |
|
$$ended = 1; |
|
} |
} |
} |
} |
} |
return; |
return; |
Line 2253 sub handler {
|
Line 2259 sub handler {
|
['action','wysiwyg','returnurl','refpage']); |
['action','wysiwyg','returnurl','refpage']); |
# |
# |
Apache::lonhtmlcommon::clear_breadcrumbs(); |
Apache::lonhtmlcommon::clear_breadcrumbs(); |
my ($brlink,$brtxt,$brhelp); |
my ($brlink,$brtxt,$brhelp,$ended); |
if (($env{'form.action'} eq 'changerolespref') && ($env{'form.returnurl'} eq '/adm/roles')) { |
if (($env{'form.action'} eq 'changerolespref') && ($env{'form.returnurl'} eq '/adm/roles')) { |
$brlink ='/adm/roles'; |
$brlink ='/adm/roles'; |
$brtxt = 'User Roles'; |
$brtxt = 'User Roles'; |
Line 2280 sub handler {
|
Line 2286 sub handler {
|
help => $brhelp,}); |
help => $brhelp,}); |
if(!exists $env{'form.action'}) { |
if(!exists $env{'form.action'}) { |
&print_main_menu($r); |
&print_main_menu($r); |
|
$ended = 1; |
}elsif($env{'form.action'} eq 'changepass'){ |
}elsif($env{'form.action'} eq 'changepass'){ |
&passwordchanger($r); |
&passwordchanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_pass'){ |
}elsif($env{'form.action'} eq 'verify_and_change_pass'){ |
&verify_and_change_password($r,'preferences'); |
&verify_and_change_password($r,'preferences','',\$ended)); |
}elsif($env{'form.action'} eq 'changescreenname'){ |
}elsif($env{'form.action'} eq 'changescreenname'){ |
&screennamechanger($r); |
&screennamechanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_screenname'){ |
}elsif($env{'form.action'} eq 'verify_and_change_screenname'){ |
&verify_and_change_screenname($r); |
&verify_and_change_screenname($r); |
|
$ended = 1; |
}elsif($env{'form.action'} eq 'changemsgforward'){ |
}elsif($env{'form.action'} eq 'changemsgforward'){ |
&msgforwardchanger($r); |
&msgforwardchanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_msgforward'){ |
}elsif($env{'form.action'} eq 'verify_and_change_msgforward'){ |
Line 2296 sub handler {
|
Line 2304 sub handler {
|
&colorschanger($r); |
&colorschanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_colors'){ |
}elsif($env{'form.action'} eq 'verify_and_change_colors'){ |
&verify_and_change_colors($r); |
&verify_and_change_colors($r); |
|
$ended = 1; |
}elsif($env{'form.action'} eq 'changelanguages'){ |
}elsif($env{'form.action'} eq 'changelanguages'){ |
&languagechanger($r); |
&languagechanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_languages'){ |
}elsif($env{'form.action'} eq 'verify_and_change_languages'){ |
&verify_and_change_languages($r); |
&verify_and_change_languages($r); |
|
$ended = 1; |
}elsif($env{'form.action'} eq 'changewysiwyg'){ |
}elsif($env{'form.action'} eq 'changewysiwyg'){ |
&wysiwygchanger($r); |
&wysiwygchanger($r); |
}elsif($env{'form.action'} eq 'set_wysiwyg'){ |
}elsif($env{'form.action'} eq 'set_wysiwyg'){ |
Line 2308 sub handler {
|
Line 2318 sub handler {
|
&discussionchanger($r); |
&discussionchanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_discussion'){ |
}elsif($env{'form.action'} eq 'verify_and_change_discussion'){ |
&verify_and_change_discussion($r); |
&verify_and_change_discussion($r); |
|
$ended = 1; |
}elsif($env{'form.action'} eq 'changerolespref'){ |
}elsif($env{'form.action'} eq 'changerolespref'){ |
&rolesprefchanger($r); |
&rolesprefchanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_rolespref'){ |
}elsif($env{'form.action'} eq 'verify_and_change_rolespref'){ |
&verify_and_change_rolespref($r); |
&verify_and_change_rolespref($r); |
|
$ended = 1; |
}elsif($env{'form.action'} eq 'changetexenginepref'){ |
}elsif($env{'form.action'} eq 'changetexenginepref'){ |
&texenginechanger($r); |
&texenginechanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_texengine'){ |
}elsif($env{'form.action'} eq 'verify_and_change_texengine'){ |
Line 2320 sub handler {
|
Line 2332 sub handler {
|
&iconchanger($r); |
&iconchanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_icons'){ |
}elsif($env{'form.action'} eq 'verify_and_change_icons'){ |
&verify_and_change_icons($r); |
&verify_and_change_icons($r); |
|
$ended = 1; |
}elsif($env{'form.action'} eq 'changeclicker'){ |
}elsif($env{'form.action'} eq 'changeclicker'){ |
&clickerchanger($r); |
&clickerchanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_clicker'){ |
}elsif($env{'form.action'} eq 'verify_and_change_clicker'){ |
Line 2328 sub handler {
|
Line 2341 sub handler {
|
&domcoordchanger($r); |
&domcoordchanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_domcoord'){ |
}elsif($env{'form.action'} eq 'verify_and_change_domcoord'){ |
&verify_and_change_domcoord($r); |
&verify_and_change_domcoord($r); |
|
$ended = 1; |
}elsif($env{'form.action'} eq 'lockwarning'){ |
}elsif($env{'form.action'} eq 'lockwarning'){ |
&lockwarning($r); |
&lockwarning($r); |
}elsif($env{'form.action'} eq 'verify_and_change_locks'){ |
}elsif($env{'form.action'} eq 'verify_and_change_locks'){ |
Line 2336 sub handler {
|
Line 2350 sub handler {
|
&coursedisplaychanger($r); |
&coursedisplaychanger($r); |
}elsif($env{'form.action'} eq 'verify_and_change_coursepage'){ |
}elsif($env{'form.action'} eq 'verify_and_change_coursepage'){ |
&verify_and_change_coursepage($r); |
&verify_and_change_coursepage($r); |
|
$ended = 1; |
}elsif($env{'form.action'} eq 'authorsettings'){ |
}elsif($env{'form.action'} eq 'authorsettings'){ |
&author_space_settings($r); |
&author_space_settings($r); |
}elsif($env{'form.action'} eq 'change_authoring_settings'){ |
}elsif($env{'form.action'} eq 'change_authoring_settings'){ |
Line 2345 sub handler {
|
Line 2360 sub handler {
|
&toggle_debug(); |
&toggle_debug(); |
} |
} |
&print_main_menu($r); |
&print_main_menu($r); |
|
$ended = 1; |
} elsif ($env{'form.action'} eq 'changelockednames') { |
} elsif ($env{'form.action'} eq 'changelockednames') { |
&lockednameschanger($r); |
&lockednameschanger($r); |
} elsif ($env{'form.action'} eq 'verify_and_change_lockednames') { |
} elsif ($env{'form.action'} eq 'verify_and_change_lockednames') { |
&verify_and_change_lockednames($r); |
&verify_and_change_lockednames($r); |
|
$ended = 1; |
} |
} |
|
|
# Properly end the HTML page of all preference pages |
# Properly end the HTML page of all preference pages |
# started in each sub routine |
# started in each sub routine |
# Exception: print_main_menu has its own end_page call |
# Exception: print_main_menu has its own end_page call |
unless (!exists $env{'form.action'} || |
unless ($ended) { |
$env{'form.action'} eq 'debugtoggle') { |
|
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
} |
} |
|
|