--- loncom/interface/lonpreferences.pm	2016/09/14 17:59:30	1.196.4.20
+++ loncom/interface/lonpreferences.pm	2014/02/12 20:29:36	1.211
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.196.4.20 2016/09/14 17:59:30 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.211 2014/02/12 20:29:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -160,14 +160,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)'
                      );
@@ -178,17 +176,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='<p>'
+                     .'<div class="LC_warning">'
+                     .&mt("It looks like you don't have the TeX math fonts installed.")
+                     .'</div>'
+                     .'<div>'
+                     .&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.'
+                         ,'<a href="http://www.math.union.edu/locate/jsMath/" target="_blank">'
+                         ,'</a>')
+                     .'</div>'
+                     .'</p>';
+
     $r->print(<<ENDLSCREEN);
 <h2>$lt{'headline'}</h2>
 <form name="prefs" action="/adm/preferences" method="post">
@@ -205,22 +219,37 @@ $lt{'exmpl'}
 
 <h3>$lt{'mathjax'}</h3>
 </script>
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=MathJax" width="400" height="150"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=MathJax" width="400" height="120"></iframe>
 </p>
 <p>
-$lt{'mathjaxinfo'}
+MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.
+</p>
+
+<h3>$lt{'jsmath'}</h3> 
+<p>
+$jsMath_start
+<script type="text/javascript" language="JavaScript">
+if (jsMath.nofonts == 1) {
+    document.writeln($jsMathWarning);
+}
+
+</script>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
 </p>
 
 <h3>$lt{'mimetex'}</h3>
 <p>
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="150"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="100"></iframe>
 </p>
 
 <h3>$lt{'tth'}</h3>
 <p>
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="150"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="220"></iframe>
 </p>
 ENDLSCREEN
+    if ($env{'environment.texengine'} ne 'jsMath') {
+	$r->print('<script type="text/javascript" language="JavaScript">jsMath.Process()</script>');
+    }
 }
 
 
