loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.540 and 1.632

-version 1.540, 2007/06/27 22:44:03
+version 1.632, 2008/01/04 18:08:11
  Line 240  Inputs: formname, elementname
  formname and elementname specify the name of the html form and the name
  of the element the selection from the search results will be placed in.
- =back
  =cut
  sub browser_and_searcher_javascript {
  Line 257  sub browser_and_searcher_javascript {
          }
          url += 'catalogmode=interactive&';
          url += 'mode=$mode&';
+         url += 'inhibitmenu=yes&';
          url += 'form=' + formname + '&';
          if (only != null) {
              url += 'only=' + only + '&';
- Line 334  sub studentbrowser_javascript {
+ Line 335  sub studentbrowser_javascript {
     return (<<'ENDSTDBRW');
  <script type="text/javascript" language="Javascript" >
      var stdeditbrowser;
-     function openstdbrowser(formname,uname,udom,roleflag) {
+     function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
          var url = '/adm/pickstudent?';
          var filter;
-         eval('filter=document.'+formname+'.'+uname+'.value;');
+ 	if (!ignorefilter) {
+ 	    eval('filter=document.'+formname+'.'+uname+'.value;');
+ 	}
          if (filter != null) {
             if (filter != '') {
                 url += 'filter='+filter+'&';
- Line 405  sub coursebrowser_javascript {
+ Line 408  sub coursebrowser_javascript {
  	                            '&cdomelement='+udom+
                                      '&cnameelement='+desc;
          if (extra_element !=null && extra_element != '') {
-             if (formname == 'rolechoice') {
+             if (formname == 'rolechoice' || formname == 'studentform') {
                  url += '&roleelement='+extra_element;
                  if (domainfilter == null || domainfilter == '') {
                      url += '&domainfilter='+extra_element;
- Line 469  sub setsec_javascript {
+ Line 472  sub setsec_javascript {
      my ($sec_element,$formname) = @_;
      my $setsections = qq|
  function setSect(sectionlist) {
-     var sectionsArray = sectionlist.split(",");
+     var sectionsArray = new Array();
+     if ((sectionlist != '') && (typeof sectionlist != "undefined")) {
+         sectionsArray = sectionlist.split(",");
+     }
      var numSections = sectionsArray.length;
      document.$formname.$sec_element.length = 0;
      if (numSections == 0) {
- Line 524  function uncheckAll(field) {
+ Line 530  function uncheckAll(field) {
      if (field.length > 0) {
          for (i = 0; i < field.length; i++) {
              field[i].checked = false ;
-         }     } else {
+         }
+     } else {
          field.checked = false ;
      }
  }
- Line 541  linked_select_forms returns a string con
+ Line 548  linked_select_forms returns a string con
  and html for two <select> menus.  The select menus will be linked in that
  changing the value of the first menu will result in new values being placed
  in the second menu.  The values in the select menu will appear in alphabetical
- order.
+ order unless a defined order is provided.
  linked_select_forms takes the following ordered inputs:
- Line 559  linked_select_forms takes the following
+ Line 566  linked_select_forms takes the following
  =item * $hashref, a reference to a hash containing the data for the menus.
+ =item * $menuorder, the order of values in the first menu
  =back
  Below is an example of such a hash.  Only the 'text', 'default', and
- Line 575  $menu{$choice1}->{'select2'}.
+ Line 584  $menu{$choice1}->{'select2'}.
                             B2 => "Choice B2",
                             B3 => "Choice B3",
                             B4 => "Choice B4"
-                            }
+                            },
+                        order => ['B4','B3','B1','B2'],
                     },
                 A2 => { text =>"Choice A2" ,
                         default => "C2",
- Line 583  $menu{$choice1}->{'select2'}.
+ Line 593  $menu{$choice1}->{'select2'}.
                             C1 => "Choice C1",
                             C2 => "Choice C2",
                             C3 => "Choice C3"
-                            }
+                            },
+                        order => ['C2','C1','C3'],
                     },
                 A3 => { text =>"Choice A3" ,
                         default => "D6",
- Line 595  $menu{$choice1}->{'select2'}.
+ Line 606  $menu{$choice1}->{'select2'}.
                             D5 => "Choice D5",
                             D6 => "Choice D6",
                             D7 => "Choice D7"
-                            }
+                            },
+                        order => ['D4','D3','D2','D1','D7','D6','D5'],
                     }
                 );
- Line 607  sub linked_select_forms {
+ Line 619  sub linked_select_forms {
          $firstdefault,
          $firstselectname,
          $secondselectname,
-         $hashref
+         $hashref,
+         $menuorder,
          ) = @_;
      my $second = "document.$formname.$secondselectname";
      my $first = "document.$formname.$firstselectname";
- Line 621  sub linked_select_forms {
+ Line 634  sub linked_select_forms {
          $result.="select2data.d_$s1 = new Object();\n";
          $result.="select2data.d_$s1.def = new String('".
              $hashref->{$s1}->{'default'}."');\n";
          $result.="select2data.d_$s1.values = new Array(";
          my @s2values = sort(keys( %{ $hashref->{$s1}->{'select2'} } ));
+         if (ref($hashref->{$s1}->{'order'}) eq 'ARRAY') {
+             @s2values = @{$hashref->{$s1}->{'order'}};
+         }
          $result.="\"@s2values\");\n";
          $result.="select2data.d_$s1.texts = new Array(";
          my @s2texts;
- Line 660  function select1_changed() {
+ Line 676  function select1_changed() {
  END
      # output the initial values for the selection lists
      $result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed()\">\n";
-     foreach my $value (sort(keys(%$hashref))) {
+     my @order = sort(keys(%{$hashref}));
+     if (ref($menuorder) eq 'ARRAY') {
+         @order = @{$menuorder};
+     }
+     foreach my $value (@order) {
          $result.="    <option value=\"$value\" ";
          $result.=" selected=\"selected\" " if ($value eq $firstdefault);
          $result.=">".&mt($hashref->{$value}->{'text'})."</option>\n";
- Line 670  END
+ Line 690  END
      $result .= $middletext;
      $result .= "<select size=\"1\" name=\"$secondselectname\">\n";
      my $seconddefault = $hashref->{$firstdefault}->{'default'};
-     foreach my $value (sort(keys(%select2))) {
+     my @secondorder = sort(keys(%select2));
+     if (ref($hashref->{$firstdefault}->{'order'}) eq 'ARRAY') {
+         @secondorder = @{$hashref->{$firstdefault}->{'order'}};
+     }
+     foreach my $value (@secondorder) {
          $result.="    <option value=\"$value\" ";
          $result.=" selected=\"selected\" " if ($value eq $seconddefault);
          $result.=">".&mt($select2{$value})."</option>\n";
- Line 708  sub help_open_topic {
+ Line 733  sub help_open_topic {
      my ($topic, $text, $stayOnPage, $width, $height) = @_;
      $text = "" if (not defined $text);
      $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual' ||
+     if ($env{'browser.interface'} eq 'textual') {
- 	$env{'environment.remote'} eq 'off' ) {
  	$stayOnPage=1;
      }
      $width = 350 if (not defined $width);
- Line 719  sub help_open_topic {
+ Line 743  sub help_open_topic {
      my $template = "";
      my $link;
      $topic=~s/\W/\_/g;
-     if (!$stayOnPage)
+     if (!$stayOnPage) {
-     {
  	$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
-     }
+     } else {
-     else
-     {
  	$link = "/adm/help/${filename}.hlp";
      }
      # Add the text
-     if ($text ne "")
+     if ($text ne "") {
-     {
  	$template .=
-   "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
+             "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
-   "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+             "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
      }
      # Add the graphic
- Line 801  ENDOUTPUT
+ Line 821  ENDOUTPUT
  # now just updates the help link and generates a blue icon
  sub help_open_menu {
      my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text)
  	= @_;
      $stayOnPage = 0 if (not defined $stayOnPage);
+     # only use pop-up help (stayOnPage == 0)
+     # if environment.remote is on (using remote control UI)
      if ($env{'browser.interface'} eq 'textual' ||
- 	$env{'environment.remote'} eq 'off' ) {
+     	$env{'environment.remote'} eq 'off' ) {
- 	$stayOnPage=1;
+         $stayOnPage=1;
      }
      my $output;
      if ($component_help) {
- Line 827  sub help_open_menu {
+ Line 848  sub help_open_menu {
  sub top_nav_help {
      my ($text) = @_;
      $text = &mt($text);
+     my $stay_on_page =
-     my $stayOnPage =
  	($env{'browser.interface'}  eq 'textual' ||
  	 $env{'environment.remote'} eq 'off' );
-     my $link=  ($stayOnPage) ? "javascript:helpMenu('display')"
+     my $link = ($stay_on_page) ? "javascript:helpMenu('display')"
  	                     : "javascript:helpMenu('open')";
-     my $banner_link = &update_help_link(undef,undef,undef,undef,$stayOnPage);
+     my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);
      my $title = &mt('Get help');
- Line 863  sub help_menu_js {
+ Line 882  sub help_menu_js {
  					'js_ready'    => 1,
  					'add_entries' => {
  					    'border' => '0',
- 					    'rows'   => "105,*",},});
+ 					    'rows'   => "110,*",},});
      my $end_page =
          &Apache::loncommon::end_page({'frameset' => 1,
  				      'js_ready' => 1,});
- Line 1077  sub changable_area {
+ Line 1096  sub changable_area {
  =pod
- =back
+ =item * viewport_geometry_js {
+ Provides javascript object (Geometry) which can provide information about the viewport geometry for the client browser.
+ =cut
+ sub viewport_geometry_js {
+     return <<"GEOMETRY";
+ var Geometry = {};
+ function init_geometry() {
+     if (Geometry.init) { return };
+     Geometry.init=1;
+     if (window.innerHeight) {
+         Geometry.getViewportHeight   = function() { return window.innerHeight; };
+         Geometry.getViewportWidth   = function() { return window.innerWidth; };
+         Geometry.getHorizontalScroll = function() { return window.pageXOffset; };
+         Geometry.getVerticalScroll   = function() { return window.pageYOffset; };
+     }
+     else if (document.documentElement && document.documentElement.clientHeight) {
+         Geometry.getViewportHeight =
+             function() { return document.documentElement.clientHeight; };
+         Geometry.getViewportWidth =
+             function() { return document.documentElement.clientWidth; };
+         Geometry.getHorizontalScroll =
+             function() { return document.documentElement.scrollLeft; };
+         Geometry.getVerticalScroll =
+             function() { return document.documentElement.scrollTop; };
+     }
+     else if (document.body.clientHeight) {
+         Geometry.getViewportHeight =
+             function() { return document.body.clientHeight; };
+         Geometry.getViewportWidth =
+             function() { return document.body.clientWidth; };
+         Geometry.getHorizontalScroll =
+             function() { return document.body.scrollLeft; };
+         Geometry.getVerticalScroll =
+             function() { return document.body.scrollTop; };
+     }
+ }
+ GEOMETRY
+ }
+ =pod
+ =item * viewport_size_js {
+ Provides a javascript function to set values of two form elements - width and height (elements are passed in as arguments to the javascript function) to the dimensions of the user's browser window.
+ =cut
+ sub viewport_size_js {
+     my $geometry = &viewport_geometry_js();
+     return <<"DIMS";
+ $geometry
+ function getViewportDims(width,height) {
+     init_geometry();
+     width.value = Geometry.getViewportWidth();
+     height.value = Geometry.getViewportHeight();
+     return;
+ }
+ DIMS
+ }
+ =pod
+ =item * resize_textarea_js
+ emits the needed javascript to resize a textarea to be as big as possible
+ creates a function resize_textrea that takes two IDs first should be
+ the id of the element to resize, second should be the id of a div that
+ surrounds everything that comes after the textarea, this routine needs
+ to be attached to the <body> for the onload and onresize events.
+ =cut
+ sub resize_textarea_js {
+     my $geometry = &viewport_geometry_js();
+     return <<"RESIZE";
+     <script type="text/javascript">
+ $geometry
+ function getX(element) {
+     var x = 0;
+     while (element) {
+ 	x += element.offsetLeft;
+ 	element = element.offsetParent;
+     }
+     return x;
+ }
+ function getY(element) {
+     var y = 0;
+     while (element) {
+ 	y += element.offsetTop;
+ 	element = element.offsetParent;
+     }
+     return y;
+ }
+ function resize_textarea(textarea_id,bottom_id) {
+     init_geometry();
+     var textarea        = document.getElementById(textarea_id);
+     //alert(textarea);
+     var textarea_top    = getY(textarea);
+     var textarea_height = textarea.offsetHeight;
+     var bottom          = document.getElementById(bottom_id);
+     var bottom_top      = getY(bottom);
+     var bottom_height   = bottom.offsetHeight;
+     var window_height   = Geometry.getViewportHeight();
+     var fudge           = 23;
+     var new_height      = window_height-fudge-textarea_top-bottom_height;
+     if (new_height < 300) {
+ 	new_height = 300;
+     }
+     textarea.style.height=new_height+'px';
+ }
+ </script>
+ RESIZE
+ }
+ =pod
+ =back
  =head1 Excel and CSV file utility routines
  =over 4
- Line 1212  sub create_workbook {
+ Line 1363  sub create_workbook {
  =item * create_text_file
- Create a file to write to and eventually make available to the usre.
+ Create a file to write to and eventually make available to the user.
  If file creation fails, outputs an error message on the request object and
  return undefs.
- Line 1262  sub domain_select {
+ Line 1413  sub domain_select {
      } &Apache::lonnet::all_domains();
      if ($multiple) {
  	$domains{''}=&mt('Any domain');
+ 	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
  	return &multiple_select_form($name,$value,4,\%domains);
      } else {
+ 	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
  	return &select_form($name,$value,%domains);
      }
  }
- Line 1276  sub domain_select {
+ Line 1429  sub domain_select {
  =over 4
- =cut
  =item * multiple_select_form($name,$value,$size,$hash,$order)
  Returns a string containing a <select> element int multiple mode
- Line 1415  sub select_level_form {
+ Line 1566  sub select_level_form {
  =pod
- =item * select_dom_form($defdom,$name,$includeempty)
+ =item * select_dom_form($defdom,$name,$includeempty,$showdomdesc)
  Returns a string containing a <select name='$name' size='1'> form to
  allow a user to select the domain to preform an operation in.
- Line 1424  See loncreateuser.pm for an example invo
+ Line 1575  See loncreateuser.pm for an example invo
  If the $includeempty flag is set, it also includes an empty choice ("no domain
  selected");
+ If the $showdomdesc flag is set, the domain name is followed by the domain description.
  =cut
  #-------------------------------------------
  sub select_dom_form {
-     my ($defdom,$name,$includeempty) = @_;
+     my ($defdom,$name,$includeempty,$showdomdesc) = @_;
-     my @domains = sort(&Apache::lonnet::all_domains());
+     my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
      if ($includeempty) { @domains=('',@domains); }
      my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
      foreach my $dom (@domains) {
          $selectdomain.="<option value=\"$dom\" ".
-             ($dom eq $defdom ? 'selected="selected" ' : '').
+             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
-                 ">$dom</option>\n";
+         if ($showdomdesc) {
+             if ($dom ne '') {
+                 my $domdesc = &Apache::lonnet::domain($dom,'description');
+                 if ($domdesc ne '') {
+                     $selectdomain .= ' ('.$domdesc.')';
+                 }
+             }
+         }
+         $selectdomain .= "</option>\n";
      }
      $selectdomain.="</select>";
      return $selectdomain;
- Line 1445  sub select_dom_form {
+ Line 1606  sub select_dom_form {
  =pod
- =item * home_server_option_list($domain)
+ =item * home_server_form_item($domain,$name,$defaultflag)
- returns a string which contains an <option> list to be used in a
+ input: 4 arguments (two required, two optional) -
- <select> form input.  See loncreateuser.pm for an example.
+     $domain - domain of new user
+     $name - name of form element
+     $default - Value of 'default' causes a default item to be first
+                             option, and selected by default.
+     $hide - Value of 'hide' causes hiding of the name of the server,
+                             if 1 server found, or default, if 0 found.
+ output: returns 2 items:
+ (a) form element which contains either:
+    (i) <select name="$name">
+         <option value="$hostid1">$hostid $servers{$hostid}</option>
+         <option value="$hostid2">$hostid $servers{$hostid}</option>
+        </select>
+        form item if there are multiple library servers in $domain, or
+    (ii) an <input type="hidden" name="$name" value="$hostid" /> form item
+        if there is only one library server in $domain.
+ (b) number of library servers found.
+ See loncreateuser.pm for example of use.
  =cut
  #-------------------------------------------
- sub home_server_option_list {
+ sub home_server_form_item {
-     my $domain = shift;
+     my ($domain,$name,$default,$hide) = @_;
      my %servers = &Apache::lonnet::get_servers($domain,'library');
-     my $result = '';
+     my $result;
-     foreach my $hostid (sort(keys(%servers))) {
+     my $numlib = keys(%servers);
-         $result.=
+     if ($numlib > 1) {
-             '<option value="'.$hostid.'">'.
+         $result .= '<select name="'.$name.'" />'."\n";
- 	    $hostid.' '.$servers{$hostid}."</option>\n";
+         if ($default) {
+             $result .= '<option value="default" selected>'.&mt('default').
+                        '</option>'."\n";
+         }
+         foreach my $hostid (sort(keys(%servers))) {
+             $result.= '<option value="'.$hostid.'">'.
+ 	              $hostid.' '.$servers{$hostid}."</option>\n";
+         }
+         $result .= '</select>'."\n";
+     } elsif ($numlib == 1) {
+         my $hostid;
+         foreach my $item (keys(%servers)) {
+             $hostid = $item;
+         }
+         $result .= '<input type="hidden" name="'.$name.'" value="'.
+                    $hostid.'" />';
+                    if (!$hide) {
+                        $result .= $hostid.' '.$servers{$hostid};
+                    }
+                    $result .= "\n";
+     } elsif ($default) {
+         $result .= '<input type="hidden" name="'.$name.
+                    '" value="default" />';
+                    if (!$hide) {
+                        $result .= &mt('default');
+                    }
+                    $result .= "\n";
      }
-     return $result;
+     return ($result,$numlib);
  }
  =pod
- Line 1615  END
+ Line 1820  END
      }
      my $radioval = "'nochange'";
-     if (exists($in{'curr_authtype'}) &&
+     if (defined($in{'curr_authtype'})) {
-         defined($in{'curr_authtype'}) &&
+         if ($in{'curr_authtype'} ne '') {
-         $in{'curr_authtype'} ne '') {
+             $radioval = "'".$in{'curr_authtype'}."arg'";
-         $radioval = "'$in{'curr_authtype'}arg'";
+         }
      }
      my $argfield = 'null';
-     if ( grep/^mode$/,(keys %in) ) {
+     if (defined($in{'mode'})) {
          if ($in{'mode'} eq 'modifycourse')  {
-             if ( grep/^curr_authtype$/,(keys %in) ) {
+             if (defined($in{'curr_autharg'})) {
-                 $radioval = "'$in{'curr_authtype'}'";
+                 if ($in{'curr_autharg'} ne '') {
-             }
-             if ( grep/^curr_autharg$/,(keys %in) ) {
-                 unless ($in{'curr_autharg'} eq '') {
                      $argfield = "'$in{'curr_autharg'}'";
                  }
              }
- Line 1710  sub authform_nochange{
+ Line 1912  sub authform_nochange{
                kerb_def_dom => 'MSU.EDU',
                @_,
            );
-     my $result = '<label>'.&mt('[_1] Do not change login data',
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
-                      '<input type="radio" name="login" value="nochange" '.
+     my $result;
-                      'checked="checked" onclick="'.
+     if (keys(%can_assign) == 0) {
+         $result = &mt('Under you current role you are not permitted to change login settings for this user');
+     } else {
+         $result = '<label>'.&mt('[_1] Do not change login data',
+                   '<input type="radio" name="login" value="nochange" '.
+                   'checked="checked" onclick="'.
              "javascript:changed_radio('nochange',$in{'formname'});".'" />').
  	    '</label>';
+     }
      return $result;
  }
- sub authform_kerberos{
+ sub authform_kerberos {
      my %in = (
                formname => 'document.cu',
                kerb_def_dom => 'MSU.EDU',
                kerb_def_auth => 'krb4',
                @_,
                );
-     my ($check4,$check5,$krbarg);
+     my ($check4,$check5,$krbcheck,$krbarg,$krbver,$result,$authtype,
+         $autharg,$jscall);
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
      if ($in{'kerb_def_auth'} eq 'krb5') {
-        $check5 = " checked=\"on\"";
+        $check5 = ' checked="on"';
      } else {
-        $check4 = " checked=\"on\"";
+        $check4 = ' checked="on"';
      }
      $krbarg = $in{'kerb_def_dom'};
+     if (defined($in{'curr_authtype'})) {
-     my $krbcheck = "";
+         if ($in{'curr_authtype'} eq 'krb') {
-     if ( grep/^curr_authtype$/,(keys %in) ) {
+             $krbcheck = ' checked="on"';
-         if ($in{'curr_authtype'} =~ m/^krb/) {
+             if (defined($in{'mode'})) {
-             $krbcheck = " checked=\"on\"";
+                 if ($in{'mode'} eq 'modifyuser') {
-             if ( grep/^curr_autharg$/,(keys %in) ) {
+                     $krbcheck = '';
+                 }
+             }
+             if (defined($in{'curr_kerb_ver'})) {
+                 if ($in{'curr_krb_ver'} eq '5') {
+                     $check5 = ' checked="on"';
+                     $check4 = '';
+                 } else {
+                     $check4 = ' checked="on"';
+                     $check5 = '';
+                 }
+             }
+             if (defined($in{'curr_autharg'})) {
                  $krbarg = $in{'curr_autharg'};
              }
+             if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
+                 if (defined($in{'curr_autharg'})) {
+                     $result =
+     &mt('Currently Kerberos authenticated with domain [_1] Version [_2].',
+         $in{'curr_autharg'},$krbver);
+                 } else {
+                     $result =
+     &mt('Currently Kerberos authenticated, Version [_1].',$krbver);
+                 }
+                 return $result;
+             }
+         }
+     } else {
+         if ($authnum == 1) {
+             $authtype = '<input type="hidden" name="login" value="krb">';
          }
      }
+     if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
-     my $jscall = "javascript:changed_radio('krb',$in{'formname'});";
+         return;
-     my $result .= &mt
+     } elsif ($authtype eq '') {
+         if (defined($in{'mode'})) {
+             if ($in{'mode'} eq 'modifycourse') {
+                 if ($authnum == 1) {
+                     $authtype = '<input type="hidden" name="login" value="krb">';
+                 }
+             }
+         }
+     }
+     $jscall = "javascript:changed_radio('krb',$in{'formname'});";
+     if ($authtype eq '') {
+         $authtype = '<input type="radio" name="login" value="krb" '.
+                     'onclick="'.$jscall.'" onchange="'.$jscall.'"'.
+                     $krbcheck.' />';
+     }
+     if (($can_assign{'krb4'} && $can_assign{'krb5'}) ||
+         ($can_assign{'krb4'} && !$can_assign{'krb5'} &&
+          $in{'curr_authtype'} eq 'krb5') ||
+         (!$can_assign{'krb4'} && $can_assign{'krb5'} &&
+          $in{'curr_authtype'} eq 'krb4')) {
+         $result .= &mt
          ('[_1] Kerberos authenticated with domain [_2] '.
           '[_3] Version 4 [_4] Version 5 [_5]',
-          '<label><input type="radio" name="login" value="krb" '.
+          '<label>'.$authtype,
-              'onclick="'.$jscall.'" onchange="'.$jscall.'"'.$krbcheck.' />',
           '</label><input type="text" size="10" name="krbarg" '.
               'value="'.$krbarg.'" '.
               'onchange="'.$jscall.'" />',
           '<label><input type="radio" name="krbver" value="4" '.$check4.' />',
           '</label><label><input type="radio" name="krbver" value="5" '.$check5.' />',
  	 '</label>');
+     } elsif ($can_assign{'krb4'}) {
+         $result .= &mt
+         ('[_1] Kerberos authenticated with domain [_2] '.
+          '[_3] Version 4 [_4]',
+          '<label>'.$authtype,
+          '</label><input type="text" size="10" name="krbarg" '.
+              'value="'.$krbarg.'" '.
+              'onchange="'.$jscall.'" />',
+          '<label><input type="hidden" name="krbver" value="4" />',
+          '</label>');
+     } elsif ($can_assign{'krb5'}) {
+         $result .= &mt
+         ('[_1] Kerberos authenticated with domain [_2] '.
+          '[_3] Version 5 [_4]',
+          '<label>'.$authtype,
+          '</label><input type="text" size="10" name="krbarg" '.
+              'value="'.$krbarg.'" '.
+              'onchange="'.$jscall.'" />',
+          '<label><input type="hidden" name="krbver" value="5" />',
+          '</label>');
+     }
      return $result;
  }
  sub authform_internal{
-     my %args = (
+     my %in = (
                  formname => 'document.cu',
                  kerb_def_dom => 'MSU.EDU',
                  @_,
                  );
+     my ($intcheck,$intarg,$result,$authtype,$autharg,$jscall);
-     my $intcheck = "";
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
-     my $intarg = 'value=""';
+     if (defined($in{'curr_authtype'})) {
-     if ( grep/^curr_authtype$/,(keys %args) ) {
+         if ($in{'curr_authtype'} eq 'int') {
-         if ($args{'curr_authtype'} eq 'int') {
+             if ($can_assign{'int'}) {
-             $intcheck = " checked=\"on\"";
+                 $intcheck = 'checked="on" ';
-             if ( grep/^curr_autharg$/,(keys %args) ) {
+                 if (defined($in{'mode'})) {
-                 $intarg = "value=\"$args{'curr_autharg'}\"";
+                     if ($in{'mode'} eq 'modifyuser') {
+                         $intcheck = '';
+                     }
+                 }
+                 if (defined($in{'curr_autharg'})) {
+                     $intarg = $in{'curr_autharg'};
+                 }
+             } else {
+                 $result = &mt('Currently internally authenticated.');
+                 return $result;
              }
          }
+     } else {
+         if ($authnum == 1) {
+             $authtype = '<input type="hidden" name="login" value="int">';
+         }
      }
+     if (!$can_assign{'int'}) {
-     my $jscall = "javascript:changed_radio('int',$args{'formname'});";
+         return;
-     my $result.=&mt
+     } elsif ($authtype eq '') {
+         if (defined($in{'mode'})) {
+             if ($in{'mode'} eq 'modifycourse') {
+                 if ($authnum == 1) {
+                     $authtype = '<input type="hidden" name="login" value="int">';
+                 }
+             }
+         }
+     }
+     $jscall = "javascript:changed_radio('int',$in{'formname'});";
+     if ($authtype eq '') {
+         $authtype = '<input type="radio" name="login" value="int" '.$intcheck.
+                     ' onchange="'.$jscall.'" onclick="'.$jscall.'" />';
+     }
+     $autharg = '<input type="password" size="10" name="intarg" value="'.
+                $intarg.'" onchange="'.$jscall.'" />';
+     $result = &mt
          ('[_1] Internally authenticated (with initial password [_2])',
-          '<label><input type="radio" name="login" value="int" '.$intcheck.
+          '<label>'.$authtype,'</label>'.$autharg);
-              ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
+     $result.="<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
-          '</label><input type="text" size="10" name="intarg" '.$intarg.
-              ' onchange="'.$jscall.'" />');
      return $result;
  }
- Line 1792  sub authform_local{
+ Line 2096  sub authform_local{
                kerb_def_dom => 'MSU.EDU',
                @_,
                );
+     my ($loccheck,$locarg,$result,$authtype,$autharg,$jscall);
-     my $loccheck = "";
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
-     my $locarg = 'value=""';
+     if (defined($in{'curr_authtype'})) {
-     if ( grep/^curr_authtype$/,(keys %in) ) {
          if ($in{'curr_authtype'} eq 'loc') {
-             $loccheck = " checked=\"on\"";
+             if ($can_assign{'loc'}) {
-             if ( grep/^curr_autharg$/,(keys %in) ) {
+                 $loccheck = 'checked="on" ';
-                 $locarg = "value=\"$in{'curr_autharg'}\"";
+                 if (defined($in{'mode'})) {
+                     if ($in{'mode'} eq 'modifyuser') {
+                         $loccheck = '';
+                     }
+                 }
+                 if (defined($in{'curr_autharg'})) {
+                     $locarg = $in{'curr_autharg'};
+                 }
+             } else {
+                 $result = &mt('Currently using local (institutional) authentication.');
+                 return $result;
              }
          }
+     } else {
+         if ($authnum == 1) {
+             $authtype = '<input type="hidden" name="login" value="loc">';
+         }
      }
+     if (!$can_assign{'loc'}) {
-     my $jscall = "javascript:changed_radio('loc',$in{'formname'});";
+         return;
-     my $result.=&mt('[_1] Local Authentication with argument [_2]',
+     } elsif ($authtype eq '') {
-                     '<label><input type="radio" name="login" value="loc" '.$loccheck.
+         if (defined($in{'mode'})) {
-                         ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
+             if ($in{'mode'} eq 'modifycourse') {
-                     '</label><input type="text" size="10" name="locarg" '.$locarg.
+                 if ($authnum == 1) {
-                         ' onchange="'.$jscall.'" />');
+                     $authtype = '<input type="hidden" name="login" value="loc">';
+                 }
+             }
+         }
+     }
+     $jscall = "javascript:changed_radio('loc',$in{'formname'});";
+     if ($authtype eq '') {
+         $authtype = '<input type="radio" name="login" value="loc" '.
+                     $loccheck.' onchange="'.$jscall.'" onclick="'.
+                     $jscall.'" />';
+     }
+     $autharg = '<input type="text" size="10" name="locarg" value="'.
+                $locarg.'" onchange="'.$jscall.'" />';
+     $result = &mt('[_1] Local Authentication with argument [_2]',
+                   '<label>'.$authtype,'</label>'.$autharg);
      return $result;
  }
- Line 1819  sub authform_filesystem{
+ Line 2150  sub authform_filesystem{
                kerb_def_dom => 'MSU.EDU',
                @_,
                );
-     my $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
+     my ($fsyscheck,$result,$authtype,$autharg,$jscall);
-     my $result.= &mt
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
+     if (defined($in{'curr_authtype'})) {
+         if ($in{'curr_authtype'} eq 'fsys') {
+             if ($can_assign{'fsys'}) {
+                 $fsyscheck = 'checked="on" ';
+                 if (defined($in{'mode'})) {
+                     if ($in{'mode'} eq 'modifyuser') {
+                         $fsyscheck = '';
+                     }
+                 }
+             } else {
+                 $result = &mt('Currently Filesystem Authenticated.');
+                 return $result;
+             }
+         }
+     } else {
+         if ($authnum == 1) {
+             $authtype = '<input type="hidden" name="login" value="fsys">';
+         }
+     }
+     if (!$can_assign{'fsys'}) {
+         return;
+     } elsif ($authtype eq '') {
+         if (defined($in{'mode'})) {
+             if ($in{'mode'} eq 'modifycourse') {
+                 if ($authnum == 1) {
+                     $authtype = '<input type="hidden" name="login" value="fsys">';
+                 }
+             }
+         }
+     }
+     $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
+     if ($authtype eq '') {
+         $authtype = '<input type="radio" name="login" value="fsys" '.
+                     $fsyscheck.' onchange="'.$jscall.'" onclick="'.
+                     $jscall.'" />';
+     }
+     $autharg = '<input type="text" size="10" name="fsysarg" value=""'.
+                ' onchange="'.$jscall.'" />';
+     $result = &mt
          ('[_1] Filesystem Authenticated (with initial password [_2])',
           '<label><input type="radio" name="login" value="fsys" '.
-          'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
+          $fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-          '</label><input type="text" size="10" name="fsysarg" value="" '.
+          '</label><input type="password" size="10" name="fsysarg" value="" '.
                    'onchange="'.$jscall.'" />');
      return $result;
  }
+ sub get_assignable_auth {
+     my ($dom) = @_;
+     if ($dom eq '') {
+         $dom = $env{'request.role.domain'};
+     }
+     my %can_assign = (
+                           krb4 => 1,
+                           krb5 => 1,
+                           int  => 1,
+                           loc  => 1,
+                      );
+     my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
+     if (ref($domconfig{'usercreation'}) eq 'HASH') {
+         if (ref($domconfig{'usercreation'}{'authtypes'}) eq 'HASH') {
+             my $authhash = $domconfig{'usercreation'}{'authtypes'};
+             my $context;
+             if ($env{'request.role'} =~ /^au/) {
+                 $context = 'author';
+             } elsif ($env{'request.role'} =~ /^dc/) {
+                 $context = 'domain';
+             } elsif ($env{'request.course.id'}) {
+                 $context = 'course';
+             }
+             if ($context) {
+                 if (ref($authhash->{$context}) eq 'HASH') {
+                    %can_assign = %{$authhash->{$context}};
+                 }
+             }
+         }
+     }
+     my $authnum = 0;
+     foreach my $key (keys(%can_assign)) {
+         if ($can_assign{$key}) {
+             $authnum ++;
+         }
+     }
+     if ($can_assign{'krb4'} && $can_assign{'krb5'}) {
+         $authnum --;
+     }
+     return ($authnum,%can_assign);
+ }
  ###############################################################
  ##    Get Authentication Defaults for Domain                 ##
  ###############################################################
- Line 1954  sub initialize_keywords {
+ Line 2366  sub initialize_keywords {
      # Remove special values from %Keywords.
      foreach my $value ('total.count','average.count') {
          delete($Keywords{$value}) if (exists($Keywords{$value}));
-     }
+   }
      return 1;
  }
- Line 2119  sub getnames {
+ Line 2531  sub getnames {
      }
  }
+ # -------------------------------------------------------------------- getemails
+ =pod
+ =item * getemails($uname,$udom)
+ Gets a user's email information and returns it as a hash with keys:
+ notification, critnotification, permanentemail
+ For notification and critnotification, values are comma-separated lists
+ of e-mail address(es); for permanentemail, value is a single e-mail address.
+ =cut
  sub getemails {
      my ($uname,$udom)=@_;
      if ($udom eq 'public' && $uname eq 'public') {
- Line 2140  sub getemails {
+ Line 2565  sub getemails {
      }
  }
+ sub flush_email_cache {
+     my ($uname,$udom)=@_;
+     if (!$udom)  { $udom =$env{'user.domain'}; }
+     if (!$uname) { $uname=$env{'user.name'};   }
+     return if ($udom eq 'public' && $uname eq 'public');
+     my $id=$uname.':'.$udom;
+     &Apache::lonnet::devalidate_cache_new('emailscache',$id);
+ }
  # ------------------------------------------------------------------ Screenname
  =pod
- Line 2213  sub track_student_link {
+ Line 2647  sub track_student_link {
          $target = '';
      }
      if ($start) { $link.='&amp;start='.$start; }
+     $title = &mt($title);
+     $linktext = &mt($linktext);
      return qq{<a href="$link" title="$title" $target>$linktext</a>}.
  	&help_open_topic('View_recent_activity');
  }
- Line 2442  sub preferred_languages {
+ Line 2877  sub preferred_languages {
  	@languages=(@languages,
  		    split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}));
      }
-     my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0];
+     my $browser=$ENV{'HTTP_ACCEPT_LANGUAGE'};
      if ($browser) {
- 	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$browser));
+ 	my @browser =
+ 	    map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser));
+ 	push(@languages,@browser);
      }
      if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) {
  	@languages=(@languages,
- Line 2466  sub preferred_languages {
+ Line 2903  sub preferred_languages {
      my @genlanguages;
      foreach my $lang (@languages) {
  	unless ($lang=~/\w/) { next; }
- 	push (@genlanguages,$lang);
+ 	push(@genlanguages,$lang);
  	if ($lang=~/(\-|\_)/) {
  	    push(@genlanguages,(split(/(\-|\_)/,$lang))[0]);
  	}
      }
+     #uniqueify the languages list
+     my %count;
+     @genlanguages = map { $count{$_}++ == 0 ? $_ : () } @genlanguages;
      return @genlanguages;
  }
+ sub languages {
+     my ($possible_langs) = @_;
+     my @preferred_langs = &preferred_languages();
+     if (!ref($possible_langs)) {
+ 	if( wantarray ) {
+ 	    return @preferred_langs;
+ 	} else {
+ 	    return $preferred_langs[0];
+ 	}
+     }
+     my %possibilities = map { $_ => 1 } (@$possible_langs);
+     my @preferred_possibilities;
+     foreach my $preferred_lang (@preferred_langs) {
+ 	if (exists($possibilities{$preferred_lang})) {
+ 	    push(@preferred_possibilities, $preferred_lang);
+ 	}
+     }
+     if( wantarray ) {
+ 	return @preferred_possibilities;
+     }
+     return $preferred_possibilities[0];
+ }
  ###############################################################
  ##               Student Answer Attempts                     ##
  ###############################################################
- Line 2528  sub get_previous_attempt {
+ Line 2991  sub get_previous_attempt {
  	  $lasthash{$key}=$returnhash{$version.':'.$key};
          }
        }
-       $prevattempts='<table border="0" width="100%"><tr><td bgcolor="#777777">';
+       $prevattempts=&start_data_table().&start_data_table_header_row();
-       $prevattempts.='<table border="0" width="100%"><tr bgcolor="#e6ffff"><td>History</td>';
+       $prevattempts.='<th>'.&mt('History').'</th>';
        foreach my $key (sort(keys(%lasthash))) {
  	my ($ign,@parts) = split(/\./,$key);
  	if ($#parts > 0) {
  	  my $data=$parts[-1];
  	  pop(@parts);
- 	  $prevattempts.='<td>Part '.join('.',@parts).'<br />'.$data.'&nbsp;</td>';
+ 	  $prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.'&nbsp;</th>';
  	} else {
  	  if ($#parts == 0) {
  	    $prevattempts.='<th>'.$parts[0].'</th>';
- Line 2544  sub get_previous_attempt {
+ Line 3007  sub get_previous_attempt {
  	  }
  	}
        }
+       $prevattempts.=&end_data_table_header_row();
        if ($getattempt eq '') {
  	for ($version=1;$version<=$returnhash{'version'};$version++) {
- 	  $prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Transaction '.$version.'</td>';
+ 	  $prevattempts.=&start_data_table_row().
+ 	      '<td>'.&mt('Transaction [_1]',$version).'</td>';
  	    foreach my $key (sort(keys(%lasthash))) {
- 	       my $value;
+ 		my $value = &format_previous_attempt_value($key,
- 	       if ($key =~ /timestamp/) {
+ 							   $returnhash{$version.':'.$key});
- 		  $value=scalar(localtime($returnhash{$version.':'.$key}));
+ 		$prevattempts.='<td>'.$value.'&nbsp;</td>';
- 	       } else {
- 		  $value=$returnhash{$version.':'.$key};
- 	       }
- 	       $prevattempts.='<td>'.&unescape($value).'&nbsp;</td>';
  	    }
+ 	  $prevattempts.=&end_data_table_row();
  	 }
        }
-       $prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Current</td>';
+       $prevattempts.=&start_data_table_row().'<td>'.&mt('Current').'</td>';
        foreach my $key (sort(keys(%lasthash))) {
- 	my $value;
+ 	my $value = &format_previous_attempt_value($key,$lasthash{$key});
- 	if ($key =~ /timestamp/) {
- 	  $value=scalar(localtime($lasthash{$key}));
- 	} else {
- 	  $value=$lasthash{$key};
- 	}
- 	$value=&unescape($value);
  	if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
  	$prevattempts.='<td>'.$value.'&nbsp;</td>';
        }
-       $prevattempts.='</tr></table></td></tr></table>';
+       $prevattempts.= &end_data_table_row().&end_data_table();
      } else {
-       $prevattempts='Nothing submitted - no attempts.';
+       $prevattempts=
+ 	  &start_data_table().&start_data_table_row().
+ 	  '<td>'.&mt('Nothing submitted - no attempts.').'</td>'.
+ 	  &end_data_table_row().&end_data_table();
      }
    } else {
-     $prevattempts='No data.';
+     $prevattempts=
+ 	  &start_data_table().&start_data_table_row().
+ 	  '<td>'.&mt('No data.').'</td>'.
+ 	  &end_data_table_row().&end_data_table();
    }
  }
+ sub format_previous_attempt_value {
+     my ($key,$value) = @_;
+     if ($key =~ /timestamp/) {
+ 	$value = &Apache::lonlocal::locallocaltime($value);
+     } elsif (ref($value) eq 'ARRAY') {
+ 	$value = '('.join(', ', @{ $value }).')';
+     } else {
+ 	$value = &unescape($value);
+     }
+     return $value;
+ }
  sub relative_to_absolute {
      my ($url,$output)=@_;
      my $parser=HTML::TokeParser->new(\$output);
- Line 2737  sub pprmlink {
+ Line 3212  sub pprmlink {
      if (!$symb) { $symb=&Apache::lonnet::symbread(); }
      $symb=&escape($symb);
      if ($target) { $target="target=\"$target\""; }
-     return '<a href="/adm/parmset?&command=set&'.
+     return '<a href="/adm/parmset?command=set&amp;'.
- 	'symb='.$symb.'&uname='.$uname.
+ 	'symb='.$symb.'&amp;uname='.$uname.
- 	'&udom='.$udom.'" '.$target.'>'.$text.'</a>';
+ 	'&amp;udom='.$udom.'" '.$target.'>'.$text.'</a>';
  }
  ##############################################
- Line 3195  sub get_domainconf {
+ Line 3670  sub get_domainconf {
      my %domconfig = &Apache::lonnet::get_dom('configuration',
  					     ['login','rolecolors'],$udom);
-     my %designhash;
+     my (%designhash,%legacy);
      if (keys(%domconfig) > 0) {
          if (ref($domconfig{'login'}) eq 'HASH') {
-             foreach my $key (keys(%{$domconfig{'login'}})) {
+             if (keys(%{$domconfig{'login'}})) {
-                 $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+                 foreach my $key (keys(%{$domconfig{'login'}})) {
+                     $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+                 }
+             } else {
+                 $legacy{'login'} = 1;
              }
+         } else {
+             $legacy{'login'} = 1;
          }
          if (ref($domconfig{'rolecolors'}) eq 'HASH') {
-             foreach my $role (keys(%{$domconfig{'rolecolors'}})) {
+             if (keys(%{$domconfig{'rolecolors'}})) {
-                 if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') {
+                 foreach my $role (keys(%{$domconfig{'rolecolors'}})) {
-                     foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) {
+                     if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') {
-                         $designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item};
+                         foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) {
+                             $designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item};
+                         }
                      }
                  }
+             } else {
+                 $legacy{'rolecolors'} = 1;
              }
+         } else {
+             $legacy{'rolecolors'} = 1;
          }
-     } else {
+         if (keys(%legacy) > 0) {
-         my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
+             my %legacyhash = &get_legacy_domconf($udom);
-         my $designfile =  $designdir.'/'.$udom.'.tab';
+             foreach my $item (keys(%legacyhash)) {
-         if (-e $designfile) {
+                 if ($item =~ /^\Q$udom\E\.login/) {
-             if ( open (my $fh,"<$designfile") ) {
+                     if ($legacy{'login'}) {
-                 while (my $line = <$fh>) {
+                         $designhash{$item} = $legacyhash{$item};
-                     next if ($line =~ /^\#/);
+                     }
-                     chomp($line);
+                 } else {
-                     my ($key,$val)=(split(/\=/,$line));
+                     if ($legacy{'rolecolors'}) {
-                     if ($val) { $designhash{$udom.'.'.$key}=$val; }
+                         $designhash{$item} = $legacyhash{$item};
+                     }
                  }
-                 close($fh);
              }
          }
-         if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') {
+     } else {
-             $designhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif";
+         %designhash = &get_legacy_domconf($udom);
-         }
      }
      &Apache::lonnet::do_cache_new('domainconfig',$udom,\%designhash,
  				  $cachetime);
      return %designhash;
  }
+ sub get_legacy_domconf {
+     my ($udom) = @_;
+     my %legacyhash;
+     my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
+     my $designfile =  $designdir.'/'.$udom.'.tab';
+     if (-e $designfile) {
+         if ( open (my $fh,"<$designfile") ) {
+             while (my $line = <$fh>) {
+                 next if ($line =~ /^\#/);
+                 chomp($line);
+                 my ($key,$val)=(split(/\=/,$line));
+                 if ($val) { $legacyhash{$udom.'.'.$key}=$val; }
+             }
+             close($fh);
+         }
+     }
+     if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') {
+         $legacyhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif";
+     }
+     return %legacyhash;
+ }
  =pod
  =item * &domainlogo()
- Line 3324  sub designparm {
+ Line 3832  sub designparm {
  =back
- =head1 HTTP Helpers
+ =head1 HTML Helpers
  =over 4
- Line 3365  Inputs:
+ Line 3873  Inputs:
  =item * $args, optional argument valid values are
              no_auto_mt_title -> prevents &mt()ing the title arg
+             inherit_jsmath -> when creating popup window in a page,
+                               should it have jsmath forced on by the
+                               current page
  =back
- Line 3413  sub bodytag {
+ Line 3924  sub bodytag {
      if (!$realm) { $realm='&nbsp;'; }
  # Set messages
      my $messages=&domainlogo($domain);
- # Port for miniserver
-     my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
-     if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
      my $extra_body_attr = &make_attr_string($forcereg,\%design);
  # construct main body tag
      my $bodytag = "<body $extra_body_attr>".
- 	&Apache::lontexconvert::init_math_support();
+ 	&Apache::lontexconvert::init_math_support($args->{'inherit_jsmath'});
      if ($bodyonly) {
          return $bodytag;
- Line 3533  ENDROLE
+ Line 4041  ENDROLE
      my $imgsrc = $img;
      if ($img =~ /^\/adm/) {
-         $imgsrc = 'http://'.$ENV{'HTTP_HOST'}.':'.$lonhttpdPort.$img;
+         $imgsrc = &lonhttpdurl($img);
      }
      my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
- Line 3618  sub make_attr_string {
+ Line 4126  sub make_attr_string {
  =pod
- =back
- =head1 HTML Helpers
- =over 4
  =item * &endbodytag()
  Returns a uniform footer for LON-CAPA web pages.
  Inputs: none
- =back
  =cut
  sub endbodytag {
- Line 3648  sub endbodytag {
+ Line 4148  sub endbodytag {
  =pod
- =over 4
  =item * &standard_css()
  Returns a style sheet
- Line 3660  Inputs: (all optional)
+ Line 4158  Inputs: (all optional)
              function       -> force usage of a specific rolish color scheme
              bgcolor        -> override the default page bgcolor
- =back
  =cut
  sub standard_css {
- Line 3679  sub standard_css {
+ Line 4175  sub standard_css {
      my $vlink  = &designparm($function.'.vlink', $domain);
      my $link   = &designparm($function.'.link',  $domain);
-     my $sans                 = 'Arial,Helvetica,sans-serif';
+     my $sans                 = 'Verdana,Arial,Helvetica,sans-serif';
      my $mono                 = 'monospace';
      my $data_table_head      = $tabbg;
      my $data_table_light     = '#EEEEEE';
- Line 3697  sub standard_css {
+ Line 4193  sub standard_css {
      my $table_header         = '#DDDDDD';
      my $feedback_link_bg     = '#BBBBBB';
-     my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'
+     my $border = ($env{'browser.type'} eq 'explorer' ||
- 	                                              : '0px 3px 0px 4px';
+ 		  $env{'browser.type'} eq 'safari'     ) ? '0px 2px 0px 2px'
+ 	                                                 : '0px 3px 0px 4px';
      return <<END;
- Line 3718  table.thinborder tr td {
+ Line 4215  table.thinborder tr td {
  form, .inline { display: inline; }
  .center { text-align: center; }
- .LC_filename {font-family: $mono;}
+ .LC_filename {font-family: $mono; white-space:pre;}
  .LC_error {
    color: red;
    font-size: larger;
- Line 3733  form, .inline { display: inline; }
+ Line 4230  form, .inline { display: inline; }
  .LC_diff_added {
    color: green;
  }
+ .LC_unknown {
+   color: yellow;
+ }
  .LC_icon {
    border: 0px;
  }
- Line 3740  form, .inline { display: inline; }
+ Line 4241  form, .inline { display: inline; }
    border: 0px;
    height: 22px;
  }
+ .LC_docs_spacer {
+   width: 25px;
+   height: 1px;
+   border: 0px;
+ }
  .LC_internal_info {
    color: #999;
- Line 3750  table.LC_pastsubmission {
+ Line 4256  table.LC_pastsubmission {
    margin: 2px;
  }
- table#LC_top_nav, table#LC_menubuttons {
+ table#LC_top_nav, table#LC_menubuttons,table#LC_nav_location {
    width: 100%;
    background: $pgbg;
    border: 2px;
- Line 3758  table#LC_top_nav, table#LC_menubuttons {
+ Line 4264  table#LC_top_nav, table#LC_menubuttons {
    padding: 0px;
  }
- table#LC_title_bar, table.LC_breadcrumbs, table#LC_nav_location,
+ table#LC_title_bar, table.LC_breadcrumbs,
  table#LC_title_bar.LC_with_remote {
    width: 100%;
    border-color: $pgbg;
- Line 3949  table.LC_data_table, table.LC_mail_list
+ Line 4455  table.LC_data_table, table.LC_mail_list
    border: 1px solid #000000;
    border-collapse: separate;
    border-spacing: 1px;
+   background: $pgbg;
  }
  .LC_data_table_dense {
    font-size: small;
  }
  table.LC_nested_outer {
    border: 1px solid #000000;
-   border-collapse: separate;
+   border-collapse: collapse;
    border-spacing: 0px;
    width: 100%;
  }
  table.LC_nested {
    border: 0px;
-   border-collapse: separate;
+   border-collapse: collapse;
    border-spacing: 0px;
    width: 100%;
  }
- Line 3971  table.LC_prior_tries tr th {
+ Line 4478  table.LC_prior_tries tr th {
    background-color: $data_table_head;
    font-size: smaller;
  }
- table.LC_data_table tr td,
+ table.LC_data_table tr.LC_odd_row > td,
  table.LC_aboutme_port tr td {
    background-color: $data_table_light;
    padding: 2px;
  }
- table.LC_data_table tr.LC_even_row td,
+ table.LC_data_table tr.LC_even_row > td,
  table.LC_aboutme_port tr.LC_even_row td {
    background-color: $data_table_dark;
  }
- Line 4013  table.LC_nested tr.LC_info_row td {
+ Line 4520  table.LC_nested tr.LC_info_row td {
    font-size: small;
    text-align: center;
  }
- table.LC_nested tr.LC_info_row td.LC_left_item {
+ table.LC_nested tr.LC_info_row td.LC_left_item,
+ table.LC_nested_outer tr th.LC_left_item {
    text-align: left;
  }
  table.LC_nested td {
- Line 4244  table#LC_helpmenu_links a:hover {
+ Line 4752  table#LC_helpmenu_links a:hover {
    border: 1px solid #8888FF;
    background: #CCCCFF;
  }
  table.LC_pick_box {
-   width: 100%;
    border-collapse: separate;
    background: white;
    border: 1px solid black;
- Line 4259  table.LC_pick_box td.LC_pick_box_title {
+ Line 4765  table.LC_pick_box td.LC_pick_box_title {
    width: 184px;
    padding: 8px;
  }
+ table.LC_pick_box td.LC_pick_box_value {
+   text-align: left;
+   padding: 8px;
+ }
+ table.LC_pick_box td.LC_pick_box_select {
+   text-align: left;
+   padding: 8px;
+ }
  table.LC_pick_box td.LC_pick_box_separator {
    padding: 0px;
    height: 1px;
- Line 4267  table.LC_pick_box td.LC_pick_box_separat
+ Line 4781  table.LC_pick_box td.LC_pick_box_separat
  table.LC_pick_box td.LC_pick_box_submit {
    text-align: right;
  }
+ table.LC_pick_box td.LC_evenrow_value {
+   text-align: left;
+   padding: 8px;
+   background-color: $data_table_light;
+ }
+ table.LC_pick_box td.LC_oddrow_value {
+   text-align: left;
+   padding: 8px;
+   background-color: $data_table_light;
+ }
+ table.LC_helpform_receipt {
+   width: 620px;
+   border-collapse: separate;
+   background: white;
+   border: 1px solid black;
+   border-spacing: 1px;
+ }
+ table.LC_helpform_receipt td.LC_pick_box_title {
+   background: $tabbg;
+   font-weight: bold;
+   text-align: right;
+   width: 184px;
+   padding: 8px;
+ }
+ table.LC_helpform_receipt td.LC_evenrow_value {
+   text-align: left;
+   padding: 8px;
+   background-color: $data_table_light;
+ }
+ table.LC_helpform_receipt td.LC_oddrow_value {
+   text-align: left;
+   padding: 8px;
+   background-color: $data_table_light;
+ }
+ table.LC_helpform_receipt td.LC_pick_box_separator {
+   padding: 0px;
+   height: 1px;
+   background: black;
+ }
+ span.LC_helpform_receipt_cat {
+   font-weight: bold;
+ }
  table.LC_group_priv_box {
    background: white;
    border: 1px solid black;
- Line 4335  table.LC_descriptive_input td.LC_descrip
+ Line 4890  table.LC_descriptive_input td.LC_descrip
    text-align: right;
    font-weight: bold;
  }
- table.LC_feedback_link {
+ div.LC_feedback_link {
-     background: $feedback_link_bg;
+   clear: both;
+   background: white;
+   width: 100%;
  }
  span.LC_feedback_link {
-     background: $feedback_link_bg;
+   background: $feedback_link_bg;
-     font-size: larger;
+   font-size: larger;
+ }
+ span.LC_message_link {
+   background: $feedback_link_bg;
+   font-size: larger;
+   position: absolute;
+   right: 1em;
  }
  table.LC_prior_tries {
- Line 4409  table.LC_prior_match tr td {
+ Line 4972  table.LC_prior_match tr td {
  }
  span.LC_nobreak {
-     white-space: nowrap;
+   white-space: nowrap;
  }
+ span.LC_cusr_emph {
+   font-style: italic;
+ }
+ table.LC_docs_documents {
+   background: #BBBBBB;
+   border-width: 0px;
+   border-collapse: collapse;
+ }
+ table.LC_docs_documents td.LC_docs_document {
+   border: 2px solid black;
+   padding: 4px;
+ }
+ .LC_docs_course_commands div {
+   float: left;
+   border: 4px solid #AAAAAA;
+   padding: 4px;
+   background: #DDDDCC;
+ }
+ .LC_docs_entry_move {
+   border: 0px;
+   border-collapse: collapse;
+ }
+ .LC_docs_entry_move td {
+   border: 2px solid #BBBBBB;
+   background: #DDDDDD;
+ }
+ .LC_docs_editor td.LC_docs_entry_commands {
+   background: #DDDDDD;
+   font-size: x-small;
+ }
+ .LC_docs_copy {
+   color: #000099;
+ }
+ .LC_docs_cut {
+   color: #550044;
+ }
+ .LC_docs_rename {
+   color: #009900;
+ }
+ .LC_docs_remove {
+   color: #990000;
+ }
+ .LC_docs_reinit_warn,
+ .LC_docs_ext_edit {
+   font-size: x-small;
+ }
+ .LC_docs_editor td.LC_docs_entry_title,
+ .LC_docs_editor td.LC_docs_entry_icon {
+   background: #FFFFBB;
+ }
+ .LC_docs_editor td.LC_docs_entry_parameter {
+   background: #BBBBFF;
+   font-size: x-small;
+   white-space: nowrap;
+ }
+ table.LC_docs_adddocs td,
+ table.LC_docs_adddocs th {
+   border: 1px solid #BBBBBB;
+   padding: 4px;
+   background: #DDDDDD;
+ }
+ table.LC_sty_begin {
+   background: #BBFFBB;
+ }
+ table.LC_sty_end {
+   background: #FFBBBB;
+ }
+ table.LC_double_column {
+   border-width: 0px;
+   border-collapse: collapse;
+   width: 100%;
+   padding: 2px;
+ }
+ table.LC_double_column tr td.LC_left_col {
+   top: 2px;
+   left: 2px;
+   width: 47%;
+   vertical-align: top;
+ }
+ table.LC_double_column tr td.LC_right_col {
+   top: 2px;
+   right: 2px;
+   width: 47%;
+   vertical-align: top;
+ }
+ span.LC_role_level {
+   font-weight: bold;
+ }
+ div.LC_left_float {
+   float: left;
+   padding-right: 5%;
+   padding-bottom: 4px;
+ }
+ div.LC_clear_float_header {
+   padding-bottom: 2px;
+ }
+ div.LC_clear_float_footer {
+   padding-top: 10px;
+   clear: both;
+ }
+ div.LC_grade_select_mode {
+   font-family: $sans;
+ }
+ div.LC_grade_select_mode div div {
+   margin: 5px;
+ }
+ div.LC_grade_select_mode_selector {
+   margin: 5px;
+   float: left;
+ }
+ div.LC_grade_select_mode_selector_header {
+   font: bold medium $sans;
+ }
+ div.LC_grade_select_mode_type {
+   clear: left;
+ }
+ div.LC_grade_show_user {
+   margin-top: 20px;
+   border: 1px solid black;
+ }
+ div.LC_grade_user_name {
+   background: #DDDDEE;
+   border-bottom: 1px solid black;
+   font: bold large $sans;
+ }
+ div.LC_grade_show_user_odd_row div.LC_grade_user_name {
+   background: #DDEEDD;
+ }
+ div.LC_grade_show_problem,
+ div.LC_grade_submissions,
+ div.LC_grade_message_center,
+ div.LC_grade_info_links,
+ div.LC_grade_assign {
+   margin: 5px;
+   width: 99%;
+   background: #FFFFFF;
+ }
+ div.LC_grade_show_problem_header,
+ div.LC_grade_submissions_header,
+ div.LC_grade_message_center_header,
+ div.LC_grade_assign_header {
+   font: bold large $sans;
+ }
+ div.LC_grade_show_problem_problem,
+ div.LC_grade_submissions_body,
+ div.LC_grade_message_center_body,
+ div.LC_grade_assign_body {
+   border: 1px solid black;
+   width: 99%;
+   background: #FFFFFF;
+ }
+ span.LC_grade_check_note {
+   font: normal medium $sans;
+   display: inline;
+   position: absolute;
+   right: 1em;
+ }
+ table.LC_scantron_action {
+   width: 100%;
+ }
+ table.LC_scantron_action tr th {
+   font: normal bold $sans;
+ }
+ div.LC_edit_problem_header,
+ div.LC_edit_problem_footer {
+   font: normal medium $sans;
+   margin: 2px;
+ }
+ div.LC_edit_problem_header,
+ div.LC_edit_problem_header div,
+ div.LC_edit_problem_footer,
+ div.LC_edit_problem_footer div,
+ div.LC_edit_problem_editxml_header,
+ div.LC_edit_problem_editxml_header div {
+   margin-top: 5px;
+ }
+ div.LC_edit_problem_header_edit_row {
+   background: $tabbg;
+   padding: 3px;
+   margin-bottom: 5px;
+ }
+ div.LC_edit_problem_header_title {
+   font: larger bold $sans;
+   background: $tabbg;
+   padding: 3px;
+ }
+ table.LC_edit_problem_header_title {
+   font: larger bold $sans;
+   width: 100%;
+   border-color: $pgbg;
+   border-style: solid;
+   border-width: $border;
+   background: $tabbg;
+   border-collapse: collapse;
+   padding: 0px
+ }
+ div.LC_edit_problem_discards {
+   float: left;
+   padding-bottom: 5px;
+ }
+ div.LC_edit_problem_saves {
+   float: right;
+   padding-bottom: 5px;
+ }
+ hr.LC_edit_problem_divide {
+   clear: both;
+   color: $tabbg;
+   background-color: $tabbg;
+   height: 3px;
+   border: 0px;
+ }
  END
  }
  =pod
- =over 4
  =item * &headtag()
  Returns a uniform footer for LON-CAPA web pages.
- Line 4442  Inputs: $title - optional title for the
+ Line 5239  Inputs: $title - optional title for the
              no_auto_mt_title
                             -> prevent &mt()ing the title arg
- =back
  =cut
  sub headtag {
- Line 4499  ADDMETA
+ Line 5294  ADDMETA
  =pod
- =over 4
  =item * &font_settings()
  Returns neccessary <meta> to set the proper encoding
  Inputs: none
- =back
  =cut
  sub font_settings {
- Line 4525  sub font_settings {
+ Line 5316  sub font_settings {
  =pod
- =over 4
  =item * &xml_begin()
  Returns the needed doctype and <html>
  Inputs: none
- =back
  =cut
  sub xml_begin {
      my $output='';
-     &Apache::lonhtmlcommon::init_htmlareafields();
+     if ($env{'internal.start_page'}==1) {
+ 	&Apache::lonhtmlcommon::init_htmlareafields();
+     }
      if ($env{'browser.mathml'}) {
  	$output='<?xml version="1.0"?>'
- Line 4559  sub xml_begin {
+ Line 5348  sub xml_begin {
  =pod
- =over 4
  =item * &endheadtag()
  Returns a uniform </head> for LON-CAPA web pages.
  Inputs: none
- =back
  =cut
  sub endheadtag {
- Line 4577  sub endheadtag {
+ Line 5362  sub endheadtag {
  =pod
- =over 4
  =item * &head()
  Returns a uniform complete <head>..</head> section for LON-CAPA web pages.
- Line 4586  Returns a uniform complete <head>..</hea
+ Line 5369  Returns a uniform complete <head>..</hea
  Inputs: $title - optional title for the page
          $head_extra - optional extra HTML to put inside the <head>
- =back
  =cut
  sub head {
- Line 4597  sub head {
+ Line 5378  sub head {
  =pod
- =over 4
  =item * &start_page()
  Returns a complete <html> .. <body> section for LON-CAPA web pages.
- Line 4637  Inputs: $title - optional title for the
+ Line 5416  Inputs: $title - optional title for the
                    no_auto_mt_title -> prevent &mt()ing the title arg
- =back
+                   inherit_jsmath -> when creating popup window in a page,
+                                     should it have jsmath forced on by the
+                                     current page
  =cut
- Line 4690  sub start_page {
+ Line 5471  sub start_page {
  =pod
- =over 4
  =item * &head()
  Returns a complete </body></html> section for LON-CAPA web pages.
- Line 4799  sub simple_error_page {
+ Line 5578  sub simple_error_page {
  }
  {
-     my $row_count;
+     my @row_count;
      sub start_data_table {
  	my ($add_class) = @_;
  	my $css_class = (join(' ','LC_data_table',$add_class));
- 	undef($row_count);
+ 	unshift(@row_count,0);
  	return '<table class="'.$css_class.'">'."\n";
      }
      sub end_data_table {
- 	undef($row_count);
+ 	shift(@row_count);
  	return '</table>'."\n";;
      }
      sub start_data_table_row {
  	my ($add_class) = @_;
- 	$row_count++;
+ 	$row_count[0]++;
- 	my $css_class = ($row_count % 2)?'':'LC_even_row';
+ 	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
  	$css_class = (join(' ',$css_class,$add_class));
  	return  '<tr class="'.$css_class.'">'."\n";;
      }
      sub continue_data_table_row {
  	my ($add_class) = @_;
- 	my $css_class = ($row_count % 2)?'':'LC_even_row';
+ 	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
  	$css_class = (join(' ',$css_class,$add_class));
  	return  '<tr class="'.$css_class.'">'."\n";;
      }
- Line 4832  sub simple_error_page {
+ Line 5611  sub simple_error_page {
      }
      sub start_data_table_empty_row {
- 	$row_count++;
+ 	$row_count[0]++;
  	return  '<tr class="LC_empty_row" >'."\n";;
      }
- Line 4849  sub simple_error_page {
+ Line 5628  sub simple_error_page {
      }
  }
+ =pod
+ =item * &inhibit_menu_check($arg)
+ Checks for a inhibitmenu state and generates output to preserve it
+ Inputs:         $arg - can be any of
+                      - undef - in which case the return value is a string
+                                to add  into arguments list of a uri
+                      - 'input' - in which case the return value is a HTML
+                                  <form> <input> field of type hidden to
+                                  preserve the value
+                      - a url - in which case the return value is the url with
+                                the neccesary cgi args added to preserve the
+                                inhibitmenu state
+                      - a ref to a url - no return value, but the string is
+                                         updated to include the neccessary cgi
+                                         args to preserve the inhibitmenu state
+ =cut
+ sub inhibit_menu_check {
+     my ($arg) = @_;
+     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
+     if ($arg eq 'input') {
+ 	if ($env{'form.inhibitmenu'}) {
+ 	    return '<input type="hidden" name="inhibitmenu" value="'.$env{'form.inhibitmenu'}.'" />';
+ 	} else {
+ 	    return
+ 	}
+     }
+     if ($env{'form.inhibitmenu'}) {
+ 	if (ref($arg)) {
+ 	    $$arg .= '?inhibitmenu='.$env{'form.inhibitmenu'};
+ 	} elsif ($arg eq '') {
+ 	    $arg .= 'inhibitmenu='.$env{'form.inhibitmenu'};
+ 	} else {
+ 	    $arg .= '?inhibitmenu='.$env{'form.inhibitmenu'};
+ 	}
+     }
+     if (!ref($arg)) {
+ 	return $arg;
+     }
+ }
  ###############################################
  =pod
+ =back
+ =head1 User Information Routines
+ =over 4
  =item * &get_users_function()
  Used by &bodytag to determine the current users primary role.
- Line 4880  sub get_users_function {
+ Line 5710  sub get_users_function {
  =pod
- =item * &check_user_status
+ =item * &check_user_status()
  Determines current status of supplied role for a
  specific user. Roles can be active, previous or future.
- Line 5053  previous, future, or all.
+ Line 5883  previous, future, or all.
 . reference to array of section restrictions (optional)
 . reference to results object (hash of hashes).
 . reference to optional userdata hash
- Keys of top level hash are roles.
+. reference to optional statushash
+. flag if privileged users (except those set to unhide in
+    course settings) should be excluded
+ Keys of top level results hash are roles.
  Keys of inner hashes are username:domain, with
  values set to access type.
  Optional userdata hash returns an array with arguments in the
  same order as loncoursedata::get_classlist() for student data.
+ Optional statushash returns
  Entries for end, start, section and status are blank because
  of the possibility of multiple values for non-student roles.
- Line 5067  of the possibility of multiple values fo
+ Line 5902  of the possibility of multiple values fo
  ###############################################
  sub get_course_users {
-     my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata) = @_;
+     my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata,$statushash,$hidepriv) = @_;
      my %idx = ();
      my %seclists;
- Line 5087  sub get_course_users {
+ Line 5922  sub get_course_users {
              my $match = 0;
              my $secmatch = 0;
              my $section = $$classlist{$student}[$idx{section}];
+             my $status = $$classlist{$student}[$idx{status}];
              if ($section eq '') {
                  $section = 'none';
              }
- Line 5106  sub get_course_users {
+ Line 5942  sub get_course_users {
                      next;
                  }
              }
-             push(@{$seclists{$student}},$section);
              if (defined($$types{'active'})) {
                  if ($$classlist{$student}[$idx{status}] eq 'Active') {
                      push(@{$$users{st}{$student}},'active');
- Line 5114  sub get_course_users {
+ Line 5949  sub get_course_users {
                  }
              }
              if (defined($$types{'previous'})) {
-                 if ($$classlist{$student}[$idx{end}] <= $now) {
+                 if ($$classlist{$student}[$idx{status}] eq 'Expired') {
                      push(@{$$users{st}{$student}},'previous');
                      $match = 1;
                  }
              }
              if (defined($$types{'future'})) {
-                 if (($$classlist{$student}[$idx{start}] > $now) && ($$classlist{$student}[$idx{end}] > $now) || ($$classlist{$student}[$idx{end}] == 0) || ($$classlist{$student}[$idx{end}] eq '')) {
+                 if ($$classlist{$student}[$idx{status}] eq 'Future') {
                      push(@{$$users{st}{$student}},'future');
                      $match = 1;
                  }
              }
-             if ($match && ref($userdata) eq 'HASH') {
+             if ($match) {
-                 $$userdata{$student} = $$classlist{$student};
+                 push(@{$seclists{$student}},$section);
+                 if (ref($userdata) eq 'HASH') {
+                     $$userdata{$student} = $$classlist{$student};
+                 }
+                 if (ref($statushash) eq 'HASH') {
+                     $statushash->{$student}{'st'}{$section} = $status;
+                 }
              }
          }
      }
      if ((@{$roles} > 1) || ((@{$roles} == 1) && ($$roles[0] ne "st"))) {
          my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
          my $now = time;
+         my %displaystatus = ( previous => 'Expired',
+                               active   => 'Active',
+                               future   => 'Future',
+                             );
+         my %nothide;
+         if ($hidepriv) {
+             my %coursehash=&Apache::lonnet::coursedescription($cdom.'_'.$cnum);
+             foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
+                 if ($user !~ /:/) {
+                     $nothide{join(':',split(/[\@]/,$user))}=1;
+                 } else {
+                     $nothide{$user} = 1;
+                 }
+             }
+         }
          foreach my $person (sort(keys(%coursepersonnel))) {
              my $match = 0;
              my $secmatch = 0;
- Line 5166  sub get_course_users {
+ Line 6022  sub get_course_users {
                      $usec = 'none';
                  }
                  if ($uname ne '' && $udom ne '') {
+                     if ($hidepriv) {
+                         if ((&Apache::lonnet::privileged($uname,$udom)) &&
+                             (!$nothide{$uname.':'.$udom})) {
+                             next;
+                         }
+                     }
                      if ($end > 0 && $end < $now) {
                          $status = 'previous';
                      } elsif ($start > $now) {
- Line 5188  sub get_course_users {
+ Line 6050  sub get_course_users {
                          if (!grep(/^\Q$usec\E$/,@{$seclists{$uname.':'.$udom}})) {
                              push(@{$seclists{$uname.':'.$udom}},$usec);
                          }
+                         if (ref($statushash) eq 'HASH') {
+                             $statushash->{$uname.':'.$udom}{$role}{$usec} = $displaystatus{$status};
+                         }
                      }
                  }
              }
- Line 5197  sub get_course_users {
+ Line 6062  sub get_course_users {
                  my %csettings = &Apache::lonnet::get('environment',['internal.courseowner'],$cdom,$cnum);
                  if ( defined($csettings{'internal.courseowner'}) ) {
                      my $owner = $csettings{'internal.courseowner'};
-                     if ($owner !~ /^[^:]+:[^:]+$/) {
+                     next if ($owner eq '');
-                         $owner = $owner.':'.$cdom;
+                     my ($ownername,$ownerdom);
+                     if ($owner =~ /^([^:]+):([^:]+)$/) {
+                         $ownername = $1;
+                         $ownerdom = $2;
+                     } else {
+                         $ownername = $owner;
+                         $ownerdom = $cdom;
+                         $owner = $ownername.':'.$ownerdom;
                      }
                      @{$$users{'ow'}{$owner}} = 'any';
                      if (defined($userdata) &&
- 			!exists($$userdata{$owner.':'.$cdom})) {
+ 			!exists($$userdata{$owner})) {
- 			&get_user_info($cdom,$owner,\%idx,$userdata);
+ 			&get_user_info($ownerdom,$ownername,\%idx,$userdata);
-                         if (!grep(/^none$/,@{$seclists{$owner.':'.$cdom}})) {
+                         if (!grep(/^none$/,@{$seclists{$owner}})) {
-                             push(@{$seclists{$owner.':'.$cdom}},'none');
+                             push(@{$seclists{$owner}},'none');
+                         }
+                         if (ref($statushash) eq 'HASH') {
+                             $statushash->{$owner}{'ow'}{'none'} = 'Any';
                          }
  		    }
                  }
- Line 5225  sub get_user_info {
+ Line 6100  sub get_user_info {
  	&plainname($uname,$udom,'lastname');
      $$userdata{$uname.':'.$udom}[$$idx{uname}] = $uname;
      $$userdata{$uname.':'.$udom}[$$idx{udom}] = $udom;
+     my %idhash =  &Apache::lonnet::idrget($udom,($uname));
+     $$userdata{$uname.':'.$udom}[$$idx{id}] = $idhash{$uname};
      return;
  }
- Line 5345  sub default_quota {
+ Line 6222  sub default_quota {
      my ($udom,$inststatus) = @_;
      my ($defquota,$settingstatus);
      my %quotahash = &Apache::lonnet::get_dom('configuration',
-                                             ['quota'],$udom);
+                                             ['quotas'],$udom);
-     if (ref($quotahash{'quota'}) eq 'HASH') {
+     if (ref($quotahash{'quotas'}) eq 'HASH') {
          if ($inststatus ne '') {
              my @statuses = split(/:/,$inststatus);
              foreach my $item (@statuses) {
-                 if ($quotahash{'quota'}{$item} ne '') {
+                 if ($quotahash{'quotas'}{$item} ne '') {
                      if ($defquota eq '') {
-                         $defquota = $quotahash{'quota'}{$item};
+                         $defquota = $quotahash{'quotas'}{$item};
                          $settingstatus = $item;
-                     } elsif ($quotahash{'quota'}{$item} > $defquota) {
+                     } elsif ($quotahash{'quotas'}{$item} > $defquota) {
-                         $defquota = $quotahash{'quota'}{$item};
+                         $defquota = $quotahash{'quotas'}{$item};
                          $settingstatus = $item;
                      }
                  }
              }
          }
          if ($defquota eq '') {
-             $defquota = $quotahash{'quota'}{'default'};
+             $defquota = $quotahash{'quotas'}{'default'};
              $settingstatus = 'default';
          }
      } else {
- Line 5413  sub get_secgrprole_info {
+ Line 6290  sub get_secgrprole_info {
      return (\@sections,\@groups,$allroles,$rolehash,$accesshash);
  }
+ sub user_picker {
+     my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype) = @_;
+     my $currdom = $dom;
+     my %curr_selected = (
+                         srchin => 'dom',
+                         srchby => 'lastname',
+                       );
+     my $srchterm;
+     if ((ref($srch) eq 'HASH') && ($env{'form.origform'} ne 'crtusername')) {
+         if ($srch->{'srchby'} ne '') {
+             $curr_selected{'srchby'} = $srch->{'srchby'};
+         }
+         if ($srch->{'srchin'} ne '') {
+             $curr_selected{'srchin'} = $srch->{'srchin'};
+         }
+         if ($srch->{'srchtype'} ne '') {
+             $curr_selected{'srchtype'} = $srch->{'srchtype'};
+         }
+         if ($srch->{'srchdomain'} ne '') {
+             $currdom = $srch->{'srchdomain'};
+         }
+         $srchterm = $srch->{'srchterm'};
+     }
+     my %lt=&Apache::lonlocal::texthash(
+                     'usr'       => 'Search criteria',
+                     'doma'      => 'Domain/institution to search',
+                     'uname'     => 'username',
+                     'lastname'  => 'last name',
+                     'lastfirst' => 'last name, first name',
+                     'crs'       => 'in this course',
+                     'dom'       => 'in selected LON-CAPA domain',
+                     'alc'       => 'all LON-CAPA',
+                     'instd'     => 'in institutional directory for selected domain',
+                     'exact'     => 'is',
+                     'contains'  => 'contains',
+                     'begins'    => 'begins with',
+                     'youm'      => "You must include some text to search for.",
+                     'thte'      => "The text you are searching for must contain at least two characters when using a 'begins' type search.",
+                     'thet'      => "The text you are searching for must contain at least three characters when using a 'contains' type search.",
+                     'yomc'      => "You must choose a domain when using an institutional directory search.",
+                     'ymcd'      => "You must choose a domain when using a domain search.",
+                     'whus'      => "When using searching by last,first you must include a comma as separator between last name and first name.",
+                     'whse'      => "When searching by last,first you must include at least one character in the first name.",
+                      'thfo'     => "The following need to be corrected before the search can be run:",
+                                        );
+     my $domform = &select_dom_form($currdom,'srchdomain',1,1);
+     my $srchinsel = ' <select name="srchin">';
+     my @srchins = ('crs','dom','alc','instd');
+     foreach my $option (@srchins) {
+         # FIXME 'alc' option unavailable until
+         #       loncreateuser::print_user_query_page()
+         #       has been completed.
+         next if ($option eq 'alc');
+         next if ($option eq 'crs' && !$env{'request.course.id'});
+         if ($curr_selected{'srchin'} eq $option) {
+             $srchinsel .= '
+    <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+         } else {
+             $srchinsel .= '
+    <option value="'.$option.'">'.$lt{$option}.'</option>';
+         }
+     }
+     $srchinsel .= "\n  </select>\n";
+     my $srchbysel =  ' <select name="srchby">';
+     foreach my $option ('lastname','lastfirst','uname') {
+         if ($curr_selected{'srchby'} eq $option) {
+             $srchbysel .= '
+    <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+         } else {
+             $srchbysel .= '
+    <option value="'.$option.'">'.$lt{$option}.'</option>';
+          }
+     }
+     $srchbysel .= "\n  </select>\n";
+     my $srchtypesel = ' <select name="srchtype">';
+     foreach my $option ('begins','contains','exact') {
+         if ($curr_selected{'srchtype'} eq $option) {
+             $srchtypesel .= '
+    <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+         } else {
+             $srchtypesel .= '
+    <option value="'.$option.'">'.$lt{$option}.'</option>';
+         }
+     }
+     $srchtypesel .= "\n  </select>\n";
+     my ($newuserscript,$new_user_create);
+     if ($forcenewuser) {
+         if (ref($srch) eq 'HASH') {
+             if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $env{'request.role.domain'}) {
+                 if ($cancreate) {
+                     $new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" /> </p>';
+                 } else {
+                     my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+                     my %usertypetext = (
+                         official   => 'institutional',
+                         unofficial => 'non-institutional',
+                     );
+                     $new_user_create = '<br /><span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';
+                 }
+             }
+         }
+         $newuserscript = <<"ENDSCRIPT";
+ function setSearch(createnew,callingForm) {
+     if (createnew == 1) {
+         for (var i=0; i<callingForm.srchby.length; i++) {
+             if (callingForm.srchby.options[i].value == 'uname') {
+                 callingForm.srchby.selectedIndex = i;
+             }
+         }
+         for (var i=0; i<callingForm.srchin.length; i++) {
+             if ( callingForm.srchin.options[i].value == 'dom') {
+ 		callingForm.srchin.selectedIndex = i;
+             }
+         }
+         for (var i=0; i<callingForm.srchtype.length; i++) {
+             if (callingForm.srchtype.options[i].value == 'exact') {
+                 callingForm.srchtype.selectedIndex = i;
+             }
+         }
+         for (var i=0; i<callingForm.srchdomain.length; i++) {
+             if (callingForm.srchdomain.options[i].value == '$env{'request.role.domain'}') {
+                 callingForm.srchdomain.selectedIndex = i;
+             }
+         }
+     }
+ }
+ ENDSCRIPT
+     }
+     my $output = <<"END_BLOCK";
+ <script type="text/javascript">
+ function validateEntry(callingForm) {
+     var checkok = 1;
+     var srchin;
+     for (var i=0; i<callingForm.srchin.length; i++) {
+ 	if ( callingForm.srchin[i].checked ) {
+ 	    srchin = callingForm.srchin[i].value;
+ 	}
+     }
+     var srchtype = callingForm.srchtype.options[callingForm.srchtype.selectedIndex].value;
+     var srchby = callingForm.srchby.options[callingForm.srchby.selectedIndex].value;
+     var srchdomain = callingForm.srchdomain.options[callingForm.srchdomain.selectedIndex].value;
+     var srchterm =  callingForm.srchterm.value;
+     var srchin = callingForm.srchin.options[callingForm.srchin.selectedIndex].value;
+     var msg = "";
+     if (srchterm == "") {
+         checkok = 0;
+         msg += "$lt{'youm'}\\n";
+     }
+     if (srchtype== 'begins') {
+         if (srchterm.length < 2) {
+             checkok = 0;
+             msg += "$lt{'thte'}\\n";
+         }
+     }
+     if (srchtype== 'contains') {
+         if (srchterm.length < 3) {
+             checkok = 0;
+             msg += "$lt{'thet'}\\n";
+         }
+     }
+     if (srchin == 'instd') {
+         if (srchdomain == '') {
+             checkok = 0;
+             msg += "$lt{'yomc'}\\n";
+         }
+     }
+     if (srchin == 'dom') {
+         if (srchdomain == '') {
+             checkok = 0;
+             msg += "$lt{'ymcd'}\\n";
+         }
+     }
+     if (srchby == 'lastfirst') {
+         if (srchterm.indexOf(",") == -1) {
+             checkok = 0;
+             msg += "$lt{'whus'}\\n";
+         }
+         if (srchterm.indexOf(",") == srchterm.length -1) {
+             checkok = 0;
+             msg += "$lt{'whse'}\\n";
+         }
+     }
+     if (checkok == 0) {
+         alert("$lt{'thfo'}\\n"+msg);
+         return;
+     }
+     if (checkok == 1) {
+         callingForm.submit();
+     }
+ }
+ $newuserscript
+ </script>
+ $new_user_create
+ <table>
+  <tr>
+   <td>$lt{'doma'}:</td>
+   <td>$domform</td>
+   </td>
+  </tr>
+  <tr>
+   <td>$lt{'usr'}:</td>
+   <td>$srchbysel
+       $srchtypesel
+       <input type="text" size="15" name="srchterm" value="$srchterm" />
+       $srchinsel
+   </td>
+  </tr>
+ </table>
+ <br />
+ END_BLOCK
+     return $output;
+ }
+ sub user_rule_check {
+     my ($usershash,$checks,$alerts,$rulematch,$inst_results,$curr_rules,$got_rules) = @_;
+     my $response;
+     if (ref($usershash) eq 'HASH') {
+         foreach my $user (keys(%{$usershash})) {
+             my ($uname,$udom) = split(/:/,$user);
+             next if ($udom eq '' || $uname eq '');
+             my ($id,$newuser);
+             if (ref($usershash->{$user}) eq 'HASH') {
+                 $newuser = $usershash->{$user}->{'newuser'};
+                 $id = $usershash->{$user}->{'id'};
+             }
+             my $inst_response;
+             if (ref($checks) eq 'HASH') {
+                 if (defined($checks->{'username'})) {
+                     ($inst_response,%{$inst_results->{$user}}) =
+                         &Apache::lonnet::get_instuser($udom,$uname);
+                 } elsif (defined($checks->{'id'})) {
+                     ($inst_response,%{$inst_results->{$user}}) =
+                         &Apache::lonnet::get_instuser($udom,undef,$id);
+                 }
+             } else {
+                 ($inst_response,%{$inst_results->{$user}}) =
+                     &Apache::lonnet::get_instuser($udom,$uname);
+                 return;
+             }
+             if (!$got_rules->{$udom}) {
+                 my %domconfig = &Apache::lonnet::get_dom('configuration',
+                                                   ['usercreation'],$udom);
+                 if (ref($domconfig{'usercreation'}) eq 'HASH') {
+                     foreach my $item ('username','id') {
+                         if (ref($domconfig{'usercreation'}{$item.'_rule'}) eq 'ARRAY') {
+                             $$curr_rules{$udom}{$item} =
+                                 $domconfig{'usercreation'}{$item.'_rule'};
+                         }
+                     }
+                 }
+                 $got_rules->{$udom} = 1;
+             }
+             foreach my $item (keys(%{$checks})) {
+                 if (ref($$curr_rules{$udom}) eq 'HASH') {
+                     if (ref($$curr_rules{$udom}{$item}) eq 'ARRAY') {
+                         if (@{$$curr_rules{$udom}{$item}} > 0) {
+                             my %rule_check = &Apache::lonnet::inst_rulecheck($udom,$uname,$id,$item,$$curr_rules{$udom}{$item});
+                             foreach my $rule (@{$$curr_rules{$udom}{$item}}) {
+                                 if ($rule_check{$rule}) {
+                                     $$rulematch{$user}{$item} = $rule;
+                                     if ($inst_response eq 'ok') {
+                                         if (ref($inst_results) eq 'HASH') {
+                                             if (ref($inst_results->{$user}) eq 'HASH') {
+                                                 if (keys(%{$inst_results->{$user}}) == 0) {
+                                                     $$alerts{$item}{$udom}{$uname} = 1;
+                                                 }
+                                             }
+                                         }
+                                     }
+                                     last;
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
+         }
+     }
+     return;
+ }
+ sub user_rule_formats {
+     my ($domain,$domdesc,$curr_rules,$check) = @_;
+     my %text = (
+                  'username' => 'Usernames',
+                  'id'       => 'IDs',
+                );
+     my $output;
+     my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($domain,$check);
+     if ((ref($rules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) {
+         if (@{$ruleorder} > 0) {
+             $output = '<br />'.&mt("$text{$check} with the following format(s) may <span class=\"LC_cusr_emph\">only</span> be used for verified users at [_1]:",$domdesc).' <ul>';
+             foreach my $rule (@{$ruleorder}) {
+                 if (ref($curr_rules) eq 'ARRAY') {
+                     if (grep(/^\Q$rule\E$/,@{$curr_rules})) {
+                         if (ref($rules->{$rule}) eq 'HASH') {
+                             $output .= '<li>'.$rules->{$rule}{'name'}.': '.
+                                         $rules->{$rule}{'desc'}.'</li>';
+                         }
+                     }
+                 }
+             }
+             $output .= '</ul>';
+         }
+     }
+     return $output;
+ }
+ sub instrule_disallow_msg {
+     my ($checkitem,$domdesc,$count,$mode) = @_;
+     my $response;
+     my %text = (
+                   item   => 'username',
+                   items  => 'usernames',
+                   match  => 'matches',
+                   do     => 'does',
+                   action => 'a username',
+                   one    => 'one',
+                );
+     if ($count > 1) {
+         $text{'item'} = 'usernames';
+         $text{'match'} ='match';
+         $text{'do'} = 'do';
+         $text{'action'} = 'usernames',
+         $text{'one'} = 'ones';
+     }
+     if ($checkitem eq 'id') {
+         $text{'items'} = 'IDs';
+         $text{'item'} = 'ID';
+         $text{'action'} = 'an ID';
+         if ($count > 1) {
+             $text{'item'} = 'IDs';
+             $text{'action'} = 'IDs';
+         }
+     }
+     $response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for <span class=\"LC_cusr_emph\">[_1]</span>, but the $text{'item'} $text{'do'} not exist in the institutional directory.",$domdesc).'<br />';
+     if ($mode eq 'upload') {
+         if ($checkitem eq 'username') {
+             $response .= &mt("You will need to modify your upload file so it will include $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");
+         } elsif ($checkitem eq 'id') {
+             $response .= &mt("Either upload a file which includes $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the ID/Student Number field.");
+         }
+     } else {
+         if ($checkitem eq 'username') {
+             $response .= &mt("You must choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");
+         } elsif ($checkitem eq 'id') {
+             $response .= &mt("You must either choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or leave the ID field blank.");
+         }
+     }
+     return $response;
+ }
+ sub personal_data_fieldtitles {
+     my %fieldtitles = &Apache::lonlocal::texthash (
+                         id => 'Student/Employee ID',
+                         permanentemail => 'E-mail address',
+                         lastname => 'Last Name',
+                         firstname => 'First Name',
+                         middlename => 'Middle Name',
+                         generation => 'Generation',
+                         gen => 'Generation',
+                    );
+     return %fieldtitles;
+ }
  =pod
+ =back
+ =head1 HTTP Helpers
+ =over 4
  =item * get_unprocessed_cgi($query,$possible_names)
  Modify the %env hash to contain unprocessed CGI form parameters held in
- Line 5664  sub record_sep {
+ Line 6932  sub record_sep {
              $i++;
          }
      } else {
-         my @allfields;
+         my $separator=',';
          if ($env{'form.upfiletype'} eq 'semisv') {
-             @allfields=split(/;/,$record,-1);
+             $separator=';';
-         } else {
-             @allfields=split(/\,/,$record,-1);
          }
          my $i=0;
-         my $j;
+ # the character we are looking for to indicate the end of a quote or a record
-         for ($j=0;$j<=$#allfields;$j++) {
+         my $looking_for=$separator;
-             my $field=$allfields[$j];
+ # do not add the characters to the fields
-             if ($field=~/^\s*(\"|\')/) {
+         my $ignore=0;
- 		my $delimiter=$1;
+ # we just encountered a separator (or the beginning of the record)
-                 while (($field!~/$delimiter$/) && ($j<$#allfields)) {
+         my $just_found_separator=1;
- 		    $j++;
+ # store the field we are working on here
- 		    $field.=','.$allfields[$j];
+         my $field='';
- 		}
+ # work our way through all characters in record
-                 $field=~s/^\s*$delimiter//;
+         foreach my $character ($record=~/(.)/g) {
-                 $field=~s/$delimiter\s*$//;
+             if ($character eq $looking_for) {
-             }
+                if ($character ne $separator) {
-             $components{&takeleft($i)}=$field;
+ # Found the end of a quote, again looking for separator
- 	    $i++;
+                   $looking_for=$separator;
+                   $ignore=1;
+                } else {
+ # Found a separator, store away what we got
+                   $components{&takeleft($i)}=$field;
+ 	          $i++;
+                   $just_found_separator=1;
+                   $ignore=0;
+                   $field='';
+                }
+                next;
+             }
+ # single or double quotation marks after a separator indicate beginning of a quote
+ # we are now looking for the end of the quote and need to ignore separators
+             if ((($character eq '"') || ($character eq "'")) && ($just_found_separator))  {
+                $looking_for=$character;
+                next;
+             }
+ # ignore would be true after we reached the end of a quote
+             if ($ignore) { next; }
+             if (($just_found_separator) && ($character=~/\s/)) { next; }
+             $field.=$character;
+             $just_found_separator=0;
          }
+ # catch the very last entry, since we never encountered the separator
+         $components{&takeleft($i)}=$field;
      }
      return %components;
  }
- Line 5756  sub csv_print_samples {
+ Line 7046  sub csv_print_samples {
      my ($r,$records) = @_;
      my $samples = &get_samples($records,3);
-     $r->print(&mt('Samples').'<br /><table border="2"><tr>');
+     $r->print(&mt('Samples').'<br />'.&start_data_table().
+               &start_data_table_header_row());
      foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
          $r->print('<th>'.&mt('Column&nbsp;[_1]',($sample+1)).'</th>'); }
-     $r->print('</tr>');
+     $r->print(&end_data_table_header_row());
      foreach my $hash (@$samples) {
- 	$r->print('<tr>');
+ 	$r->print(&start_data_table_row());
  	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
  	    $r->print('<td>');
  	    if (defined($$hash{$sample})) { $r->print($$hash{$sample}); }
  	    $r->print('</td>');
  	}
- 	$r->print('</tr>');
+ 	$r->print(&end_data_table_row());
      }
-     $r->print('</tr></table><br />'."\n");
+     $r->print(&end_data_table().'<br />'."\n");
  }
  ######################################################
- Line 5794  sub csv_print_select_table {
+ Line 7085  sub csv_print_select_table {
      my $i=0;
      my $samples = &get_samples($records,1);
      $r->print(&mt('Associate columns with student attributes.')."\n".
- 	     '<table border="2"><tr>'.
+ 	      &start_data_table().&start_data_table_header_row().
                '<th>'.&mt('Attribute').'</th>'.
-               '<th>'.&mt('Column').'</th></tr>'."\n");
+               '<th>'.&mt('Column').'</th>'.
+               &end_data_table_header_row()."\n");
      foreach my $array_ref (@$d) {
  	my ($value,$display,$defaultcol)=@{ $array_ref };
- 	$r->print('<tr><td>'.$display.'</td>');
+ 	$r->print(&start_data_table_row().'<tr><td>'.$display.'</td>');
  	$r->print('<td><select name=f'.$i.
  		  ' onchange="javascript:flip(this.form,'.$i.');">');
- Line 5809  sub csv_print_select_table {
+ Line 7101  sub csv_print_select_table {
                        ($sample eq $defaultcol ? ' selected="selected" ' : '').
                        '>Column '.($sample+1).'</option>');
  	}
- 	$r->print('</select></td></tr>'."\n");
+ 	$r->print('</select></td>'.&end_data_table_row()."\n");
  	$i++;
      }
+     $r->print(&end_data_table());
      $i--;
      return $i;
  }
- Line 5838  sub csv_samples_select_table {
+ Line 7131  sub csv_samples_select_table {
      my $i=0;
      #
      my $samples = &get_samples($records,3);
-     $r->print('<table border=2><tr><th>'.
+     $r->print(&start_data_table().
-               &mt('Field').'</th><th>'.&mt('Samples').'</th></tr>');
+               &start_data_table_header_row().'<th>'.
+               &mt('Field').'</th><th>'.&mt('Samples').'</th>'.
+               &end_data_table_header_row());
      foreach my $key (sort(keys(%{ $samples->[0] }))) {
- 	$r->print('<tr><td><select name="f'.$i.'"'.
+ 	$r->print(&start_data_table_row().'<td><select name="f'.$i.'"'.
  		  ' onchange="javascript:flip(this.form,'.$i.');">');
  	foreach my $option (@$d) {
  	    my ($value,$display,$defaultcol)=@{ $option };
- Line 5856  sub csv_samples_select_table {
+ Line 7151  sub csv_samples_select_table {
  		$r->print($samples->[$line]{$key}."<br />\n");
  	    }
  	}
- 	$r->print('</td></tr>');
+ 	$r->print('</td>'.&end_data_table_row());
  	$i++;
      }
+     $r->print(&end_data_table());
      $i--;
      return($i);
  }
- Line 6357  a hash ref describing the data to be sto
+ Line 7653  a hash ref describing the data to be sto
  Returns: both routines return nothing
+ =back
  =cut
  #######################################################
- Line 6437  sub restore_settings {
+ Line 7735  sub restore_settings {
      }
  }
+ #######################################################
+ #######################################################
+ =pod
+ =head1 Domain E-mail Routines
+ =over 4
+ =item &build_recipient_list
+ Build recipient lists for three types of e-mail:
+ (a) Error Reports, (b) Package Updates, (c) Help requests, generated by
+ lonerrorhandler.pm, CHECKRPMS and lonsupportreq.pm respectively.
+ Inputs:
+ defmail (scalar - email address of default recipient),
+ mailing type (scalar - errormail, packagesmail, or helpdeskmail),
+ defdom (domain for which to retrieve configuration settings),
+ origmail (scalar - email address of recipient from loncapa.conf,
+ i.e., predates configuration by DC via domainprefs.pm
+ Returns: comma separated list of addresses to which to send e-mail.
+ =cut
+ ############################################################
+ ############################################################
+ sub build_recipient_list {
+     my ($defmail,$mailing,$defdom,$origmail) = @_;
+     my @recipients;
+     my $otheremails;
+     my %domconfig =
+          &Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
+     if (ref($domconfig{'contacts'}) eq 'HASH') {
+         if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
+             my @contacts = ('adminemail','supportemail');
+             foreach my $item (@contacts) {
+                 if ($domconfig{'contacts'}{$mailing}{$item}) {
+                     my $addr = $domconfig{'contacts'}{$item};
+                     if (!grep(/^\Q$addr\E$/,@recipients)) {
+                         push(@recipients,$addr);
+                     }
+                 }
+                 $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
+             }
+         }
+     } elsif ($origmail ne '') {
+         push(@recipients,$origmail);
+     }
+     if ($defmail ne '') {
+         push(@recipients,$defmail);
+     }
+     if ($otheremails) {
+         my @others;
+         if ($otheremails =~ /,/) {
+             @others = split(/,/,$otheremails);
+         } else {
+             push(@others,$otheremails);
+         }
+         foreach my $addr (@others) {
+             if (!grep(/^\Q$addr\E$/,@recipients)) {
+                 push(@recipients,$addr);
+             }
+         }
+     }
+     my $recipientlist = join(',',@recipients);
+     return $recipientlist;
+ }
  ############################################################
  ############################################################
  sub commit_customrole {
      my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
-     my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url.
+     my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.':'.$three.' in '.$url.
                           ($start?', '.&mt('starting').' '.localtime($start):'').
                           ($end?', ending '.localtime($end):'').': <b>'.
                &Apache::lonnet::assigncustomrole(
- Line 6452  sub commit_customrole {
+ Line 7820  sub commit_customrole {
  }
  sub commit_standardrole {
-     my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
+     my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_;
-     my $output;
+     my ($output,$logmsg,$linefeed);
-     my $logmsg;
+     if ($context eq 'auto') {
+         $linefeed = "\n";
+     } else {
+         $linefeed = "<br />\n";
+     }
      if ($three eq 'st') {
-         my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec);
+         my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,
-         if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
+                                          $one,$two,$sec,$context);
-             $output = "Error: $result\n";
+         if (($result =~ /^error/) || ($result eq 'not_in_class') ||
+             ($result eq 'unknown_course') || ($result eq 'refused')) {
+             $output = $logmsg.' '.&mt('Error: ').$result."\n";
          } else {
-             $output = &mt('Assigning').' '.$three.' in '.$url.
+             $output = $logmsg.$linefeed.&mt('Assigning').' '.$three.' in '.$url.
                 ($start?', '.&mt('starting').' '.localtime($start):'').
-                ($end?', '.&mt('ending').' '.localtime($end):'').
+                ($end?', '.&mt('ending').' '.localtime($end):'').': ';
-                ': <b>'.$result.'</b><br />'.
+             if ($context eq 'auto') {
-                &mt('Add to classlist').': <b>ok</b><br />';
+                 $output .= $result.$linefeed.&mt('Add to classlist').': ok';
+             } else {
+                $output .= '<b>'.$result.'</b>'.$linefeed.
+                &mt('Add to classlist').': <b>ok</b>';
+             }
+             $output .= $linefeed;
          }
      } else {
          $output = &mt('Assigning').' '.$three.' in '.$url.
                 ($start?', '.&mt('starting').' '.localtime($start):'').
-                ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
+                ($end?', '.&mt('ending').' '.localtime($end):'').': ';
-                &Apache::lonnet::assignrole(
+         my $result = &Apache::lonnet::assignrole($udom,$uname,$url,$three,$end,$start);
-                    $udom,$uname,$url,$three,$end,$start).
+         if ($context eq 'auto') {
-                    '</b><br />';
+             $output .= $result.$linefeed;
+         } else {
+             $output .= '<b>'.$result.'</b>'.$linefeed;
+         }
      }
      return $output;
  }
  sub commit_studentrole {
-     my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
+     my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_;
-     my $linefeed =  '<br />'."\n";
+     my ($result,$linefeed,$oldsecurl,$newsecurl);
-     my $result;
+     if ($context eq 'auto') {
+         $linefeed = "\n";
+     } else {
+         $linefeed = '<br />'."\n";
+     }
      if (defined($one) && defined($two)) {
          my $cid=$one.'_'.$two;
          my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid);
          my $secchange = 0;
          my $expire_role_result;
          my $modify_section_result;
-         unless ($oldsec eq '-1') {
+         if ($oldsec ne '-1') {
-             unless ($sec eq $oldsec) {
+             if ($oldsec ne $sec) {
                  $secchange = 1;
+                 my $now = time;
                  my $uurl='/'.$cid;
                  $uurl=~s/\_/\//g;
                  if ($oldsec) {
                      $uurl.='/'.$oldsec;
                  }
-                 $expire_role_result = &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',time);
+                 $oldsecurl = $uurl;
+                 $expire_role_result =
+                     &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',$now);
+                 if ($env{'request.course.sec'} ne '') {
+                     if ($expire_role_result eq 'refused') {
+                         my @roles = ('st');
+                         my @statuses = ('previous');
+                         my @roledoms = ($one);
+                         my $withsec = 1;
+                         my %roleshash =
+                             &Apache::lonnet::get_my_roles($uname,$udom,'userroles',
+                                               \@statuses,\@roles,\@roledoms,$withsec);
+                         if (defined ($roleshash{$two.':'.$one.':st:'.$oldsec})) {
+                             my ($oldstart,$oldend) =
+                                 split(':',$roleshash{$two.':'.$one.':st:'.$oldsec});
+                             if ($oldend > 0 && $oldend <= $now) {
+                                 $expire_role_result = 'ok';
+                             }
+                         }
+                     }
+                 }
                  $result = $expire_role_result;
              }
          }
- Line 6503  sub commit_studentrole {
+ Line 7910  sub commit_studentrole {
              $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid);
              if ($modify_section_result =~ /^ok/) {
                  if ($secchange == 1) {
-                     $$logmsg .= "Section for $uname switched from old section: $oldsec to new section: $sec".$linefeed;
+                     if ($sec eq '') {
+                         $$logmsg .= &mt('Section for [_1] switched from (possibly expired) old section: [_2] to student role without a section.',$uname,$oldsec).$linefeed;
+                     } else {
+                         $$logmsg .= &mt('Section for [_1] switched from (possibly expired) old section: [_2] to new section: [_3].',$uname,$oldsec,$sec).$linefeed;
+                     }
                  } elsif ($oldsec eq '-1') {
-                     $$logmsg .= "New student role for $uname in section $sec in course $cid".$linefeed;
+                     if ($sec eq '') {
+                         $$logmsg .= &mt('New student role without a section for [_1] in course [_2].',$uname,$cid).$linefeed;
+                     } else {
+                         $$logmsg .= &mt('New student role for [_1] in section [_2] in course [_3].',$uname,$sec,$cid).$linefeed;
+                     }
                  } else {
-                     $$logmsg .= "Student $uname assigned to unchanged section $sec in course $cid".$linefeed;
+                     if ($sec eq '') {
+                         $$logmsg .= &mt('Student [_1] assigned to course [_2] without a section.',$uname,$cid).$linefeed;
+                     } else {
+                         $$logmsg .= &mt('Student [_1] assigned to section [_2] in course [_3].',$uname,$sec,$cid).$linefeed;
+                     }
                  }
              } else {
-                 $$logmsg .= "Error when attempting section change for $uname from old section $oldsec to new section: $sec in course $cid -error: $modify_section_result".$linefeed;
+                 if ($secchange) {
+                     $$logmsg .= &mt('Error when attempting section change for [_1] from old section "[_2]" to new section: "[_3]" in course [_4] -error:',$uname,$oldsec,$sec,$cid).' '.$modify_section_result.$linefeed;
+                 } else {
+                     $$logmsg .= &mt('Error when attempting to modify role for [_1] for section: "[_2]" in course [_3] -error:',$uname,$sec,$cid).' '.$modify_section_result.$linefeed;
+                 }
              }
              $result = $modify_section_result;
          } elsif ($secchange == 1) {
-             $$logmsg .= "Error when attempting to expire role for $uname in old section $oldsec in course $cid -error: $expire_role_result".$linefeed;
+             if ($oldsec eq '') {
+                 $$logmsg .= &mt('Error when attempting to expire existing role without a section for [_1] in course [_3] -error: ',$uname,$cid).' '.$expire_role_result.$linefeed;
+             } else {
+                 $$logmsg .= &mt('Error when attempting to expire existing role for [_1] in section [_2] in course [_3] -error: ',$uname,$oldsec,$cid).' '.$expire_role_result.$linefeed;
+             }
+             if ($expire_role_result eq 'refused') {
+                 my $newsecurl = '/'.$cid;
+                 $newsecurl =~ s/\_/\//g;
+                 if ($sec ne '') {
+                     $newsecurl.='/'.$sec;
+                 }
+                 if (&Apache::lonnet::allowed('cst',$newsecurl) && !(&Apache::lonnet::allowed('cst',$oldsecurl))) {
+                     if ($sec eq '') {
+                         $$logmsg .= &mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments unaffiliated with any section.',$sec).$linefeed;
+                     } else {
+                         $$logmsg .= &mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments in other sections.',$sec).$linefeed;
+                     }
+                 }
+             }
          }
      } else {
-         $$logmsg .= "Incomplete course id defined.  Addition of user $uname from domain $udom to course $one\_$two, section $sec not completed.$linefeed";
+         $$logmsg .= &mt('Incomplete course id defined.').$linefeed.&mt('Addition of user [_1] from domain [_2] to course [_3], section [_4] not completed.',$uname,$udom,$one.'_'.$two,$sec).$linefeed;
          $result = "error: incomplete course id\n";
      }
      return $result;
- Line 6526  sub commit_studentrole {
+ Line 7967  sub commit_studentrole {
  ############################################################
  ############################################################
+ sub check_clone {
+     my ($args,$linefeed) = @_;
+     my $cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
+     my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid);
+     my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
+     my $clonemsg;
+     my $can_clone = 0;
+     if ($clonehome eq 'no_host') {
+         $clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
+     } else {
+ 	my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
+ 	if ($env{'request.role.domain'} eq $args->{'clonedomain'}) {
+ 	    $can_clone = 1;
+ 	} else {
+ 	    my %clonehash = &Apache::lonnet::get('environment',['cloners'],
+ 						 $args->{'clonedomain'},$args->{'clonecourse'});
+ 	    my @cloners = split(/,/,$clonehash{'cloners'});
+             if (grep(/^\*$/,@cloners)) {
+                 $can_clone = 1;
+             } elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {
+                 $can_clone = 1;
+             } else {
+ 	        my %roleshash =
+ 		    &Apache::lonnet::get_my_roles($args->{'ccuname'},
+ 					 $args->{'ccdomain'},
+                                          'userroles',['active'],['cc'],
+ 					 [$args->{'clonedomain'}]);
+ 	        if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
+ 		    $can_clone = 1;
+ 	        } else {
+                     $clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+ 	        }
+ 	    }
+         }
+     }
+     return ($can_clone, $clonemsg, $cloneid, $clonehome);
+ }
  sub construct_course {
-     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_;
+     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_;
      my $outcome;
+     my $linefeed =  '<br />'."\n";
+     if ($context eq 'auto') {
+         $linefeed = "\n";
+     }
+ #
+ # Are we cloning?
+ #
+     my ($can_clone, $clonemsg, $cloneid, $clonehome);
+     if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
+ 	($can_clone, $clonemsg, $cloneid, $clonehome) = &check_clone($args,$linefeed);
+ 	if ($context ne 'auto') {
+             if ($clonemsg ne '') {
+ 	        $clonemsg = '<span class="LC_error">'.$clonemsg.'</span>';
+             }
+ 	}
+ 	$outcome .= $clonemsg.$linefeed;
+         if (!$can_clone) {
+ 	    return (0,$outcome);
+ 	}
+     }
  #
  # Open course
- Line 6549  sub construct_course {
+ Line 8051  sub construct_course {
      # Utils::Course. This needs to at least be output as a comment
      # if anyone ever decides to not show this, and Utils::Course::new
      # will need to be suitably modified.
-     $outcome .= &mt('New LON-CAPA [_1] ID: [_2]<br />',$crstype,$$courseid);
+     $outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;
  #
  # Check if created correctly
  #
      ($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid);
      my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
-     $outcome .= &mt('Created on').': '.$crsuhome.'<br>';
+     $outcome .= &mt('Created on').': '.$crsuhome.$linefeed;
- #
- # Are we cloning?
  #
-     my $cloneid='';
+ # Do the cloning
-     if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
+ #
- 	$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
+     if ($can_clone && $cloneid) {
-         my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid);
+ 	$clonemsg = &mt('Cloning [_1] from [_2]',$crstype,$clonehome);
- 	my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
+ 	if ($context ne 'auto') {
- 	if ($clonehome eq 'no_host') {
+ 	    $clonemsg = '<span class="LC_success">'.$clonemsg.'</span>';
- 	    $outcome .=
+ 	}
-     '<br /><font color="red">'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.'</font>';
+ 	$outcome .= $clonemsg.$linefeed;
- 	} else {
+ 	my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
- 	    $outcome .=
-     '<br /><font color="green">'.&mt('Cloning [_1] from [_2]',$crstype,$clonehome).'</font>';
- 	    my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
  # Copy all files
- 	    &Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid);
+ 	&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid);
  # Restore URL
- 	    $cenv{'url'}=$oldcenv{'url'};
+ 	$cenv{'url'}=$oldcenv{'url'};
  # Restore title
- 	    $cenv{'description'}=$oldcenv{'description'};
+ 	$cenv{'description'}=$oldcenv{'description'};
  # restore grading mode
- 	    if (defined($oldcenv{'grading'})) {
+ 	if (defined($oldcenv{'grading'})) {
- 		$cenv{'grading'}=$oldcenv{'grading'};
+ 	    $cenv{'grading'}=$oldcenv{'grading'};
- 	    }
- # Mark as cloned
- 	    $cenv{'clonedfrom'}=$cloneid;
- 	    delete($cenv{'default_enrollment_start_date'});
- 	    delete($cenv{'default_enrollment_end_date'});
  	}
+ # Mark as cloned
+ 	$cenv{'clonedfrom'}=$cloneid;
+ 	delete($cenv{'default_enrollment_start_date'});
+ 	delete($cenv{'default_enrollment_end_date'});
      }
  #
  # Set environment (will override cloned, if existing)
  #
- Line 6672  sub construct_course {
+ Line 8170  sub construct_course {
      }
      if ($args->{'notify_dc'}) {
          if ($uname ne '') {
-             push(@notified,$uname.'@'.$udom);
+             push(@notified,$uname.':'.$udom);
          }
      }
      if (@notified > 0) {
- Line 6690  sub construct_course {
+ Line 8188  sub construct_course {
                  'dnhr' => 'does not have rights to access enrollment in these classes',
                  'adby' => 'as determined by the policies of your institution on access to official classlists'
          );
-         $outcome .= '<font color="red">'.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').<br /><ul>'."\n";
+         my $badclass_msg = $cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.
-         foreach (@badclasses) {
+                            ' ('.$lt{'adby'}.')';
-             $outcome .= "<li>$_</li>\n";
+         if ($context eq 'auto') {
-         }
+             $outcome .= $badclass_msg.$linefeed;
-         $outcome .= "</ul><br /><br /></font>\n";
+             $outcome .= '<div class="LC_warning">'.$badclass_msg.$linefeed.'<ul>'."\n";
+             foreach my $item (@badclasses) {
+                 if ($context eq 'auto') {
+                     $outcome .= " - $item\n";
+                 } else {
+                     $outcome .= "<li>$item</li>\n";
+                 }
+             }
+             if ($context eq 'auto') {
+                 $outcome .= $linefeed;
+             } else {
+                 $outcome .= "</ul><br /><br /></div>\n";
+             }
+         }
      }
      if ($args->{'no_end_date'}) {
          $args->{'endaccess'} = 0;
- Line 6710  sub construct_course {
+ Line 8221  sub construct_course {
      $cenv{'internal.autharg'} = $args->{'autharg'};
      if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) {
          if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'}  eq '') {
-             $outcome .= '<font color="red" size="+1">'.
+             my $krb_msg = &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student');
-                       &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student').'</font></p>';
+             if ($context eq 'auto') {
+                 $outcome .= $krb_msg;
+             } else {
+                 $outcome .= '<span class="LC_error">'.$krb_msg.'</span>';
+             }
+             $outcome .= $linefeed;
          }
      }
      if (($args->{'ccdomain'}) && ($args->{'ccuname'})) {
- Line 6767  sub construct_course {
+ Line 8283  sub construct_course {
      # By default, use standard grading
      if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; }
-     $outcome .= ('<br />'.&mt('Setting environment').': '.
+     $outcome .= $linefeed.&mt('Setting environment').': '.
-           &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).'<br>');
+           &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).$linefeed;
  #
  # Open all assignments
  #
- Line 6778  sub construct_course {
+ Line 8294  sub construct_course {
                             $storeunder.'.type' => 'date_start');
         $outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput
-                  ('resourcedata',\%storecontent,$$crsudom,$$crsunum).'<br>';
+                  ('resourcedata',\%storecontent,$$crsudom,$$crsunum).$linefeed;
     }
  #
  # Set first page
- Line 6805  sub construct_course {
+ Line 8321  sub construct_course {
  	(my $outtext,$errtext) = &LONCAPA::map::storemap($map,1);
  	if ($errtext) { $fatal=2; }
-         $outcome .= ($fatal?$errtext:'write ok').'<br />';
+         $outcome .= ($fatal?$errtext:'write ok').$linefeed;
      }
-     return $outcome;
+     return (1,$outcome);
  }
  ############################################################
- Line 6850  sub icon {
+ Line 8367  sub icon {
      return &lonhttpdurl($iconname);
  }
- sub lonhttpdurl {
+ sub lonhttpd_port {
-     my ($url)=@_;
      my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
      if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }
+     # IE doesn't like a secure page getting images from a non-secure
+     # port (when logging we haven't parsed the browser type so default
+     # back to secure
+     if ((!exists($env{'browser.type'}) || $env{'browser.type'} eq 'explorer')
+ 	&& $ENV{'SERVER_PORT'} == 443) {
+ 	return 443;
+     }
+     return $lonhttpd_port;
+ }
+ sub lonhttpdurl {
+     my ($url)=@_;
+     my $lonhttpd_port = &lonhttpd_port();
+     if ($lonhttpd_port == 443) {
+ 	return 'https://'.$ENV{'SERVER_NAME'}.$url;
+     }
      return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
  }

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

Removed from v.1.540
changed lines
	Added in v.1.632