loncom/interface/lonpreferences.pm - diff

Return to lonpreferences.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonpreferences.pm between versions 1.159 and 1.196.4.24

-version 1.159, 2009/05/06 16:19:34
+version 1.196.4.24, 2018/09/03 14:03:03
  Line 36  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;
  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                    #
  ################################################################
- Line 116  sub wysiwygchanger {
+ Line 71  sub wysiwygchanger {
      my $switchon=&mt('Enable WYSIWYG editor');
      my $warning='';
      if ($env{'user.adv'}) {
-        $warning.="<p>".&mt("The WYSIWYG editor only supports simple HTML and is in many cases unsuited for advanced authoring. In a number of cases, it may destroy advanced authoring involving LaTeX and script function calls.")."</p>";
+        $warning.='<p class="LC_warning">'.&mt("The WYSIWYG editor only supports simple HTML and is in many cases unsuited for advanced authoring. In a number of cases, it may destroy advanced authoring involving LaTeX and script function calls.")."</p>";
      }
      $r->print(<<ENDLSCREEN);
  <form name="prefs" action="/adm/preferences" method="post">
- Line 151  sub languagechanger {
+ Line 106  sub languagechanger {
                  text => 'Change Language'});
      $r->print(Apache::loncommon::start_page('Content Display Settings'));
      $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language'));
-     my $user       = $env{'user.name'};
+     my %userenv = &Apache::lonnet::get('environment',['languages']);
-     my $domain     = $env{'user.domain'};
-     my %userenv = &Apache::lonnet::get
-         ('environment',['languages']);
      my $language=$userenv{'languages'};
-     my $pref=&mt('Preferred language');
+     $r->print(
-     my %langchoices=('' => 'No language preference');
+         '<form name="prefs" action="/adm/preferences" method="post">'."\n".
-     foreach (&Apache::loncommon::languageids()) {
+         '<input type="hidden" name="action" value="verify_and_change_languages" />'.
- 	if (&Apache::loncommon::supportedlanguagecode($_)) {
+         '<br /><span class="LC_nobreak">'.&mt('Preferred language').':&nbsp;'.
- 	    $langchoices{&Apache::loncommon::supportedlanguagecode($_)}
+         &Apache::loncommon::select_language('language',$language,1).'</span>'."\n".
- 	               = &Apache::loncommon::plainlanguagedescription($_);
+         '<br /><input type="submit" value="'.&mt('Save').'" /></form>'
- 	}
+     );
-     }
-     my $selectionbox=&Apache::loncommon::select_form($language,'language',
- 						     %langchoices);
-     $r->print(<<ENDLSCREEN);
- <form name="prefs" action="/adm/preferences" method="post">
- <input type="hidden" name="action" value="verify_and_change_languages" />
- <br />$pref: $selectionbox
- ENDLSCREEN
-     $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
  }
- Line 187  sub verify_and_change_languages {
+ Line 130  sub verify_and_change_languages {
      if ($newlanguage) {
          &Apache::lonnet::put('environment',{'languages' => $newlanguage});
          &Apache::lonnet::appenv({'environment.languages' => $newlanguage});
-         $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Preferred language').'</i>','<tt>"'.$newlanguage.'"</tt>.'));
+         $message=&Apache::lonhtmlcommon::confirm_success(
+             &mt('Set [_1] to [_2]',
+                 '<i>'.&mt('Preferred language').'</i>',
+                 '<tt>"'.$newlanguage.'"</tt>.'))
+            .'<br />'
+            .&mt('The change will become active on the next page.');
      } else {
          &Apache::lonnet::del('environment',['languages']);
          &Apache::lonnet::delenv('environment.languages');
- Line 205  sub texenginechanger {
+ Line 153  sub texenginechanger {
      my $r = shift;
      Apache::lonhtmlcommon::add_breadcrumb(
  	    {	href => '/adm/preferences?action=changetexenginepref',
-                 text => 'Change How Math Equations Are Displayed'});
+                 text => 'Math display settings'});
      $r->print(Apache::loncommon::start_page('Content Display Settings'));
-     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change How Math Equations Are Displayed'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Math display settings'));
      my $user       = $env{'user.name'};
      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',
- 		     'jsMath' => 'jsMath',
+                      'MathJax' => 'MathJax',
- 		     'mimetex' => 'mimetex (Convert to Images)'
+ 		     'mimetex' => 'mimetex (Convert to Images)',
+                      'raw' => 'Raw (Screen Reader)'
                       );
-     my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
+     %mathchoices = &Apache::lonlocal::texthash(%mathchoices);
- 						     %mathchoices);
+     my $selectionbox=
-     my $jsMath_start=&Apache::lontexconvert::jsMath_header();
+            &Apache::loncommon::select_form(
+                $texengine,
+                'texengine',
+                \%mathchoices);
+     my $MathJax_start=&Apache::lontexconvert::MathJax_header();
      my %lt=&Apache::lonlocal::texthash(
-       'headline' => 'Change Math Preferences',
+       'headline' => 'Change how math is displayed',
-       'preftxt'  => 'Preferred method to display Math',
+       'preftxt'  => 'Preferred method to display math',
        'change'   => 'Save',
        'exmpl'    => 'Examples',
-       'jsmath'   => 'jsMath:',
+       'mathjax'  => 'MathJax:',
+       '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):',
      );
- Line 246  $lt{'preftxt'}: $selectionbox
+ Line 203  $lt{'preftxt'}: $selectionbox
  <hr />
  $lt{'exmpl'}
- <h3>$lt{'jsmath'}</h3>
+ <h3>$lt{'mathjax'}</h3>
- <p>
- $jsMath_start
- <script type="text/javascript" language="JavaScript">
- if (jsMath.nofonts == 1) {
-     document.writeln
-         ('<div style="padding: 10; border-style: solid; border-width:3;'
- 	 +' border-color: #DD0000; background-color: #FFF8F8; width: 75%; text-align: left">'
- 	 +'<small><font color="#AA0000"><b>Warning:</b> '
- 	 +'It looks like you don\\\'t have the TeX math fonts installed. '
- 	 +'The jsMath example on this page may not look right without them. '
- 	 +'The <a href="http://www.math.union.edu/locate/jsMath/" target="_blank"> '
- 	 +'jsMath Home Page</a> 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. '
- 	 +'</font></small></div>');
- }
  </script>
- <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
+ <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=MathJax" width="400" height="150"></iframe>
+ </p>
+ <p>
+ $lt{'mathjaxinfo'}
  </p>
  <h3>$lt{'mimetex'}</h3>
  <p>
- <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="100"></iframe>
+ <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="150"></iframe>
  </p>
  <h3>$lt{'tth'}</h3>
  <p>
- <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="200"></iframe>
+ <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="150"></iframe>
  </p>
  ENDLSCREEN
-     if ($env{'environment.texengine'} ne 'jsMath') {
- 	$r->print('<script type="text/javascript" language="JavaScript">jsMath.Process()</script>');
-     }
  }
