--- loncom/interface/lonpreferences.pm	2020/02/09 05:36:27	1.196.4.26
+++ loncom/interface/lonpreferences.pm	2019/08/21 22:41:13	1.235
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.196.4.26 2020/02/09 05:36:27 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.235 2019/08/21 22:41:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -165,7 +165,7 @@ sub texenginechanger {
     my %mathchoices=('' => 'Default',
 		     'tth' => 'tth (TeX to HTML)',
 		     #'ttm' => 'TeX to MathML',
-                     'MathJax' => 'MathJax',
+		     'MathJax' => 'MathJax',
 		     'mimetex' => 'mimetex (Convert to Images)',
                      'raw' => 'Raw (Screen Reader)'
                      );
@@ -182,7 +182,7 @@ sub texenginechanger {
       '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.',
+      'mathjaxinfo' => 'MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.',
       'tth'      => 'tth (TeX to HTML):',
       'mimetex'  => 'mimetex (Convert to Images):',
     );
@@ -280,7 +280,7 @@ sub rolesprefchanger {
     my $hotlist_n=$userenv{'recentrolesn'};
     my ($checkedon,$checkedoff);
     if ($hotlist_flag) {
-        $checkedon = 'checked="checked"'; 
+	$checkedon = 'checked="checked"';
     } else {
         $checkedoff = 'checked="checked"';
     }
@@ -683,16 +683,51 @@ sub verify_and_change_clicker {
     my $r = shift;
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
+    my $uhome      = $env{'user.home'};
     my $newclickers  = $env{'form.clickers'};
+    my $message;
     $newclickers=~s/[^\w\:\-]+/\,/gs;
     $newclickers=~tr/a-z/A-Z/;
     $newclickers=~s/[\:\-]+/\-/g;
     $newclickers=~s/\,+/\,/g;
     $newclickers=~s/^\,//;
     $newclickers=~s/\,$//;
-    &Apache::lonnet::put('environment',{'clickers' => $newclickers});
-    &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
-    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
+    my @oldclickers = split(/,/,$env{'environment.clickers'});
+    my @newclickers = split(/,/,$newclickers);
+    my %newuniq;
+    map { $newuniq{$_} = 1; }  @newclickers;
+    @newclickers = sort(keys(%newuniq));
+    my @differences = &Apache::loncommon::compare_arrays(\@oldclickers,\@newclickers);
+    if (@differences) {
+        my $putres = &Apache::lonnet::put('environment',{'clickers' => $newclickers});
+        if ($putres eq 'ok') {
+            my @adds = ();
+            my @dels = ();
+            foreach my $item (@differences) {
+                if (grep(/^\Q$item\E$/,@newclickers)) {
+                    push(@adds,$item);
+                } else {
+                    push(@dels,$item);
+                }
+            }
+            if (@dels) {
+                 my %delclicker;
+                 map { $delclicker{$_} = $user; } @dels;
+                 my $putresult = &Apache::lonnet::iddel($domain,\%delclicker,$uhome,'clickers');
+            }
+            if (@adds) {
+                 my %addclicker;
+                 map { $addclicker{$_} = $user; } @adds;
+                 my $putresult = &Apache::lonnet::updateclickers($domain,'add',\%addclicker,$uhome,1);
+            }
+            &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
+            $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
+        } else {
+            $message=&Apache::lonhtmlcommon::confirm_success(&mt('Error saving clicker ID').1);
+        }
+    } else {
+        $message='<span class="LC_info">'.&mt('Clicker information unchanged').'</span>';
+    }
     $message=&Apache::loncommon::confirmwrapper($message);
     &print_main_menu($r, $message);
 }
@@ -1142,10 +1177,10 @@ sub colorschanger {
     foreach my $item (sort(keys(%colortypes))) {
        my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);
        $chtable.=&Apache::loncommon::start_data_table_row().
-                 '<td>'.$colortypes{$item}.'<td><input name="'.$item.
-                 '" class="colorchooser"  size="10" value="'.$curcol.
-                 '" /></td>'.
-	         &Apache::loncommon::end_data_table_row()."\n";
+	   '<td>'.$colortypes{$item}.'<td><input name="'.$item.
+        '" class="colorchooser"  size="10" value="'.$curcol.
+'" /></td>'.
+	    &Apache::loncommon::end_data_table_row()."\n";
     }
     my $end_data_table = &Apache::loncommon::end_data_table();
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
@@ -1197,9 +1232,9 @@ sub verify_and_change_colors {
     my $message='';
     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});
@@ -1238,18 +1273,18 @@ sub passwordchanger {
         $r->print(Apache::loncommon::start_page('Personal Data'));
         $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
     }
+    my ($blocked,$blocktext) =
+        &Apache::loncommon::blocking_status('passwd');
+    if ($blocked) {
+        $r->print('<p class="LC_warning">'.$blocktext.'</p>');
+        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('<p class="LC_warning">'.$blocktext.'</p>');
-            return;
-        }
     } elsif ($caller eq 'reset_by_email') {
         my %data = &Apache::lonnet::tmpget($mailtoken);
         if (keys(%data) == 0) {
@@ -1266,12 +1301,6 @@ sub passwordchanger {
                 $user = $data{'username'};
                 $domain = $data{'domain'};
                 $currentpass = $data{'temppasswd'};
-                my ($blocked,$blocktext) =
-                    &Apache::loncommon::blocking_status('passwd',$user,$domain);
-                if ($blocked) {
-                    $r->print('<p class="LC_warning">'.$blocktext.'</p>');
-                    return;
-                }
             } else {
                 $r->print(
                     '<p class="LC_warning">'
@@ -1284,9 +1313,9 @@ sub passwordchanger {
         } else {
             $r->print(
                 '<p class="LC_warning">'
-                .&mt('Sorry, the URL generated when you requested reset of'
-                    .' your password contained incomplete information.')
-                .'</p>'
+               .&mt('Sorry, the URL generated when you requested reset of'
+                   .' your password contained incomplete information.')
+               .'</p>'
             );
             return;
         }
@@ -1331,7 +1360,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,$extrafields));
     $r->print(<<ENDFORM);
 $errormessage
 
@@ -1348,105 +1377,11 @@ ENDFORM
 }
 
 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<rules.length; i++) {
-                        if (rules[i] == 'uc') {
-                            if (!posspass.match(/[A-Z]/)) {
-                                errors.push("$js_lt{'uc'}");
-                            }
-                        } else if (rules[i] == 'lc') {
-                            if (!posspass.match(/[a-z]/)) {
-                                errors.push("$js_lt{'lc'}");
-                            }
-                        } else if (rules[i] == 'num') {
-                            if (!posspass.match(/\\d/)) {
-                                errors.push("$js_lt{'num'}");
-                            }
-                        } else if (rules[i] == 'spec') {
-                            var pattern = /^[!@#$%^&*()_+\\-=\\[\\]{};':"\\\|,.<a>\\/?]/;
-                            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,$extrafields) = @_;
     my $output = qq|
 <script type="text/javascript" language="JavaScript">
 
     function send() {
-$passwdcheck
         uextkey=this.document.client.elements.ukey_cpass.value;
         lextkey=this.document.client.elements.lkey_cpass.value;
         initkeys();
@@ -1587,8 +1522,14 @@ sub server_form {
 }
 
 sub verify_and_change_password {
-    my ($r,$caller,$mailtoken,$timelimit,$extrafields,$ended) = @_;
+    my ($r,$caller,$mailtoken,$ended) = @_;
     my ($user,$domain,$homeserver);
+    my ($blocked,$blocktext) =
+        &Apache::loncommon::blocking_status('passwd');
+    if ($blocked) {
+        $r->print('<p class="LC_warning">'.$blocktext.'</p>');
+        return;
+    }
     if ($caller eq 'reset_by_email') {
         $user       = $env{'form.uname'};
         $domain     = $env{'form.udom'};
@@ -1597,30 +1538,20 @@ sub verify_and_change_password {
             if ($homeserver eq 'no_host') {
         &passwordchanger($r,"<p>\n<span class='LC_error'>".
                          &mt("Invalid username and/or domain")."</span>\n</p>",
-                         $caller,$mailtoken,$timelimit,$extrafields);
-                return 'no_host';
+                         $caller,$mailtoken);
+                return 1;
             }
         } else {
             &passwordchanger($r,"<p>\n<span class='LC_error'>".
                              &mt("Username and domain were blank")."</span>\n</p>",
-                             $caller,$mailtoken,$timelimit,$extrafields);
-            return 'missingdata';
+                             $caller,$mailtoken);
+            return 1;
         }
     } else {
         $user       = $env{'user.name'};
         $domain     = $env{'user.domain'};
         $homeserver = $env{'user.home'};
     }
-    my ($blocked,$blocktext) =
-        &Apache::loncommon::blocking_status('passwd',$user,$domain);
-    if ($blocked) {
-        $r->print('<p class="LC_warning">'.$blocktext.'</p>');
-        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):/) {
@@ -1628,8 +1559,8 @@ sub verify_and_change_password {
             &passwordchanger($r,"<p>\n<span class='LC_error'>".
                              &mt("Authentication type for this user can not be changed by this mechanism").
                              "</span>\n</p>",
-                              $caller,$mailtoken,$timelimit,$extrafields);
-            return 'otherauth';
+                              $caller,$mailtoken);
+            return 1;
         } else {
             return;
         }
@@ -1645,12 +1576,8 @@ sub verify_and_change_password {
 	    defined($newpass2)    ){
 	&passwordchanger($r,"<p>\n<span class='LC_error'>".
 			 &mt("One or more password fields were blank").
-                         "</span>\n</p>",$caller,$mailtoken,$timelimit,$extrafields);
-        if ($caller eq 'reset_by_email') {
-            return 'missingdata';
-        } else {
-            return;
-        }
+                         "</span>\n</p>",$caller,$mailtoken);
+	return;
     }
     # Get the keys
     my $lonhost = $r->dir_config('lonHostID');
