--- loncom/interface/lonpreferences.pm 2024/07/04 23:13:07 1.196.4.29 +++ loncom/interface/lonpreferences.pm 2013/07/22 18:06:51 1.208 @@ -1,7 +1,7 @@ # The LearningOnline Network # Preferences # -# $Id: lonpreferences.pm,v 1.196.4.29 2024/07/04 23:13:07 raeburn Exp $ +# $Id: lonpreferences.pm,v 1.208 2013/07/22 18:06:51 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,6 +27,8 @@ # # This package uses the "londes.js" javascript code. # +# TODOs that have to be completed: +# interface with lonnet to change the password package Apache::lonpreferences; @@ -34,6 +36,8 @@ use strict; use LONCAPA; use Apache::Constants qw(:common); use Apache::File; +use Crypt::DES; +use DynaLoader; # for Crypt::DES version use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; @@ -41,6 +45,50 @@ use Apache::lonnet; use LONCAPA::lonauthcgi(); use LONCAPA(); +# +# Write lonnet::passwd to do the call below. +# Use: +# my $answer=reply("encrypt:passwd:$udom:$uname:$upass",$tryserver); +# +################################################## +# password associated functions # +################################################## +sub des_keys { + # Make a new key for DES encryption. + # Each key has two parts which are returned separately. + # Please note: Each key must be passed through the &hex function + # before it is output to the web browser. The hex versions cannot + # be used to decrypt. + my @hexstr=('0','1','2','3','4','5','6','7', + '8','9','a','b','c','d','e','f'); + my $lkey=''; + for (0..7) { + $lkey.=$hexstr[rand(15)]; + } + my $ukey=''; + for (0..7) { + $ukey.=$hexstr[rand(15)]; + } + return ($lkey,$ukey); +} + +sub des_decrypt { + my ($key,$cyphertext) = @_; + my $keybin=pack("H16",$key); + my $cypher; + if ($Crypt::DES::VERSION>=2.03) { + $cypher=new Crypt::DES $keybin; + } else { + $cypher=new DES $keybin; + } + my $plaintext= + $cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,0,16)))); + $plaintext.= + $cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,16,16)))); + $plaintext=substr($plaintext,1,ord(substr($plaintext,0,1)) ); + return $plaintext; +} + ################################################################ # Handler subroutines # ################################################################ @@ -158,14 +206,12 @@ sub texenginechanger { my $domain = $env{'user.domain'}; my %userenv = &Apache::lonnet::get('environment',['texengine']); my $texengine=$userenv{'texengine'}; - if (lc($texengine) eq 'jsmath') { - $texengine = 'MathJax'; - } my %mathchoices=('' => 'Default', 'tth' => 'tth (TeX to HTML)', #'ttm' => 'TeX to MathML', - 'MathJax' => 'MathJax', + 'jsMath' => 'jsMath', + 'MathJax' => 'MathJax', 'mimetex' => 'mimetex (Convert to Images)', 'raw' => 'Raw (Screen Reader)' ); @@ -176,17 +222,33 @@ sub texenginechanger { 'texengine', \%mathchoices); my $MathJax_start=&Apache::lontexconvert::MathJax_header(); + my $jsMath_start=&Apache::lontexconvert::jsMath_header(); my %lt=&Apache::lonlocal::texthash( 'headline' => 'Change how math is displayed', 'preftxt' => 'Preferred method to display math', 'change' => 'Save', 'exmpl' => 'Examples', 'mathjax' => 'MathJax:', - 'mathjaxinfo' => 'MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.', + 'jsmath' => 'jsMath:', 'tth' => 'tth (TeX to HTML):', 'mimetex' => 'mimetex (Convert to Images):', ); + my $jsMathWarning='

' + .'

' + .&mt("It looks like you don't have the TeX math fonts installed.") + .'
' + .'
' + .&mt('The jsMath example on this page may not look right without them. ' + .'The [_1]jsMath Home Page[_2] has information on how to download the ' + .'needed fonts. In the meantime, jsMath will do the best it can ' + .'with the fonts you have, but it may not be pretty and some equations ' + .'may not be rendered correctly.' + ,'' + ,'') + .'
' + .'