- Line 291  sub verify_and_change_texengine {
+ Line 231  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 {
- Line 323  sub rolesprefchanger {
+ Line 266  sub rolesprefchanger {
      my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get
          ('environment',['recentroles','recentrolesn']);
+     my $brtext = 'Change '.$role.' Page Pref';
+     my $brtitle;
+     if ($env{'form.returnurl'} eq '/adm/roles') {
+         $brtext = 'Configure Hotlist';
+     } else {
+         $brtitle = $brtext;
+     }
      Apache::lonhtmlcommon::add_breadcrumb(
  	    {	href => '/adm/preferences?action=changerolespref',
-                 text => 'Change '.$role.' Page Pref'});
+                 text => $brtext});
      $r->print(Apache::loncommon::start_page('Content Display Settings'));
-     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change '.$role.' Page Pref'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs($brtitle));
      my $hotlist_flag=$userenv{'recentroles'};
      my $hotlist_n=$userenv{'recentrolesn'};
-     my $checked;
+     my ($checkedon,$checkedoff);
      if ($hotlist_flag) {
- 	$checked = 'checked="checked"';
+         $checkedon = 'checked="checked"';
+     } else {
+         $checkedoff = 'checked="checked"';
      }
      if (!$hotlist_n) { $hotlist_n=3; }
- Line 359  sub rolesprefchanger {
+ Line 311  sub rolesprefchanger {
  	    &Apache::loncommon::start_data_table().
  	    &Apache::loncommon::start_data_table_header_row().
  	    "<th>".&mt('Freeze '.$role)."</th>".
- 	    "<th>".&mt($role)."</td>".
+ 	    "<th>".&mt($role)."</th>".
  	    &Apache::loncommon::end_data_table_header_row().
  	    "\n";
  	my $count;
- Line 382  sub rolesprefchanger {
+ Line 334  sub rolesprefchanger {
          $roles_check_list .= "</table>\n";
      }
+     my $actionurl = '/adm/preferences';
+     if ($env{'form.returnurl'} eq '/adm/roles') {
+         $actionurl = '/adm/roles';
+     }
+     $r->print('<h3>'.&mt('Recent Roles Hotlist').'</h3>');
+     unless ($checkedon) {
+         $r->print(&mt('LON-CAPA users with several '.$lc_role.'s may wish to enable the Hotlist.').'<br />');
+     }
      $r->print('
- <p>'.&mt('Some LON-CAPA users have a long list of '.$lc_role.'s. The Recent '.$role.'s Hotlist feature keeps track of the last N '.$lc_role.'s which have been visited and places a table of these at the top of the '.$lc_role.'s page. People with very few '.$lc_role.'s should leave this feature disabled.').'
+ <form name="prefs" action="'.$actionurl.'" method="post">
- </p>
- <form name="prefs" action="/adm/preferences" method="POST">
  <input type="hidden" name="action" value="verify_and_change_rolespref" />
- <br /><label>'.&mt('Enable Recent '.$role.'s Hotlist:').'
+ <input type="hidden" name="returnurl" value="'.$env{'form.returnurl'}.'" />
- <input type="checkbox"'.$checked.' name="recentroles" value="true" /></label>
+ <div class="LC_left_float"><h4>'.&mt('Hotlist options').'</h4>
- <br />'.&mt('Number of '.$role.'s in Hotlist:').'
+ <p>'.
- <select name="recentrolesn" size="1">
+ &mt('When enabled, the Hotlist keeps track of the last N '.$lc_role.'s visited.').'<br />'.
- '.$options.'
+ &mt('Those N '.$lc_role.'s are then shown in a table at the top of the '.$lc_role.'s page.').'</p>'.
- </select>
+ &Apache::lonhtmlcommon::start_pick_box().
- <p>'.&mt('This list below can be used to <q>freeze</q> '.$lc_role.'s on your screen. Those marked as frozen will not be removed from the list, even if they have not been used recently.').'
+ &Apache::lonhtmlcommon::row_title(&mt('Use Recent '.$role.'s Hotlist')).
+ '<span class="LC_nobreak">
+ <label><input id="Hotliston" type="radio" '.$checkedon.' name="recentroles" value="1" />'.&mt('Yes').'</label>'.
+ ('&nbsp;'x2).
+ '<label><input id="Hotlistoff" type="radio" '.$checkedoff.' name="recentroles" value="0" />'.&mt('No').'</label>
+ </span>'.
+ &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_title('<label for="NumberOfRoles">'.&mt('Number of '.$role.'s in Hotlist').'</label>').
+ '<select name="recentrolesn" size="1" id ="NumberOfRoles">'.
+ $options.'
+ </select>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::end_pick_box().'
+ </div>');
+     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 />'.
+ &mt('Those '.$lc_role.'s marked frozen will not be removed from the list, even if not recently used.').'
  </p>
  '.$roles_check_list.'
- <br />
+ </div>');
+      } else {
+          $r->print('<br clear="all" />'.
+                    &mt('Once the Hotlist contains recently visited '.$lc_role.'s you can return to this page to also set frozen roles.'));
+      }
+      $r->print('
+ <br clear="all" />
  <input type="submit" value="'.&mt('Save').'" />
  </form>');
  }
- Line 443  sub verify_and_change_rolespref {
+ Line 425  sub verify_and_change_rolespref {
      if ($hotlist_flag) {
          &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});
          &Apache::lonnet::appenv({'environment.recentroles' => $hotlist_flag});
-         $message=&mt('Recent '.$role.'s Hotlist is Enabled');
+         $message=&Apache::lonhtmlcommon::confirm_success(&mt('Recent '.$role.'s Hotlist is Enabled.')." ".&mt('Display [_1] Most Recent '.$role.'s.',$hotlist_n));
      } else {
          &Apache::lonnet::del('environment',['recentroles']);
          &Apache::lonnet::delenv('environment.recentroles');
-         $message=&mt('Recent '.$role.'s Hotlist is Disabled');
+         $message=&Apache::lonhtmlcommon::confirm_success(&mt('Recent '.$role.'s Hotlist is Disabled'));
      }
      if ($hotlist_n) {
          &Apache::lonnet::put('environment',{'recentrolesn' => $hotlist_n});
          &Apache::lonnet::appenv({'environment.recentrolesn' => $hotlist_n});
-         if ($hotlist_flag) {
-             $message.="<br />".
- 		&mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";
-         }
      }
  # Get list of froze roles and list of recent roles
- Line 491  sub verify_and_change_rolespref {
+ Line 469  sub verify_and_change_rolespref {
          }
      }
      $message=&Apache::loncommon::confirmwrapper($message);
-     &print_main_menu($r, $message);
+     if ($env{'form.returnurl'} eq '/adm/roles') {
+         return $message;
+     } else {
+         &print_main_menu($r, $message);
+     }
  }
- Line 544  sub verify_and_change_screenname {
+ Line 526  sub verify_and_change_screenname {
      if ($newscreen) {
          &Apache::lonnet::put('environment',{'screenname' => $newscreen});
          &Apache::lonnet::appenv({'environment.screenname' => $newscreen});
-         $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Screenname').'</i>','<tt>"'.$newscreen.'."</tt>'));
+         $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Screenname').'</i>','<tt>"'.$newscreen.'"</tt>'));
      } else {
          &Apache::lonnet::del('environment',['screenname']);
          &Apache::lonnet::delenv('environment.screenname');
- Line 557  sub verify_and_change_screenname {
+ Line 539  sub verify_and_change_screenname {
      if ($newscreen) {
          &Apache::lonnet::put('environment',{'nickname' => $newscreen});
          &Apache::lonnet::appenv({'environment.nickname' => $newscreen});
-         $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Nickname').'</i>','<tt>"'.$newscreen.'"</tt>.'));
+         $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Nickname').'</i>','<tt>"'.$newscreen.'"</tt>'));
      } else {
          &Apache::lonnet::del('environment',['nickname']);
          &Apache::lonnet::delenv('environment.nickname');
- Line 574  sub verify_and_change_screenname {
+ Line 556  sub verify_and_change_screenname {
  sub iconchanger {
      my $r = shift;
      &Apache::lonhtmlcommon::add_breadcrumb(
- 	    {	href => '/adm/preferences?action=changeicons',
+             {   href => '/adm/preferences?action=changeicons',
-                 text => 'Change Main Menu'});
+                 text => 'Change Menu Display'});
      $r->print(Apache::loncommon::start_page('Page Display Settings'));
-     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Main Menu'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Menu Display'));
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
-     my %userenv = &Apache::lonnet::get
+     my %userenv = &Apache::lonnet::get('environment',['icons']);
-         ('environment',['icons']);
      my $iconic='checked="checked"';
-     my $classic='';
+     my ($classic,$onlyicon,$iconic_preview,$iconsonly_preview);
-     my $onlyicon='';
      if ($userenv{'icons'} eq 'classic') {
-        $classic='checked="checked"';
+         $iconic='';
-        $iconic='';
+         $classic='<div class="LC_info">'.
+                  &mt('Your current selection: "Use buttons and text" is deprecated - it is recommended that you change this to "Use icons and text".').'</div>';
      }
      if ($userenv{'icons'} eq 'iconsonly') {
         $onlyicon='checked="checked"';
         $iconic='';
      }
-     my $useicons=&mt('Use icons and text');
-     my $usebuttons=&mt('Use buttons and text');
-     my $useicononly=&mt('Use icons only');
      my $change=&mt('Save');
+     my %lt = &icon_options();
+     my ($inlinetools,$toolsorder) = &icon_previews();
+     if ((ref($inlinetools) eq 'HASH') && (ref($toolsorder) eq 'ARRAY')) {
+         foreach my $tool (@{$toolsorder}) {
+             my ($command,$row,$col,$img,$top,$bot,$act,$desc) =
+                 split(/\&/,$inlinetools->{$tool});
+             $iconic_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" /><span class="LC_menubuttons_inline_text">'.$top.('&nbsp;' x 2).'</span></a></li>';
+             $iconsonly_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" />&nbsp;</a></li>';
+         }
+     }
+     $iconsonly_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.
+                          '<ul>'.
+                          $iconsonly_preview.
+                          '</ul></li></ul>';
+     $iconic_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.
+                       '<ul>'.
+                       $iconic_preview.
+                       '</ul></li></ul>';
      $r->print(<<ENDSCREEN);
+ $classic
  <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_icons" />
- <label><input type="radio" name="menumode" value="iconic" $iconic /> $useicons</label><br />
+ <label><input type="radio" name="menumode" value="iconic" $iconic /> $lt{'iconic'}</label>$iconic_preview<br />
- <label><input type="radio" name="menumode" value="classic" $classic /> $usebuttons</label><br />
+ <label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $lt{'iconsonly'}</label>$iconsonly_preview<br />
- <label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $useicononly</label><br />
  <input type="submit" value="$change" />
  </form>
  ENDSCREEN
- Line 614  sub verify_and_change_icons {
+ Line 610  sub verify_and_change_icons {
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
      my $newicons   = $env{'form.menumode'};
+     my %lt = &icon_options();
+     my $newchoice = $newicons;
+     if ($lt{$newicons}) {
+         $newchoice = $lt{$newicons};
+     }
      &Apache::lonnet::put('environment',{'icons' => $newicons});
      &Apache::lonnet::appenv({'environment.icons' => $newicons});
-     my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newicons.'</tt>'));
+     my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newchoice.'</tt>'));
      $message=&Apache::loncommon::confirmwrapper($message);
      &print_main_menu($r, $message);
  }
+ sub icon_options {
+     return &Apache::lonlocal::texthash(
+                                         iconic    => 'Use icons and text',
+                                         iconsonly => 'Use icons only',
+                                       );
+ }
+ sub icon_previews {
+      my %icon_text = (
+                       annotate => 'Notes',
+                       wishlist => 'Stored Links',
+                       catalog  => 'Info',
+                       evaluate => 'Evaluate',
+                       feedback => 'Communicate',
+                       printout => 'Print',
+                      );
+     my %inlinetools = (
+         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);
+ }
  ################################################################
  #                     Clicker Subroutines                      #
  ################################################################
- Line 691  sub domcoordchanger {
+ Line 719  sub domcoordchanger {
      if ($userenv{'domcoord.author'} eq 'blocked') {
         $constchecked=' checked="checked"';
      }
-     my $text=&mt('By default, the Domain Coordinator can enter your construction space.');
+     my $text=&mt('By default, the Domain Coordinator can enter your Authoring Space.');
-     my $construction=&mt('Block access to construction space');
+     my $construction=&mt('Block access to Authoring Space');
      my $change=&mt('Save');
+     my $returnurl = &HTML::Entities::encode($env{'form.returnurl'},'"<>&\'');
      $r->print(<<ENDSCREEN);
  <form name="prefs" action="/adm/preferences" method="post">
+ <input type="hidden" name="returnurl" value="$returnurl" />
  <input type="hidden" name="action" value="verify_and_change_domcoord" />
  $text<br />
  <label><input type="checkbox" name="construction"$constchecked />$construction</label><br />
- Line 718  sub verify_and_change_domcoord {
+ Line 748  sub verify_and_change_domcoord {
      } else {
          $status=&mt('off');
      }
-     my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to construction space').'</i>','<tt>'.$status.'</tt>'));
+     my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to Authoring Space').'</i>','<tt>'.$status.'</tt>'));
      $message=&Apache::loncommon::confirmwrapper($message);
-     &print_main_menu($r,$message);
+     if ($env{'form.returnurl'}) {
+         &do_redirect($r,$env{'form.returnurl'},$message);
+     } else {
+         &print_main_menu($r,$message);
+     }
  }
  #################################################################
- Line 734  sub lockwarning {
+ Line 768  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');
- Line 773  sub msgforwardchanger {
+ Line 807  sub msgforwardchanger {
                                            all   => 'All',
                                            crit  => 'Critical only',
                                            reg   => 'Non-critical only',
-                                           foad  => 'Forwarding Address(es)',
+                                           foad  => 'Forward to account(s)',
-                                           noti  => 'Notification E-mail Address(es)',
+                                           fwdm  => 'Forward messages to other account(s) in LON-CAPA',
-                                           foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',
+                                           noti  => 'E-mail notification of LON-CAPA messages',
-                                           mnot  => 'E-mail Address(es) which should be notified about new LON-CAPA messages',
+                                           mnot  => 'E-mail address(es) which should be notified about new LON-CAPA messages',
-  # old: 'Message Notification Email Address(es)',
-                                           mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',
                                            chg   => 'Save',
                                            email => 'The e-mail address entered in row ',
                                            notv => 'is not a valid e-mail address',
                                            toen => "To enter multiple addresses, enter one address at a time, click 'Change' and then add the next one",
                                            prme => 'Back',
                                          );
+     $lt{'foad_exmpl'} = &mt('e.g. [_1]userA:domain1,userB:domain2,...[_2]','<tt>','</tt>');
+     $lt{'mnot_exmpl'} = &mt('e.g. [_1]joe@doe.com[_2]','<tt>','</tt>');
      Apache::lonhtmlcommon::add_breadcrumb(
  	    {	href => '/adm/preferences?action=changemsgforward',
- 		text => 'Change Message Forwarding/Notification'});
+ 		text => 'Messages & Notifications'});
-     $r->print(Apache::loncommon::start_page('Message Management'));
+     $r->print(Apache::loncommon::start_page('Messages &amp; Notifications'));
-     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Message Forwarding/Notification'));
+     $r->print(Apache::lonhtmlcommon::breadcrumbs('Messages &amp; Notifications'));
      my $forwardingHelp = &Apache::loncommon::help_open_topic("Prefs_Forwarding");
      my $notificationHelp = &Apache::loncommon::help_open_topic("Prefs_Notification");
      my $criticalMessageHelp = &Apache::loncommon::help_open_topic("Course_Critical_Message");
- Line 855  $validatescript
+ Line 889  $validatescript
      $r->print(<<ENDMSG);
  $jscript
  $message
- <h3>$lt{'foad'} $forwardingHelp</h3>
+ <h3>$lt{'fwdm'} $forwardingHelp</h3>
  <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_msgforward" />
  $lt{'foad'} ($lt{'foad_exmpl'}):
- <input type="text" size="40" value="$msgforward" name="msgforward" /><br />
+ <input type="text" size="40" value="$msgforward" name="msgforward" />
+ <br /><br />
  <h3>$lt{'noti'} $notificationHelp</h3>
  $lt{'mnot'} ($lt{'mnot_exmpl'}):<br />
  ENDMSG
- Line 887  ENDMSG
+ Line 922  ENDMSG
                     '" onclick="javscript:delete_address('."'$num'".')" />'.
                     &mt('Delete').'</label></span></td>'.
                     '<td><input type="text" value="'.$item.'" name="address_'.
-                    $num.'" onFocus="javascript:address_changes('."'$num'".
+                    $num.'" onfocus="javascript:address_changes('."'$num'".
                     ')" /></td><td>';
          my %chk;
          if (defined($allnot{$item}{'crit'})) {
- Line 904  ENDMSG
+ Line 939  ENDMSG
                         '<input type="radio" name="notify_type_'.$num.
                         '" value="'.$type.'" '.$chk{$type}.
                         ' onchange="javascript:address_changes('."'$num'".')" />'.
-                        $lt{$type}.'</label></span>&nbsp;';
+                        $lt{$type}.'</label></span>'.('&nbsp;' x4);
          }
          my $htmlon = '';
          my $htmloff = '';
- Line 916  ENDMSG
+ Line 951  ENDMSG
          $output .= '</td><td><label><input type="radio" name="html_'.$num.
                     '" value="1" '.$htmlon.
                     ' onchange="javascript:address_changes('."'$num'".')" />'.
-                    &mt('Yes').'</label>&nbsp;'.
+                    &mt('Yes').'</label>'.('&nbsp;' x3).
                     '<label><input type="radio" name="html_'.$num.'" value="0" '.
                     $htmloff. ' onchange="javascript:address_changes('."'$num'".
  ')" />'.
- Line 936  ENDMSG
+ Line 971  ENDMSG
                 '<input type="checkbox" name="add_notify_'.$num.
                 '" value="1" />'.&mt('Add new address').'</label></span></td>'.
                 '<td><input type="text" value="" name="address_'.$num.
-                '" onFocus="javascript:new_address('."'$num'".')" /></td><td>';
+                '" onfocus="javascript:new_address('."'$num'".')" /></td><td>';
      foreach my $type ('all','crit','reg') {
          $output .= '<span class="LC_nobreak"><label>'.
                     '<input type="radio" name="notify_type_'.$num.
                     '" value="'.$type.'" '.$defchk{$type}.'/>'.
-                    $lt{$type}.'</label></span>&nbsp;';
+                    $lt{$type}.'</label></span>'.('&nbsp;' x4);
      }
      $output .= '</td><td><label><input type="radio" name="html_'.$num.
-                '" value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                '" value="1" />'.&mt('Yes').'</label>'.('&nbsp;' x3).
                 '<label><input type="radio" name="html_'.$num.'" value="0" '.
                 ' checked="checked" />'.
                 &mt('No').'</label></td>'.
- Line 982  sub verify_and_change_msgforward {
+ Line 1017  sub verify_and_change_msgforward {
      my $domain     = $env{'user.domain'};
      my $newscreen  = '';
      my $message='';
-     foreach (split(/\,/,$env{'form.msgforward'})) {
+     foreach my $recip (split(/\,/,$env{'form.msgforward'})) {
- 	my ($msuser,$msdomain)=split(/[\@\:]/,$_);
+         my ($msuser,$msdomain);
+         if ($recip =~ /:/) {
+             ($msuser,$msdomain)=split(':',$recip);
+         } else {
+             ($msuser,$msdomain)=split(/\@/,$recip);
+         }
          $msuser = &LONCAPA::clean_username($msuser);
          $msdomain = &LONCAPA::clean_domain($msdomain);
          if (($msuser) && ($msdomain)) {
  	    if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
-                $newscreen.=$msuser.':'.$msdomain.',';
+                 $newscreen.=$msuser.':'.$msdomain.',';
- 	   } else {
+ 	    } else {
-                $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br>';
+                 $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br />';
-            }
+             }
          }
      }
      $newscreen=~s/\,$//;
      if ($newscreen) {
          &Apache::lonnet::put('environment',{'msgforward' => $newscreen});
          &Apache::lonnet::appenv({'environment.msgforward' => $newscreen});
-         $message .= &mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.'
+         $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.<br />');
-                     .'<br />';
      } else {
          &Apache::lonnet::del('environment',['msgforward']);
          &Apache::lonnet::delenv('environment.msgforward');
-         $message.= &mt("Set message forwarding to 'off'.").'<br />';
+         $message.= &Apache::lonhtmlcommon::confirm_success(&mt("Set message forwarding to 'off'.").'<br />');
      }
      my $critnotification;
      my $notification;
- Line 1039  sub verify_and_change_msgforward {
+ Line 1078  sub verify_and_change_msgforward {
      if ($notification) {
          &Apache::lonnet::put('environment',{'notification' => $notification});
          &Apache::lonnet::appenv({'environment.notification' => $notification});
-         $message.=&mt('Set non-critical message notification address(es) to ').'<tt>"'.$notification.'"</tt>.<br />';
+         $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set non-critical message notification address(es) to ').'<tt>"'.$notification.'"</tt>.<br />');
      } else {
          &Apache::lonnet::del('environment',['notification']);
          &Apache::lonnet::delenv('environment.notification');
-         $message.=&mt("Set non-critical message notification to 'off'.").'<br />';
+         $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set non-critical message notification to 'off'.").'<br />');
      }
      if ($critnotification) {
          &Apache::lonnet::put('environment',{'critnotification' => $critnotification});
          &Apache::lonnet::appenv({'environment.critnotification' => $critnotification});
-         $message.=&mt('Set critical message notification address(es) to ').'<tt>"'.$critnotification.'"</tt>.<br />';
+         $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set critical message notification address(es) to ').'<tt>"'.$critnotification.'"</tt>.<br />');
      } else {
          &Apache::lonnet::del('environment',['critnotification']);
          &Apache::lonnet::delenv('environment.critnotification');
-         $message.=&mt("Set critical message notification to 'off'.").'<br />';
+         $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set critical message notification to 'off'.").'<br />');
      }
      if ($critnotification || $notification) {
          if ($notify_with_html) {
              &Apache::lonnet::put('environment',{'notifywithhtml' => $notify_with_html});
              &Apache::lonnet::appenv({'environment.notifywithhtml' => $notify_with_html});
-             $message.=&mt('Set address(es) to receive excerpts with html retained ').'<tt>"'.$notify_with_html.'"</tt>.';
+             $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set address(es) to receive excerpts with html retained ').'<tt>"'.$notify_with_html.'"</tt>.');
          } else {
              &Apache::lonnet::del('environment',['notifywithhtml']);
              &Apache::lonnet::delenv('environment.notifywithhtml');
              if ($totaladdresses == 1) {
-                 $message.=&mt("Set notification address to receive excerpts with html stripped.");
+                 $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set notification address to receive excerpts with html stripped."));
              } else {
-                 $message.=&mt("Set all notification addresses to receive excerpts with html stripped.");
+                 $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set all notification addresses to receive excerpts with html stripped."));
              }
          }
      } else {
          &Apache::lonnet::del('environment',['notifywithhtml']);
          &Apache::lonnet::delenv('environment.notifywithhtml');
      }
-     if ($message) {
-         $message .= '<br /><hr />';
-     }
      &Apache::loncommon::flush_email_cache($user,$domain);
+     $message=&Apache::loncommon::confirmwrapper($message);
      &msgforwardchanger($r,$message);
  }
- Line 1108  sub colorschanger {
+ Line 1145  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><td style="background: '.$curcol.
+                  '<td>'.$colortypes{$item}.'<td><input name="'.$item.
-         '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><input name="'.$item.
+                  '" class="colorchooser"  size="10" value="'.$curcol.
-         '" size="10" value="'.$curcol.
+                  '" /></td>'.
- '" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.
+ 	         &Apache::loncommon::end_data_table_row()."\n";
- "','".$curcol."','"
- 	    .$item."','parmform.pres','psub'".');">'.&mt('Select').'</a></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();
      my $savebutton = &mt('Save');
      my $resetbutton = &mt('Reset All');
      my $resetbuttondesc = &mt('Reset All Colors to Default');
+     my $colorchooser=&Apache::lonhtmlcommon::color_picker();
+     $r->print('<script type="text/javascript" language="JavaScript">
+ ' . $colorchooser . '
+ </script>
+ ');
      $r->print(<<ENDCOL);
- <script type="text/javascript" language="JavaScript">
-     function pclose() {
+ <form name="parmform" action="">
-         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
-                  "height=350,width=350,scrollbars=no,menubar=no");
-         parmwin.close();
-     }
-     $pjump_def
-     function psub() {
-         pclose();
-         if (document.parmform.pres_marker.value!='') {
-             if (document.parmform.pres_type.value!='') {
-                 eval('document.prefs.'+
-                      document.parmform.pres_marker.value+
- 		     '.value=document.parmform.pres_value.value;');
- 	    }
-         } else {
-             document.parmform.pres_value.value='';
-             document.parmform.pres_marker.value='';
-         }
-     }
- </script>
- <form name="parmform">
  <input type="hidden" name="pres_marker" />
  <input type="hidden" name="pres_type" />
  <input type="hidden" name="pres_value" />
- Line 1184  sub verify_and_change_colors {
+ Line 1198  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;
+         }
          my $entry='color.'.$function.'.'.$item;
  	if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
  	    &Apache::lonnet::put('environment',{$entry => $color});
- Line 1216  sub passwordchanger {
+ Line 1233  sub passwordchanger {
      # This function is a bit of a mess....
      # Passwords are encrypted using londes.js (DES encryption)
      $errormessage = ($errormessage || '');
-     my ($user,$domain,$currentpass,$defdom);
+     my ($user,$domain,$currentpass);
      &Apache::lonhtmlcommon::add_breadcrumb(
  		{ href => '/adm/preferences?action=changepass',
                    text => 'Change Password'});
- Line 1224  sub passwordchanger {
+ Line 1241  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'};
- Line 1231  sub passwordchanger {
+ Line 1254  sub passwordchanger {
              $caller = 'preferences';
          }
      } elsif ($caller eq 'reset_by_email') {
-             $defdom = $r->dir_config('lonDefDomain');
              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.'
+                 $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>')
+                    .'</p>'
                  );
                  return;
              }
- Line 1245  sub passwordchanger {
+ Line 1270  sub passwordchanger {
                      $domain = $data{'domain'};
                      $currentpass = $data{'temppasswd'};
                  } else {
-                     $r->print(&mt('Sorry, the token generated when you requested a password reset has expired.').'<br />');
+                     $r->print(
+                         '<p class="LC_warning">'
+                        .&mt('Sorry, the token generated when you requested'
+                            .' a password reset has expired.')
+                        .'</p>'
+                     );
                      return;
                  }
              } else {
-                 $r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />');
+                 $r->print(
+                    '<p class="LC_warning">'
+                   .&mt('Sorry, the URL generated when you requested reset of'
+                       .' your password contained incomplete information.')
+                    .'</p>'
+                 );
                  return;
              }
-    } else {
+             if (&Apache::lonnet::domain($domain) eq '') {
-         $r->print(&mt('Page requested in unexpected context').'<br />');
+                 $domain = $r->dir_config('lonDefDomain');
+             }
+     } else {
+         $r->print(
+             '<p class="LC_error">'
+            .&mt('Page requested in unexpected context')
+            .'</p>'
+         );
          return;
      }
      my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
- Line 1261  sub passwordchanger {
+ Line 1303  sub passwordchanger {
      return if ($currentauth !~ /^(unix|internal):/);
      #
      # Generate keys
-     my ($lkey_cpass ,$ukey_cpass ) = &des_keys();
+     my ($lkey_cpass ,$ukey_cpass ) = &Apache::loncommon::des_keys();
-     my ($lkey_npass1,$ukey_npass1) = &des_keys();
+     my ($lkey_npass1,$ukey_npass1) = &Apache::loncommon::des_keys();
-     my ($lkey_npass2,$ukey_npass2) = &des_keys();
+     my ($lkey_npass2,$ukey_npass2) = &Apache::loncommon::des_keys();
      # Store the keys in the log files
      my $lonhost = $r->dir_config('lonHostID');
      my $logtoken=Apache::lonnet::reply('tmpput:'
- Line 1296  $errormessage
+ Line 1338  $errormessage
       crappy browser -->
  ENDFORM
      $r->print(&server_form($logtoken,$caller,$mailtoken));
-     $r->print(&client_form($caller,\%hexkey,$currentpass,$defdom));
+     $r->print(&client_form($caller,\%hexkey,$currentpass,$domain));
      #
      return;
- Line 1311  sub jscript_send {
+ Line 1353  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 =
-         this.document.pserver.elements.currentpass.value
+             getCrypted(this.document.client.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
-             =crypted(this.document.client.elements.newpass_1.value);
+             =getCrypted(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
-             =crypted(this.document.client.elements.newpass_2.value);
+             =getCrypted(this.document.client.elements.newpass_2.value);
  |;
      if ($caller eq 'reset_by_email') {
          $output .= qq|
- Line 1333  sub jscript_send {
+ Line 1372  sub jscript_send {
                     this.document.client.elements.uname.value;
          this.document.pserver.elements.udom.value =
                     this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
+         this.document.pserver.elements.email.value =
+                    this.document.client.elements.email.value;
  |;
      }
      $ output .= qq|
          this.document.pserver.submit();
      }
  </script>
  |;
  }
- Line 1351  sub client_form {
+ Line 1393  sub client_form {
                  'currentpass' => 'Current Password',
                  'newpass' => 'New Password',
                  'confirmpass' => 'Confirm Password',
-                 'changepass' => 'Save');
+                 'changepass' => 'Save',
+     );
-     my $output = qq|
+     my $output = '<form name="client" action="">'
- <form name="client" >
+                 .&Apache::lonhtmlcommon::start_pick_box();
- <table>
- |;
      if ($caller eq 'reset_by_email') {
-         $output .= qq|
+         my $mobileargs;
- <tr><td class="LC_preferences_labeltext"><label for="email">$lt{'email'}</label>:</td>
+         (undef,undef,undef,undef,undef,undef,my $clientmobile) =
-     <td><input type="text" name="email" size="30" /> </td></tr>
+             &Apache::loncommon::decode_user_agent();
- <tr><td class="LC_preferences_labeltext"><label for="uname">$lt{'username'}</label>:</td>
+         if ($clientmobile) {
-     <td>
+             $mobileargs = 'autocapitalize="off" autocorrect="off" ';
-      <input type="text" name="uname" size="15" />
+         }
-      <input type="hidden" name="currentpass" value="$currentpass" />
+         $output .= &Apache::lonhtmlcommon::row_title(
-     </td></tr>
+                        '<label for="email">'.$lt{'email'}.'</label>')
- <tr><td class="LC_preferences_labeltext"><label for="udom">$lt{'domain'}</label>:</td>
+                   .'<input type="text" name="email" size="30" '.$mobileargs.'/>'
-     <td>
+                   .&Apache::lonhtmlcommon::row_closure()
- |;
+                   .&Apache::lonhtmlcommon::row_title(
-         $output .= &Apache::loncommon::select_dom_form($defdom,'udom').'
+                        '<label for="uname">'.$lt{'username'}.'</label>')
-    </td>
+                   .'<input type="text" name="uname" size="20" '.$mobileargs.'/>'
- </tr>
+                   .'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'
- ';
+                   .&Apache::lonhtmlcommon::row_closure()
+                   .&Apache::lonhtmlcommon::row_title(
+                        '<label for="udom">'.$lt{'domain'}.'</label>')
+                   .&Apache::loncommon::select_dom_form($defdom,'udom')
+                   .&Apache::lonhtmlcommon::row_closure();
      } else {
-         $output .= qq|
+         $output .= &Apache::lonhtmlcommon::row_title(
- <tr><td class="LC_preferences_labeltext"><label for="currentpass">$lt{'currentpass'}</label></td>
+                        '<label for="currentpass">'.$lt{'currentpass'}.'</label>')
-     <td><input type="password" name="currentpass" size="10"/> </td></tr>
+                   .'<input type="password" name="currentpass" size="20"/>'
- |;
+                   .&Apache::lonhtmlcommon::row_closure();
      }
-     $output .= <<"ENDFORM";
+     $output .= &Apache::lonhtmlcommon::row_title(
- <tr><td class="LC_preferences_labeltext"><label for="newpass_1">$lt{'newpass'}</label></td>
+                    '<label for="newpass_1">'.$lt{'newpass'}.'</label>')
-     <td><input type="password" name="newpass_1" size="10"  /> </td></tr>
+               .'<input type="password" name="newpass_1" size="20" />'
- <tr><td class="LC_preferences_labeltext"><label for="newpass_2">$lt{'confirmpass'}</label></td>
+               .&Apache::lonhtmlcommon::row_closure()
-     <td><input type="password" name="newpass_2" size="10"  /> </td></tr>
+               .&Apache::lonhtmlcommon::row_title(
- <tr><td colspan="2" align="center">
+                    '<label for="newpass_2">'.$lt{'confirmpass'}.'</label>')
-     <input type="button" value="$lt{'changepass'}" onClick="send();" />
+               .'<input type="password" name="newpass_2" size="20" />'
- </table>
+               .&Apache::lonhtmlcommon::row_closure(1)
+               .&Apache::lonhtmlcommon::end_pick_box();
+     $output .= '<p><input type="button" value="'.$lt{'changepass'}.'" onclick="send();" /></p>'
+               .qq|
  <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />
  <input type="hidden" name="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />
  <input type="hidden" name="ukey_npass1" value="$hexkey->{'ukey_npass1'}" />
- Line 1395  sub client_form {
+ Line 1443  sub client_form {
  <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
  </form>
  </p>
- ENDFORM
+ |;
      return $output;
  }
- Line 1417  sub server_form {
+ Line 1465  sub server_form {
  <input type="hidden" name="token"   value="$mailtoken" />
  <input type="hidden" name="uname"   value="" />
  <input type="hidden" name="udom"   value="" />
+ <input type="hidden" name="email"   value="" />
  |;
      }
- Line 1428  sub server_form {
+ Line 1477  sub server_form {
  }
  sub verify_and_change_password {
-     my ($r,$caller,$mailtoken) = @_;
+     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'};
- Line 1499  ENDERROR
+ Line 1554  ENDERROR
      }
      my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
      #
-     $currentpass = &des_decrypt($ckey ,$currentpass);
+     $currentpass = &Apache::loncommon::des_decrypt($ckey ,$currentpass);
-     $newpass1    = &des_decrypt($n1key,$newpass1);
+     $newpass1    = &Apache::loncommon::des_decrypt($n1key,$newpass1);
-     $newpass2    = &des_decrypt($n2key,$newpass2);
+     $newpass2    = &Apache::loncommon::des_decrypt($n2key,$newpass2);
      #
      if ($caller eq 'reset_by_email') {
          my %data = &Apache::lonnet::tmpget($mailtoken);
- Line 1522  ENDERROR
+ Line 1577  ENDERROR
      }
      if ($newpass1 ne $newpass2) {
  	&passwordchanger($r,
- 			 '<span class="LC_error">'.
+ 			 '<span class="LC_warning">'.
  			 &mt('The new passwords you entered do not match.').'  '.
  			 &mt('Please try again.').'</span>',$caller,$mailtoken);
  	return 1;
      }
      if (length($newpass1) < 7) {
  	&passwordchanger($r,
- 			 '<span class="LC_error">'.
+ 			 '<span class="LC_warning">'.
  			 &mt('Passwords must be a minimum of 7 characters long.').'  '.
  			 &mt('Please try again.').'</span>',$caller,$mailtoken);
  	return 1;
- Line 1542  ENDERROR
+ Line 1597  ENDERROR
      }
      if ($badpassword) {
  	# I can't figure out how to enter bad characters on my browser.
- 	my $errormessage ='<span class="LC_error">'.
+ 	my $errormessage ='<span class="LC_warning">'.
             &mt('The password you entered contained illegal characters.').'<br />'.
             &mt('Valid characters are').(<<"ENDERROR");
  : space and <br />
- Line 1561  ENDERROR
+ Line 1616  ENDERROR
      # Inform the user the password has (not?) been changed
      my $message;
      if ($result =~ /^ok$/) {
-         $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'<i>'));
+         $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'</i>'));
+         $message = &Apache::loncommon::confirmwrapper($message);
          if ($caller eq 'reset_by_email') {
              $r->print($message.'<br />');
          } else {
              &print_main_menu($r, $message);
+             if (ref($ended)) {
+                 $$ended = 1;
+             }
          }
      } else {
  	# error error: run in circles, scream and shout
-         $message = &Apache::lonhtmlcommon::confirm_success(
+         if ($caller eq 'reset_by_email') {
-           &mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);
+             if (!$result) {
-         unless ($caller eq 'reset_by_email') {
+                 return 1;
+             } else {
+                 return $result;
+             }
+         } else {
+             $message = &Apache::lonhtmlcommon::confirm_success(
+                 &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);
              &print_main_menu($r, $message);
+             if (ref($ended)) {
+                 $$ended = 1;
+             }
          }
-         return 1;
      }
      return;
  }
- Line 1588  sub discussionchanger {
+ Line 1655  sub discussionchanger {
      Apache::lonhtmlcommon::add_breadcrumb(
  	    {	href => '/adm/preferences?action=changediscussions',
                  text => 'Change Discussion Preferences'});
-     $r->print(Apache::loncommon::start_page('Message Management'));
+     $r->print(Apache::loncommon::start_page('Change Discussion Preferences'));
      $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Discussion Preferences'));
      my $user       = $env{'user.name'};
      my $domain     = $env{'user.domain'};
- Line 1603  sub discussionchanger {
+ Line 1670  sub discussionchanger {
          }
      }
      if (defined($userenv{'discmarkread'})) {
-         unless ($userenv{'discdisplay'} eq '') {
+         unless ($userenv{'discmarkread'} eq '') {
              $discmark = $userenv{'discmarkread'};
          }
      }
- Line 1621  sub discussionchanger {
+ Line 1688  sub discussionchanger {
          'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',
          'prca' => 'Preferences can be set that determine',
          'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',
-         'unwh' => 'Under what circumstances posts are identfied as "New"',
+         'unwh' => 'Under what circumstances posts are identified as "NEW"',
          'allposts' => 'All posts',
          'unread' => 'New posts only',
          'ondisp' => 'Once displayed',
-         'onmark' => 'Once marked as read',
+         'onmark' => 'Once marked not NEW',
          'disa' => 'Posts displayed?',
-         'npmr' => 'New posts cease to be identified as "New"?',
+         'npmr' => 'New posts cease to be identified as "NEW"?',
          'thde'  => 'The preferences you set here can be overridden within each individual discussion.',
          'chgt' => 'Change to '
      );
- Line 1647  sub discussionchanger {
+ Line 1714  sub discussionchanger {
          $currmark = $lt{'ondisp'};
          $newmark = 'onmark';
      }
      $r->print(<<"END");
  <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_discussion" />
- Line 1696  sub verify_and_change_discussion {
+ Line 1763  sub verify_and_change_discussion {
      if (defined($env{'form.discdisp'}) ) {
          my $newdisp  = $env{'form.newdisp'};
          if ($newdisp eq 'unread') {
-             $message .=&mt('In discussions: only new posts will be displayed.').'<br />';
+             $message .=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: only new posts will be displayed.')).'<br />';
              &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
              &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
          } else {
-             $message .= &mt('In discussions: all posts will be displayed.').'<br />';
+             $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: all posts will be displayed.')).'<br />';
              &Apache::lonnet::del('environment',['discdisplay']);
              &Apache::lonnet::delenv('environment.discdisplay');
          }
- Line 1708  sub verify_and_change_discussion {
+ Line 1775  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 be cease to be identified as "NEW" after display.')).'<br />';
+             $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will cease to be identified as "NEW" after display.')).'<br />';
              &Apache::lonnet::put('environment',{'discmarkread' => $newmark});
              &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
          } else {
-             $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.')).'<br />';
+             $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: posts will be identified as "NEW" until marked as not "NEW".')).'<br />';
              &Apache::lonnet::del('environment',['discmarkread']);
              &Apache::lonnet::delenv('environment.discmarkread');
          }
- Line 1799  sub verify_and_change_coursepage {
+ Line 1866  sub verify_and_change_coursepage {
              my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
              my ($furl,$ferr)=
                  &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
-             $message .= '<br /><font size="+1"><a href="'.$furl.'">'.$lt{'gtts'}.' <i>'.&mt('now').'</i></a></font>';
+             $message .= '<br /><a href="'.$furl.'">'.$lt{'gtts'}.' <i>'.&mt('now').'</i></a>';
+         } else {
+             $message .= '<br /><a href="/adm/whatsnew?refpage='.
+                         $refpage.'">'.$lt{'dasp'}.'</a>';
+         }
+     }
+     $message = &Apache::lonhtmlcommon::confirm_success($message);
+     $message = &Apache::loncommon::confirmwrapper($message);
+     &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(<<ENDSCREEN);
+         <form name="prefs" action="/adm/preferences" method="post">
+         <input type="hidden" name="returnurl" value="$returnurl" />
+         <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);
+             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='';
+     if (&can_toggle_namelocking()) {
+         if ($userenv{'lockedname'}) {
+             $lockedname = ' checked="checked"';
+         }
+         my %updateable;
+         my %domconfig =
+             &Apache::lonnet::get_dom('configuration',['autoupdate'],$env{'user.domain'});
+         if (ref($domconfig{'autoupdate'}) eq 'HASH') {
+             if ($domconfig{'autoupdate'}{'run'}) {
+                 my @inststatuses = split(':',$env{'environment.inststatus'});
+                 unless (@inststatuses) {
+                     @inststatuses = ('default');
+                 }
+                 %updateable = &updateable_userinfo($domconfig{'autoupdate'},\@inststatuses);
+             }
+         }
+         if (keys(%updateable)) {
+             my %longnames = &Apache::lonlocal::texthash (
+                                 firstname  => 'First Name',
+                                 middlename => 'Middle Name',
+                                 lastname   => 'Last Name',
+                             );
+             my $text=&mt('By default, based on your institutional affiliation, your LON-CAPA account can be automatically updated nightly based on directory information from your institution.').'<br />'.&mt('The following may be updated, unless you disallow updates:').
+                      '<ul>';
+            foreach my $item ('firstname','middlename','lastname') {
+                if ($updateable{$item}) {
+                    $text .= '<li>'.$longnames{$item}.'</li>';
+                }
+            }
+            $text .= '</ul>';
+            my $locking=&mt('Disallow automatic updates to name information for your LON-CAPA account');
+            my $change=&mt('Save');
+            $r->print(<<ENDSCREEN);
+ <form name="prefs" action="/adm/preferences" method="post">
+ <input type="hidden" name="action" value="verify_and_change_lockednames" />
+ $text<br />
+ <label><input type="checkbox" value="1" name="lockednames"$lockedname />$locking</label><br />
+ <input type="submit" value="$change" />
+ </form>
+ ENDSCREEN
          } else {
-             $message .= '<br /><font size="+1"><a href="/adm/whatsnew?refpage='.
+             my $message = &mt('Based on your institutional affiliation no name information is automatically updated for your LON-CAPA account.');
-                         $refpage.'">'.$lt{'dasp'}.'</a></font>';
+             &print_main_menu($r,$message);
          }
+     } 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);
      }
-     &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success($message));
+ }
+ sub verify_and_change_lockednames {
+     my $r = shift;
+     my $message;
+     if (&can_toggle_namelocking()) {
+         my $newlockedname = $env{'form.lockednames'};
+         $newlockedname =~ s/\D//g;
+         my $currlockedname = $env{'environment.lockedname'};
+         if ($newlockedname ne $currlockedname) {
+             if ($newlockedname) {
+                 if (&Apache::lonnet::put('environment',{lockedname => $newlockedname}) eq 'ok') {
+                     &Apache::lonnet::appenv({'environment.lockedname' => $newlockedname});
+                 }
+             } elsif (&Apache::lonnet::del('environment',['lockedname']) eq 'ok') {
+                 &Apache::lonnet::delenv('environment.lockedname');
+             }
+         }
+         my $status='';
+         if ($newlockedname) {
+             $status=&mt('disallowed');
+         } else {
+             $status=&mt('allowed');
+         }
+         $message=&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]','<i>'.&mt('Automatic update of first, middle and last names if institutional directory information indicates changes').'</i>','<tt>'.$status.'</tt>'));
+         $message=&Apache::loncommon::confirmwrapper($message);
+     }
+     &print_main_menu($r,$message);
  }
  sub print_main_menu {
- Line 1841  my @menu=
+ Line 2055  my @menu=
  	    },
  		]
      },
-     {	categorytitle=>'Page Display Settings',
- 	items =>[
- 	    {	linktext => 'Color Scheme',
- 		url => '/adm/preferences?action=changecolors',
- 		permission => 'F',
- 		#help => 'Change_Colors',
- 		icon => 'preferences-desktop-theme.png',
- 		linktitle => 'Change LON-CAPA default colors.'
- 	    },
- 	    {	linktext => 'Menu Display',
- 		url => '/adm/preferences?action=changeicons',
- 		permission => 'F',
- 		#help => '',
- 		icon => 'preferences-system-windows.png',
- 		linktitle => 'Change whether the menus are displayed with buttons, icons or icons and text.'
- 	    }
- 		]
-     },
      {	categorytitle=>'Content Display Settings',
  	items =>[
  	    {	linktext => 'Language',
- Line 1869  my @menu=
+ Line 2064  my @menu=
  		icon => 'preferences-desktop-locale.png',
  		linktitle => 'Choose the default language for this user.'
  	    },
- 	    {	linktext => 'WYSIWYG Editor',
- 		url => '/adm/preferences?action=changewysiwyg',
- 		permission => 'F',
- 		#help => '',
- 		icon => 'edit-select-all.png',
- 		linktitle => 'Enable or disable the WYSIWYG-Editor.'
- 	    },
  	    {	linktext => $role.' Page',
  		url => '/adm/preferences?action=changerolespref',
  		permission => 'F',
  		#help => '',
- 		icon => 'sctr.png',
+ 		icon => 'role_hotlist.png',
  		linktitle => 'Configure the roles hotlist.'
  	    },
- 	    {	linktext => 'Display of Scientific Equations',
+ 	    {	linktext => 'Math display settings',
  		url => '/adm/preferences?action=changetexenginepref',
  		permission => 'F',
  		#help => '',
- 		icon => 'stat.png',
+ 		icon => 'dismath.png',
- 		linktitle => 'Change how Scientific Equations are displayed.'
+ 		linktitle => 'Change how math is displayed.'
  	    },
  		]
      },
-     {	categorytitle=>'Message Management',
+     {	categorytitle=>'Page Display Settings',
+ 	items =>[
+ 	    {	linktext => 'Color Scheme',
+ 		url => '/adm/preferences?action=changecolors',
+ 		permission => 'F',
+ 		#help => 'Change_Colors',
+ 		icon => 'preferences-desktop-theme.png',
+ 		linktitle => 'Change LON-CAPA default colors.'
+ 	    },
+             {   linktext => 'Menu Display',
+                 url => '/adm/preferences?action=changeicons',
+                 permission => 'F',
+                 #help => '',
+                 icon => 'preferences-system-windows.png',
+                 linktitle => 'Change whether the menus are displayed with icons or icons and text.'
+             }
+ 		]
+     },
+     {	categorytitle=>'Messages &amp; Notifications',
  	items =>[
  	    {	linktext => 'Messages &amp; Notifications',
  		url => '/adm/preferences?action=changemsgforward',
- Line 1905  my @menu=
+ Line 2111  my @menu=
  		url => '/adm/preferences?action=changediscussions',
  		permission => 'F',
  		#help => 'Change_Discussion_Display',
- 		icon => 'mail-message-new.png',
+ 		icon => 'chat.png',
  		linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
  	    },
  		]
- Line 1935  push(@{ $menu[0]->{items} }, {
+ Line 2141  push(@{ $menu[0]->{items} }, {
      }
      if ($env{'environment.remote'} eq 'off') {
  push(@{ $menu[1]->{items} }, {
- 	linktext => 'Launch Remote Control',
+         linktext => 'Launch Remote Control',
- 	url => '/adm/remote?url=/adm/preferences?action=launch',
+         url => '/adm/remote?url=/adm/preferences&amp;action=launch',
- 	permission => 'F',
+         permission => 'F',
- 	#help => '',
+         #help => '',
- 	icon => 'network-wireless.png',
+         icon => 'remotecontrol.png',
- 	linktitle => 'Launch the remote control for LON-CAPA.',
+         linktitle => 'Launch the remote control for LON-CAPA.',
- 	});
+         });
      }else{
  push(@{ $menu[1]->{items} }, {
- 	linktext => 'Collapse Remote Control',
+         linktext => 'Collapse Remote Control',
- 	url => '/adm/remote?url=/adm/preferences?action=collapse',
+         url => '/adm/remote?url=/adm/preferences&amp;action=collapse',
- 	permission => 'F',
+         permission => 'F',
- 	#help => '',
+         #help => '',
- 	icon => 'network-wireless.png',
+         icon => 'remotecontrol.png',
- 	linktitle => 'Collapse the remote control for LON-CAPA.',
+         linktitle => 'Collapse the remote control for LON-CAPA.',
- 	});
+         });
+     }
+     if (&can_toggle_namelocking()) {
+         push(@{ $menu[0]->{items} }, {
+         linktext => 'Automatic name changes',
+         url => '/adm/preferences?action=changelockednames',
+         permission => 'F',
+         #help => '',
+         icon => 'system-lock-screen.png',
+         linktitle => 'Allow/disallow propagation of name changes from institutional directory service',
+         });
      }
      my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
      if (keys(%author_roles) > 0) {
  push(@{ $menu[4]->{items} }, {
- Line 1972  push(@{ $menu[4]->{items} }, {
+ Line 2190  push(@{ $menu[4]->{items} }, {
  	url => '/adm/preferences?action=changecourseinit',
  	permission => 'F',
  	#help => '',
- 	icon => 'edit-copy.png',
+ 	icon => 'course_ini.png',
  	linktitle => 'Set the default page to be displayed when you select a course role.',
  	});
      }
-     if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
+     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 (Current:'.$env{'user.debug'}.')',
+ 	linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'),
  	url => '/adm/preferences?action=debugtoggle',
  	permission => 'F',
  	#help => '',
  	icon => 'blog.png',
  	linktitle => 'Toggle Debug Messages.',
  	});
      }
      $r->print(&Apache::loncommon::start_page('My Space'));
      $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Preferences'));
- Line 2014  sub handler {
+ Line 2244  sub handler {
                                     ['action','wysiwyg','returnurl','refpage']);
      #
      Apache::lonhtmlcommon::clear_breadcrumbs();
+     my ($brlink,$brtxt,$brhelp,$ended);
+     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';
+     }
      Apache::lonhtmlcommon::add_breadcrumb
-         ({href => '/adm/preferences',
+         ({href => $brlink,
-           text => 'Set User Preferences',
+           text => $brtxt,
-           help =>
+           help => $brhelp,});
-           'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display'});
      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);
+         &verify_and_change_password($r,'preferences','',\$ended);
      }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'){
- Line 2037  sub handler {
+ Line 2289  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'){
- Line 2077  sub handler {
+ Line 2338  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'){
-         &toggle_debug();
+         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;
      }
-     return OK;
+     # 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) {
+         $r->print(&Apache::loncommon::end_page());
+     }
+     return OK;
  }
- #remove when done
- #old handler routine
- sub handler2 {
-     my $r = shift;
-     my $user = $env{'user.name'};
-     my $domain = $env{'user.domain'};
-     &Apache::loncommon::content_type($r,'text/html');
-     # Some pages contain DES keys and should not be cached.
-     &Apache::loncommon::no_cache($r);
-     $r->send_http_header;
-     return OK if $r->header_only;
-     #
-     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                    ['action','wysiwyg','returnurl','refpage']);
-     #
-     &Apache::lonhtmlcommon::clear_breadcrumbs();
-     &Apache::lonhtmlcommon::add_breadcrumb
-         ({href => '/adm/preferences',
-           text => 'Set User Preferences'});
-     my @Options;
-     # Determine current authentication method
-     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
-     if ($currentauth =~ /^(unix|internal):/) {
-         push (@Options,({ action   => 'changepass',
-                           linktext => 'Change Password',
-                           href     => '/adm/preferences',
-                           help     => 'Change_Password',
-                           subroutine => \&passwordchanger,
-                           breadcrumb =>
-                               { href => '/adm/preferences?action=changepass',
-                                 text => 'Change Password'},
-                           },
-                         { action => 'verify_and_change_pass',
-                           subroutine => \&verify_and_change_password,
-                           breadcrumb =>
-                               { href =>'/adm/preferences?action=changepass',
-                                 text => 'Change Password'},
-                           printmenu => 'not_on_error',
-                           }));
-     }
-     push (@Options,({ action   => 'changescreenname',
-                       linktext => 'Change Screen Name',
-                       href     => '/adm/preferences',
-                       help     => 'Prefs_Screen_Name_Nickname',
-                       subroutine => \&screennamechanger,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changescreenname',
-                             text => 'Change Screen Name'},
-                       },
-                     { action   => 'verify_and_change_screenname',
-                       subroutine => \&verify_and_change_screenname,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changescreenname',
-                             text => 'Change Screen Name'},
-                       printmenu => 'yes',
-                       }));
-     push (@Options,({ action   => 'changemsgforward',
-                       linktext => 'Change Message Forwarding and Notification E-mail Addresses',
-                       href     => '/adm/preferences',
-                       help     => 'Prefs_Messages',
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changemsgforward',
-                             text => 'Change Message Forwarding/Notification'},
-                       subroutine => \&msgforwardchanger,
-                       },
-                     { action => 'verify_and_change_msgforward',
-                       help   => 'Prefs_Messages',
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changemsgforward',
-                             text => 'Change Message Forwarding/Notification'},
-                       printmenu => 'yes',
-                       subroutine => \&verify_and_change_msgforward }));
-     my $aboutmeaction=
-         '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
-     push (@Options,{ action => 'none',
-                      linktext =>
-                          q{Edit the Personal Information Page},
- 		     help => 'Prefs_About_Me',
-                      href => $aboutmeaction});
-     push (@Options,({ action => 'changecolors',
-                       linktext => 'Change Color Scheme',
-                       href => '/adm/preferences',
-                       help => 'Change_Colors',
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changecolors',
-                             text => 'Change Colors'},
-                       subroutine => \&colorschanger,
-                   },
-                     { action => 'verify_and_change_colors',
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changecolors',
-                             text => 'Change Colors'},
-                       printmenu => 'yes',
-                       subroutine => \&verify_and_change_colors,
-                       }));
-     push (@Options,({ action => 'changelanguages',
-                       linktext => 'Change Language Preferences',
-                       href => '/adm/preferences',
- 		      help => 'Prefs_Language',
-                       breadcrumb=>
-                           { href => '/adm/preferences?action=changelanguages',
-                             text => 'Change Language'},
-                       subroutine =>  \&languagechanger,
-                   },
-                     { action => 'verify_and_change_languages',
-                       breadcrumb=>
-                           {href => '/adm/preferences?action=changelanguages',
-                            text => 'Change Language'},
-                       printmenu => 'yes',
-                       subroutine=>\&verify_and_change_languages, }
-                     ));
-     push (@Options,({ action => 'changewysiwyg',
-                       linktext => 'Change WYSIWYG Editor Preferences',
-                       href => '/adm/preferences',
-                       breadcrumb =>
-                             { href => '/adm/preferences?action=changewysiwyg',
-                               text => 'Change WYSIWYG Preferences'},
-                       subroutine => \&wysiwygchanger,
-                   },
-                     { action => 'set_wysiwyg',
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changewysiwyg',
-                             text => 'Change WYSIWYG Preferences'},
-                       printmenu => 'yes',
-                       subroutine => \&verify_and_change_wysiwyg, }
-                     ));
-     push (@Options,({ action => 'changediscussions',
-                       linktext => 'Change Discussion Display Preferences',
-                       href => '/adm/preferences',
-                       help => 'Change_Discussion_Display',
-                       breadcrumb =>
-                             { href => '/adm/preferences?action=changediscussions',
-                               text => 'Change Discussion Preferences'},
-                       subroutine => \&discussionchanger,
-                   },
-                     { action => 'verify_and_change_discussion',
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changediscussions',
-                             text => 'Change Discussion Preferences'},
-                       printmenu => 'yes',
-                       subroutine => \&verify_and_change_discussion, }
-                     ));
-     my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
-     push (@Options,({ action   => 'changerolespref',
-                       linktext => 'Change '.$role.' Page Preferences',
-                       href     => '/adm/preferences',
-                       subroutine => \&rolesprefchanger,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changerolespref',
-                             text => 'Change '.$role.' Page Pref'},
-                       },
-                     { action   => 'verify_and_change_rolespref',
-                       subroutine => \&verify_and_change_rolespref,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changerolespref',
-                             text => 'Change '.$role.' Page Preferences'},
-                       printmenu => 'yes',
-                       }));
-     push (@Options,({ action   => 'changetexenginepref',
-                       linktext => 'Change How Math Equations Are Displayed',
-                       href     => '/adm/preferences',
-                       subroutine => \&texenginechanger,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changetexenginepref',
-                             text => 'Change Math Pref'},
-                       },
-                     { action   => 'verify_and_change_texengine',
-                       subroutine => \&verify_and_change_texengine,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changetexenginepref',
-                             text => 'Change Math Preferences'},
-                       printmenu => 'yes',
-                       }));
-     if ($env{'environment.remote'} eq 'off') {
- 	push (@Options,({ action => 'launch',
- 			  linktext => 'Launch Remote Control',
- 			  href => '/adm/remote?url=/adm/preferences',
- 		      }));
-     } else {
- 	push (@Options,({ action => 'collapse',
- 			  linktext => 'Collapse Remote Control',
- 			  href => '/adm/remote?url=/adm/preferences',
- 		      }));
-     }
-     push (@Options,({ action   => 'changeicons',
-                       linktext => 'Change How Menus are Displayed',
-                       href     => '/adm/preferences',
-                       subroutine => \&iconchanger,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changeicons',
-                             text => 'Change Main Menu'},
-                       },
-                     { action   => 'verify_and_change_icons',
-                       subroutine => \&verify_and_change_icons,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changeicons',
-                             text => 'Change Main Menu'},
-                       printmenu => 'yes',
-                       }));
-     push (@Options,({ action   => 'changeclicker',
-                       linktext => 'Register Response Devices ("Clickers")',
-                       href     => '/adm/preferences',
-                       subroutine => \&clickerchanger,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changeclicker',
-                             text => 'Register Clicker'},
-                       },
-                     { action   => 'verify_and_change_clicker',
-                       subroutine => \&verify_and_change_clicker,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=changeclicker',
-                             text => 'Register Clicker'},
-                       printmenu => 'yes',
-                       }));
-     my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
-     if (keys(%author_roles) > 0) {
-       push (@Options,({ action   => 'changedomcoord',
-                         linktext => 'Restrict Domain Coordinator Access',
-                         href     => '/adm/preferences',
-                         subroutine => \&domcoordchanger,
-                         breadcrumb =>
-                             { href => '/adm/preferences?action=changedomcoord',
-                               text => 'Restrict Domain Coordinator Access'},
-                       },
-                       { action   => 'verify_and_change_domcoord',
-                         subroutine => \&verify_and_change_domcoord,
-                         breadcrumb =>
-                             { href => '/adm/preferences?action=changedomcoord',
-                               text => 'Restrict Domain Coordinator Access'},
-                         printmenu => 'yes',
-                       }));
-     }
-     push (@Options,({ action   => 'lockwarning',
-                       subroutine => \&lockwarning,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=lockwarning',
-                             text => 'Lock Warnings'},
-                       },
-                     { action   => 'verify_and_change_locks',
-                       subroutine => \&verify_and_change_lockwarning,
-                       breadcrumb =>
-                           { href => '/adm/preferences?action=lockwarning',
-                             text => 'Lockwarnings'},
-                       printmenu => 'yes',
-                       }));
+ sub toggle_debug {
+     if ($env{'user.debug'}) {
+         &Apache::lonnet::delenv('user.debug');
+     } else {
+         &Apache::lonnet::appenv({'user.debug' => 1});
+     }
+ }
-     if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
+ sub can_toggle_debug {
- 	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
+     my $can_toggle = 0;
- 				    .$env{'request.course.sec'})) {
+     my $page = 'toggledebug';
-         push (@Options,({ action => 'changecourseinit',
+     if (&LONCAPA::lonauthcgi::can_view($page)) {
-                           linktext => 'Change Course Initialization Preference',
+         $can_toggle = 1;
-                           href => '/adm/preferences',
+     } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) {
-                           subroutine => \&coursedisplaychanger,
+         $can_toggle = 1;
-                           breadcrumb =>
+     }
-                               { href => '/adm/preferences?action=changecourseinit',
+     return $can_toggle;
-                                 text => 'Change Course Init. Pref.'},
+ }
-                           },
-                         { action => 'verify_and_change_coursepage',
+ sub can_toggle_namelocking {
-                           breadcrumb =>
+     my $lockablenames;
-                           { href => '/adm/preferences?action=changecourseinit',                               text => 'Change Course Initialization Preference'},
+     my %domconfig =
-                         printmenu => 'yes',
+         &Apache::lonnet::get_dom('configuration',['autoupdate'],$env{'user.domain'});
-                         subroutine => \&verify_and_change_coursepage,
+     if (ref($domconfig{'autoupdate'}) eq 'HASH') {
-                        }));
+         if ($domconfig{'autoupdate'}{'run'}) {
-     }
+             my @inststatuses = split(':',$env{'environment.inststatus'});
+             unless (@inststatuses) {
-     if (($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/)
+                 @inststatuses = ('default');
-      && ($env{'user.domain'} =~/^(msu|gerd)$/)){
+             }
-         push (@Options,({ action => 'debugtoggle',
+             my %updateable = &updateable_userinfo($domconfig{'autoupdate'},\@inststatuses);
-                           printmenu => 'yes',
+             if ($updateable{'lastname'} || $updateable{'firstname'} ||
-                           subroutine => \&toggle_debug,
+                 $updateable{'middlename'}) {
-                           }));
+                 if (ref($domconfig{'autoupdate'}{'lockablenames'}) eq 'ARRAY') {
-     }
+                     unless (@inststatuses) {
+                         @inststatuses = ('default');
-     $r->print(&Apache::loncommon::start_page('Change Preferences'));
+                     }
+                     foreach my $status (@inststatuses) {
-     my $call = undef;
+                         if (grep(/^\Q$status\E$/,@{$domconfig{'autoupdate'}{'lockablenames'}})) {
-     my $help = undef;
+                             $lockablenames = 1;
-     my $printmenu = 'yes';
+                             last;
-     foreach my $option (@Options) {
+                         }
-         if ($option->{'action'} eq $env{'form.action'}) {
+                     }
-             $call = $option->{'subroutine'};
-             $printmenu = $option->{'printmenu'};
-             if (exists($option->{'breadcrumb'})) {
-                 &Apache::lonhtmlcommon::add_breadcrumb
-                     ($option->{'breadcrumb'});
-             }
- 	    $help=$option->{'help'};
-         }
-     }
-     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Change Preferences',$help));
-     my $error;
-     if (defined($call)) {
-         $error = $call->($r);
-     }
-     if ( ( ($printmenu eq 'yes')
- 	   || ($printmenu eq 'not_on_error' && !$error) )
- 	 && (!$env{'form.returnurl'})) {
-         my $optionlist = '<table cellpadding="5">';
-         if ($env{'user.name'} =~
-                          /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle|raeburn)$/
-             ) {
-             push (@Options,({ action => 'debugtoggle',
-                               linktext => 'Toggle Debug Messages',
-                               text => 'Current Debug status is -'.
-                                   $env{'user.debug'}.'-.',
-                               href => '/adm/preferences',
-                               printmenu => 'yes',
-                               subroutine => \&toggle_debug,
-                               }));
-         }
-         foreach my $option(@Options) {
-             my $optiontext = '';
-             if (exists($option->{'href'})) {
- 		$option->{'href_args'}{'action'}=$option->{'action'};
- 		$optiontext .=
-                     '<a href="'.&add_get_param($option->{'href'},
- 					       $option->{'href_args'}).'">'.
-                     &mt($option->{'linktext'}).'</a>';
-             }
-             if (exists($option->{'text'})) {
-                 $optiontext .= ' '.&mt($option->{'text'});
-             }
-             if ($optiontext ne '') {
-                 $optiontext = '<font size="+1">'.$optiontext.'</font>';
-                 my $helplink = '&nbsp;';
-                 if (exists($option->{'help'})) {
-                     $helplink = &Apache::loncommon::help_open_topic
-                                                     ($option->{'help'});
                  }
-                 $optionlist .= '<tr>'.
-                     '<td>'.$helplink.'</td>'.
-                     '<td>'.$optiontext.'</td>'.
-                     '</tr>';
              }
          }
-         $optionlist .= '</table>';
-         $r->print($optionlist);
-     } elsif ($env{'form.returnurl'}) {
- 	$r->print('<br /><a href="'.$env{'form.returnurl'}.'"><font size="+1">'.
- 		  &mt('Return').'</font></a>');
      }
-     $r->print(&Apache::loncommon::end_page());
+     return $lockablenames;
-     return OK;
  }
- sub toggle_debug {
+ sub updateable_userinfo {
-     if ($env{'user.debug'}) {
+     my ($autoupdate,$inststatuses) = @_;
-         &Apache::lonnet::delenv('user.debug');
+     my %updateable;
-     } else {
+     return %updateable unless ((ref($autoupdate) eq 'HASH') &&
-         &Apache::lonnet::appenv({'user.debug' => 1});
+                                (ref($inststatuses) eq 'ARRAY'));
+     if (ref($autoupdate->{'fields'}) eq 'HASH') {
+         foreach my $status (@{$inststatuses}) {
+             if (ref($autoupdate->{'fields'}{$status}) eq 'ARRAY') {
+                 foreach my $field (@{$autoupdate->{'fields'}{$status}}) {
+                     $updateable{$field} = 1;
+                 }
+             }
+         }
      }
+     return %updateable;
+ }
+ sub do_redirect {
+     my ($r,$url,$msg) = @_;
+     $r->print(
+         &Apache::loncommon::start_page('Switching Server ...',undef,
+                                        {'redirect'       => [0.5,$url]}).
+         '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n".
+         "$msg\n".
+         &Apache::loncommon::end_page());
+     return;
  }
 ;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.159
changed lines
	Added in v.1.196.4.24