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.55 and 1.118

-version 1.55, 2005/02/25 06:48:00
+version 1.118, 2008/05/12 23:47:43
  Line 33
  package Apache::lonpreferences;
  use strict;
+ use LONCAPA;
  use Apache::Constants qw(:common);
  use Apache::File;
  use Crypt::DES;
- Line 40  use DynaLoader; # for Crypt::DES version
+ Line 41  use DynaLoader; # for Crypt::DES version
  use Apache::loncommon();
  use Apache::lonhtmlcommon();
  use Apache::lonlocal;
+ use Apache::lonnet;
+ use LONCAPA();
  #
  # Write lonnet::passwd to do the call below.
- Line 97  sub wysiwygchanger {
+ Line 100  sub wysiwygchanger {
      my $r = shift;
      my %userenv = &Apache::lonnet::get
          ('environment',['wysiwygeditor']);
+     my $onselect='checked="checked"';
      my $offselect='';
-     my $onselect='checked="1"';
+     if ($userenv{'wysiwygeditor'} eq 'on') {
-     if ($userenv{'wysiwygeditor'}) {
  	$onselect='';
- 	$offselect='checked="1"';
+ 	$offselect='checked="checked"';
      }
      my $switchoff=&mt('Disable WYSIWYG editor');
      my $switchon=&mt('Enable WYSIWYG editor');
      $r->print(<<ENDLSCREEN);
- <form name="server" action="/adm/preferences" method="post">
+ <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="set_wysiwyg" />
  <br />
- <input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff<br />
+ <label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
- <input type="radio" name="wysiwyg" value="on" $offselect /> $switchon
+ <label><input type="radio" name="wysiwyg" value="on" $offselect /> $switchon</label>
  ENDLSCREEN
      $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
  }
- Line 118  ENDLSCREEN
+ Line 121  ENDLSCREEN
  sub verify_and_change_wysiwyg {
      my $r = shift;
-     my $newsetting=$ENV{'form.wysiwyg'};
+     my $newsetting=$env{'form.wysiwyg'};
      &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});
-     &Apache::lonnet::appenv('environment.wysiwygeditor' => $newsetting);
+     &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting});
      $r->print('<p>'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'</p>');
  }