@@ -1668,11 +1595,7 @@ sub verify_and_change_password {
 </p>
 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);
     #
@@ -1686,52 +1609,40 @@ ENDERROR
             &passwordchanger($r,
                          '<span class="LC_error">'.
                          &mt('Could not verify current authentication.').'  '.
-                         &mt('Please try again.').'</span>',$caller,$mailtoken,$timelimit,$extrafields);
-            return 'emptydata';
+                         &mt('Please try again.').'</span>',$caller,$mailtoken);
+            return 1;
         }
         if ($currentpass ne $data{'temppasswd'}) {
             &passwordchanger($r,
                          '<span class="LC_error">'.
                          &mt('Could not verify current authentication.').'  '.
-                         &mt('Please try again.').'</span>',$caller,$mailtoken,$timelimit,$extrafields);
-            return 'missingtemp';
+                         &mt('Please try again.').'</span>',$caller,$mailtoken);
+            return 1;
         }
     }
     if ($newpass1 ne $newpass2) {
 	&passwordchanger($r,
 			 '<span class="LC_warning">'.
 			 &mt('The new passwords you entered do not match.').'  '.
-			 &mt('Please try again.').'</span>',$caller,$mailtoken,$timelimit,$extrafields);
-        if ($caller eq 'reset_by_email') {
-            return 'mismatch';
-        } else {
-            return;
-        }
+			 &mt('Please try again.').'</span>',$caller,$mailtoken);
+	return 1;
     }
     if ($currentauth eq 'unix:') {
         if (length($newpass1) < 7) {
             &passwordchanger($r,
                              '<span class="LC_warning">'.
                              &mt('Passwords must be a minimum of 7 characters long.').'  '.
-                             &mt('Please try again.').'</span>',$caller,$mailtoken,$timelimit,$extrafields);
-            if ($caller eq 'reset_by_email') {
-                return 'length';
-            } else {
-                return;
-            }
+                             &mt('Please try again.').'</span>',$caller,$mailtoken);
+            return 1;
         }
     } else {
         my $warning = &Apache::loncommon::check_passwd_rules($domain,$newpass1);
         if ($warning) {
-	    &passwordchanger($r,'<span class="LC_warning">'.
-                             $warning.
-			     &mt('Please try again.').'</span>',
-                             $caller,$mailtoken,$timelimit,$extrafields);
-            if ($caller eq 'reset_by_email') {
-                return 'rules';
-            } else {
-                return;
-            }
+            &passwordchanger($r,'<span class="LC_warning">'.
+                            $warning.
+                            &mt('Please try again.').'</span>',
+                            $caller,$mailtoken);
+            return 1;
         }
     }
     #
@@ -1751,12 +1662,8 @@ ENDERROR
 ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{|}~
 </pre></span>
 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)
@@ -1779,7 +1686,7 @@ ENDERROR
 	# error error: run in circles, scream and shout
         if ($caller eq 'reset_by_email') {
             if (!$result) {
-                return 'error';
+                return 1;
             } else {
                 return $result;
             }
@@ -2294,25 +2201,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&amp;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&amp;action=collapse',
-        permission => 'F',
-        #help => '',
-        icon => 'remotecontrol.png',
-        linktitle => 'Collapse the remote control for LON-CAPA.',
-        });
-    }
 
     if (&can_toggle_namelocking()) {
         push(@{ $menu[0]->{items} }, {
@@ -2425,12 +2313,12 @@ sub handler {
           text => $brtxt,
           help => $brhelp,});
     if(!exists $env{'form.action'}) {
-	    &print_main_menu($r);
-            $ended = 1;
+	&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,'preferences','',\$ended);
     }elsif($env{'form.action'} eq 'changescreenname'){
         &screennamechanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_screenname'){