'; + $r->print(<$lt{'headline'}
@@ -203,22 +265,37 @@ $lt{'exmpl'}

$lt{'mathjax'}

- +

-$lt{'mathjaxinfo'} +MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation. +

+ +

$lt{'jsmath'}

+

+$jsMath_start + +

$lt{'mimetex'}

- +

$lt{'tth'}

- +

ENDLSCREEN + if ($env{'environment.texengine'} ne 'jsMath') { + $r->print(''); + } } @@ -229,9 +306,6 @@ sub verify_and_change_texengine { # Screenname my $newtexengine = $env{'form.texengine'}; $newtexengine=~s/[^\-\w]//g; - if (lc($newtexengine) eq 'jsmath') { - $newtexengine = 'MathJax'; - } if ($newtexengine eq 'ttm') { &Apache::lonnet::appenv({'browser.mathml' => 1}); } else { @@ -280,7 +354,7 @@ sub rolesprefchanger { my $hotlist_n=$userenv{'recentrolesn'}; my ($checkedon,$checkedoff); if ($hotlist_flag) { - $checkedon = 'checked="checked"'; + $checkedon = 'checked="checked"'; } else { $checkedoff = 'checked="checked"'; } @@ -363,7 +437,7 @@ $options.' &Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::end_pick_box().' '); - if ($roles_check_list) { + if ($roles_check_list) { $r->print('

'.&mt('Freeze Roles').'

'.&mt('The table below can be used to [_1]freeze[_2] '.$lc_role.'s in the Hotlist.','','').'
'. @@ -373,7 +447,7 @@ $options.'

'); } else { $r->print('
'. - &mt('Once the Hotlist contains recently visited '.$lc_role.'s you can return to this page to also set frozen roles.')); + &mt('Once the Hotlist contains recently visited '.$lc_role.'s, you can return to this page to also set frozen roles.')); } $r->print('
@@ -475,6 +549,7 @@ sub verify_and_change_rolespref { } + ################################################################ # Anonymous Discussion Name Change Subroutines # ################################################################ @@ -627,7 +702,7 @@ sub icon_options { } sub icon_previews { - my %icon_text = &Apache::lonlocal::texthash ( + my %icon_text = ( annotate => 'Notes', wishlist => 'Stored Links', catalog => 'Info', @@ -636,12 +711,12 @@ sub icon_previews { printout => 'Print', ); my %inlinetools = ( - printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&".&mt('Prepare a printable document'), - wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&".&mt('Save a link for this resource in your personal Stored Links repository'), - evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&".&mt('Provide my evaluation of this resource'), - feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&".&mt('Provide feedback messages or contribute to the course discussion about this resource'), - annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&".&mt('Make notes and annotations about this resource'), - catalog => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&".&mt('Show Metadata'), + printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document", + wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository", + evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource", + feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource", + annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&Make notes and annotations about this resource", + catalog => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&Show Metadata", ); my @toolsorder = qw(annotate wishlist evaluate feedback printout catalog); return (\%inlinetools,\@toolsorder); @@ -719,10 +794,8 @@ sub domcoordchanger { my $text=&mt('By default, the Domain Coordinator can enter your Authoring Space.'); my $construction=&mt('Block access to Authoring Space'); my $change=&mt('Save'); - my $returnurl = &HTML::Entities::encode($env{'form.returnurl'},'"<>&\''); $r->print(< - $text

@@ -747,11 +820,7 @@ sub verify_and_change_domcoord { } my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]',''.&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); } ################################################################# @@ -765,7 +834,7 @@ sub lockwarning { my $textbottom=&mt('Changing roles or logging out may result in data corruption.'); my ($num,%which)=&Apache::lonnet::get_locks(); my $which=''; - foreach my $id (keys(%which)) { + foreach my $id (keys %which) { $which.='
  • '.$which{$id}.'
    • '; } my $change=&mt('Override'); @@ -1142,10 +1211,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}.''. - &Apache::loncommon::end_data_table_row()."\n"; + ''.$colortypes{$item}.''. + &Apache::loncommon::end_data_table_row()."\n"; } my $end_data_table = &Apache::loncommon::end_data_table(); my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); @@ -1195,11 +1264,11 @@ sub verify_and_change_colors { ); my $message=''; - foreach my $item (keys(%colortypes)) { + foreach my $item (keys %colortypes) { my $color=$env{'form.'.$item}; - if (!($color =~ /^#/)) { - $color = '#' . $color; - } + if (!($color =~ /^#/)) { + $color = '#' . $color; + } my $entry='color.'.$function.'.'.$item; if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) { &Apache::lonnet::put('environment',{$entry => $color}); @@ -1226,12 +1295,11 @@ sub verify_and_change_colors { # password handler subroutines # ###################################################### sub passwordchanger { - my ($r,$errormessage,$caller,$mailtoken,$timelimit,$extrafields) = @_; + my ($r,$errormessage,$caller,$mailtoken) = @_; # This function is a bit of a mess.... # Passwords are encrypted using londes.js (DES encryption) $errormessage = ($errormessage || ''); - my ($user,$domain,$currentpass,$clientip); - $clientip = &Apache::lonnet::get_requestor_ip($r); + my ($user,$domain,$currentpass); &Apache::lonhtmlcommon::add_breadcrumb( { href => '/adm/preferences?action=changepass', text => 'Change Password'}); @@ -1245,55 +1313,43 @@ sub passwordchanger { if (!defined($caller)) { $caller = 'preferences'; } - my ($blocked,$blocktext) = - &Apache::loncommon::blocking_status('passwd',$clientip); - 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',$clientip,$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( '

    ' @@ -1307,9 +1363,9 @@ sub passwordchanger { return if ($currentauth !~ /^(unix|internal):/); # # Generate keys - my ($lkey_cpass ,$ukey_cpass ) = &Apache::loncommon::des_keys(); - my ($lkey_npass1,$ukey_npass1) = &Apache::loncommon::des_keys(); - my ($lkey_npass2,$ukey_npass2) = &Apache::loncommon::des_keys(); + my ($lkey_cpass ,$ukey_cpass ) = &des_keys(); + my ($lkey_npass1,$ukey_npass1) = &des_keys(); + my ($lkey_npass2,$ukey_npass2) = &des_keys(); # Store the keys in the log files my $lonhost = $r->dir_config('lonHostID'); my $logtoken=Apache::lonnet::reply('tmpput:' @@ -1332,7 +1388,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', @@ -1503,40 +1461,34 @@ sub client_form { my $output = '' .&Apache::lonhtmlcommon::start_pick_box(); if ($caller eq 'reset_by_email') { - if ((ref($extrafields) eq 'HASH') && ($extrafields->{'email'})) { - $output .= &Apache::lonhtmlcommon::row_title( + $output .= &Apache::lonhtmlcommon::row_title( '') - .'' - .&Apache::lonhtmlcommon::row_closure(); - } - if ((ref($extrafields) eq 'HASH') && ($extrafields->{'username'})) { - $output .= &Apache::lonhtmlcommon::row_title( + .'' + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title( '') - .'' - .&Apache::lonhtmlcommon::row_closure() - .&Apache::lonhtmlcommon::row_title( + .'' + .'' + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title( '') - .&Apache::loncommon::select_dom_form($defdom,'udom') - .&Apache::lonhtmlcommon::row_closure(); - } + .&Apache::loncommon::select_dom_form($defdom,'udom') + .&Apache::lonhtmlcommon::row_closure(); } else { $output .= &Apache::lonhtmlcommon::row_title( '') - .'' + .'' .&Apache::lonhtmlcommon::row_closure(); } $output .= &Apache::lonhtmlcommon::row_title( '') - .'' + .'' .&Apache::lonhtmlcommon::row_closure() .&Apache::lonhtmlcommon::row_title( '') - .'' + .'' .&Apache::lonhtmlcommon::row_closure(1) .&Apache::lonhtmlcommon::end_pick_box(); - if ($caller eq 'reset_by_email') { - $output .= ''; - } $output .= '

    ' .qq| @@ -1552,7 +1504,7 @@ sub client_form { } sub server_form { - my ($logtoken,$caller,$mailtoken,$extrafields) = @_; + my ($logtoken,$caller,$mailtoken) = @_; my $action = '/adm/preferences'; if ($caller eq 'reset_by_email') { $action = '/adm/resetpw'; @@ -1563,22 +1515,15 @@ sub server_form { -|; + |; if ($caller eq 'reset_by_email') { $output .= qq| -|; - if ((ref($extrafields) eq 'HASH') && ($extrafields->{'username'})) { - $output .= qq| -|; - } - if ((ref($extrafields) eq 'HASH') && ($extrafields->{'email'})) { - $output .= qq| + |; - } } $output .= qq| @@ -1588,8 +1533,8 @@ sub server_form { } sub verify_and_change_password { - my ($r,$caller,$mailtoken,$timelimit,$extrafields,$ended) = @_; - my ($user,$domain,$homeserver,$clientip); + my ($r,$caller,$mailtoken) = @_; + my ($user,$domain,$homeserver); if ($caller eq 'reset_by_email') { $user = $env{'form.uname'}; $domain = $env{'form.udom'}; @@ -1598,31 +1543,20 @@ sub verify_and_change_password { if ($homeserver eq 'no_host') { &passwordchanger($r,"

    \n". &mt("Invalid username and/or domain")."\n

    ", - $caller,$mailtoken,$timelimit,$extrafields); - return 'no_host'; + $caller,$mailtoken); + return 1; } } else { &passwordchanger($r,"

    \n". &mt("Username and domain were blank")."\n

    ", - $caller,$mailtoken,$timelimit,$extrafields); - return 'missingdata'; + $caller,$mailtoken); + return 1; } } else { $user = $env{'user.name'}; $domain = $env{'user.domain'}; $homeserver = $env{'user.home'}; } - $clientip = &Apache::lonnet::get_requestor_ip($r); - my ($blocked,$blocktext) = - &Apache::loncommon::blocking_status('passwd',$clientip,$user,$domain); - if ($blocked) { - $r->print('

    '.$blocktext.'

    '); - if ($caller eq 'reset_by_email') { - return 'blocked'; - } else { - return; - } - } my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain); # Check for authentication types that allow changing of the password. if ($currentauth !~ /^(unix|internal):/) { @@ -1630,8 +1564,8 @@ sub verify_and_change_password { &passwordchanger($r,"

    \n". &mt("Authentication type for this user can not be changed by this mechanism"). "\n

    ", - $caller,$mailtoken,$timelimit,$extrafields); - return 'otherauth'; + $caller,$mailtoken); + return 1; } else { return; } @@ -1647,12 +1581,8 @@ sub verify_and_change_password { defined($newpass2) ){ &passwordchanger($r,"

    \n". &mt("One or more password fields were blank"). - "\n

    ",$caller,$mailtoken,$timelimit,$extrafields); - if ($caller eq 'reset_by_email') { - return 'missingdata'; - } else { - return; - } + "\n

    ",$caller,$mailtoken); + return; } # Get the keys my $lonhost = $r->dir_config('lonHostID'); @@ -1670,17 +1600,13 @@ 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); + # + $currentpass = &des_decrypt($ckey ,$currentpass); + $newpass1 = &des_decrypt($n1key,$newpass1); + $newpass2 = &des_decrypt($n2key,$newpass2); # if ($caller eq 'reset_by_email') { my %data = &Apache::lonnet::tmpget($mailtoken); @@ -1688,53 +1614,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 @@ -1753,12 +1656,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) @@ -1773,32 +1672,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; @@ -1932,7 +1819,7 @@ sub verify_and_change_discussion { if (defined($env{'form.discmark'}) ) { my $newmark = $env{'form.newmark'}; if ($newmark eq 'ondisp') { - $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will cease to be identified as "NEW" after display.')).'
    '; + $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will be cease to be identified as "NEW" after display.')).'
    '; &Apache::lonnet::put('environment',{'discmarkread' => $newmark}); &Apache::lonnet::appenv({'environment.discmarkread' => $newmark}); } else { @@ -2034,69 +1921,15 @@ sub verify_and_change_coursepage { &print_main_menu($r,$message); } -sub author_space_settings { - my $r = shift; - &Apache::lonhtmlcommon::add_breadcrumb( - { href => '/adm/preferences?action=authorsettings', - text => 'Authoring Space Settings'}); - my $user = $env{'user.name'}; - my $domain = $env{'user.domain'}; - my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']); - if (keys(%author_roles) > 0) { - $r->print(Apache::loncommon::start_page('Authoring Space Settings')); - $r->print(Apache::lonhtmlcommon::breadcrumbs('Authoring Space Settings')); - my %userenv = &Apache::lonnet::get('environment',['nocodemirror']); - my $constchecked=''; - if ($env{'environment.nocodemirror'}) { - $constchecked=' checked="checked"'; - } - 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(< - - - $text
    -
    - - -ENDSCREEN - } -} - -sub change_authoring_settings { - my $r = shift; - my $user = $env{'user.name'}; - my $domain = $env{'user.domain'}; - my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']); - if (keys(%author_roles) > 0) { - my %ausettings=('environment.nocodemirror' => ''); - if ($env{'form.cmoff'}) { $ausettings{'environment.nocodemirror'}='yes'; } - &Apache::lonnet::put('environment',\%ausettings); - &Apache::lonnet::appenv({'environment.nocodemirror' => $ausettings{'environment.nocodemirror'}}); - my $status=''; - if ($ausettings{'environment.nocodemirror'} eq 'yes') { - $status=&mt('on'); - } else { - $status=&mt('off'); - } - my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]',''.&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); - } - } -} - sub lockednameschanger { my $r = shift; + &Apache::lonhtmlcommon::add_breadcrumb( + { href => '/adm/preferences?action=changelockednames', + text => 'Automatic name changes'}); + $r->print(Apache::loncommon::start_page('Automatic name changes')); + $r->print(Apache::lonhtmlcommon::breadcrumbs('Allow/disallow name updates')); my %userenv = &Apache::lonnet::get('environment',['lockedname']); my $lockedname=''; - my $ended; if (&can_toggle_namelocking()) { if ($userenv{'lockedname'}) { $lockedname = ' checked="checked"'; @@ -2114,11 +1947,6 @@ sub lockednameschanger { } } if (keys(%updateable)) { - &Apache::lonhtmlcommon::add_breadcrumb( - { href => '/adm/preferences?action=changelockednames', - text => 'Automatic name changes'}); - $r->print(Apache::loncommon::start_page('Automatic name changes')); - $r->print(Apache::lonhtmlcommon::breadcrumbs('Allow/disallow name updates')); my %longnames = &Apache::lonlocal::texthash ( firstname => 'First Name', middlename => 'Middle Name', @@ -2145,14 +1973,11 @@ ENDSCREEN } else { my $message = &mt('Based on your institutional affiliation no name information is automatically updated for your LON-CAPA account.'); &print_main_menu($r,$message); - $ended = 1; } } else { my $message = &mt('You are not permitted to set a user preference for automatic name updates for your LON-CAPA account.'); &print_main_menu($r,$message); - $ended = 1; } - return $ended; } sub verify_and_change_lockednames { @@ -2300,25 +2125,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} }, { @@ -2356,18 +2162,6 @@ 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) { - push(@{ $menu[4]->{items} }, { - linktext => 'Authoring Space Configuration', - url => '/adm/preferences?action=authorsettings', - permission => 'F', - icon => 'codemirror.png', - linktitle => 'Settings for your authoring space.', - }); - } - if (&can_toggle_debug()) { push(@{ $menu[4]->{items} }, { linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'), @@ -2405,26 +2199,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, @@ -2432,16 +2214,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'){ @@ -2450,47 +2230,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'){ @@ -2499,29 +2270,22 @@ 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') { - $ended = &lockednameschanger($r); + &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()); } @@ -2594,16 +2358,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__