- Line 129  sub verify_and_change_wysiwyg {
+ Line 132  sub verify_and_change_wysiwyg {
  ################################################################
  sub languagechanger {
      my $r = shift;
-     my $user       = $ENV{'user.name'};
+     my $user       = $env{'user.name'};
-     my $domain     = $ENV{'user.domain'};
+     my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get
          ('environment',['languages']);
      my $language=$userenv{'languages'};
- Line 146  sub languagechanger {
+ Line 149  sub languagechanger {
      my $selectionbox=&Apache::loncommon::select_form($language,'language',
  						     %langchoices);
      $r->print(<<ENDLSCREEN);
- <form name="server" action="/adm/preferences" method="post">
+ <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_languages" />
  <br />$pref: $selectionbox
  ENDLSCREEN
- Line 156  ENDLSCREEN
+ Line 159  ENDLSCREEN
  sub verify_and_change_languages {
      my $r = shift;
-     my $user       = $ENV{'user.name'};
+     my $user       = $env{'user.name'};
-     my $domain     = $ENV{'user.domain'};
+     my $domain     = $env{'user.domain'};
  # Screenname
-     my $newlanguage  = $ENV{'form.language'};
+     my $newlanguage  = $env{'form.language'};
      $newlanguage=~s/[^\-\w]//g;
      my $message='';
      if ($newlanguage) {
          &Apache::lonnet::put('environment',{'languages' => $newlanguage});
-         &Apache::lonnet::appenv('environment.languages' => $newlanguage);
+         &Apache::lonnet::appenv({'environment.languages' => $newlanguage});
-         $message='Set new preferred languages to '.$newlanguage;
+         $message=&mt('Set new preferred languages to ').'<tt>"'.$newlanguage.'"</tt>.';
      } else {
          &Apache::lonnet::del('environment',['languages']);
          &Apache::lonnet::delenv('environment\.languages');
-         $message='Reset preferred language';
+         $message=&mt('Reset preferred language.');
      }
      $r->print(<<ENDVCSCREEN);
- </p>
  $message
  ENDVCSCREEN
  }
- Line 182  ENDVCSCREEN
+ Line 184  ENDVCSCREEN
  ################################################################
  sub texenginechanger {
      my $r = shift;
-     my $user       = $ENV{'user.name'};
+     my $user       = $env{'user.name'};
-     my $domain     = $ENV{'user.domain'};
+     my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get('environment',['texengine']);
      my $texengine=$userenv{'texengine'};
      my $pref=&mt('Preferred method to display Math');
-     my %mathchoices=('' => 'No Preference',
+     my %mathchoices=('' => 'Default',
  		     'tth' => 'TeX to HTML',
  		     #'ttm' => 'TeX to MathML',
  		     'jsMath' => 'jsMath',
- 		     #'mimetex' => 'Convert to Images'
+ 		     'mimetex' => 'Convert to Images'
                       );
      my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
  						     %mathchoices);
-     my $mathexample='$$\int\left(\frac{a+b}{c^6*d}\right)$$';
+     my $jsMath_start=&Apache::lontexconvert::jsMath_header();
-     my $jsMath_example=&Apache::lontexconvert::jsMath_converted(\$mathexample);
-     $mathexample='$$\int\left(\frac{a+b}{c^6*d}\right)$$';
-     my $tth_example=&Apache::lontexconvert::tth_converted(\$mathexample);
      my $change=&mt('Change');
      $r->print(<<ENDLSCREEN);
- <form name="server" action="/adm/preferences" method="post">
+ <br />
+ <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_texengine" />
  <p>$pref: $selectionbox</p>
  <p><input type="submit" value="$change" /></p>
  </form>
  Examples:
- <p> TeX to HTML <br /> $tth_example</p>
+ <p> TeX to HTML <br />
- <script type"text/javascript">function NoFontMessage () { }</script>
+ <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" hieght="200"></iframe>
- <script src="/adm/jsMath/jsMath.js"></script>
+ </p>
  <p>jsMath <br />
+ $jsMath_start
- <script type"text/javascript">
+ <script type="text/javascript">
  if (jsMath.nofonts == 1) {
      document.writeln
          ('<center><div style="padding: 10; border-style: solid; border-width:3;'
- Line 229  if (jsMath.nofonts == 1) {
+ Line 230  if (jsMath.nofonts == 1) {
  	 +'</font></small></div></center>');
  }
  </script>
+ <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" hieght="200"></iframe>
- $jsMath_example</p>
+ </p>
+ <p> Convert to Images <br />
+ <br />
+ <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" hieght="200"></iframe>
+ </p>
  ENDLSCREEN
-     if ($ENV{'environment.texengine'} ne 'jsMath') {
+     if ($env{'environment.texengine'} ne 'jsMath') {
  	$r->print('<script type="text/javascript">jsMath.Process()</script>');
      }
  }
- Line 240  ENDLSCREEN
+ Line 246  ENDLSCREEN
  sub verify_and_change_texengine {
      my $r = shift;
-     my $user       = $ENV{'user.name'};
+     my $user       = $env{'user.name'};
-     my $domain     = $ENV{'user.domain'};
+     my $domain     = $env{'user.domain'};
  # Screenname
-     my $newtexengine  = $ENV{'form.texengine'};
+     my $newtexengine  = $env{'form.texengine'};
      $newtexengine=~s/[^\-\w]//g;
+     if ($newtexengine eq 'ttm') {
+ 	&Apache::lonnet::appenv({'browser.mathml' => 1});
+     } else {
+ 	if ($env{'environment.texengine'} eq 'ttm') {
+ 	    &Apache::lonnet::appenv({'browser.mathml' => 0});
+ 	}
+     }
      my $message='';
      if ($newtexengine) {
          &Apache::lonnet::put('environment',{'texengine' => $newtexengine});
-         &Apache::lonnet::appenv('environment.texengine' => $newtexengine);
+         &Apache::lonnet::appenv({'environment.texengine' => $newtexengine});
-         $message='Set new preferred math display to '.$newtexengine;
+         $message=&mt('Set new preferred math display to ').'<tt>"'.$newtexengine.'"</tt>.';
      } else {
          &Apache::lonnet::del('environment',['texengine']);
          &Apache::lonnet::delenv('environment\.texengine');
-         $message='Reset preferred math display.';
+         $message=&mt('Reset preferred math display.');
      }
      $r->print(<<ENDVCSCREEN);
- </p>
  $message
  ENDVCSCREEN
  }
- Line 266  ENDVCSCREEN
+ Line 280  ENDVCSCREEN
  ################################################################
  sub rolesprefchanger {
      my $r = shift;
-     my $user       = $ENV{'user.name'};
+     my $role    = ($env{'user.adv'} ? 'Role' : 'Course');
-     my $domain     = $ENV{'user.domain'};
+     my $lc_role = ($env{'user.adv'} ? 'role' : 'course');
+     my $user       = $env{'user.name'};
+     my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get
          ('environment',['recentroles','recentrolesn']);
      my $hotlist_flag=$userenv{'recentroles'};
- Line 285  sub rolesprefchanger {
+ Line 301  sub rolesprefchanger {
  	$options .= "<option $select>$i</option>\n";
      }
-     $r->print(<<ENDSCREEN);
+ # Get list of recent roles and display with checkbox in front
- <p>Some LON-CAPA users have a long list of roles. The Recent Roles Hotlist
+     my $roles_check_list = '';
- feature keeps track of the last N roles which have been
+     my $role_key='';
- visited and places a table of these at the top of the roles page.
+     if ($env{'environment.recentroles'}) {
- People with very few roles should leave this feature disabled.
+         my %recent_roles =
- </p>
+                &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});
+         my %frozen_roles =
+                &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
+         my %role_text = &rolespref_get_role_text([keys(%recent_roles)]);
+         my @sorted_roles = sort {$role_text{$a} cmp $role_text{$b}} keys(%role_text);
+         $roles_check_list .=
+ 	    &Apache::loncommon::start_data_table().
+ 	    &Apache::loncommon::start_data_table_header_row().
+ 	    "<th>".&mt('Freeze '.$role)."</th>".
+ 	    "<th>".&mt($role)."</td>".
+ 	    &Apache::loncommon::end_data_table_header_row().
+ 	    "\n";
+ 	my $count;
+         foreach $role_key (@sorted_roles) {
+             my $checked = "";
+             my $value = $recent_roles{$role_key};
+             if ($frozen_roles{$role_key}) {
+                 $checked = "checked=\"checked\"";
+             }
+ 	    $count++;
+             $roles_check_list .=
+ 		&Apache::loncommon::start_data_table_row().
+ 		'<td class="LC_table_cell_checkbox">'.
+ 		"<input type=\"checkbox\" $checked name=\"freezeroles\"".
+ 		" id=\"freezeroles$count\" value=\"$role_key\" /></td>".
+ 		"<td><label for=\"freezeroles$count\">".
+ 		"$role_text{$role_key}</label></td>".
+ 		&Apache::loncommon::end_data_table_row(). "\n";
+         }
+         $roles_check_list .= "</table>\n";
+     }
- <form name="server" action="/adm/preferences" method="post">
+     $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.').'
+ </p>
+ <form name="prefs" action="/adm/preferences" method="POST">
  <input type="hidden" name="action" value="verify_and_change_rolespref" />
- <br />Enable Recent Roles Hotlist:
+ <br /><label>'.&mt('Enable Recent '.$role.'s Hotlist:').'
- <input type="checkbox" $checked name="recentroles" value="true" />
+ <input type="checkbox" '.$checked.' name="recentroles" value="true" /></label>
- <br />Number of roles in Hotlist:
+ <br />'.&mt('Number of '.$role.'s in Hotlist:').'
  <select name="recentrolesn" size="1">
- $options
+ '.$options.'
  </select>
+ <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.').'
+ </p>
+ '.$roles_check_list.'
  <br />
- <input type="submit" value="Change" />
+ <input type="submit" value="'.&mt('Change').'" />
- </form>
+ </form>');
- ENDSCREEN
+ }
+ sub rolespref_get_role_text {
+ # Get a line of text for each role
+     my ($roles) = @_;
+     my %roletext = ();
+     foreach my $item (@$roles) {
+ # get course information
+         my ($role,$rest) = split(/\./, $item);
+         my $trole = "";
+         $trole = &Apache::lonnet::plaintext($role);
+         my ($tdomain,$other,$tsection)= split(/\//,Apache::lonnet::declutter($rest));
+         my $tother = '-';
+         if ($role =~ /^(cc|st|in|ta|ep|cr)/ ) {
+             my %newhash=&Apache::lonnet::coursedescription($tdomain."_".$other);
+             $tother = " - ".$newhash{'description'};
+         } elsif ($role =~ /dc/) {
+             $tother = "";
+         } else {
+             $tother = " - $other";
+         }
+         my $section="";
+         if ($tsection) {
+             $section = " - Section/Group: $tsection";
+         }
+         $roletext{$item} = $tdomain." - ".$trole.$tother.$section;
+     }
+     return %roletext;
  }
  sub verify_and_change_rolespref {
      my $r = shift;
-     my $user       = $ENV{'user.name'};
+     my $role = ($env{'user.adv'} ? 'Role' : 'Course');
-     my $domain     = $ENV{'user.domain'};
+     my $user       = $env{'user.name'};
+     my $domain     = $env{'user.domain'};
  # Recent Roles Hotlist Flag
-     my $hotlist_flag  = $ENV{'form.recentroles'};
+     my $hotlist_flag  = $env{'form.recentroles'};
-     my $hotlist_n  = $ENV{'form.recentrolesn'};
+     my $hotlist_n  = $env{'form.recentrolesn'};
-     my $message='';
+     my $message='<hr />';
      if ($hotlist_flag) {
          &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});
-         &Apache::lonnet::appenv('environment.recentroles' => $hotlist_flag);
+         &Apache::lonnet::appenv({'environment.recentroles' => $hotlist_flag});
-         $message='Recent Roles Hotlist is Enabled';
+         $message=&mt('Recent '.$role.'s Hotlist is Enabled');
      } else {
          &Apache::lonnet::del('environment',['recentroles']);
          &Apache::lonnet::delenv('environment\.recentroles');
-         $message='Recent Roles Hotlist is Disabled';
+         $message=&mt('Recent '.$role.'s Hotlist is Disabled');
      }
      if ($hotlist_n) {
          &Apache::lonnet::put('environment',{'recentrolesn' => $hotlist_n});
-         &Apache::lonnet::appenv('environment.recentrolesn' => $hotlist_n);
+         &Apache::lonnet::appenv({'environment.recentrolesn' => $hotlist_n});
          if ($hotlist_flag) {
-             $message.="<br />Display $hotlist_n Most Recent Roles\n";
+             $message.="<br />".
+ 		&mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";
          }
      }
+ # Get list of froze roles and list of recent roles
+     my @freeze_list = &Apache::loncommon::get_env_multiple('form.freezeroles');
+     my %freeze = ();
+     my %roletext = ();
+     foreach my $key (@freeze_list) {
+         $freeze{$key}='1';
+     }
+     my %recent_roles =
+         &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});
+     my %frozen_roles =
+         &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
+     my %role_text = &rolespref_get_role_text([keys(%recent_roles)]);
+ # Unset any roles that were previously frozen but aren't in list
+     foreach my $role_key (sort(keys(%recent_roles))) {
+         if (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) {
+ 	    $message .= "<br />".&mt('Unfreezing '.$role.': [_1]',$role_text{$role_key})."\n";
+ 	    &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
+         }
+     }
+ # Freeze selected roles
+     foreach my $role_key (@freeze_list) {
+         if (!$frozen_roles{$role_key}) {
+              $message .= "<br />".&mt('Freezing '.$role.': [_1]',$role_text{$role_key})."\n";
+              &Apache::lonhtmlcommon::store_recent('roles',
+                                           $role_key,' ',1);
+         }
+     }
+     $message .= "<hr /><br />\n";
      $r->print(<<ENDRPSCREEN);
- </p>
  $message
  ENDRPSCREEN
  }
- Line 344  ENDRPSCREEN
+ Line 461  ENDRPSCREEN
  ################################################################
  sub screennamechanger {
      my $r = shift;
-     my $user       = $ENV{'user.name'};
+     my $user       = $env{'user.name'};
-     my $domain     = $ENV{'user.domain'};
+     my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get
          ('environment',['screenname','nickname']);
      my $screenname=$userenv{'screenname'};
      my $nickname=$userenv{'nickname'};
+     my %lt = &Apache::lonlocal::texthash(
+                                           text_screenname  => 'New screenname (shown if you post anonymously):',
+                                           text_nickname  => 'New nickname (shown if you post non-anonymously):',
+                                           text_submit => 'Change',
+                                         );
      $r->print(<<ENDSCREEN);
- <form name="server" action="/adm/preferences" method="post">
+ <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_screenname" />
- <br />New screenname (shown if you post anonymously):
+ <br />$lt{'text_screenname'}
  <input type="text" size="20" value="$screenname" name="screenname" />
- <br />New nickname (shown if you post non-anonymously):
+ <br />$lt{'text_nickname'}
  <input type="text" size="20" value="$nickname" name="nickname" />
- <input type="submit" value="Change" />
+ <br />
+ <input type="submit" value="$lt{'text_submit'}" />
  </form>
  ENDSCREEN
  }
  sub verify_and_change_screenname {
      my $r = shift;
-     my $user       = $ENV{'user.name'};
+     my $user       = $env{'user.name'};
-     my $domain     = $ENV{'user.domain'};
+     my $domain     = $env{'user.domain'};
  # Screenname
-     my $newscreen  = $ENV{'form.screenname'};
+     my $newscreen  = $env{'form.screenname'};
      $newscreen=~s/[^ \w]//g;
      my $message='';
      if ($newscreen) {
          &Apache::lonnet::put('environment',{'screenname' => $newscreen});
-         &Apache::lonnet::appenv('environment.screenname' => $newscreen);
+         &Apache::lonnet::appenv({'environment.screenname' => $newscreen});
-         $message='Set new screenname to '.$newscreen;
+         $message=&mt('Set new screenname to ').'<tt>"'.$newscreen.'."</tt>.';
      } else {
          &Apache::lonnet::del('environment',['screenname']);
          &Apache::lonnet::delenv('environment\.screenname');
-         $message='Reset screenname';
+         $message=&mt('Reset screenname.');
      }
  # Nickname
      $message.='<br />';
-     $newscreen  = $ENV{'form.nickname'};
+     $newscreen  = $env{'form.nickname'};
      $newscreen=~s/[^ \w]//g;
      if ($newscreen) {
          &Apache::lonnet::put('environment',{'nickname' => $newscreen});
-         &Apache::lonnet::appenv('environment.nickname' => $newscreen);
+         &Apache::lonnet::appenv({'environment.nickname' => $newscreen});
-         $message.='Set new nickname to '.$newscreen;
+         $message.=&mt('Set new nickname to ').'<tt>"'.$newscreen.'"</tt>.';
      } else {
          &Apache::lonnet::del('environment',['nickname']);
          &Apache::lonnet::delenv('environment\.nickname');
-         $message.='Reset nickname';
+         $message.=&mt('Reset nickname.');
      }
+     &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
      $r->print(<<ENDVCSCREEN);
- </p>
  $message
  ENDVCSCREEN
  }
  ################################################################
+ #                     Icon Subroutines                         #
+ ################################################################
+ sub iconchanger {
+     my $r = shift;
+     my $user       = $env{'user.name'};
+     my $domain     = $env{'user.domain'};
+     my %userenv = &Apache::lonnet::get
+         ('environment',['icons']);
+     my $iconic='checked="checked"';
+     my $classic='';
+     my $onlyicon='';
+     if ($userenv{'icons'} eq 'classic') {
+        $classic='checked="checked"';
+        $iconic='';
+     }
+     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('Change');
+     $r->print(<<ENDSCREEN);
+ <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="classic" $classic /> $usebuttons</label><br />
+ <label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $useicononly</label><br />
+ <input type="submit" value="$change" />
+ </form>
+ ENDSCREEN
+ }
+ sub verify_and_change_icons {
+     my $r = shift;
+     my $user       = $env{'user.name'};
+     my $domain     = $env{'user.domain'};
+     my $newicons  = $env{'form.menumode'};
+     &Apache::lonnet::put('environment',{'icons' => $newicons});
+     &Apache::lonnet::appenv({'environment.icons' => $newicons});
+     $r->print(&mt('Set menu mode to [_1].',$newicons));
+ }
+ ################################################################
+ #                     Clicker Subroutines                      #
+ ################################################################
+ sub clickerchanger {
+     my $r = shift;
+     my $user       = $env{'user.name'};
+     my $domain     = $env{'user.domain'};
+     my %userenv = &Apache::lonnet::get
+         ('environment',['clickers']);
+     my $clickers=$userenv{'clickers'};
+     $clickers=~s/\,/\n/gs;
+     my $text=&mt('Enter response device ("clicker") numbers');
+     my $change=&mt('Register');
+     my $helplink=&Apache::loncommon::help_open_topic('Clicker_Registration',&mt('Locating your clicker ID'));
+     $r->print(<<ENDSCREEN);
+ <form name="prefs" action="/adm/preferences" method="post">
+ <input type="hidden" name="action" value="verify_and_change_clicker" />
+ <label>$text $helplink<br />
+ <textarea name="clickers" rows="5" cols="20">$clickers</textarea>
+ </label>
+ <input type="submit" value="$change" />
+ </form>
+ ENDSCREEN
+ }
+ sub verify_and_change_clicker {
+     my $r = shift;
+     my $user       = $env{'user.name'};
+     my $domain     = $env{'user.domain'};
+     my $newclickers  = $env{'form.clickers'};
+     $newclickers=~s/[^\w\:\-]+/\,/gs;
+     $newclickers=~tr/a-z/A-Z/;
+     $newclickers=~s/[\:\-]+/\-/g;
+     $newclickers=~s/\,+/\,/g;
+     $newclickers=~s/^\,//;
+     $newclickers=~s/\,$//;
+     &Apache::lonnet::put('environment',{'clickers' => $newclickers});
+     &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
+     $r->print(&mt('Registering clickers: [_1]',$newclickers));
+ }
+ #################################################################
+ ##                      Lock Subroutines                        #
+ #################################################################
+ sub lockwarning {
+     my $r = shift;
+     my $title=&mt('Action locked');
+     my $texttop=&mt('LON-CAPA is currently performing the following actions:');
+     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) {
+        $which.='<li>'.$which{$id}.'</li>';
+     }
+     my $change=&mt('Override');
+     $r->print(<<ENDSCREEN);
+ <form name="prefs" action="/adm/preferences" method="post">
+ <input type="hidden" name="action" value="verify_and_change_locks" />
+ <h1>$title</h1>
+ $texttop
+ <ul>
+ $which
+ </ul>
+ $textbottom
+ <input type="submit" value="$change" />
+ </form>
+ ENDSCREEN
+ }
+ sub verify_and_change_lockwarning {
+     my $r = shift;
+     &Apache::lonnet::remove_all_locks();
+     $r->print(&mt('Cleared locks.'));
+ }
+ ################################################################
  #         Message Forward                                      #
  ################################################################
  sub msgforwardchanger {
-     my $r = shift;
+     my ($r,$message) = @_;
-     my $user       = $ENV{'user.name'};
+     my $user       = $env{'user.name'};
-     my $domain     = $ENV{'user.domain'};
+     my $domain     = $env{'user.domain'};
-     my %userenv = &Apache::lonnet::get('environment',['msgforward','notification','critnotification']);
+     my %userenv = &Apache::lonnet::get('environment',['msgforward','notification','critnotification','notifywithhtml']);
      my $msgforward=$userenv{'msgforward'};
-     my $notification=$userenv{'notification'};
+     my %lt = &Apache::lonlocal::texthash(
-     my $critnotification=$userenv{'critnotification'};
+                                           all   => 'All',
-     my $forwardingHelp = Apache::loncommon::help_open_topic("Prefs_Forwarding",
+                                           crit  => 'Critical only',
- 							    "What are forwarding ".
+                                           reg   => 'Non-critical only',
- 							    "and notification ".
+                                           foad  => 'Forwarding Address(es)',
- 							    "addresses");
+                                           noti  => 'Notification E-mail Address(es)',
-     my $criticalMessageHelp = Apache::loncommon::help_open_topic("Course_Critical_Message",
+                                           foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',
- 								 "What are critical messages");
+                                           mnot  => 'Email 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   => 'Change',
+                                           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 to preferences menu',
+                                         );
+     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");
+     my @allow_html = split(/,/,$userenv{'notifywithhtml'});
+     my %allnot = &get_notifications(\%userenv);
+     my $validatescript = &Apache::lonhtmlcommon::javascript_valid_email();
+     my $jscript = qq|
+ <script type="text/javascript">
+ function validate() {
+     for (var i=0; i<document.prefs.numnotify.value; i++) {
+         var checkaddress = 0;
+         var addr = document.prefs.elements['address_'+i].value;
+         var rownum = i+1;
+         if (i < document.prefs.numnotify.value-1) {
+             if (document.prefs.elements['modify_notify_'+i].checked) {
+                 checkaddress = 1;
+             }
+         } else {
+             if (document.prefs.elements['add_notify_'+i].checked == true) {
+                 checkaddress = 1;
+             }
+         }
+         if (checkaddress == 1)  {
+             var addr = document.prefs.elements['address_'+i].value;
+             if (validmail(document.prefs.elements['address_'+i]) == false) {
+                 var multimsg = '';
+                 if (addr.indexOf(",") >= 0) {
+                     multimsg = "\\n($lt{'toen'}).";
+                 }
+                 alert("$lt{'email'} "+rownum+" ('"+addr+"') $lt{'notv'}."+multimsg);
+                 return;
+             }
+         }
+     }
+     document.prefs.submit();
+ }
+ function address_changes (adnum) {
+      if (!document.prefs.elements['del_notify_'+adnum].checked) {
+          document.prefs.elements['modify_notify_'+adnum].checked = true;
+      }
+ }
+ function new_address(adnum) {
+      document.prefs.elements['add_notify_'+adnum].checked = true;
+ }
+ function delete_address(adnum) {
+      if (document.prefs.elements['del_notify_'+adnum].checked) {
+           document.prefs.elements['modify_notify_'+adnum].checked = false;
+      }
+ }
+ function modify_address(adnum) {
+     if (document.prefs.elements['modify_notify_'+adnum].checked) {
+         document.prefs.elements['del_notify_'+adnum].checked = false;
+     }
+ }
+ $validatescript
+ </script>
+ |;
      $r->print(<<ENDMSG);
- $forwardingHelp <br />
+ $jscript
- <form name="server" action="/adm/preferences" method="post">
+ $message
+ <h3>$lt{'foad'} $forwardingHelp</h3>
+ <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_msgforward" />
- New Forwarding Address(es) (<tt>user:domain,user:domain,...</tt>):
+ $lt{'foad'} ($lt{'foad_exmpl'}):
- <input type="text" size="40" value="$msgforward" name="msgforward" /><hr />
+ <input type="text" size="40" value="$msgforward" name="msgforward" /><br />
- New Message Notification Email Address(es) (<tt>joe\@doe.com,jane\@doe.edu,...</tt>):
+ <h3>$lt{'noti'} $notificationHelp</h3>
- <input type="text" size="40" value="$notification" name="notification" /><hr />
+ $lt{'mnot'} ($lt{'mnot_exmpl'}):<br />
- New Critical Message Notification Email Address(es) (<tt>joe\@doe.com,jane\@doe.edu,...</tt>):
- <input type="text" size="40" value="$critnotification" name="critnotification" />$criticalMessageHelp<hr />
- <input type="submit" value="Change" />
- </form>
  ENDMSG
+     my @sortforwards = sort (keys(%allnot));
+     my $output = &Apache::loncommon::start_data_table().
+                  &Apache::loncommon::start_data_table_header_row().
+                  '<th>&nbsp;</th>'.
+                  '<th>'.&mt('Action').'</th>'.
+                  '<th>'.&mt('Notification address').'</th><th>'.
+                  &mt('Types of message for which notification is sent').
+                  $criticalMessageHelp.'</th><th>'.
+                  &mt('Excerpt retains HTML tags in message').'</th>'.
+                  &Apache::loncommon::end_data_table_header_row();
+     my $num = 0;
+     my $counter = 1;
+     foreach my $item (@sortforwards) {
+         $output .= &Apache::loncommon::start_data_table_row().
+                    '<td><b>'.$counter.'</b></td>'.
+                    '<td><span class="LC_nobreak"><label>'.
+                    '<input type="checkbox" name="modify_notify_'.
+                    $num.'" onclick="javscript:modify_address('."'$num'".')" />'.
+                    &mt('Modify').'</label></span>&nbsp;&nbsp; '.
+                    '<span class="LC_nobreak"><label>'.
+                    '<input type="checkbox" name="del_notify_'.$num.
+                    '" onclick="javscript:delete_address('."'$num'".')" />'.
+                    &mt('Delete').'</label></span></td>'.
+                    '<td><input type="text" value="'.$item.'" name="address_'.
+                    $num.'" onFocus="javascript:address_changes('."'$num'".
+                    ')" /></td><td>';
+         my %chk;
+         if (defined($allnot{$item}{'crit'})) {
+             if (defined($allnot{$item}{'reg'})) {
+                 $chk{'all'} = 'checked="checked" ';
+             } else {
+                 $chk{'crit'} = 'checked="checked" ';
+             }
+         } else {
+             $chk{'reg'} = 'checked="checked" ';
+         }
+         foreach my $type ('all','crit','reg') {
+             $output .= '<span class="LC_nobreak"><label>'.
+                        '<input type="radio" name="notify_type_'.$num.
+                        '" value="'.$type.'" '.$chk{$type}.
+                        ' onchange="javascript:address_changes('."'$num'".')" />'.
+                        $lt{$type}.'</label></span>&nbsp;';
+         }
+         my $htmlon = '';
+         my $htmloff = '';
+         if (grep/^\Q$item\E/,@allow_html) {
+             $htmlon = 'checked="checked" ';
+         } else {
+             $htmloff = 'checked="checked" ';
+         }
+         $output .= '</td><td><label><input type="radio" name="html_'.$num.
+                    '" value="1" '.$htmlon.
+                    ' onchange="javascript:address_changes('."'$num'".')" />'.
+                    &mt('Yes').'</label>&nbsp;'.
+                    '<label><input type="radio" name="html_'.$num.'" value="0" '.
+                    $htmloff. ' onchange="javascript:address_changes('."'$num'".
+ ')" />'.
+                    &mt('No').'</label></td>'.
+                    &Apache::loncommon::end_data_table_row();
+         $num ++;
+         $counter ++;
+     }
+     my %defchk = (
+                    all => 'checked="checked" ',
+                    crit => '',
+                    reg => '',
+                  );
+     $output .= &Apache::loncommon::start_data_table_row().
+                '<td><b>'.$counter.'</b></td>'.
+                '<td><span class="LC_nobreak"><label>'.
+                '<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>';
+     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;';
+     }
+     $output .= '</td><td><label><input type="radio" name="html_'.$num.
+                '" value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                '<label><input type="radio" name="html_'.$num.'" value="0" '.
+                ' checked="checked" />'.
+                &mt('No').'</label></td>'.
+                &Apache::loncommon::end_data_table_row().
+                &Apache::loncommon::end_data_table();
+     $num ++;
+     $r->print($output);
+     $r->print(qq|
+ <br /><hr />
+ <input type="hidden" name="numnotify" value="$num" />
+ <input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
+ <input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />
+ </form>
+ |);
+ }
+ sub get_notifications {
+     my ($userenv) = @_;
+     my %allnot;
+     my @critnot = split(/,/,$userenv->{'critnotification'});
+     my @regnot = split(/,/,$userenv->{'notification'});
+     foreach my $item (@critnot) {
+         $allnot{$item}{crit} = 1;
+     }
+     foreach my $item (@regnot) {
+         $allnot{$item}{reg} = 1;
+     }
+     return %allnot;
  }
  sub verify_and_change_msgforward {
      my $r = shift;
-     my $user       = $ENV{'user.name'};
+     my $user       = $env{'user.name'};
-     my $domain     = $ENV{'user.domain'};
+     my $domain     = $env{'user.domain'};
      my $newscreen  = '';
      my $message='';
-     foreach (split(/\,/,$ENV{'form.msgforward'})) {
+     foreach (split(/\,/,$env{'form.msgforward'})) {
  	my ($msuser,$msdomain)=split(/[\@\:]/,$_);
-         $msuser=~s/\W//g;
+         $msuser = &LONCAPA::clean_username($msuser);
-         $msdomain=~s/\W//g;
+         $msdomain = &LONCAPA::clean_domain($msdomain);
          if (($msuser) && ($msdomain)) {
  	    if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
                 $newscreen.=$msuser.':'.$msdomain.',';
  	   } else {
-                $message.='No such user: '.$msuser.':'.$msdomain.'<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);
+         &Apache::lonnet::appenv({'environment.msgforward' => $newscreen});
-         $message.='Set new message forwarding to '.$newscreen.'<br />';
+         $message .= &mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.'
+                     .'<br />';
      } else {
          &Apache::lonnet::del('environment',['msgforward']);
          &Apache::lonnet::delenv('environment\.msgforward');
-         $message.='Reset message forwarding<br />';
+         $message.= &mt("Set message forwarding to 'off'.").'<br />';
+     }
+     my $critnotification;
+     my $notification;
+     my $notify_with_html;
+     my $lastnotify = $env{'form.numnotify'}-1;
+     my $totaladdresses = 0;
+     for (my $i=0; $i<$env{'form.numnotify'}; $i++) {
+         if ((!defined($env{'form.del_notify_'.$i})) &&
+            ((($i==$lastnotify) && ($env{'form.add_notify_'.$lastnotify} == 1)) ||
+             ($i<$lastnotify))) {
+             if (defined($env{'form.address_'.$i})) {
+                 if ($env{'form.notify_type_'.$i} eq 'all') {
+                     $critnotification .= $env{'form.address_'.$i}.',';
+                     $notification .= $env{'form.address_'.$i}.',';
+                 } elsif ($env{'form.notify_type_'.$i} eq 'crit') {
+                     $critnotification .= $env{'form.address_'.$i}.',';
+                 } elsif ($env{'form.notify_type_'.$i} eq 'reg') {
+                     $notification .= $env{'form.address_'.$i}.',';
+                 }
+                 if ($env{'form.html_'.$i} eq '1') {
+ 		    $notify_with_html .= $env{'form.address_'.$i}.',';
+                 }
+                 $totaladdresses ++;
+             }
+         }
      }
-     my $notification=$ENV{'form.notification'};
+     $critnotification =~ s/,$//;
+     $critnotification=~s/\s//gs;
+     $notification =~ s/,$//;
      $notification=~s/\s//gs;
+     $notify_with_html =~ s/,$//;
+     $notify_with_html =~ s/\s//gs;
      if ($notification) {
          &Apache::lonnet::put('environment',{'notification' => $notification});
-         &Apache::lonnet::appenv('environment.notification' => $notification);
+         &Apache::lonnet::appenv({'environment.notification' => $notification});
-         $message.='Set message notification address to '.$notification.'<br />';
+         $message.=&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.='Reset message notification<br />';
+         $message.=&mt("Set non-critical message notification to 'off'.").'<br />';
      }
-     my $critnotification=$ENV{'form.critnotification'};
-     $critnotification=~s/\s//gs;
      if ($critnotification) {
          &Apache::lonnet::put('environment',{'critnotification' => $critnotification});
-         &Apache::lonnet::appenv('environment.critnotification' => $critnotification);
+         &Apache::lonnet::appenv({'environment.critnotification' => $critnotification});
-         $message.='Set critical message notification address to '.$critnotification;
+         $message.=&mt('Set critical message notification address(es) to ').'<tt>"'.$critnotification.'"</tt>.<br />';
      } else {
          &Apache::lonnet::del('environment',['critnotification']);
          &Apache::lonnet::delenv('environment\.critnotification');
-         $message.='Reset critical message notification<br />';
+         $message.=&mt("Set critical message notification to 'off'.").'<br />';
      }
-     $r->print(<<ENDVCMSG);
+     if ($critnotification || $notification) {
- </p>
+         if ($notify_with_html) {
- $message
+             &Apache::lonnet::put('environment',{'notifywithhtml' => $notify_with_html});
- ENDVCMSG
+             &Apache::lonnet::appenv({'environment.notifywithhtml' => $notify_with_html});
+             $message.=&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.");
+             } else {
+                 $message.=&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);
+     &msgforwardchanger($r,$message);
  }
  ################################################################
- Line 496  ENDVCMSG
+ Line 966  ENDVCMSG
  sub colorschanger {
      my $r = shift;
  # figure out colors
-     my $function='student';
+     my $function=&Apache::loncommon::get_users_function();
-     if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
- 	$function='coordinator';
-     }
-     if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
- 	$function='admin';
-     }
-     if (($ENV{'request.role'}=~/^(au|ca)/) ||
- 	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
- 	$function='author';
-     }
      my $domain=&Apache::loncommon::determinedomain();
      my %colortypes=('pgbg'  => 'Page Background',
                      'tabbg' => 'Header Background',
- Line 515  sub colorschanger {
+ Line 975  sub colorschanger {
                      'link'  => 'Un-Visited Link',
                      'vlink' => 'Visited Link',
                      'alink' => 'Active Link');
+     my $start_data_table = &Apache::loncommon::start_data_table();
      my $chtable='';
      foreach my $item (sort(keys(%colortypes))) {
         my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);
-        $chtable.='<tr><td>'.$colortypes{$item}.'</td><td bgcolor="'.$curcol.
+        $chtable.=&Apache::loncommon::start_data_table_row().
+ 	   '<td>'.$colortypes{$item}.'</td><td style="background: '.$curcol.
          '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><input name="'.$item.
          '" size="10" value="'.$curcol.
  '" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.
  "','".$curcol."','"
- 	    .$item."','parmform.pres','psub'".');">Select</a></td></tr>';
+ 	    .$item."','parmform.pres','psub'".');">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();
      $r->print(<<ENDCOL);
- <script>
+ <script type="text/javascript">
      function pclose() {
          parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
- Line 541  sub colorschanger {
+ Line 1005  sub colorschanger {
          pclose();
          if (document.parmform.pres_marker.value!='') {
              if (document.parmform.pres_type.value!='') {
-                 eval('document.server.'+
+                 eval('document.prefs.'+
                       document.parmform.pres_marker.value+
  		     '.value=document.parmform.pres_value.value;');
  	    }
- Line 558  sub colorschanger {
+ Line 1022  sub colorschanger {
  <input type="hidden" name="pres_type" />
  <input type="hidden" name="pres_value" />
  </form>
- <form name="server" action="/adm/preferences" method="post">
+ <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_colors" />
- <table border="2">
+ $start_data_table
  $chtable
+ $end_data_table
  </table>
  <input type="submit" value="Change Custom Colors" />
  <input type="submit" name="resetall" value="Reset All Colors to Default" />
- Line 572  ENDCOL
+ Line 1037  ENDCOL
  sub verify_and_change_colors {
      my $r = shift;
  # figure out colors
-     my $function='student';
+     my $function=&Apache::loncommon::get_users_function();
-     if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
- 	$function='coordinator';
-     }
-     if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
- 	$function='admin';
-     }
-     if (($ENV{'request.role'}=~/^(au|ca)/) ||
- 	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
- 	$function='author';
-     }
      my $domain=&Apache::loncommon::determinedomain();
      my %colortypes=('pgbg'  => 'Page Background',
                      'tabbg' => 'Header Background',
- Line 594  sub verify_and_change_colors {
+ Line 1049  sub verify_and_change_colors {
      my $message='';
      foreach my $item (keys %colortypes) {
-         my $color=$ENV{'form.'.$item};
+         my $color=$env{'form.'.$item};
          my $entry='color.'.$function.'.'.$item;
- 	if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$ENV{'form.resetall'})) {
+ 	if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
  	    &Apache::lonnet::put('environment',{$entry => $color});
- 	    &Apache::lonnet::appenv('environment.'.$entry => $color);
+ 	    &Apache::lonnet::appenv({'environment.'.$entry => $color});
- 	    $message.='Set '.$colortypes{$item}.' to '.$color.'<br />';
+ 	    $message.=&mt('Set '.$colortypes{$item}.' to ').'<tt>"'.$color.'"</tt>.<br />';
  	} else {
  	    &Apache::lonnet::del('environment',[$entry]);
  	    &Apache::lonnet::delenv('environment\.'.$entry);
- 	    $message.='Reset '.$colortypes{$item}.'<br />';
+ 	    $message.=&mt('Reset '.$colortypes{$item}.'.').'<br />';
  	}
      }
+     my $now = time;
+     &Apache::lonnet::put('environment',{'color.timestamp' => $now});
+     &Apache::lonnet::appenv({'environment.color.timestamp' => $now});
      $r->print(<<ENDVCCOL);
- </p>
  $message
  <form name="client" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="changecolors" />
- Line 619  ENDVCCOL
+ Line 1077  ENDVCCOL
  #            password handler subroutines            #
  ######################################################
  sub passwordchanger {
+     my ($r,$errormessage,$caller,$mailtoken) = @_;
      # This function is a bit of a mess....
      # Passwords are encrypted using londes.js (DES encryption)
-     my $r = shift;
-     my $errormessage = shift;
      $errormessage = ($errormessage || '');
-     my $user       = $ENV{'user.name'};
+     my ($user,$domain,$currentpass,$defdom);
-     my $domain     = $ENV{'user.domain'};
+     if ((!defined($caller)) || ($caller eq 'preferences')) {
-     my $homeserver = $ENV{'user.home'};
+         $user = $env{'user.name'};
+         $domain = $env{'user.domain'};
+         if (!defined($caller)) {
+             $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 <a href="/adm/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'));
+                 return;
+             }
+             if (defined($data{time})) {
+                 if (time - $data{'time'} < 7200) {
+                     $user = $data{'username'};
+                     $domain = $data{'domain'};
+                     $currentpass = $data{'temppasswd'};
+                 } else {
+                     $r->print(&mt('Sorry, the token generated when you requested a password reset has expired.').'<br />');
+                     return;
+                 }
+             } else {
+                 $r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />');
+                 return;
+             }
+    } else {
+         $r->print(&mt('Page requested in unexpected context').'<br />');
+         return;
+     }
      my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
      # Check for authentication types that allow changing of the password.
      return if ($currentauth !~ /^(unix|internal):/);
- Line 643  sub passwordchanger {
+ Line 1128  sub passwordchanger {
  				       .$ukey_npass2 . $lkey_npass2,
  				       $lonhost);
      # Hexify the keys for output as javascript variables
-     $ukey_cpass = hex($ukey_cpass);
+     my %hexkey;
-     $lkey_cpass = hex($lkey_cpass);
+     $hexkey{'ukey_cpass'}  = hex($ukey_cpass);
-     $ukey_npass1= hex($ukey_npass1);
+     $hexkey{'lkey_cpass'}  = hex($lkey_cpass);
-     $lkey_npass1= hex($lkey_npass1);
+     $hexkey{'ukey_npass1'} = hex($ukey_npass1);
-     $ukey_npass2= hex($ukey_npass2);
+     $hexkey{'lkey_npass1'} = hex($lkey_npass1);
-     $lkey_npass2= hex($lkey_npass2);
+     $hexkey{'ukey_npass2'} = hex($ukey_npass2);
+     $hexkey{'lkey_npass2'} = hex($lkey_npass2);
      # Output javascript to deal with passwords
      # Output DES javascript
-     my $html=&Apache::lonxml::xmlbegin();
-     $r->print($html."<head>");
      {
  	my $include = $r->dir_config('lonIncludes');
  	my $jsh=Apache::File->new($include."/londes.js");
  	$r->print(<$jsh>);
      }
+     $r->print(&jscript_send($caller));
      $r->print(<<ENDFORM);
+ $errormessage
+ <p>
+ <!-- We separate the forms into 'server' and 'client' in order to
+      ensure that unencrypted passwords will not be sent out by a
+      crappy browser -->
+ ENDFORM
+     $r->print(&server_form($logtoken,$caller,$mailtoken));
+     $r->print(&client_form($caller,\%hexkey,$currentpass,$defdom));
+     #
+     return;
+ }
+ sub jscript_send {
+     my ($caller) = @_;
+     my $output = qq|
  <script language="JavaScript">
      function send() {
- Line 680  sub passwordchanger {
+ Line 1182  sub passwordchanger {
          initkeys();
          this.document.pserver.elements.newpass_2.value
              =crypted(this.document.client.elements.newpass_2.value);
+ |;
+     if ($caller eq 'reset_by_email') {
+         $output .= qq|
+         this.document.pserver.elements.uname.value =
+                    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;
+ |;
+     }
+     $ output .= qq|
          this.document.pserver.submit();
      }
  </script>
- $errormessage
+ |;
+ }
- <p>
+ sub client_form {
- <!-- We separate the forms into 'server' and 'client' in order to
+     my ($caller,$hexkey,$currentpass,$defdom) = @_;
-      ensure that unencrypted passwords will not be sent out by a
+     my %lt=&Apache::lonlocal::texthash(
-      crappy browser -->
+                 'email' => 'E-mail Address',
+                 'username' => 'Username',
- <form name="pserver" action="/adm/preferences" method="post">
+                 'domain' => 'Domain',
- <input type="hidden" name="logtoken"    value="$logtoken" />
+                 'currentpass' => 'Current Password',
- <input type="hidden" name="action"      value="verify_and_change_pass" />
+                 'newpass' => 'New Password',
- <input type="hidden" name="currentpass" value="" />
+                 'confirmpass' => 'Confirm Password',
- <input type="hidden" name="newpass_1"   value="" />
+                 'changepass' => 'Change Password');
- <input type="hidden" name="newpass_2"   value="" />
- </form>
+     my $output = qq|
  <form name="client" >
  <table>
- <tr><td align="right"> Current password:                      </td>
+ |;
+     if ($caller eq 'reset_by_email') {
+         $output .= qq|
+ <tr><td class="LC_preferences_labeltext"><label for="email">$lt{'email'}</label>:</td>
+     <td><input type="text" name="email" size="30" /> </td></tr>
+ <tr><td class="LC_preferences_labeltext"><label for="uname">$lt{'username'}</label>:</td>
+     <td>
+      <input type="text" name="uname" size="15" />
+      <input type="hidden" name="currentpass" value="$currentpass" />
+     </td></tr>
+ <tr><td class="LC_preferences_labeltext"><label for="udom">$lt{'domain'}</label>:</td>
+     <td>
+ |;
+         $output .= &Apache::loncommon::select_dom_form($defdom,'udom').'
+    </td>
+ </tr>
+ ';
+     } else {
+         $output .= qq|
+ <tr><td class="LC_preferences_labeltext"><label for="currentpass">$lt{'currentpass'}</label></td>
      <td><input type="password" name="currentpass" size="10"/> </td></tr>
- <tr><td align="right"> New password:                          </td>
+ |;
+     }
+     $output .= <<"ENDFORM";
+ <tr><td class="LC_preferences_labeltext"><label for="newpass_1">$lt{'newpass'}</label></td>
      <td><input type="password" name="newpass_1" size="10"  /> </td></tr>
- <tr><td align="right"> Confirm password:                      </td>
+ <tr><td class="LC_preferences_labeltext"><label for="newpass_2">$lt{'confirmpass'}</label></td>
      <td><input type="password" name="newpass_2" size="10"  /> </td></tr>
  <tr><td colspan="2" align="center">
-     <input type="button" value="Change Password" onClick="send();">
+     <input type="button" value="$lt{'changepass'}" onClick="send();">
  </table>
- <input type="hidden" name="ukey_cpass"  value="$ukey_cpass" />
+ <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />
- <input type="hidden" name="lkey_cpass"  value="$lkey_cpass" />
+ <input type="hidden" name="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />
- <input type="hidden" name="ukey_npass1" value="$ukey_npass1" />
+ <input type="hidden" name="ukey_npass1" value="$hexkey->{'ukey_npass1'}" />
- <input type="hidden" name="lkey_npass1" value="$lkey_npass1" />
+ <input type="hidden" name="lkey_npass1" value="$hexkey->{'lkey_npass1'}" />
- <input type="hidden" name="ukey_npass2" value="$ukey_npass2" />
+ <input type="hidden" name="ukey_npass2" value="$hexkey->{'ukey_npass2'}" />
- <input type="hidden" name="lkey_npass2" value="$lkey_npass2" />
+ <input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
  </form>
  </p>
  ENDFORM
-     #
+     return $output;
-     return;
+ }
+ sub server_form {
+     my ($logtoken,$caller,$mailtoken) = @_;
+     my $action = '/adm/preferences';
+     if ($caller eq 'reset_by_email') {
+         $action = '/adm/resetpw';
+     }
+     my $output = qq|
+ <form name="pserver" action="$action" method="post">
+ <input type="hidden" name="logtoken"    value="$logtoken" />
+ <input type="hidden" name="currentpass" value="" />
+ <input type="hidden" name="newpass_1"   value="" />
+ <input type="hidden" name="newpass_2"   value="" />
+     |;
+     if ($caller eq 'reset_by_email') {
+         $output .=  qq|
+ <input type="hidden" name="token"   value="$mailtoken" />
+ <input type="hidden" name="uname"   value="" />
+ <input type="hidden" name="udom"   value="" />
+ |;
+     }
+     $output .= qq|
+ <input type="hidden" name="action" value="verify_and_change_pass" />
+ </form>
+ |;
+     return $output;
  }
  sub verify_and_change_password {
-     my $r = shift;
+     my ($r,$caller,$mailtoken) = @_;
-     my $user       = $ENV{'user.name'};
+     my ($user,$domain,$homeserver);
-     my $domain     = $ENV{'user.domain'};
+     if ($caller eq 'reset_by_email') {
-     my $homeserver = $ENV{'user.home'};
+         $user       = $env{'form.uname'};
+         $domain     = $env{'form.udom'};
+         if ($user ne '' && $domain ne '') {
+             $homeserver = &Apache::lonnet::homeserver($user,$domain);
+             if ($homeserver eq 'no_host') {
+         &passwordchanger($r,"<p>\n<span class='LC_error'>".
+                          &mt("Invalid username and/or domain")."</span>\n</p>",
+                          $caller,$mailtoken);
+                 return 1;
+             }
+         } else {
+             &passwordchanger($r,"<p>\n<span class='LC_error'>".
+                              &mt("Username and domain were blank")."</span>\n</p>",
+                              $caller,$mailtoken);
+             return 1;
+         }
+     } else {
+         $user       = $env{'user.name'};
+         $domain     = $env{'user.domain'};
+         $homeserver = $env{'user.home'};
+     }
      my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
      # Check for authentication types that allow changing of the password.
-     return if ($currentauth !~ /^(unix|internal):/);
+     if ($currentauth !~ /^(unix|internal):/) {
-     #
+         if ($caller eq 'reset_by_email') {
-     my $html=&Apache::lonxml::xmlbegin();
+             &passwordchanger($r,"<p>\n<span class='LC_error'>".
-     $r->print(<<ENDHEADER);
+                              &mt("Authentication type for this user can not be changed by this mechanism").
- $html
+                              "</span>\n</p>",
- <head>
+                               $caller,$mailtoken);
- <title>LON-CAPA Preferences:  Change password for $user</title>
+             return 1;
- </head>
+         } else {
- ENDHEADER
+             return;
+         }
+     }
      #
-     my $currentpass = $ENV{'form.currentpass'};
+     my $currentpass = $env{'form.currentpass'};
-     my $newpass1    = $ENV{'form.newpass_1'};
+     my $newpass1    = $env{'form.newpass_1'};
-     my $newpass2    = $ENV{'form.newpass_2'};
+     my $newpass2    = $env{'form.newpass_2'};
-     my $logtoken    = $ENV{'form.logtoken'};
+     my $logtoken    = $env{'form.logtoken'};
      # Check for empty data
      unless (defined($currentpass) &&
  	    defined($newpass1)    &&
  	    defined($newpass2)    ){
- 	&passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>".
+ 	&passwordchanger($r,"<p>\n<span class='LC_error'>".
- 			 "Password data was blank.\n</p>");
+ 			 &mt("One or more password fields were blank").
+                          "</span>\n</p>",$caller,$mailtoken);
  	return;
      }
      # Get the keys
- Line 758  ENDHEADER
+ Line 1340  ENDHEADER
      my $tmpinfo = Apache::lonnet::reply('tmpget:'.$logtoken,$lonhost);
      if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
          # I do not a have a better idea about how to handle this
+         my $tryagain_text = &mt('Please log out and try again.');
+         if ($caller eq 'reset_by_email') {
+             $tryagain_text = &mt('Please try again later.');
+         }
+         my $unable=&mt("Unable to retrieve saved token for password decryption");
  	$r->print(<<ENDERROR);
  <p>
- <font color="#ff0000">ERROR:</font> Unable to retrieve stored token for
+ <span class="LC_error">$unable.  $tryagain_text</span>
- password decryption.  Please log out and try again.
  </p>
  ENDERROR
          # Probably should log an error here
-         return;
+         return 1;
      }
      my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
      #
      $currentpass = &des_decrypt($ckey ,$currentpass);
      $newpass1    = &des_decrypt($n1key,$newpass1);
      $newpass2    = &des_decrypt($n2key,$newpass2);
      #
+     if ($caller eq 'reset_by_email') {
+         my %data = &Apache::lonnet::tmpget($mailtoken);
+         if (keys(%data) == 0) {
+             &passwordchanger($r,
+                          '<span class="LC_error">'.
+                          &mt('Could not verify current authentication.').'  '.
+                          &mt('Please try again.').'</span>',$caller,$mailtoken);
+             return 1;
+         }
+         if ($currentpass ne $data{'temppasswd'}) {
+             &passwordchanger($r,
+                          '<span class="LC_error">'.
+                          &mt('Could not verify current authentication.').'  '.
+                          &mt('Please try again.').'</span>',$caller,$mailtoken);
+             return 1;
+         }
+     }
      if ($newpass1 ne $newpass2) {
  	&passwordchanger($r,
- 			 '<font color="#ff0000">ERROR:</font>'.
+ 			 '<span class="LC_error">'.
- 			 'The new passwords you entered do not match.  '.
+ 			 &mt('The new passwords you entered do not match.').'  '.
- 			 'Please try again.');
+ 			 &mt('Please try again.').'</span>',$caller,$mailtoken);
- 	return;
+ 	return 1;
      }
      if (length($newpass1) < 7) {
  	&passwordchanger($r,
- 			 '<font color="#ff0000">ERROR:</font>'.
+ 			 '<span class="LC_error">'.
- 			 'Passwords must be a minimum of 7 characters long.  '.
+ 			 &mt('Passwords must be a minimum of 7 characters long.').'  '.
- 			 'Please try again.');
+ 			 &mt('Please try again.').'</span>',$caller,$mailtoken);
- 	return;
+ 	return 1;
      }
      #
      # Check for bad characters
- Line 795  ENDERROR
+ Line 1398  ENDERROR
      }
      if ($badpassword) {
  	# I can't figure out how to enter bad characters on my browser.
- 	&passwordchanger($r,<<ENDERROR);
+ 	my $errormessage ='<span class="LC_error">'.
- <font color="#ff0000">ERROR:</font>
+            &mt('The password you entered contained illegal characters.').'<br />'.
- The password you entered contained illegal characters.<br />
+            &mt('Valid characters are').(<<"ENDERROR");
- Valid characters are: space and <br />
+ : space and <br />
  <pre>
  !&quot;\#$%&amp;\'()*+,-./0123456789:;&lt;=&gt;?\@
  ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{|}~
- </pre>
+ </pre></span>
  ENDERROR
+         &passwordchanger($r,$errormessage,$caller,$mailtoken);
+         return 1;
      }
      #
      # Change the password (finally)
      my $result = &Apache::lonnet::changepass
- 	($user,$domain,$currentpass,$newpass1,$homeserver);
+ 	($user,$domain,$currentpass,$newpass1,$homeserver,$caller);
      # Inform the user the password has (not?) been changed
      if ($result =~ /^ok$/) {
- 	$r->print(<<"ENDTEXT");
+ 	$r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
- <h2>The password for $user was successfully changed</h2>
- ENDTEXT
      } else {
  	# error error: run in circles, scream and shout
-         $r->print(<<ENDERROR);
+         $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
- <h2><font color="#ff0000">The password for $user was not changed</font></h2>
+                   &mt('Please make sure your old password was entered correctly.'));
- Please make sure your old password was entered correctly.
+         return 1;
- ENDERROR
      }
      return;
  }
- Line 829  ENDERROR
+ Line 1431  ENDERROR
  ################################################################
  sub discussionchanger {
      my $r = shift;
-     my $user       = $ENV{'user.name'};
+     my $user       = $env{'user.name'};
-     my $domain     = $ENV{'user.domain'};
+     my $domain     = $env{'user.domain'};
      my %userenv = &Apache::lonnet::get
          ('environment',['discdisplay','discmarkread']);
      my $discdisp = 'allposts';
- Line 852  sub discussionchanger {
+ Line 1454  sub discussionchanger {
      my $function = &Apache::loncommon::get_users_function();
      my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                     $ENV{'user.domain'});
+                                                     $env{'user.domain'});
      my %lt = &Apache::lonlocal::texthash(
          'pref' => 'Display Preference',
          'curr' => 'Current setting ',
- Line 888  sub discussionchanger {
+ Line 1490  sub discussionchanger {
      }
      $r->print(<<"END");
- <form name="server" action="/adm/preferences" method="post">
+ <form name="prefs" action="/adm/preferences" method="post">
  <input type="hidden" name="action" value="verify_and_change_discussion" />
  <br />
- $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol>
+ $lt{'sdpf'}<br /> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol>
  <br />
  <br />
- <table border="0" cellpadding="0" cellspacing="0">
+ END
-  <tr>
+     $r->print(&Apache::loncommon::start_data_table());
-   <td width="100%" bgcolor="#000000">
+     $r->print(<<"END");
-    <table width="100%" border="0" cellpadding="1" cellspacing="0">
+        <tr>
-     <tr>
+         <th>$lt{'pref'}</th>
-      <td width="100%" bgcolor="#000000">
+         <th>$lt{'curr'}</th>
-       <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
+         <th>$lt{'actn'}?</th>
-        <tr bgcolor="$color">
-         <td><b>$lt{'pref'}</b></td>
-         <td><b>$lt{'curr'}</b></td>
-         <td><b>$lt{'actn'}?</b></td>
         </tr>
-        <tr bgcolor="#dddddd">
+ END
+     $r->print(&Apache::loncommon::start_data_table_row());
+     $r->print(<<"END");
         <td>$lt{'disa'}</td>
         <td>$lt{$discdisp}</td>
-        <td><input type="checkbox" name="discdisp" /><input type="hidden" name="newdisp" value="$newdisp" />&nbsp;$lt{'chgt'} "$dispchange"</td>
+        <td><label><input type="checkbox" name="discdisp" /><input type="hidden" name="newdisp" value="$newdisp" />&nbsp;$lt{'chgt'} "$dispchange"</label></td>
-       </tr><tr bgcolor="#eeeeee">
+ END
+     $r->print(&Apache::loncommon::end_data_table_row().
+ 	      &Apache::loncommon::start_data_table_row());
+     $r->print(<<"END");
         <td>$lt{'npmr'}</td>
         <td>$lt{$discmark}</td>
-        <td><input type="checkbox" name="discmark" /><input type="hidden" name="newmark" value="$newmark" />&nbsp;$lt{'chgt'} "$markchange"</td>
+        <td><label><input type="checkbox" name="discmark" /><input type="hidden" name="newmark" value="$newmark" />&nbsp;$lt{'chgt'} "$markchange"</label></td>
        </tr>
-      </table>
+ END
-     </td>
+     $r->print(&Apache::loncommon::end_data_table_row().
-    </tr>
+ 	      &Apache::loncommon::end_data_table());
-   </table>
+     $r->print(<<"END");
-  </td>
- </tr>
- </table>
  <br />
  <br />
- <input type="submit" name="sub" value="Store Changes" />
+ <input type="submit" name="sub" value="Save Changes" />
  <br />
  <br />
  Note: $lt{'thde'}
- Line 934  END
+ Line 1534  END
  sub verify_and_change_discussion {
      my $r = shift;
-     my $user     = $ENV{'user.name'};
+     my $user     = $env{'user.name'};
-     my $domain   = $ENV{'user.domain'};
+     my $domain   = $env{'user.domain'};
      my $message='';
-     if (defined($ENV{'form.discdisp'}) ) {
+     if (defined($env{'form.discdisp'}) ) {
-         my $newdisp  = $ENV{'form.newdisp'};
+         my $newdisp  = $env{'form.newdisp'};
          if ($newdisp eq 'unread') {
-             $message .='In discussions: only new posts will be displayed.<br/>';
+             $message .=&mt('In discussions: only new posts will be displayed.').'<br />';
              &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
-             &Apache::lonnet::appenv('environment.discdisplay' => $newdisp);
+             &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
          } else {
-             $message .= 'In discussions: all posts will be displayed.<br/>';
+             $message .= &mt('In discussions: all posts will be displayed.').'<br />';
              &Apache::lonnet::del('environment',['discdisplay']);
              &Apache::lonnet::delenv('environment\.discdisplay');
          }
      }
-     if (defined($ENV{'form.discmark'}) ) {
+     if (defined($env{'form.discmark'}) ) {
-         my $newmark = $ENV{'form.newmark'};
+         my $newmark = $env{'form.newmark'};
          if ($newmark eq 'ondisp') {
-            $message.='In discussions: new posts will be cease to be identified as "new" after display.<br/>';
+            $message.=&mt('In discussions: new posts will be cease to be identified as "NEW" after display.').'<br />';
              &Apache::lonnet::put('environment',{'discmarkread' => $newmark});
-             &Apache::lonnet::appenv('environment.discmarkread' => $newmark);
+             &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
          } else {
-             $message.='In discussions: posts will be identified as "new" until marked as read by the reader.<br/>';
+             $message.=&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.').'<br />';
              &Apache::lonnet::del('environment',['discmarkread']);
              &Apache::lonnet::delenv('environment\.discmarkread');
          }
      }
      $r->print(<<ENDVCSCREEN);
- </p>
  $message
  ENDVCSCREEN
  }
+ ################################################################
+ # Subroutines for page display on course access (Course Coordinators)
+ ################################################################
+ sub coursedisplaychanger {
+     my $r = shift;
+     my $user       = $env{'user.name'};
+     my $domain     = $env{'user.domain'};
+     my %userenv = &Apache::lonnet::get('environment',['course_init_display']);
+     my $currvalue = 'whatsnew';
+     my $firstselect = '';
+     my $whatsnewselect = 'checked="checked"';
+     if (exists($userenv{'course_init_display'})) {
+         if ($userenv{'course_init_display'} eq 'firstres') {
+             $currvalue = 'firstres';
+             $firstselect = 'checked="checked"';
+ 	    $whatsnewselect = '';
+         }
+     }
+     my %pagenames = (
+                        firstres => 'First resource',
+                        whatsnew => "What's new page",
+                     );
+     my $whatsnew_off=&mt('Display the [_1] in the course.','<b>first resource</b>');
+     my $whatsnew_on=&mt('Display the "[_1]" page - a summary of items in the course which require attention.',"<b>What's New</b>");
+     $r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role').'</b>&nbsp;'.&mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"<i>What's New</i>").'<br /><br />');
+     $r->print(<<ENDLSCREEN);
+ <form name="prefs" action="/adm/preferences" method="post">
+ <input type="hidden" name="action" value="verify_and_change_coursepage" />
+ <br />
+ <label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />
+ <label><input type="radio" name="newdisp" value="whatsnew" $whatsnewselect /> $whatsnew_on</label><input type="hidden" name="refpage" value="$env{'form.refpage'}" />
+ ENDLSCREEN
+     $r->print('<br /><br /><input type="submit" value="'.&mt('Change').'" />
+ </form>');
+ }
+ sub verify_and_change_coursepage {
+     my $r = shift;
+     my $message='';
+     my %lt = &Apache::lonlocal::texthash(
+         'defs' => 'Default now set',
+         'when' => 'when you select a course role from the roles screen',
+         'ywbt' => 'you will be taken to the start of the course.',
+         'apwb' => 'a page will be displayed that lists items in the course that may require action from you.',
+         'gtts' => 'Go to the start of the course',
+         'dasp' => "Display the What's New page listing course action items",
+     );
+     my $newdisp  = $env{'form.newdisp'};
+     $message = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';
+     if ($newdisp eq 'firstres') {
+         $message .= $lt{'ywbt'}.'<br />';
+         &Apache::lonnet::put('environment',{'course_init_display' => $newdisp});
+         &Apache::lonnet::appenv({'environment.course_init_display' => $newdisp});
+     } else {
+         $message .= $lt{'apwb'}.'<br />';
+         &Apache::lonnet::del('environment',['course_init_display']);
+         &Apache::lonnet::delenv('environment\.course_init_display');
+     }
+     my $refpage = $env{'form.refpage'};
+     if (($env{'request.course.fn'}) && ($env{'request.course.id'})) {
+         if ($newdisp eq 'firstres') {
+             my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+             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>';
+         } else {
+             $message .= '<br /><font size="+1"><a href="/adm/whatsnew?refpage='.
+                         $refpage.'">'.$lt{'dasp'}.'</a></font>';
+         }
+     }
+     $r->print(<<ENDVCSCREEN);
+ $message
+ <br /><br />
+ ENDVCSCREEN
+ }
  ######################################################
  #            other handler subroutines               #
  ######################################################
- Line 976  ENDVCSCREEN
+ Line 1654  ENDVCSCREEN
  ################################################################
  sub handler {
      my $r = shift;
-     my $user = $ENV{'user.name'};
+     my $user = $env{'user.name'};
-     my $domain = $ENV{'user.domain'};
+     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);
- Line 985  sub handler {
+ Line 1663  sub handler {
      return OK if $r->header_only;
      #
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                             ['action','wysiwyg','returnurl']);
+                                    ['action','wysiwyg','returnurl','refpage']);
      #
      &Apache::lonhtmlcommon::clear_breadcrumbs();
      &Apache::lonhtmlcommon::add_breadcrumb
- Line 1010  sub handler {
+ Line 1688  sub handler {
                            breadcrumb =>
                                { href =>'/adm/preferences?action=changepass',
                                  text => 'Change Password'},
-                           printmenu => 'yes',
+                           printmenu => 'not_on_error',
                            }));
      }
      push (@Options,({ action   => 'changescreenname',
- Line 1031  sub handler {
+ Line 1709  sub handler {
                        }));
      push (@Options,({ action   => 'changemsgforward',
-                       linktext => 'Change Message Forwarding and Notification Addresses',
+                       linktext => 'Change Message Forwarding and Notification Email Addresses',
                        href     => '/adm/preferences',
-                       help     => 'Prefs_Forwarding',
+                       help     => 'Prefs_Messages',
                        breadcrumb =>
                            { href => '/adm/preferences?action=changemsgforward',
-                             text => 'Change Message Forwarding'},
+                             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'},
+                             text => 'Change Message Forwarding/Notification'},
-                       printmenu => 'yes',
+                       printmenu => 'no',
                        subroutine => \&verify_and_change_msgforward }));
      my $aboutmeaction=
-         '/adm/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/aboutme';
+         '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
      push (@Options,{ action => 'none',
                       linktext =>
                           q{Edit the 'About Me' Personal Information Screen},
- Line 1115  sub handler {
+ Line 1794  sub handler {
                        printmenu => 'yes',
                        subroutine => \&verify_and_change_discussion, }
                      ));
+     my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
      push (@Options,({ action   => 'changerolespref',
-                       linktext => 'Change Roles Page Preferences',
+                       linktext => 'Change '.$role.' Page Preferences',
                        href     => '/adm/preferences',
                        subroutine => \&rolesprefchanger,
                        breadcrumb =>
                            { href => '/adm/preferences?action=changerolespref',
-                             text => 'Change Roles Pref'},
+                             text => 'Change '.$role.' Page Pref'},
                        },
                      { action   => 'verify_and_change_rolespref',
                        subroutine => \&verify_and_change_rolespref,
                        breadcrumb =>
                            { href => '/adm/preferences?action=changerolespref',
-                             text => 'Change Roles Preferences'},
+                             text => 'Change '.$role.' Page Preferences'},
                        printmenu => 'yes',
                        }));
- Line 1148  sub handler {
+ Line 1828  sub handler {
                        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',
+ 		      }));
+     }
-     if ($ENV{'user.name'} =~ /^(albertel|fox|foxr|koretemey|korte|hallmat3|turtle)$/) {
+     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',
+                       }));
+     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',
+                       }));
+     if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
+ 	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
+ 				    .$env{'request.course.sec'})) {
+         push (@Options,({ action => 'changecourseinit',
+                           linktext => 'Change Course Initialization Preference',
+                           href => '/adm/preferences',
+                           subroutine => \&coursedisplaychanger,
+                           breadcrumb =>
+                               { href => '/adm/preferences?action=changecourseinit',
+                                 text => 'Change Course Init. Pref.'},
+                           },
+                         { action => 'verify_and_change_coursepage',
+                           breadcrumb =>
+                           { href => '/adm/preferences?action=changecourseinit',                               text => 'Change Course Initialization Preference'},
+                         printmenu => 'yes',
+                         subroutine => \&verify_and_change_coursepage,
+                        }));
+     }
+     if ($env{'user.name'} =~ /^(albertel|fox|foxr|koretemey|korte|hallmat3|turtle|raeburn)$/) {
          push (@Options,({ action => 'debugtoggle',
                            printmenu => 'yes',
                            subroutine => \&toggle_debug,
                            }));
      }
-     my $html=&Apache::lonxml::xmlbegin();
-     $r->print(<<ENDHEADER);
+     $r->print(&Apache::loncommon::start_page('Change Preferences'));
- $html
- <head>
- <title>LON-CAPA Preferences</title>
- </head>
- ENDHEADER
      my $call = undef;
      my $help = undef;
      my $printmenu = 'yes';
      foreach my $option (@Options) {
-         if ($option->{'action'} eq $ENV{'form.action'}) {
+         if ($option->{'action'} eq $env{'form.action'}) {
              $call = $option->{'subroutine'};
              $printmenu = $option->{'printmenu'};
              if (exists($option->{'breadcrumb'})) {
- Line 1176  ENDHEADER
+ Line 1929  ENDHEADER
  	    $help=$option->{'help'};
          }
      }
-     $r->print(&Apache::loncommon::bodytag('Change Preferences'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Change Preferences',$help));
-     $r->print(&Apache::lonhtmlcommon::breadcrumbs
+     my $error;
-               (undef,'Change Preferences',$help));
      if (defined($call)) {
-         $call->($r);
+         $error = $call->($r);
      }
-     if (($printmenu eq 'yes') && (!$ENV{'form.returnurl'})) {
+     if ( ( ($printmenu eq 'yes')
+ 	   || ($printmenu eq 'not_on_error' && !$error) )
+ 	 && (!$env{'form.returnurl'})) {
          my $optionlist = '<table cellpadding="5">';
-         if ($ENV{'user.name'} =~
+         if ($env{'user.name'} =~
-                          /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle)$/
+                          /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle|raeburn)$/
              ) {
              push (@Options,({ action => 'debugtoggle',
                                linktext => 'Toggle Debug Messages',
                                text => 'Current Debug status is -'.
-                                   $ENV{'user.debug'}.'-.',
+                                   $env{'user.debug'}.'-.',
                                href => '/adm/preferences',
                                printmenu => 'yes',
                                subroutine => \&toggle_debug,
- Line 1199  ENDHEADER
+ Line 1953  ENDHEADER
          foreach my $option(@Options) {
              my $optiontext = '';
              if (exists($option->{'href'})) {
-                 $optiontext .=
+ 		$option->{'href_args'}{'action'}=$option->{'action'};
-                     '<a href="'.$option->{'href'}.
+ 		$optiontext .=
-                     '?action='.$option->{'action'}.'">'.
+                     '<a href="'.&add_get_param($option->{'href'},
+ 					       $option->{'href_args'}).'">'.
                      &mt($option->{'linktext'}).'</a>';
              }
              if (exists($option->{'text'})) {
- Line 1222  ENDHEADER
+ Line 1977  ENDHEADER
          }
          $optionlist .= '</table>';
          $r->print($optionlist);
-     } elsif ($ENV{'form.returnurl'}) {
+     } elsif ($env{'form.returnurl'}) {
- 	$r->print('<br /><a href="'.$ENV{'form.returnurl'}.'"><font size="+1">'.
+ 	$r->print('<br /><a href="'.$env{'form.returnurl'}.'"><font size="+1">'.
  		  &mt('Return').'</font></a>');
      }
-     $r->print(&Apache::loncommon::endbodytag().'</html>');
+     $r->print(&Apache::loncommon::end_page());
      return OK;
  }
  sub toggle_debug {
-     if ($ENV{'user.debug'}) {
+     if ($env{'user.debug'}) {
          &Apache::lonnet::delenv('user\.debug');
      } else {
-         &Apache::lonnet::appenv('user.debug' => 1);
+         &Apache::lonnet::appenv({'user.debug' => 1});
      }
  }

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

Removed from v.1.55
changed lines
	Added in v.1.118