'.&mt('Freeze Roles').'
'.&mt('The table below can be used to [_1]freeze[_2] '.$lc_role.'s in the Hotlist.','',' ').'
-'.&mt('Block access to Authoring Space').' ',''.$status.' '));
$message=&Apache::loncommon::confirmwrapper($message);
- if ($env{'form.returnurl'}) {
- &do_redirect($r,$env{'form.returnurl'},$message);
- } else {
- &print_main_menu($r,$message);
- }
+ &print_main_menu($r,$message);
}
#################################################################
@@ -1142,10 +1166,10 @@ sub colorschanger {
foreach my $item (sort(keys(%colortypes))) {
my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);
$chtable.=&Apache::loncommon::start_data_table_row().
- ''.$colortypes{$item}.' '.$colortypes{$item}.' '.$blocktext.'
');
+ return;
+ }
if ((!defined($caller)) || ($caller eq 'preferences')) {
$user = $env{'user.name'};
$domain = $env{'user.domain'};
if (!defined($caller)) {
$caller = 'preferences';
}
- my ($blocked,$blocktext) =
- &Apache::loncommon::blocking_status('passwd');
- if ($blocked) {
- $r->print(''.$blocktext.'
');
- return;
- }
} elsif ($caller eq 'reset_by_email') {
- 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 [_1]new request[_2] 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'} < $timelimit) {
- $user = $data{'username'};
- $domain = $data{'domain'};
- $currentpass = $data{'temppasswd'};
- my ($blocked,$blocktext) =
- &Apache::loncommon::blocking_status('passwd',$user,$domain);
- if ($blocked) {
- $r->print(''.$blocktext.'
');
+ 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 [_1]new request[_2] 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.')
+ .'
'
+ );
return;
}
} else {
$r->print(
''
- .&mt('Sorry, the token generated when you requested'
- .' a password reset has expired.')
+ .&mt('Sorry, the URL generated when you requested reset of'
+ .' your password contained incomplete information.')
.'
'
);
return;
}
- } else {
- $r->print(
- ''
- .&mt('Sorry, the URL generated when you requested reset of'
- .' your password contained incomplete information.')
- .'
'
- );
- return;
- }
- if (&Apache::lonnet::domain($domain) eq '') {
- $domain = $r->dir_config('lonDefDomain');
- }
+ if (&Apache::lonnet::domain($domain) eq '') {
+ $domain = $r->dir_config('lonDefDomain');
+ }
} else {
$r->print(
''
@@ -1331,7 +1349,7 @@ sub passwordchanger {
my $jsh=Apache::File->new($include."/londes.js");
$r->print(<$jsh>);
}
- $r->print(&jscript_send($caller,$domain,$currentauth,$extrafields));
+ $r->print(&jscript_send($caller));
$r->print(<
ENDFORM
- $r->print(&server_form($logtoken,$caller,$mailtoken,$extrafields));
- $r->print(&client_form($caller,\%hexkey,$currentpass,$domain,$extrafields));
+ $r->print(&server_form($logtoken,$caller,$mailtoken));
+ $r->print(&client_form($caller,\%hexkey,$currentpass,$domain));
#
return;
}
sub jscript_send {
- my ($caller,$domain,$currentauth,$extrafields) = @_;
- my ($min,$max,$rulestr,$numrules);
- $min = $Apache::lonnet::passwdmin;
- my %js_lt = &Apache::lonlocal::texthash(
- uc => 'New password needs at least one upper case letter',
- lc => 'New password needs at least one lower case letter',
- num => 'New password needs at least one number',
- spec => 'New password needs at least one non-alphanumeric',
- blank1 => 'Empty Password field',
- blank2 => 'Empty Confirm Password field',
- mismatch => 'Contents of Password and Confirm Password fields must match',
- fail => 'Please fix the following:',
- );
- &js_escape(\%js_lt);
- if ($currentauth eq 'internal:') {
- if ($domain ne '') {
- my %passwdconf = &Apache::lonnet::get_passwdconf($domain);
- if (keys(%passwdconf)) {
- if ($passwdconf{min}) {
- $min = $passwdconf{min};
- }
- if ($passwdconf{max}) {
- $max = $passwdconf{max};
- $js_lt{'long'} = &js_escape(&mt('Maximum password length: [_1]',$max));
- }
- if (ref($passwdconf{chars}) eq 'ARRAY') {
- if (@{$passwdconf{chars}}) {
- $rulestr = join('","',@{$passwdconf{chars}});
- $numrules = scalar(@{$passwdconf{chars}});
- }
- }
- }
- }
- }
- $js_lt{'short'} = &js_escape(&mt('Minimum password length: [_1]',$min));
-
- my $passwdcheck = <<"ENDJS";
- var errors = new Array();
- var min = parseInt("$min") || 0;
- var currauth = "$currentauth";
- if (this.document.client.elements.newpass_1.value == '') {
- errors.push("$js_lt{'blank1'}");
- }
- if (this.document.client.elements.newpass_2.value == '') {
- errors.push("$js_lt{'blank2'}");
- }
- if (errors.length == 0) {
- if (this.document.client.elements.newpass_1.value != this.document.client.elements.newpass_2.value) {
- errors.push("$js_lt{'mismatch'}");
- }
- var posspass = this.document.client.elements.newpass_1.value;
- if (min > 0) {
- if (posspass.length < min) {
- errors.push("$js_lt{'short'}");
- }
- }
- if (currauth == 'internal:') {
- var max = parseInt("$max") || 0;
- if (max > 0) {
- if (posspass.length > max) {
- errors.push("$js_lt{'long'}");
- }
- }
- var numrules = parseInt("$numrules") || 0;
- if (numrules > 0) {
- var rules = new Array("$rulestr");
- for (var i=0; i\\/?]/;
- if (!posspass.match(pattern)) {
- errors.push("$js_lt{'spec'}");
- }
- }
- }
- }
- }
- }
- if (errors.length > 0) {
- alert("$js_lt{'fail'}"+"\\n\\n"+errors.join("\\n"));
- return;
- }
-ENDJS
+ my ($caller) = @_;
my $output = qq|
|;
}
sub client_form {
- my ($caller,$hexkey,$currentpass,$defdom,$extrafields) = @_;
+ my ($caller,$hexkey,$currentpass,$defdom) = @_;
my %lt=&Apache::lonlocal::texthash(
'email' => 'E-mail Address',
'username' => 'Username',
@@ -1502,40 +1422,34 @@ sub client_form {
my $output = '
",$caller,$mailtoken);
+ return;
}
# Get the keys
my $lonhost = $r->dir_config('lonHostID');
@@ -1668,14 +1567,10 @@ sub verify_and_change_password {
ENDERROR
# Probably should log an error here
- if ($caller eq 'reset_by_email') {
- return 'internalerror';
- } else {
- return;
- }
+ return 1;
}
my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
- #
+ #
$currentpass = &Apache::loncommon::des_decrypt($ckey ,$currentpass);
$newpass1 = &Apache::loncommon::des_decrypt($n1key,$newpass1);
$newpass2 = &Apache::loncommon::des_decrypt($n2key,$newpass2);
@@ -1686,53 +1581,30 @@ ENDERROR
&passwordchanger($r,
'
'.
&mt('Could not verify current authentication.').' '.
- &mt('Please try again.').' ',$caller,$mailtoken,$timelimit,$extrafields);
- return 'emptydata';
+ &mt('Please try again.').'',$caller,$mailtoken);
+ return 1;
}
if ($currentpass ne $data{'temppasswd'}) {
&passwordchanger($r,
'
'.
&mt('Could not verify current authentication.').' '.
- &mt('Please try again.').' ',$caller,$mailtoken,$timelimit,$extrafields);
- return 'missingtemp';
+ &mt('Please try again.').'',$caller,$mailtoken);
+ return 1;
}
- }
+ }
if ($newpass1 ne $newpass2) {
&passwordchanger($r,
'
'.
&mt('The new passwords you entered do not match.').' '.
- &mt('Please try again.').' ',$caller,$mailtoken,$timelimit,$extrafields);
- if ($caller eq 'reset_by_email') {
- return 'mismatch';
- } else {
- return;
- }
+ &mt('Please try again.').'',$caller,$mailtoken);
+ return 1;
}
- if ($currentauth eq 'unix:') {
- if (length($newpass1) < 7) {
- &passwordchanger($r,
- '
'.
- &mt('Passwords must be a minimum of 7 characters long.').' '.
- &mt('Please try again.').' ',$caller,$mailtoken,$timelimit,$extrafields);
- if ($caller eq 'reset_by_email') {
- return 'length';
- } else {
- return;
- }
- }
- } else {
- my $warning = &Apache::loncommon::check_passwd_rules($domain,$newpass1);
- if ($warning) {
- &passwordchanger($r,'
'.
- $warning.
- &mt('Please try again.').' ',
- $caller,$mailtoken,$timelimit,$extrafields);
- if ($caller eq 'reset_by_email') {
- return 'rules';
- } else {
- return;
- }
- }
+ if (length($newpass1) < 7) {
+ &passwordchanger($r,
+ '
'.
+ &mt('Passwords must be a minimum of 7 characters long.').' '.
+ &mt('Please try again.').' ',$caller,$mailtoken);
+ return 1;
}
#
# Check for bad characters
@@ -1751,12 +1623,8 @@ ENDERROR
ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{|}~
ENDERROR
- &passwordchanger($r,$errormessage,$caller,$mailtoken,$timelimit,$extrafields);
- if ($caller eq 'reset_by_email') {
- return 'badchars';
- } else {
- return;
- }
+ &passwordchanger($r,$errormessage,$caller,$mailtoken);
+ return 1;
}
#
# Change the password (finally)
@@ -1771,32 +1639,20 @@ ENDERROR
$r->print($message.'
');
} else {
&print_main_menu($r, $message);
- if (ref($ended)) {
- $$ended = 1;
- }
}
} else {
# error error: run in circles, scream and shout
if ($caller eq 'reset_by_email') {
if (!$result) {
- return 'error';
+ return 1;
} else {
return $result;
}
} else {
- my $feedback;
- if ($result eq 'prioruse') {
- $feedback = &mt('Please enter a password that you have not used recently.');
- } else {
- $feedback = &mt('Please make sure your old password was entered correctly.');
- }
$message = &Apache::lonhtmlcommon::confirm_success(
- &mt("The password for user [_1] was not changed.",'
'.$user.' ').' '.$feedback,1);
+ &mt("The password for user [_1] was not changed.",'
'.$user.' ').' '.&mt('Please make sure your old password was entered correctly.'),1);
$message=&Apache::loncommon::confirmwrapper($message);
&print_main_menu($r, $message);
- if (ref($ended)) {
- $$ended = 1;
- }
}
}
return;
@@ -2051,10 +1907,8 @@ sub author_space_settings {
my $text=&mt('By default, CodeMirror an editor with advanced functionality for editing code is activated for authors.');
my $cmoff=&mt('Deactivate CodeMirror. This can improve performance on slow computers and accessibility.');
my $change=&mt('Save');
- my $returnurl = &HTML::Entities::encode($env{'form.returnurl'},'"<>&\'');
$r->print(<
- '.&mt('Deactivate CodeMirror in Authoring Space').' ',''.$status.' '));
$message=&Apache::loncommon::confirmwrapper($message);
- if ($env{'form.returnurl'}) {
- &do_redirect($r,$env{'form.returnurl'},$message);
- } else {
- &print_main_menu($r,$message);
- }
+ &print_main_menu($r,$message);
}
}
@@ -2294,25 +2144,6 @@ push(@{ $menu[0]->{items} }, {
linktitle => 'Change your password.',
});
}
- if ($env{'environment.remote'} eq 'off') {
-push(@{ $menu[1]->{items} }, {
- linktext => 'Launch Remote Control',
- url => '/adm/remote?url=/adm/preferences&action=launch',
- permission => 'F',
- #help => '',
- icon => 'remotecontrol.png',
- linktitle => 'Launch the remote control for LON-CAPA.',
- });
- }else{
-push(@{ $menu[1]->{items} }, {
- linktext => 'Collapse Remote Control',
- url => '/adm/remote?url=/adm/preferences&action=collapse',
- permission => 'F',
- #help => '',
- icon => 'remotecontrol.png',
- linktitle => 'Collapse the remote control for LON-CAPA.',
- });
- }
if (&can_toggle_namelocking()) {
push(@{ $menu[0]->{items} }, {
@@ -2351,13 +2182,13 @@ push(@{ $menu[4]->{items} }, {
}
- my %author_coauthor_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
- if (keys(%author_coauthor_roles) > 0) {
+ my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
+ if (keys(%author_roles) > 0) {
push(@{ $menu[4]->{items} }, {
linktext => 'Authoring Space Configuration',
url => '/adm/preferences?action=authorsettings',
permission => 'F',
- icon => 'codemirror.png',
+ icon => 'course_ini.png',
linktitle => 'Settings for your authoring space.',
});
}
@@ -2399,26 +2230,14 @@ sub handler {
['action','wysiwyg','returnurl','refpage']);
#
Apache::lonhtmlcommon::clear_breadcrumbs();
- my ($brlink,$brtxt,$brhelp,$ended);
+ my ($brlink,$brtxt,$brhelp);
if (($env{'form.action'} eq 'changerolespref') && ($env{'form.returnurl'} eq '/adm/roles')) {
$brlink ='/adm/roles';
$brtxt = 'User Roles';
- } elsif ((($env{'form.action'} eq 'changedomcoord') ||
- ($env{'form.action'} eq 'authorsettings')) &&
- (($env{'form.returnurl'} =~ m{^/(priv/|res($|/))}) ||
- ($env{'form.returnurl'} eq '/adm/createuser'))) {
- $brlink = $env{'form.returnurl'};
- if ($env{'form.returnurl'} eq '/adm/createuser') {
- $brtxt = 'User Management';
- } elsif ($env{'form.returnurl'} =~ m{^/res($\/)}) {
- $brtxt = 'Browse published resources';
- } else {
- $brtxt = 'Authoring Space';
- }
} else {
$brlink ='/adm/preferences';
$brtxt = 'Set User Preferences';
- $brhelp = 'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display';
+ $brhelp = 'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display';
}
Apache::lonhtmlcommon::add_breadcrumb
({href => $brlink,
@@ -2426,16 +2245,14 @@ sub handler {
help => $brhelp,});
if(!exists $env{'form.action'}) {
&print_main_menu($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'changepass'){
&passwordchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_pass'){
- &verify_and_change_password($r,'preferences','','','',\$ended);
+ &verify_and_change_password($r);
}elsif($env{'form.action'} eq 'changescreenname'){
&screennamechanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_screenname'){
&verify_and_change_screenname($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'changemsgforward'){
&msgforwardchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_msgforward'){
@@ -2444,47 +2261,38 @@ sub handler {
&colorschanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_colors'){
&verify_and_change_colors($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'changelanguages'){
&languagechanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_languages'){
&verify_and_change_languages($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'changewysiwyg'){
&wysiwygchanger($r);
}elsif($env{'form.action'} eq 'set_wysiwyg'){
&verify_and_change_wysiwyg($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'changediscussions'){
&discussionchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_discussion'){
&verify_and_change_discussion($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'changerolespref'){
&rolesprefchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_rolespref'){
&verify_and_change_rolespref($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'changetexenginepref'){
&texenginechanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_texengine'){
&verify_and_change_texengine($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'changeicons'){
&iconchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_icons'){
&verify_and_change_icons($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'changeclicker'){
&clickerchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_clicker'){
&verify_and_change_clicker($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'changedomcoord'){
&domcoordchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_domcoord'){
&verify_and_change_domcoord($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'lockwarning'){
&lockwarning($r);
}elsif($env{'form.action'} eq 'verify_and_change_locks'){
@@ -2493,29 +2301,26 @@ sub handler {
&coursedisplaychanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
&verify_and_change_coursepage($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'authorsettings'){
&author_space_settings($r);
}elsif($env{'form.action'} eq 'change_authoring_settings'){
&change_authoring_settings($r);
- $ended = 1;
}elsif($env{'form.action'} eq 'debugtoggle'){
if (&can_toggle_debug()) {
&toggle_debug();
}
&print_main_menu($r);
- $ended = 1;
} elsif ($env{'form.action'} eq 'changelockednames') {
&lockednameschanger($r);
} elsif ($env{'form.action'} eq 'verify_and_change_lockednames') {
&verify_and_change_lockednames($r);
- $ended = 1;
}
# Properly end the HTML page of all preference pages
# started in each sub routine
# Exception: print_main_menu has its own end_page call
- unless ($ended) {
+ unless (!exists $env{'form.action'} ||
+ $env{'form.action'} eq 'debugtoggle') {
$r->print(&Apache::loncommon::end_page());
}
@@ -2588,16 +2393,5 @@ sub updateable_userinfo {
return %updateable;
}
-sub do_redirect {
- my ($r,$url,$msg) = @_;
- $r->print(
- &Apache::loncommon::start_page('Switching Server ...',undef,
- {'redirect' => [0.5,$url]}).
- '
'."\n".
- "$msg\n".
- &Apache::loncommon::end_page());
- return;
-}
-
1;
__END__