@@ -231,9 +260,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 {
@@ -282,7 +308,7 @@ sub rolesprefchanger {
     my $hotlist_n=$userenv{'recentrolesn'};
     my ($checkedon,$checkedoff);
     if ($hotlist_flag) {
-        $checkedon = 'checked="checked"'; 
+	$checkedon = 'checked="checked"';
     } else {
         $checkedoff = 'checked="checked"';
     }
@@ -365,7 +391,7 @@ $options.'
 &Apache::lonhtmlcommon::row_closure(1).
 &Apache::lonhtmlcommon::end_pick_box().'
 </div>');
-    if ($roles_check_list) {
+    if ($roles_check_list) { 
         $r->print('<div class="LC_left_float">
 <h4>'.&mt('Freeze Roles').'</h4>
 <p>'.&mt('The table below can be used to [_1]freeze[_2] '.$lc_role.'s in the Hotlist.','<q>','</q>').'<br />'.
@@ -762,7 +788,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.='<li>'.$which{$id}.'</li>';
     }
     my $change=&mt('Override');
@@ -1139,10 +1165,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();
@@ -1154,7 +1180,6 @@ sub colorschanger {
 ' . $colorchooser . '
 </script>
 ');
-
     $r->print(<<ENDCOL);
 
 <form name="parmform" action="">
@@ -1193,11 +1218,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});
@@ -1236,12 +1261,6 @@ 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'};
@@ -1254,7 +1273,7 @@ sub passwordchanger {
                 $r->print(
                     '<p class="LC_warning">'
                    .&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.'
-                             ,'<a href="/adm/resetpw">','</a>')
+                       ,'<a href="/adm/resetpw">','</a>')
                    .'</p>'
                 );
                 return;
@@ -1275,9 +1294,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 class="LC_warning">'
+                   .&mt('Sorry, the URL generated when you requested reset of'
+                       .' your password contained incomplete information.')
                    .'</p>'
                 );
                 return;
@@ -1298,9 +1317,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:'
@@ -1348,18 +1367,21 @@ sub jscript_send {
         uextkey=this.document.client.elements.ukey_cpass.value;
         lextkey=this.document.client.elements.lkey_cpass.value;
         initkeys();
-        this.document.pserver.elements.currentpass.value =
-            getCrypted(this.document.client.elements.currentpass.value);
+
+        this.document.pserver.elements.currentpass.value
+            =crypted(this.document.client.elements.currentpass.value);
+
         uextkey=this.document.client.elements.ukey_npass1.value;
         lextkey=this.document.client.elements.lkey_npass1.value;
         initkeys();
         this.document.pserver.elements.newpass_1.value
-            =getCrypted(this.document.client.elements.newpass_1.value);
+            =crypted(this.document.client.elements.newpass_1.value);
+
         uextkey=this.document.client.elements.ukey_npass2.value;
         lextkey=this.document.client.elements.lkey_npass2.value;
         initkeys();
         this.document.pserver.elements.newpass_2.value
-            =getCrypted(this.document.client.elements.newpass_2.value);
+            =crypted(this.document.client.elements.newpass_2.value);
 |;
     if ($caller eq 'reset_by_email') {
         $output .= qq|
@@ -1374,7 +1396,6 @@ sub jscript_send {
     $ output .= qq|
         this.document.pserver.submit();
     }
-
 </script>
 |;
 }
@@ -1400,7 +1421,7 @@ sub client_form {
                   .&Apache::lonhtmlcommon::row_closure()
                   .&Apache::lonhtmlcommon::row_title(
                        '<label for="uname">'.$lt{'username'}.'</label>')
-                  .'<input type="text" name="uname" size="20" />'
+                  .'<input type="text" name="uname" size="15" />'
                   .'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'
                   .&Apache::lonhtmlcommon::row_closure()
                   .&Apache::lonhtmlcommon::row_title(
@@ -1410,16 +1431,16 @@ sub client_form {
     } else {
         $output .= &Apache::lonhtmlcommon::row_title(
                        '<label for="currentpass">'.$lt{'currentpass'}.'</label>')
-                  .'<input type="password" name="currentpass" size="20"/>'
+                  .'<input type="password" name="currentpass" size="10"/>'
                   .&Apache::lonhtmlcommon::row_closure();
     }
     $output .= &Apache::lonhtmlcommon::row_title(
                    '<label for="newpass_1">'.$lt{'newpass'}.'</label>')
-              .'<input type="password" name="newpass_1" size="20" />'
+              .'<input type="password" name="newpass_1" size="10" />'
               .&Apache::lonhtmlcommon::row_closure()
               .&Apache::lonhtmlcommon::row_title(
                    '<label for="newpass_2">'.$lt{'confirmpass'}.'</label>')
-              .'<input type="password" name="newpass_2" size="20" />'
+              .'<input type="password" name="newpass_2" size="10" />'
               .&Apache::lonhtmlcommon::row_closure(1)
               .&Apache::lonhtmlcommon::end_pick_box();
     $output .= '<p><input type="button" value="'.$lt{'changepass'}.'" onclick="send();" /></p>'
@@ -1468,12 +1489,6 @@ sub server_form {
 sub verify_and_change_password {
     my ($r,$caller,$mailtoken) = @_;
     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'};
@@ -1860,58 +1875,6 @@ 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');
-            $r->print(<<ENDSCREEN);
-        <form name="prefs" action="/adm/preferences" method="post">
-        <input type="hidden" name="action" value="change_authoring_settings" />
-        $text<br />
-        <label><input type="checkbox" name="cmoff"$constchecked />$cmoff</label><br />
-        <input type="submit" value="$change" />
-        </form>
-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]','<i>'.&mt('Deactivate CodeMirror in Authoring Space').'</i>','<tt>'.$status.'</tt>'));
-            $message=&Apache::loncommon::confirmwrapper($message);
-            &print_main_menu($r,$message);
-    }
-}
-
 sub lockednameschanger {
     my $r = shift;
     &Apache::lonhtmlcommon::add_breadcrumb(
@@ -2116,25 +2079,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} }, {
@@ -2216,7 +2160,7 @@ sub handler {
     } 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,
@@ -2227,7 +2171,7 @@ sub handler {
     }elsif($env{'form.action'} eq 'changepass'){
         &passwordchanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_pass'){
-        &verify_and_change_password($r,'preferences');
+        &verify_and_change_password($r);
     }elsif($env{'form.action'} eq 'changescreenname'){
         &screennamechanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_screenname'){
@@ -2280,10 +2224,6 @@ sub handler {
         &coursedisplaychanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
         &verify_and_change_coursepage($r);
-    }elsif($env{'form.action'} eq 'authorsettings'){
-        &author_space_settings($r);
-    }elsif($env{'form.action'} eq 'change_authoring_settings'){
-        &change_authoring_settings($r);
     }elsif($env{'form.action'} eq 'debugtoggle'){
         if (&can_toggle_debug()) {
             &toggle_debug();