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.476 and 1.981

-version 1.476, 2006/11/29 19:33:29
+version 1.981, 2010/09/24 13:15:41
  Line 59  use Apache::lonnet;
  use GDBM_File;
  use POSIX qw(strftime mktime);
  use Apache::lonmenu();
+ use Apache::lonenc();
  use Apache::lonlocal;
+ use Apache::lonnet();
  use HTML::Entities;
  use Apache::lonhtmlcommon();
  use Apache::loncoursedata();
  use Apache::lontexconvert();
  use Apache::lonclonecourse();
- use LONCAPA;
+ use LONCAPA qw(:DEFAULT :match);
+ use DateTime::TimeZone;
+ use DateTime::Locale::Catalog;
+ # ---------------------------------------------- Designs
+ use vars qw(%defaultdesign);
  my $readit;
  ##
  ## Global Variables
  ##
+ # ----------------------------------------------- SSI with retries:
+ #
+ =pod
+ =head1 Server Side include with retries:
+ =over 4
+ =item * &ssi_with_retries(resource,retries form)
+ Performs an ssi with some number of retries.  Retries continue either
+ until the result is ok or until the retry count supplied by the
+ caller is exhausted.
+ Inputs:
+ =over 4
+ resource   - Identifies the resource to insert.
+ retries    - Count of the number of retries allowed.
+ form       - Hash that identifies the rendering options.
+ =back
+ Returns:
+ =over 4
+ content    - The content of the response.  If retries were exhausted this is empty.
+ response   - The response from the last attempt (which may or may not have been successful.
+ =back
+ =back
+ =cut
+ sub ssi_with_retries {
+     my ($resource, $retries, %form) = @_;
+     my $ok = 0;			# True if we got a good response.
+     my $content;
+     my $response;
+     # Try to get the ssi done. within the retries count:
+     do {
+ 	($content, $response) = &Apache::lonnet::ssi($resource, %form);
+ 	$ok      = $response->is_success;
+         if (!$ok) {
+             &Apache::lonnet::logthis("Failed ssi_with_retries on $resource: ".$response->is_success.', '.$response->code.', '.$response->message);
+         }
+ 	$retries--;
+     } while (!$ok && ($retries > 0));
+     if (!$ok) {
+ 	$content = '';		# On error return an empty content.
+     }
+     return ($content, $response);
+ }
  # ----------------------------------------------- Filetypes/Languages/Copyright
  my %language;
  my %supported_language;
- Line 81  my %scprtag;
+ Line 159  my %scprtag;
  my %fe; my %fd; my %fm;
  my %category_extensions;
- # ---------------------------------------------- Designs
- my %designhash;
  # ---------------------------------------------- Thesaurus variables
  #
  # %Keywords:
- Line 150  BEGIN {
+ Line 224  BEGIN {
          }
      }
- # -------------------------------------------------------------- domain designs
+ # -------------------------------------------------------------- default domain designs
-     my $filename;
      my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
-     opendir(DIR,$designdir);
+     my $designfile = $designdir.'/default.tab';
-     while ($filename=readdir(DIR)) {
+     if ( open (my $fh,"<$designfile") ) {
- 	if ($filename!~/\.tab$/) { next; }
+         while (my $line = <$fh>) {
- 	my ($domain)=($filename=~/^(\w+)\./);
+             next if ($line =~ /^\#/);
- 	{
+             chomp($line);
- 	    my $designfile = $designdir.'/'.$filename;
+             my ($key,$val)=(split(/\=/,$line));
- 	    if ( open (my $fh,"<$designfile") ) {
+             if ($val) { $defaultdesign{$key}=$val; }
- 		while (my $line = <$fh>) {
+         }
- 		    next if ($line =~ /^\#/);
+         close($fh);
- 		    chomp($line);
- 		    my ($key,$val)=(split(/\=/,$line));
- 		    if ($val) { $designhash{$domain.'.'.$key}=$val; }
- 		}
- 		close($fh);
- 	    }
- 	}
      }
-     closedir(DIR);
  # ------------------------------------------------------------- file categories
      {
- Line 209  BEGIN {
+ Line 271  BEGIN {
          }
      }
      &Apache::lonnet::logthis(
-               "<font color=yellow>INFO: Read file types</font>");
+              "<span style='color:yellow;'>INFO: Read file types</span>");
      $readit=1;
      }  # end of unless($readit)
- Line 225  BEGIN {
+ Line 287  BEGIN {
  =over 4
- =item * browser_and_searcher_javascript ()
+ =item * &browser_and_searcher_javascript()
  X<browsing, javascript>X<searching, javascript>Returns a string
  containing javascript with two functions, C<openbrowser> and
  C<opensearcher>. Returned string does not contain E<lt>scriptE<gt>
  tags.
- =item * openbrowser(formname,elementname,only,omit) [javascript]
+ =item * &openbrowser(formname,elementname,only,omit) [javascript]
  inputs: formname, elementname, only, omit
- Line 245  with the given extension.  Can be a comm
+ Line 307  with the given extension.  Can be a comm
  Specifying 'omit' will restrict the browser to NOT displaying files
  with the given extension.  Can be a comma separated list.
- =item * opensearcher(formname, elementname) [javascript]
+ =item * &opensearcher(formname,elementname) [javascript]
  Inputs: formname, elementname
- Line 268  sub browser_and_searcher_javascript {
+ Line 330  sub browser_and_searcher_javascript {
          }
          url += 'catalogmode=interactive&';
          url += 'mode=$mode&';
+         url += 'inhibitmenu=yes&';
          url += 'form=' + formname + '&';
          if (only != null) {
              url += 'only=' + only + '&';
- Line 329  sub storeresurl {
+ Line 392  sub storeresurl {
      unless ($resurl=~/^\/res/) { return 0; }
      $resurl=~s/\/$//;
      &Apache::lonnet::put('environment',{'lastresurl' => $resurl});
-     &Apache::lonnet::appenv('environment.lastresurl' => $resurl);
+     &Apache::lonnet::appenv({'environment.lastresurl' => $resurl});
      return 1;
  }
- Line 343  sub studentbrowser_javascript {
+ Line 406  sub studentbrowser_javascript {
           || ($env{'request.role'}=~/^(au|dc|su)/)
            ) { return ''; }
     return (<<'ENDSTDBRW');
- <script type="text/javascript" language="Javascript" >
+ <script type="text/javascript" language="Javascript">
+ // <![CDATA[
      var stdeditbrowser;
-     function openstdbrowser(formname,uname,udom,roleflag) {
+     function openstdbrowser(formname,uname,udom,roleflag,ignorefilter,courseadvonly) {
          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 357  sub studentbrowser_javascript {
+ Line 423  sub studentbrowser_javascript {
          url += 'form=' + formname + '&unameelement='+uname+
                                      '&udomelement='+udom;
  	if (roleflag) { url+="&roles=1"; }
+         if (courseadvonly) { url+="&courseadvonly=1"; }
          var title = 'Student_Browser';
          var options = 'scrollbars=1,resizable=1,menubar=0';
          options += ',width=700,height=600';
          stdeditbrowser = open(url,title,options,'1');
          stdeditbrowser.focus();
      }
+ // ]]>
  </script>
  ENDSTDBRW
  }
  sub selectstudent_link {
-    my ($form,$unameele,$udomele)=@_;
+    my ($form,$unameele,$udomele,$courseadvonly)=@_;
+    my $callargs = "'".$form."','".$unameele."','".$udomele."'";
     if ($env{'request.course.id'}) {
         if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
  	   && !&Apache::lonnet::allowed('srm',$env{'request.course.id'}.
  					'/'.$env{'request.course.sec'})) {
  	   return '';
         }
-        return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
+        if ($courseadvonly)  {
-         '","'.$udomele.'");'."'>".&mt('Select User')."</a>";
+            $callargs .= ",'',1,1";
+        }
+        return '<span class="LC_nobreak">'.
+               '<a href="javascript:openstdbrowser('.$callargs.');">'.
+               &mt('Select User').'</a></span>';
     }
     if ($env{'request.role'}=~/^(au|dc|su)/) {
-        return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
+        $callargs .= ",1";
-         '","'.$udomele.'",1);'."'>".&mt('Select User')."</a>";
+        return '<span class="LC_nobreak">'.
+               '<a href="javascript:openstdbrowser('.$callargs.');">'.
+               &mt('Select User').'</a></span>';
     }
     return '';
  }
+ sub authorbrowser_javascript {
+     return <<"ENDAUTHORBRW";
+ <script type="text/javascript" language="JavaScript">
+ // <![CDATA[
+ var stdeditbrowser;
+ function openauthorbrowser(formname,udom) {
+     var url = '/adm/pickauthor?';
+     url += 'form='+formname+'&roledom='+udom;
+     var title = 'Author_Browser';
+     var options = 'scrollbars=1,resizable=1,menubar=0';
+     options += ',width=700,height=600';
+     stdeditbrowser = open(url,title,options,'1');
+     stdeditbrowser.focus();
+ }
+ // ]]>
+ </script>
+ ENDAUTHORBRW
+ }
  sub coursebrowser_javascript {
-     my ($domainfilter,$sec_element,$formname)=@_;
+     my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_;
-     my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
+     my $wintitle = 'Course_Browser';
-    my $output = '
+     if ($crstype eq 'Community') {
- <script type="text/javascript" language="Javascript" >
+         $wintitle = 'Community_Browser';
+     }
+     my $id_functions = &javascript_index_functions();
+     my $output = '
+ <script type="text/javascript" language="JavaScript">
+ // <![CDATA[
      var stdeditbrowser;'."\n";
-    $output .= <<"ENDSTDBRW";
-     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
+     $output .= <<"ENDSTDBRW";
+     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,type,type_elem) {
          var url = '/adm/pickcourse?';
-         var domainfilter = '';
          var formid = getFormIdByName(formname);
-         if (formid > -1) {
+         var domainfilter = getDomainFromSelectbox(formname,udom);
-             var domid = getIndexByName(formid,udom);
-             if (domid > -1) {
-                 if (document.forms[formid].elements[domid].type == 'select-one') {
-                     domainfilter=document.forms[formid].elements[domid].options[document.forms[formid].elements[domid].selectedIndex].value;
-                 }
-                 if (document.forms[formid].elements[domid].type == 'hidden') {
-                     domainfilter=document.forms[formid].elements[domid].value;
-                 }
-             }
-         }
          if (domainfilter != null) {
             if (domainfilter != '') {
                 url += 'domainfilter='+domainfilter+'&';
- Line 416  sub coursebrowser_javascript {
+ Line 507  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 425  sub coursebrowser_javascript {
+ Line 516  sub coursebrowser_javascript {
              else {
                  if (formname == 'portform') {
                      url += '&setroles='+extra_element;
+                 } else {
+                     if (formname == 'rules') {
+                         url += '&fixeddom='+extra_element;
+                     }
                  }
              }
          }
-         if (multflag !=null && multflag != '') {
+         if (type != null && type != '') {
-             url += '&multiple='+multflag;
+             url += '&type='+type;
          }
-         if (crstype == 'Course/Group') {
+         if (type_elem != null && type_elem != '') {
-             if (formname == 'cu') {
+             url += '&typeelement='+type_elem;
-                 crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
+         }
-                 if (crstype == "") {
+         if (formname == 'ccrs') {
-                     alert("$crs_or_grp_alert");
+             var ownername = document.forms[formid].ccuname.value;
-                     return;
+             var ownerdom =  document.forms[formid].ccdomain.options[document.forms[formid].ccdomain.selectedIndex].value;
-                 }
+             url += '&cloner='+ownername+':'+ownerdom;
-             }
          }
-         if (crstype !=null && crstype != '') {
+         if (multflag !=null && multflag != '') {
-             url += '&type='+crstype;
+             url += '&multiple='+multflag;
          }
-         var title = 'Course_Browser';
+         var title = '$wintitle';
          var options = 'scrollbars=1,resizable=1,menubar=0';
          options += ',width=700,height=600';
          stdeditbrowser = open(url,title,options,'1');
          stdeditbrowser.focus();
      }
+ $id_functions
+ ENDSTDBRW
+     if (($sec_element ne '') || ($role_element ne '')) {
+         $output .= &setsec_javascript($sec_element,$formname,$role_element);
+     }
+     $output .= '
+ // ]]>
+ </script>';
+     return $output;
+ }
-     function getFormIdByName(formname) {
+ sub javascript_index_functions {
-         for (var i=0;i<document.forms.length;i++) {
+     return <<"ENDJS";
-             if (document.forms[i].name == formname) {
-                 return i;
+ function getFormIdByName(formname) {
-             }
+     for (var i=0;i<document.forms.length;i++) {
+         if (document.forms[i].name == formname) {
+             return i;
+         }
+     }
+     return -1;
+ }
+ function getIndexByName(formid,item) {
+     for (var i=0;i<document.forms[formid].elements.length;i++) {
+         if (document.forms[formid].elements[i].name == item) {
+             return i;
          }
-         return -1;
      }
+     return -1;
+ }
-     function getIndexByName(formid,item) {
+ function getDomainFromSelectbox(formname,udom) {
-         for (var i=0;i<document.forms[formid].elements.length;i++) {
+     var userdom;
-             if (document.forms[formid].elements[i].name == item) {
+     var formid = getFormIdByName(formname);
-                 return i;
+     if (formid > -1) {
+         var domid = getIndexByName(formid,udom);
+         if (domid > -1) {
+             if (document.forms[formid].elements[domid].type == 'select-one') {
+                 userdom=document.forms[formid].elements[domid].options[document.forms[formid].elements[domid].selectedIndex].value;
+             }
+             if (document.forms[formid].elements[domid].type == 'hidden') {
+                 userdom=document.forms[formid].elements[domid].value;
              }
          }
-         return -1;
      }
- ENDSTDBRW
+     return userdom;
-     if ($sec_element ne '') {
+ }
-         $output .= &setsec_javascript($sec_element,$formname);
+ ENDJS
+ }
+ sub userbrowser_javascript {
+     my $id_functions = &javascript_index_functions();
+     return <<"ENDUSERBRW";
+ function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom,crsdom,caller) {
+     var url = '/adm/pickuser?';
+     var userdom = getDomainFromSelectbox(formname,udom);
+     if (userdom != null) {
+        if (userdom != '') {
+            url += 'srchdom='+userdom+'&';
+        }
      }
-     $output .= '
+     url += 'form=' + formname + '&unameelement='+uname+
- </script>';
+                                 '&udomelement='+udom+
-     return $output;
+                                 '&ulastelement='+ulast+
+                                 '&ufirstelement='+ufirst+
+                                 '&uemailelement='+uemail+
+                                 '&hideudomelement='+hideudom+
+                                 '&coursedom='+crsdom;
+     if ((caller != null) && (caller != undefined)) {
+         url += '&caller='+caller;
+     }
+     var title = 'User_Browser';
+     var options = 'scrollbars=1,resizable=1,menubar=0';
+     options += ',width=700,height=600';
+     var stdeditbrowser = open(url,title,options,'1');
+     stdeditbrowser.focus();
+ }
+ function fix_domain (formname,udom,origdom,uname) {
+     var formid = getFormIdByName(formname);
+     if (formid > -1) {
+         var unameid = getIndexByName(formid,uname);
+         var domid = getIndexByName(formid,udom);
+         var hidedomid = getIndexByName(formid,origdom);
+         if (hidedomid > -1) {
+             var fixeddom = document.forms[formid].elements[hidedomid].value;
+             var unameval = document.forms[formid].elements[unameid].value;
+             if ((fixeddom != '') && (fixeddom != undefined) && (fixeddom != null) && (unameval != '') && (unameval != undefined) && (unameval != null)) {
+                 if (domid > -1) {
+                     var slct = document.forms[formid].elements[domid];
+                     if (slct.type == 'select-one') {
+                         var i;
+                         for (i=0;i<slct.length;i++) {
+                             if (slct.options[i].value==fixeddom) { slct.selectedIndex=i; }
+                         }
+                     }
+                     if (slct.type == 'hidden') {
+                         slct.value = fixeddom;
+                     }
+                 }
+             }
+         }
+     }
+     return;
+ }
+ $id_functions
+ ENDUSERBRW
  }
  sub setsec_javascript {
-     my ($sec_element,$formname) = @_;
+     my ($sec_element,$formname,$role_element) = @_;
+     my (@courserolenames,@communityrolenames,$rolestr,$courserolestr,
+         $communityrolestr);
+     if ($role_element ne '') {
+         my @allroles = ('st','ta','ep','in','ad');
+         foreach my $crstype ('Course','Community') {
+             if ($crstype eq 'Community') {
+                 foreach my $role (@allroles) {
+                     push(@communityrolenames,&Apache::lonnet::plaintext($role,$crstype));
+                 }
+                 push(@communityrolenames,&Apache::lonnet::plaintext('co'));
+             } else {
+                 foreach my $role (@allroles) {
+                     push(@courserolenames,&Apache::lonnet::plaintext($role,$crstype));
+                 }
+                 push(@courserolenames,&Apache::lonnet::plaintext('cc'));
+             }
+         }
+         $rolestr = '"'.join('","',@allroles).'"';
+         $courserolestr = '"'.join('","',@courserolenames).'"';
+         $communityrolestr = '"'.join('","',@communityrolenames).'"';
+     }
      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 508  function setSect(sectionlist) {
+ Line 713  function setSect(sectionlist) {
          }
      }
  }
+ function setRole(crstype) {
  |;
+     if ($role_element eq '') {
+         $setsections .= '    return;
+ }
+ ';
+     } else {
+         $setsections .= qq|
+     var elementLength = document.$formname.$role_element.length;
+     var allroles = Array($rolestr);
+     var courserolenames = Array($courserolestr);
+     var communityrolenames = Array($communityrolestr);
+     if (elementLength != undefined) {
+         if (document.$formname.$role_element.options[5].value == 'cc') {
+             if (crstype == 'Course') {
+                 return;
+             } else {
+                 allroles[5] = 'co';
+                 for (var i=0; i<6; i++) {
+                     document.$formname.$role_element.options[i].value = allroles[i];
+                     document.$formname.$role_element.options[i].text = communityrolenames[i];
+                 }
+             }
+         } else {
+             if (crstype == 'Community') {
+                 return;
+             } else {
+                 allroles[5] = 'cc';
+                 for (var i=0; i<6; i++) {
+                     document.$formname.$role_element.options[i].value = allroles[i];
+                     document.$formname.$role_element.options[i].text = courserolenames[i];
+                 }
+             }
+         }
+     }
+     return;
+ }
+ |;
+     }
      return $setsections;
  }
  sub selectcourse_link {
-    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
+    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype,
-     return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
+        $typeelement) = @_;
-         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select [_1]',$selecttype)."</a>";
+    my $type = $selecttype;
+    my $linktext = &mt('Select Course');
+    if ($selecttype eq 'Community') {
+        $linktext = &mt('Select Community');
+    } elsif ($selecttype eq 'Course/Community') {
+        $linktext = &mt('Select Course/Community');
+        $type = '';
+    }
+    return '<span class="LC_nobreak">'
+          ."<a href='"
+          .'javascript:opencrsbrowser("'.$form.'","'.$unameele
+          .'","'.$udomele.'","'.$desc.'","'.$extra_element
+          .'","'.$multflag.'","'.$type.'","'.$typeelement.'");'
+          ."'>".$linktext.'</a>'
+          .'</span>';
+ }
+ sub selectauthor_link {
+    my ($form,$udom)=@_;
+    return '<a href="javascript:openauthorbrowser('."'$form','$udom'".');">'.
+           &mt('Select Author').'</a>';
+ }
+ sub selectuser_link {
+     my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem,
+         $coursedom,$linktext,$caller) = @_;
+     return '<a href="javascript:openuserbrowser('."'$form','$unameelem','$domelem',".
+            "'$lastelem','$firstelem','$emailelem','$hdomelem','$coursedom','$caller'".
+            ');">'.$linktext.'</a>';
  }
  sub check_uncheck_jscript {
- Line 535  function uncheckAll(field) {
+ Line 806  function uncheckAll(field) {
      if (field.length > 0) {
          for (i = 0; i < field.length; i++) {
              field[i].checked = false ;
-         }     } else {
+         }
+     } else {
          field.checked = false ;
      }
  }
- Line 543  ENDSCRT
+ Line 815  ENDSCRT
      return $jscript;
  }
+ sub select_timezone {
+    my ($name,$selected,$onchange,$includeempty)=@_;
+    my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
+    if ($includeempty) {
+        $output .= '<option value=""';
+        if (($selected eq '') || ($selected eq 'local')) {
+            $output .= ' selected="selected" ';
+        }
+        $output .= '> </option>';
+    }
+    my @timezones = DateTime::TimeZone->all_names;
+    foreach my $tzone (@timezones) {
+        $output.= '<option value="'.$tzone.'"';
+        if ($tzone eq $selected) {
+            $output.=' selected="selected"';
+        }
+        $output.=">$tzone</option>\n";
+    }
+    $output.="</select>";
+    return $output;
+ }
+ sub select_datelocale {
+     my ($name,$selected,$onchange,$includeempty)=@_;
+     my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
+     if ($includeempty) {
+         $output .= '<option value=""';
+         if ($selected eq '') {
+             $output .= ' selected="selected" ';
+         }
+         $output .= '> </option>';
+     }
+     my (@possibles,%locale_names);
+     my @locales = DateTime::Locale::Catalog::Locales;
+     foreach my $locale (@locales) {
+         if (ref($locale) eq 'HASH') {
+             my $id = $locale->{'id'};
+             if ($id ne '') {
+                 my $en_terr = $locale->{'en_territory'};
+                 my $native_terr = $locale->{'native_territory'};
+                 my @languages = &Apache::lonlocal::preferred_languages();
+                 if (grep(/^en$/,@languages) || !@languages) {
+                     if ($en_terr ne '') {
+                         $locale_names{$id} = '('.$en_terr.')';
+                     } elsif ($native_terr ne '') {
+                         $locale_names{$id} = $native_terr;
+                     }
+                 } else {
+                     if ($native_terr ne '') {
+                         $locale_names{$id} = $native_terr.' ';
+                     } elsif ($en_terr ne '') {
+                         $locale_names{$id} = '('.$en_terr.')';
+                     }
+                 }
+                 push (@possibles,$id);
+             }
+         }
+     }
+     foreach my $item (sort(@possibles)) {
+         $output.= '<option value="'.$item.'"';
+         if ($item eq $selected) {
+             $output.=' selected="selected"';
+         }
+         $output.=">$item";
+         if ($locale_names{$item} ne '') {
+             $output.="  $locale_names{$item}</option>\n";
+         }
+         $output.="</option>\n";
+     }
+     $output.="</select>";
+     return $output;
+ }
+ sub select_language {
+     my ($name,$selected,$includeempty) = @_;
+     my %langchoices;
+     if ($includeempty) {
+         %langchoices = ('' => 'No language preference');
+     }
+     foreach my $id (&languageids()) {
+         my $code = &supportedlanguagecode($id);
+         if ($code) {
+             $langchoices{$code} = &plainlanguagedescription($id);
+         }
+     }
+     return &select_form($selected,$name,\%langchoices);
+ }
  =pod
- =item * linked_select_forms(...)
+ =item * &linked_select_forms(...)
  linked_select_forms returns a string containing a <script></script> block
  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 570  linked_select_forms takes the following
+ Line 929  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 586  $menu{$choice1}->{'select2'}.
+ Line 947  $menu{$choice1}->{'select2'}.
                             B2 => "Choice B2",
                             B3 => "Choice B3",
                             B4 => "Choice B4"
-                            }
+                            },
+                        order => ['B4','B3','B1','B2'],
                     },
                 A2 => { text =>"Choice A2" ,
                         default => "C2",
- Line 594  $menu{$choice1}->{'select2'}.
+ Line 956  $menu{$choice1}->{'select2'}.
                             C1 => "Choice C1",
                             C2 => "Choice C2",
                             C3 => "Choice C3"
-                            }
+                            },
+                        order => ['C2','C1','C3'],
                     },
                 A3 => { text =>"Choice A3" ,
                         default => "D6",
- Line 606  $menu{$choice1}->{'select2'}.
+ Line 969  $menu{$choice1}->{'select2'}.
                             D5 => "Choice D5",
                             D6 => "Choice D6",
                             D7 => "Choice D7"
-                            }
+                            },
+                        order => ['D4','D3','D2','D1','D7','D6','D5'],
                     }
                 );
- Line 618  sub linked_select_forms {
+ Line 982  sub linked_select_forms {
          $firstdefault,
          $firstselectname,
          $secondselectname,
-         $hashref
+         $hashref,
+         $menuorder,
          ) = @_;
      my $second = "document.$formname.$secondselectname";
      my $first = "document.$formname.$firstselectname";
      # output the javascript to do the changing
      my $result = '';
-     $result.="<script type=\"text/javascript\">\n";
+     $result.='<script type="text/javascript" language="JavaScript">'."\n";
+     $result.="// <![CDATA[\n";
      $result.="var select2data = new Object();\n";
      $" = '","';
      my $debug = '';
- Line 632  sub linked_select_forms {
+ Line 998  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 667  function select1_changed() {
+ Line 1036  function select1_changed() {
          }
      }
  }
+ // ]]>
  </script>
  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 681  END
+ Line 1055  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 693  END
+ Line 1072  END
  =pod
- =item * help_open_topic($topic, $text, $stayOnPage, $width, $height)
+ =item * &help_open_topic($topic,$text,$stayOnPage,$width,$height,$imgid)
  Returns a string corresponding to an HTML link to the given help
  $topic, where $topic corresponds to the name of a .tex file in
- Line 711  a new window using Javascript. (Default
+ Line 1090  a new window using Javascript. (Default
  $width and $height are optional numerical parameters that will
  override the width and height of the popped up window, which may
  be useful for certain help topics with big pictures included.
+ $imgid is the id of the img tag used for the help icon. This may be
+ used in a javascript call to switch the image src.  See
+ lonhtmlcommon::htmlareaselectactive() for an example.
  =cut
  sub help_open_topic {
-     my ($topic, $text, $stayOnPage, $width, $height) = @_;
+     my ($topic, $text, $stayOnPage, $width, $height, $imgid) = @_;
      $text = "" if (not defined $text);
      $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual' ||
- 	$env{'environment.remote'} eq 'off' ) {
- 	$stayOnPage=1;
-     }
      $width = 350 if (not defined $width);
      $height = 400 if (not defined $height);
      my $filename = $topic;
- Line 730  sub help_open_topic {
+ Line 1109  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.='<span class="LC_help_open_topic">'
- 	$template .=
+                   .'<a target="_top" href="'.$link.'">'
-   "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
+                   .$text.'</a>';
-   "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
      }
-     # Add the graphic
+     # (Always) Add the graphic
      my $title = &mt('Online Help');
-     my $helpicon=&lonhttpdurl("/adm/help/gif/smallHelp.gif");
+     my $helpicon=&lonhttpdurl("/adm/help/help.png");
-     $template .= <<"ENDTEMPLATE";
+     if ($imgid ne '') {
-  <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
+         $imgid = ' id="'.$imgid.'"';
- ENDTEMPLATE
+     }
-     if ($text ne '') { $template.='</td></tr></table>' };
+     $template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'
+               .'<img src="'.$helpicon.'" border="0"'
+               .' alt="'.&mt('Help: [_1]',$topic).'"'
+               .' title="'.$title.'" style="vertical-align:middle;"'.$imgid
+               .' /></a>';
+     if ($text ne "") {
+         $template.='</span>';
+     }
      return $template;
  }
- Line 764  ENDTEMPLATE
+ Line 1146  ENDTEMPLATE
  # This is a quicky function for Latex cheatsheet editing, since it
  # appears in at least four places
  sub helpLatexCheatsheet {
-     my $other = shift;
+     my ($topic,$text,$not_author) = @_;
+     my $out;
      my $addOther = '';
-     if ($other) {
+     if ($topic) {
- 	$addOther = Apache::loncommon::help_open_topic($other, shift,
+ 	$addOther = '<span>'.&Apache::loncommon::help_open_topic($topic,&mt($text),
- 						       undef, undef, 600) .
+ 							       undef, undef, 600).
- 							   '</td><td>';
+ 								   '</span> ';
      }
-     return '<table><tr><td>'.
+     $out = '<span>' # Start cheatsheet
- 	$addOther .
+ 	  .$addOther
- 	&Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols',
+           .'<span>'
- 					    undef,undef,600)
+ 	  .&Apache::loncommon::help_open_topic('Greek_Symbols',&mt('Greek Symbols'),
- 	.'</td><td>'.
+ 					       undef,undef,600)
- 	&Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols',
+ 	  .'</span> <span>'
- 					    undef,undef,600)
+ 	  .&Apache::loncommon::help_open_topic('Other_Symbols',&mt('Other Symbols'),
- 	.'</td></tr></table>';
+ 					       undef,undef,600)
+ 	  .'</span>';
+     unless ($not_author) {
+         $out .= ' <span>'
+ 	       .&Apache::loncommon::help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),
+ 	                                            undef,undef,600)
+ 	       .'</span>';
+     }
+     $out .= '</span>'; # End cheatsheet
+     return $out;
  }
  sub general_help {
      my $helptopic='Student_Intro';
      if ($env{'request.role'}=~/^(ca|au)/) {
  	$helptopic='Authoring_Intro';
-     } elsif ($env{'request.role'}=~/^cc/) {
+     } elsif ($env{'request.role'}=~/^(cc|co)/) {
  	$helptopic='Course_Coordination_Intro';
+     } elsif ($env{'request.role'}=~/^dc/) {
+         $helptopic='Domain_Coordination_Intro';
      }
      return $helptopic;
  }
- Line 803  sub update_help_link {
+ Line 1197  sub update_help_link {
      my $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";
      my $output .= <<"ENDOUTPUT";
  <script type="text/javascript">
+ // <![CDATA[
  banner_link = '$banner_link';
+ // ]]>
  </script>
  ENDOUTPUT
      return $output;
- Line 812  ENDOUTPUT
+ Line 1208  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 = 1;
-     $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual' ||
- 	$env{'environment.remote'} eq 'off' ) {
- 	$stayOnPage=1;
-     }
      my $output;
      if ($component_help) {
  	if (!$text) {
- Line 838  sub help_open_menu {
+ Line 1229  sub help_open_menu {
  sub top_nav_help {
      my ($text) = @_;
      $text = &mt($text);
+     my $stay_on_page = 1;
-     my $stayOnPage =
+     my $link = ($stay_on_page) ? "javascript:helpMenu('display')"
- 	($env{'browser.interface'}  eq 'textual' ||
- 	 $env{'environment.remote'} eq 'off' );
-     my $link=  ($stayOnPage) ? "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 858  END
+ Line 1246  END
  sub help_menu_js {
      my ($text) = @_;
+     my $stayOnPage = 1;
-     my $stayOnPage =
- 	($env{'browser.interface'}  eq 'textual' ||
- 	 $env{'environment.remote'} eq 'off' );
      my $width = 620;
      my $height = 600;
      my $helptopic=&general_help();
- Line 874  sub help_menu_js {
+ Line 1258  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,});
      my $template .= <<"ENDTEMPLATE";
  <script type="text/javascript">
- // <!-- BEGIN LON-CAPA Internal
  // <![CDATA[
+ // <!-- BEGIN LON-CAPA Internal
  var banner_link = '';
  function helpMenu(target) {
      var caller = this;
- Line 907  function writeHelp(caller) {
+ Line 1291  function writeHelp(caller) {
      caller.document.close()
      caller.focus()
  }
- // ]]>
  // END LON-CAPA Internal -->
+ // ]]>
  </script>
  ENDTEMPLATE
      return $template;
- Line 919  sub help_open_bug {
+ Line 1303  sub help_open_bug {
      unless ($env{'user.adv'}) { return ''; }
      unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; }
      $text = "" if (not defined $text);
-     $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual' ||
- 	$env{'environment.remote'} eq 'off' ) {
  	$stayOnPage=1;
-     }
      $width = 600 if (not defined $width);
      $height = 600 if (not defined $height);
- Line 945  sub help_open_bug {
+ Line 1325  sub help_open_bug {
      {
  	$template .=
    "<table bgcolor='#AA3333' cellspacing='1' cellpadding='1' border='0'><tr>".
-   "<td bgcolor='#FF5555'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+   "<td bgcolor='#FF5555'><a target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF;font-size:10pt;\">$text</span></a>";
      }
      # Add the graphic
- Line 964  sub help_open_faq {
+ Line 1344  sub help_open_faq {
      unless ($env{'user.adv'}) { return ''; }
      unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; }
      $text = "" if (not defined $text);
-     $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual' ||
- 	$env{'environment.remote'} eq 'off' ) {
  	$stayOnPage=1;
-     }
      $width = 350 if (not defined $width);
      $height = 400 if (not defined $height);
- Line 990  sub help_open_faq {
+ Line 1366  sub help_open_faq {
      {
  	$template .=
    "<table bgcolor='#337733' cellspacing='1' cellpadding='1' border='0'><tr>".
-   "<td bgcolor='#448844'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+   "<td bgcolor='#448844'><a target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF; font-size:10pt;\">$text</span></a>";
      }
      # Add the graphic
- Line 1009  ENDTEMPLATE
+ Line 1385  ENDTEMPLATE
  =pod
- =item * change_content_javascript():
+ =item * &change_content_javascript():
  This and the next function allow you to create small sections of an
  otherwise static HTML page that you can update on the fly with
- Line 1064  DOMBASED
+ Line 1440  DOMBASED
  =pod
- =item * changable_area($name, $origContent):
+ =item * &changable_area($name,$origContent):
  This provides a "changable area" that can be modified on the fly via
  the Javascript code provided in C<change_content_javascript>. $name is
- Line 1088  sub changable_area {
+ Line 1464  sub changable_area {
  =pod
+ =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.
  =back
+ =cut
+ sub resize_textarea_js {
+     my $geometry = &viewport_geometry_js();
+     return <<"RESIZE";
+     <script type="text/javascript">
+ // <![CDATA[
+ $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
  =head1 Excel and CSV file utility routines
  =over 4
- Line 1101  sub changable_area {
+ Line 1610  sub changable_area {
  =pod
- =item * csv_translate($text)
+ =item * &csv_translate($text)
  Translate $text to allow it to be output as a 'comma separated values'
  format.
- Line 1122  sub csv_translate {
+ Line 1631  sub csv_translate {
  =pod
- =item * define_excel_formats
+ =item * &define_excel_formats()
  Define some commonly used Excel cell formats.
- Line 1178  sub define_excel_formats {
+ Line 1687  sub define_excel_formats {
  =pod
- =item * create_workbook
+ =item * &create_workbook()
  Create an Excel worksheet.  If it fails, output message on the
  request object and return undefs.
- Line 1203  sub create_workbook {
+ Line 1712  sub create_workbook {
      my $workbook  = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
      if (! defined($workbook)) {
          $r->log_error("Error creating excel spreadsheet $filename: $!");
-         $r->print('<p>'.&mt("Unable to create new Excel file.  ".
+         $r->print(
-                             "This error has been logged.  ".
+             '<p class="LC_error">'
-                             "Please alert your LON-CAPA administrator").
+            .&mt('Problems occurred in creating the new Excel file.')
-                   '</p>');
+            .' '.&mt('This error has been logged.')
+            .' '.&mt('Please alert your LON-CAPA administrator.')
+            .'</p>'
+         );
          return (undef);
      }
      #
- Line 1221  sub create_workbook {
+ Line 1733  sub create_workbook {
  =pod
- =item * create_text_file
+ =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 1246  sub create_text_file {
+ Line 1758  sub create_text_file {
      $fh = Apache::File->new('>/home/httpd'.$filename);
      if (! defined($fh)) {
          $r->log_error("Couldn't open $filename for output $!");
-         $r->print("Problems occured in creating the output file.  ".
+         $r->print(
-                   "This error has been logged.  ".
+             '<p class="LC_error">'
-                   "Please alert your LON-CAPA administrator.");
+            .&mt('Problems occurred in creating the output file.')
+            .' '.&mt('This error has been logged.')
+            .' '.&mt('Please alert your LON-CAPA administrator.')
+            .'</p>'
+         );
      }
      return ($fh,$filename)
  }
- Line 1264  sub create_text_file {
+ Line 1780  sub create_text_file {
  ##        Home server <option> list generating code          ##
  ###############################################################
- =pod
- =head1 Home Server option list generating code
- =over 4
- =item * get_domains()
- Returns an array containing each of the domains listed in the hosts.tab
- file.
- =cut
- #-------------------------------------------
- sub get_domains {
-     # The code below was stolen from "The Perl Cookbook", p 102, 1st ed.
-     my @domains;
-     my %seen;
-     foreach my $dom (sort(values(%Apache::lonnet::hostdom))) {
- 	push(@domains,$dom) unless $seen{$dom}++;
-     }
-     return @domains;
- }
  # ------------------------------------------
  sub domain_select {
      my ($name,$value,$multiple)=@_;
      my %domains=map {
- 	$_ => $_.' '.$Apache::lonnet::domaindescription{$_}
+ 	$_ => $_.' '. &Apache::lonnet::domain($_,'description')
-     } &get_domains;
+     } &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 {
- 	return &select_form($name,$value,%domains);
+ 	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
+ 	return &select_form($name,$value,\%domains);
      }
  }
- Line 1307  sub domain_select {
+ Line 1801  sub domain_select {
  =pod
- =item * multiple_select_form($name,$value,$size,$hash,$order)
+ =head1 Routines for form select boxes
+ =over 4
+ =item * &multiple_select_form($name,$value,$size,$hash,$order)
  Returns a string containing a <select> element int multiple mode
  Args:
    $name - name of the <select> element
-   $value - sclara or array ref of values that should already be selected
+   $value - scalar or array ref of values that should already be selected
    $size - number of rows long the select element is
    $hash - the elements should be 'option' => 'shown text'
            (shown text should already have been &mt())
-   $order - (optional) array ref of the order to show the elments in
+   $order - (optional) array ref of the order to show the elements in
  =cut
- Line 1333  sub multiple_select_form {
+ Line 1831  sub multiple_select_form {
              $size = scalar(keys(%$hash));
          }
      }
-     $output.="\n<select name='$name' size='$size' multiple='1'>";
+     $output.="\n".'<select name="'.$name.'" size="'.$size.'" multiple="multiple">';
-     my @order = ref($order) ? @$order
+     my @order;
-                             : sort(keys(%$hash));
+     if (ref($order) eq 'ARRAY')  {
+         @order = @{$order};
+     } else {
+         @order = sort(keys(%$hash));
+     }
+     if (exists($$hash{'select_form_order'})) {
+         @order = @{$$hash{'select_form_order'}};
+     }
      foreach my $key (@order) {
          $output.='<option value="'.&HTML::Entities::encode($key,'"<>&').'" ';
          $output.='selected="selected" ' if ($selected{$key});
- Line 1349  sub multiple_select_form {
+ Line 1855  sub multiple_select_form {
  =pod
- =item * select_form($defdom,$name,%hash)
+ =item * &select_form($defdom,$name,$hashref,$onchange)
  Returns a string containing a <select name='$name' size='1'> form to
- allow a user to select options from a hash option_name => displayed text.
+ allow a user to select options from a ref to a hash containing:
+ option_name => displayed text. An optional $onchange can include
+ a javascript onchange item, e.g., onchange="this.form.submit();"
  See lonrights.pm for an example invocation and use.
  =cut
  #-------------------------------------------
  sub select_form {
-     my ($def,$name,%hash) = @_;
+     my ($def,$name,$hashref,$onchange) = @_;
-     my $selectform = "<select name=\"$name\" size=\"1\">\n";
+     return unless (ref($hashref) eq 'HASH');
+     if ($onchange) {
+         $onchange = ' onchange="'.$onchange.'"';
+     }
+     my $selectform = "<select name=\"$name\" size=\"1\"$onchange>\n";
      my @keys;
-     if (exists($hash{'select_form_order'})) {
+     if (exists($hashref->{'select_form_order'})) {
- 	@keys=@{$hash{'select_form_order'}};
+ 	@keys=@{$hashref->{'select_form_order'}};
      } else {
- 	@keys=sort(keys(%hash));
+ 	@keys=sort(keys(%{$hashref}));
      }
      foreach my $key (@keys) {
          $selectform.=
  	    '<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.
              ($key eq $def ? 'selected="selected" ' : '').
-                 ">".&mt($hash{$key})."</option>\n";
+                 ">".$hashref->{$key}."</option>\n";
      }
      $selectform.="</select>";
      return $selectform;
- Line 1381  sub select_form {
+ Line 1894  sub select_form {
  sub display_filter {
      if (!$env{'form.show'}) { $env{'form.show'}=10; }
-     return '<nobr><label>'.&mt('Records [_1]',
+     if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }
+     return '<span class="LC_nobreak"><label>'.&mt('Records [_1]',
  			       &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
  							   (&mt('all'),10,20,50,100,1000,10000))).
- 	   '</label></nobr> <nobr><label>'.
+ 	   '</label></span> <span class="LC_nobreak">'.
             &mt('Filter [_1]',
- 	   &select_form(($env{'form.displayfilter'}?$env{'form.displayfilter'}:'currentfolder'),
+ 	   &select_form($env{'form.displayfilter'},
- 					'displayfilter',
+ 			'displayfilter',
- 					('currentfolder' => 'Current folder',
+ 			{'currentfolder' => 'Current folder/page',
- 					 'containing' => 'Containing phrase',
+ 			 'containing' => 'Containing phrase',
- 					 'none' => 'None'))).
+ 			 'none' => 'None'})).
- 	   '<input type="text" name="containingphrase" size="30" /></label></nobr>';
+ 			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></span>';
  }
  sub gradeleveldescription {
- Line 1435  sub select_level_form {
+ Line 1949  sub select_level_form {
  =pod
- =item * select_dom_form($defdom,$name,$includeempty)
+ =item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms)
  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 1444  See loncreateuser.pm for an example invo
+ Line 1958  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.
+ The optional $onchange argument specifies what should occur if the domain selector is changed, e.g., 'this.form.submit()' if the form is to be automatically submitted.
+ The optional $incdoms is a reference to an array of domains which will be the only available options.
  =cut
  #-------------------------------------------
  sub select_dom_form {
-     my ($defdom,$name,$includeempty) = @_;
+     my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms) = @_;
-     my @domains = get_domains();
+     if ($onchange) {
+         $onchange = ' onchange="'.$onchange.'"';
+     }
+     my @domains;
+     if (ref($incdoms) eq 'ARRAY') {
+         @domains = sort {lc($a) cmp lc($b)} (@{$incdoms});
+     } else {
+         @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
+     }
      if ($includeempty) { @domains=('',@domains); }
-     my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
+     my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\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 1465  sub select_dom_form {
+ Line 2001  sub select_dom_form {
  =pod
- =item * get_library_servers($domain)
+ =item * &home_server_form_item($domain,$name,$defaultflag)
- Returns a hash which contains keys like '103l3' and values like
+ input: 4 arguments (two required, two optional) -
- 'kirk.lite.msu.edu'.  All of the keys will be for machines in the
+     $domain - domain of new user
- given $domain.
+     $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.
- =cut
+ (b) number of library servers found.
- #-------------------------------------------
+ See loncreateuser.pm for example of use.
- sub get_library_servers {
-     my $domain = shift;
-     my %library_servers;
-     foreach my $hostid (keys(%Apache::lonnet::libserv)) {
-         if ($Apache::lonnet::hostdom{$hostid} eq $domain) {
-             $library_servers{$hostid} = $Apache::lonnet::hostname{$hostid};
-         }
-     }
-     return %library_servers;
- }
- #-------------------------------------------
- =pod
- =item * home_server_option_list($domain)
- returns a string which contains an <option> list to be used in a
- <select> form input.  See loncreateuser.pm for an example.
  =cut
  #-------------------------------------------
- sub home_server_option_list {
+ sub home_server_form_item {
-     my $domain = shift;
+     my ($domain,$name,$default,$hide) = @_;
-     my %servers = &get_library_servers($domain);
+     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="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
  =back
  =cut
- Line 1605  sub decode_user_agent {
+ Line 2161  sub decode_user_agent {
  =over 4
- =item * authform_xxxxxx
+ =item * &authform_xxxxxx()
  The authform_xxxxxx subroutines provide javascript and html forms which
  handle some of the conveniences required for authentication forms.
  This is not an optimal method, but it works.
- See loncreateuser.pm for invocation and use examples.
  =over 4
  =item * authform_header
- Line 1629  See loncreateuser.pm for invocation and
+ Line 2183  See loncreateuser.pm for invocation and
  =back
- =back
+ See loncreateuser.pm for invocation and use examples.
  =cut
- Line 1659  END
+ Line 2213  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 1754  sub authform_nochange{
+ Line 2305  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="checked"';
      } else {
-        $check4 = " checked=\"on\"";
+        $check4 = ' checked="checked"';
      }
      $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="checked"';
-         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="checked"';
+                     $check4 = '';
+                 } else {
+                     $check4 = ' checked="checked"';
+                     $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="checked" ';
-             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 1836  sub authform_local{
+ Line 2489  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="checked" ';
-                 $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 1863  sub authform_filesystem{
+ Line 2543  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="checked" ';
+                 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 {
- ##    Get Authentication Defaults for Domain                 ##
+     my ($dom) = @_;
- ###############################################################
+     if ($dom eq '') {
+         $dom = $env{'request.role.domain'};
- =pod
+     }
+     my %can_assign = (
- =head1 Domains and Authentication
+                           krb4 => 1,
+                           krb5 => 1,
- Returns default authentication type and an associated argument as
+                           int  => 1,
- listed in file 'domain.tab'.
+                           loc  => 1,
+                      );
- =over 4
+     my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
+     if (ref($domconfig{'usercreation'}) eq 'HASH') {
- =item * get_auth_defaults
+         if (ref($domconfig{'usercreation'}{'authtypes'}) eq 'HASH') {
+             my $authhash = $domconfig{'usercreation'}{'authtypes'};
- get_auth_defaults($target_domain) returns the default authentication
+             my $context;
- type and an associated argument (initial password or a kerberos domain).
+             if ($env{'request.role'} =~ /^au/) {
- These values are stored in lonTabs/domain.tab
+                 $context = 'author';
+             } elsif ($env{'request.role'} =~ /^dc/) {
- ($def_auth, $def_arg) = &get_auth_defaults($target_domain);
+                 $context = 'domain';
+             } elsif ($env{'request.course.id'}) {
- If target_domain is not found in domain.tab, returns nothing ('').
+                 $context = 'course';
+             }
- =cut
+             if ($context) {
+                 if (ref($authhash->{$context}) eq 'HASH') {
- #-------------------------------------------
+                    %can_assign = %{$authhash->{$context}};
- sub get_auth_defaults {
+                 }
-     my $domain=shift;
+             }
-     return ($Apache::lonnet::domain_auth_def{$domain},$Apache::lonnet::domain_auth_arg_def{$domain});
+         }
+     }
+     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);
  }
- ###############################################################
- ##   End Get Authentication Defaults for Domain              ##
- ###############################################################
  ###############################################################
  ##    Get Kerberos Defaults for Domain                 ##
- Line 1919  sub get_auth_defaults {
+ Line 2646  sub get_auth_defaults {
  =pod
- =item * get_kerberos_defaults
+ =item * &get_kerberos_defaults()
  get_kerberos_defaults($target_domain) returns the default kerberos
- version and domain. If not found in domain.tabs, it defaults to
+ version and domain. If not found, it defaults to version 4 and the
- version 4 and the domain of the server.
+ domain of the server.
+ =over 4
  ($def_version, $def_krb_domain) = &get_kerberos_defaults($target_domain);
+ =back
+ =back
  =cut
  #-------------------------------------------
  sub get_kerberos_defaults {
      my $domain=shift;
-     my ($krbdef,$krbdefdom) =
+     my ($krbdef,$krbdefdom);
-         &Apache::loncommon::get_auth_defaults($domain);
+     my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
-     unless ($krbdef =~/^krb/ && $krbdefdom) {
+     if (($domdefaults{'auth_def'} =~/^krb(4|5)$/) && ($domdefaults{'auth_arg_def'} ne '')) {
+         $krbdef = $domdefaults{'auth_def'};
+         $krbdefdom = $domdefaults{'auth_arg_def'};
+     } else {
          $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
          my $krbdefdom=$1;
          $krbdefdom=~tr/a-z/A-Z/;
- Line 1943  sub get_kerberos_defaults {
+ Line 2679  sub get_kerberos_defaults {
      return ($krbdef,$krbdefdom);
  }
- =pod
- =back
- =cut
  ###############################################################
  ##                Thesaurus Functions                        ##
- Line 1959  sub get_kerberos_defaults {
+ Line 2690  sub get_kerberos_defaults {
  =over 4
- =item * initialize_keywords
+ =item * &initialize_keywords()
  Initializes the package variable %Keywords if it is empty.  Uses the
  package variable $thesaurus_db_file.
- Line 1996  sub initialize_keywords {
+ Line 2727  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 2004  sub initialize_keywords {
+ Line 2735  sub initialize_keywords {
  =pod
- =item * keyword($word)
+ =item * &keyword($word)
  Returns true if $word is a keyword.  A keyword is a word that appears more
  than the average number of times in the thesaurus database.  Calls
- Line 2025  sub keyword {
+ Line 2756  sub keyword {
  =pod
- =item * get_related_words
+ =item * &get_related_words()
  Look up a word in the thesaurus.  Takes a scalar argument and returns
  an array of words.  If the keyword is not in the thesaurus, an empty array
- Line 2083  sub get_related_words {
+ Line 2814  sub get_related_words {
  =over 4
- =item * plainname($uname,$udom,$first)
+ =item * &plainname($uname,$udom,$first)
  Takes a users logon name and returns it as a string in
  "first middle last generation" form
- Line 2096  if $first is set to 'lastname' then it r
+ Line 2827  if $first is set to 'lastname' then it r
  ###############################################################
  sub plainname {
      my ($uname,$udom,$first)=@_;
+     return if (!defined($uname) || !defined($udom));
      my %names=&getnames($uname,$udom);
      my $name=&Apache::lonnet::format_name($names{'firstname'},
  					  $names{'middlename'},
- Line 2111  sub plainname {
+ Line 2843  sub plainname {
  # -------------------------------------------------------------------- Nickname
  =pod
- =item * nickname($uname,$udom)
+ =item * &nickname($uname,$udom)
  Gets a users name and returns it as a string as
- Line 2127  if the user does not
+ Line 2859  if the user does not
  sub nickname {
      my ($uname,$udom)=@_;
+     return if (!defined($uname) || !defined($udom));
      my %names=&getnames($uname,$udom);
      my $name=$names{'nickname'};
      if ($name) {
- Line 2142  sub nickname {
+ Line 2875  sub nickname {
  sub getnames {
      my ($uname,$udom)=@_;
+     return if (!defined($uname) || !defined($udom));
      if ($udom eq 'public' && $uname eq 'public') {
  	return ('lastname' => &mt('Public'));
      }
- Line 2158  sub getnames {
+ Line 2892  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 addresses; for permanentemail, value is a single e-mail address.
+ =cut
  sub getemails {
      my ($uname,$udom)=@_;
      if ($udom eq 'public' && $uname eq 'public') {
- Line 2179  sub getemails {
+ Line 2929  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);
+ }
+ # -------------------------------------------------------------------- getlangs
+ =pod
+ =item * &getlangs($uname,$udom)
+ Gets a user's language preference and returns it as a hash with key:
+ language.
+ =cut
+ sub getlangs {
+     my ($uname,$udom) = @_;
+     if (!$udom)  { $udom =$env{'user.domain'}; }
+     if (!$uname) { $uname=$env{'user.name'};   }
+     my $id=$uname.':'.$udom;
+     my ($langs,$cached)=&Apache::lonnet::is_cached_new('userlangs',$id);
+     if ($cached) {
+         return %{$langs};
+     } else {
+         my %loadlangs=&Apache::lonnet::get('environment',['languages'],
+                                            $udom,$uname);
+         &Apache::lonnet::do_cache_new('userlangs',$id,\%loadlangs);
+         return %loadlangs;
+     }
+ }
+ sub flush_langs_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('userlangs',$id);
+ }
  # ------------------------------------------------------------------ Screenname
  =pod
- =item * screenname($uname,$udom)
+ =item * &screenname($uname,$udom)
  Gets a users screenname and returns it as a string
- Line 2198  sub screenname {
+ Line 2994  sub screenname {
  }
+ # ------------------------------------------------------------- Confirm Wrapper
+ =pod
+ =item confirmwrapper
+ Wrap messages about completion of operation in box
+ =cut
+ sub confirmwrapper {
+     my ($message)=@_;
+     if ($message) {
+         return "\n".'<div class="LC_confirm_box">'."\n"
+                .$message."\n"
+                .'</div>'."\n";
+     } else {
+         return $message;
+     }
+ }
  # ------------------------------------------------------------- Message Wrapper
  sub messagewrapper {
- Line 2208  sub messagewrapper {
+ Line 3024  sub messagewrapper {
  	'&amp;subject='.&escape($subject).'&amp;text='.&escape($text).'" '.
          'title="'.&mt('Send message').'">'.$link.'</a>';
  }
  # --------------------------------------------------------------- Notes Wrapper
  sub noteswrapper {
      my ($link,$un,$do)=@_;
      return
- "<a href='/adm/email?recordftf=retrieve&recname=$un&recdom=$do'>$link</a>";
+ "<a href='/adm/email?recordftf=retrieve&amp;recname=$un&amp;recdom=$do'>$link</a>";
  }
  # ------------------------------------------------------------- Aboutme Wrapper
  sub aboutmewrapper {
- Line 2222  sub aboutmewrapper {
+ Line 3040  sub aboutmewrapper {
      if (!defined($username)  && !defined($domain)) {
          return;
      }
-     return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
+     return '<a href="/adm/'.$domain.'/'.$username.'/aboutme?forcestudent=1"'.
- 	($target?' target="$target"':'').' title="'.&mt("View this user's personal page").'">'.$link.'</a>';
+ 	($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.'</a>';
  }
  # ------------------------------------------------------------ Syllabus Wrapper
  sub syllabuswrapper {
-     my ($linktext,$coursedir,$domain,$fontcolor)=@_;
+     my ($linktext,$coursedir,$domain)=@_;
-     if ($fontcolor) {
-         $linktext='<font color="'.$fontcolor.'">'.$linktext.'</font>';
-     }
      return qq{<a href="/public/$domain/$coursedir/syllabus">$linktext</a>};
  }
+ # -----------------------------------------------------------------------------
  sub track_student_link {
-     my ($linktext,$sname,$sdom,$target,$start) = @_;
+     my ($linktext,$sname,$sdom,$target,$start,$only_body) = @_;
      my $link ="/adm/trackstudent?";
      my $title = 'View recent activity';
      if (defined($sname) && $sname !~ /^\s*$/ &&
- Line 2252  sub track_student_link {
+ Line 3068  sub track_student_link {
          $target = '';
      }
      if ($start) { $link.='&amp;start='.$start; }
+     if ($only_body) { $link .= '&amp;only_body=1'; }
+     $title = &mt($title);
+     $linktext = &mt($linktext);
      return qq{<a href="$link" title="$title" $target>$linktext</a>}.
  	&help_open_topic('View_recent_activity');
  }
+ sub slot_reservations_link {
+     my ($linktext,$sname,$sdom,$target) = @_;
+     my $link ="/adm/slotrequest?command=showresv&amp;origin=aboutme";
+     my $title = 'View slot reservation history';
+     if (defined($sname) && $sname !~ /^\s*$/ &&
+         defined($sdom)  && $sdom  !~ /^\s*$/) {
+         $link .= "&amp;uname=$sname&amp;udom=$sdom";
+         $title .= ' of this student';
+     }
+     if (defined($target) && $target !~ /^\s*$/) {
+         $target = qq{target="$target"};
+     } else {
+         $target = '';
+     }
+     $title = &mt($title);
+     $linktext = &mt($linktext);
+     return qq{<a href="$link" title="$title" $target>$linktext</a>};
+ # FIXME uncomment when help item created: &help_open_topic('Slot_Reservation_History');
+ }
+ # ===================================================== Display a student photo
+ sub student_image_tag {
+     my ($domain,$user)=@_;
+     my $imgsrc=&Apache::lonnet::studentphoto($domain,$user,'jpg');
+     if (($imgsrc) && ($imgsrc ne '/adm/lonKaputt/lonlogo_broken.gif')) {
+ 	return '<img src="'.$imgsrc.'" align="right" />';
+     } else {
+ 	return '';
+     }
+ }
  =pod
  =back
- Line 2265  sub track_student_link {
+ Line 3117  sub track_student_link {
  =over 4
- =item * languageids()
+ =item * &languageids()
  returns list of all language ids
- Line 2277  sub languageids {
+ Line 3129  sub languageids {
  =pod
- =item * languagedescription()
+ =item * &languagedescription()
  returns description of a specified language id
- Line 2302  sub supportedlanguagecode {
+ Line 3154  sub supportedlanguagecode {
  =pod
- =item * copyrightids()
+ =item * &copyrightids()
  returns list of all copyrights
- Line 2314  sub copyrightids {
+ Line 3166  sub copyrightids {
  =pod
- =item * copyrightdescription()
+ =item * &copyrightdescription()
  returns description of a specified copyright id
- Line 2326  sub copyrightdescription {
+ Line 3178  sub copyrightdescription {
  =pod
- =item * source_copyrightids()
+ =item * &source_copyrightids()
  returns list of all source copyrights
- Line 2338  sub source_copyrightids {
+ Line 3190  sub source_copyrightids {
  =pod
- =item * source_copyrightdescription()
+ =item * &source_copyrightdescription()
  returns description of a specified source copyright id
- Line 2350  sub source_copyrightdescription {
+ Line 3202  sub source_copyrightdescription {
  =pod
- =item * filecategories()
+ =item * &filecategories()
  returns list of all file categories
- Line 2362  sub filecategories {
+ Line 3214  sub filecategories {
  =pod
- =item * filecategorytypes()
+ =item * &filecategorytypes()
  returns list of file types belonging to a given file
  category
- Line 2376  sub filecategorytypes {
+ Line 3228  sub filecategorytypes {
  =pod
- =item * fileembstyle()
+ =item * &fileembstyle()
  returns embedding style for a specified file type
- Line 2394  sub filemimetype {
+ Line 3246  sub filemimetype {
  sub filecategoryselect {
      my ($name,$value)=@_;
      return &select_form($value,$name,
- 			'' => &mt('Any category'),
+                         {'' => &mt('Any category'), map { $_,$_ } sort(keys(%category_extensions))});
- 			map { $_,$_ } sort(keys(%category_extensions)));
  }
  =pod
- =item * filedescription()
+ =item * &filedescription()
  returns description for a specified file type
- Line 2414  sub filedescription {
+ Line 3265  sub filedescription {
  =pod
- =item * filedescriptionex()
+ =item * &filedescriptionex()
  returns description for a specified file type with
  extra formatting
- Line 2446  sub fileextensions {
+ Line 3297  sub fileextensions {
  sub display_languages {
      my %languages=();
-     foreach my $lang (&preferred_languages()) {
+     foreach my $lang (&Apache::lonlocal::preferred_languages()) {
  	$languages{$lang}=1;
      }
      &get_unprocessed_cgi($ENV{'QUERY_STRING'},['displaylanguage']);
- Line 2458  sub display_languages {
+ Line 3309  sub display_languages {
      return %languages;
  }
- sub preferred_languages {
+ sub languages {
-     my @languages=();
+     my ($possible_langs) = @_;
-     if ($env{'course.'.$env{'request.course.id'}.'.languages'}) {
+     my @preferred_langs = &Apache::lonlocal::preferred_languages();
- 	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,
+     if (!ref($possible_langs)) {
- 	         $env{'course.'.$env{'request.course.id'}.'.languages'}));
+ 	if( wantarray ) {
-     }
+ 	    return @preferred_langs;
-     if ($env{'environment.languages'}) {
+ 	} else {
- 	@languages=(@languages,
+ 	    return $preferred_langs[0];
- 		    split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}));
+ 	}
      }
-     my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0];
+     my %possibilities = map { $_ => 1 } (@$possible_langs);
-     if ($browser) {
+     my @preferred_possibilities;
- 	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$browser));
+     foreach my $preferred_lang (@preferred_langs) {
-     }
+ 	if (exists($possibilities{$preferred_lang})) {
-     if ($Apache::lonnet::domain_lang_def{$env{'user.domain'}}) {
+ 	    push(@preferred_possibilities, $preferred_lang);
- 	@languages=(@languages,
- 		$Apache::lonnet::domain_lang_def{$env{'user.domain'}});
-     }
-     if ($Apache::lonnet::domain_lang_def{$env{'request.role.domain'}}) {
- 	@languages=(@languages,
- 		$Apache::lonnet::domain_lang_def{$env{'request.role.domain'}});
-     }
-     if ($Apache::lonnet::domain_lang_def{
- 	                          $Apache::lonnet::perlvar{'lonDefDomain'}}) {
- 	@languages=(@languages,
- 		$Apache::lonnet::domain_lang_def{
-                                   $Apache::lonnet::perlvar{'lonDefDomain'}});
-     }
- # turn "en-ca" into "en-ca,en"
-     my @genlanguages;
-     foreach my $lang (@languages) {
- 	unless ($lang=~/\w/) { next; }
- 	push (@genlanguages,$lang);
- 	if ($lang=~/(\-|\_)/) {
- 	    push(@genlanguages,(split(/(\-|\_)/,$lang))[0]);
  	}
      }
-     return @genlanguages;
+     if( wantarray ) {
+ 	return @preferred_possibilities;
+     }
+     return $preferred_possibilities[0];
+ }
+ sub user_lang {
+     my ($touname,$toudom,$fromcid) = @_;
+     my @userlangs;
+     if (($fromcid ne '') && ($env{'course.'.$fromcid.'.languages'} ne '')) {
+         @userlangs=(@userlangs,split(/\s*(\,|\;|\:)\s*/,
+                     $env{'course.'.$fromcid.'.languages'}));
+     } else {
+         my %langhash = &getlangs($touname,$toudom);
+         if ($langhash{'languages'} ne '') {
+             @userlangs = split(/\s*(\,|\;|\:)\s*/,$langhash{'languages'});
+         } else {
+             my %domdefs = &Apache::lonnet::get_domain_defaults($toudom);
+             if ($domdefs{'lang_def'} ne '') {
+                 @userlangs = ($domdefs{'lang_def'});
+             }
+         }
+     }
+     my @languages=&Apache::lonlocal::get_genlanguages(@userlangs);
+     my $user_lh = Apache::localize->get_handle(@languages);
+     return $user_lh;
  }
  ###############################################################
  ##               Student Answer Attempts                     ##
  ###############################################################
- Line 2508  sub preferred_languages {
+ Line 3365  sub preferred_languages {
  =over 4
- =item * get_previous_attempt($symb, $username, $domain, $course,
+ =item * &get_previous_attempt($symb, $username, $domain, $course,
      $getattempt, $regexp, $gradesub)
  Return string with previous attempt on problem. Arguments:
- Line 2552  sub get_previous_attempt {
+ Line 3409  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>';
+       my (%typeparts,%lasthidden);
+       my $showsurv=&Apache::lonnet::allowed('vas',$env{'request.course.id'});
        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>';
+           if ($data eq 'type') {
+               unless ($showsurv) {
+                   my $id = join(',',@parts);
+                   $typeparts{$ign.'.'.$id} = $lasthash{$key};
+                   if (($lasthash{$key} eq 'anonsurvey') || ($lasthash{$key} eq 'anonsurveycred')) {
+                       $lasthidden{$ign.'.'.$id} = 1;
+                   }
+               }
+               delete($lasthash{$key});
+           } else {
+ 	      $prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.'&nbsp;</th>';
+           }
  	} else {
  	  if ($#parts == 0) {
  	    $prevattempts.='<th>'.$parts[0].'</th>';
- Line 2568  sub get_previous_attempt {
+ Line 3438  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>';
+             my @hidden;
- 	    foreach my $key (sort(keys(%lasthash))) {
+             if (%typeparts) {
- 	       my $value;
+                 foreach my $id (keys(%typeparts)) {
- 	       if ($key =~ /timestamp/) {
+                     if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') || ($returnhash{$version.':'.$id.'.type'} eq 'anonsurveycred')) {
- 		  $value=scalar(localtime($returnhash{$version.':'.$key}));
+                         push(@hidden,$id);
- 	       } else {
+                     }
- 		  $value=$returnhash{$version.':'.$key};
+                 }
- 	       }
+             }
- 	       $prevattempts.='<td>'.&unescape($value).'&nbsp;</td>';
+             $prevattempts.=&start_data_table_row().
- 	    }
+                            '<td>'.&mt('Transaction [_1]',$version).'</td>';
+             if (@hidden) {
+                 foreach my $key (sort(keys(%lasthash))) {
+                     my $hide;
+                     foreach my $id (@hidden) {
+                         if ($key =~ /^\Q$id\E/) {
+                             $hide = 1;
+                             last;
+                         }
+                     }
+                     if ($hide) {
+                         my ($id,$data) = ($key =~ /^(.+)\.([^.]+)$/);
+                         if (($data eq 'award') || ($data eq 'awarddetail')) {
+                             my $value = &format_previous_attempt_value($key,
+                                              $returnhash{$version.':'.$key});
+                             $prevattempts.='<td>'.$value.'&nbsp;</td>';
+                         } else {
+                             $prevattempts.='<td>&nbsp;</td>';
+                         }
+                     } else {
+                         if ($key =~ /\./) {
+                             my $value = &format_previous_attempt_value($key,
+                                               $returnhash{$version.':'.$key});
+                             $prevattempts.='<td>'.$value.'&nbsp;</td>';
+                         } else {
+                             $prevattempts.='<td>&nbsp;</td>';
+                         }
+                     }
+                 }
+             } else {
+ 	        foreach my $key (sort(keys(%lasthash))) {
+ 		    my $value = &format_previous_attempt_value($key,
+ 			            $returnhash{$version.':'.$key});
+ 		    $prevattempts.='<td>'.$value.'&nbsp;</td>';
+ 	        }
+             }
+ 	    $prevattempts.=&end_data_table_row();
  	 }
        }
-       $prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Current</td>';
+       my @currhidden = keys(%lasthidden);
+       $prevattempts.=&start_data_table_row().'<td>'.&mt('Current').'</td>';
        foreach my $key (sort(keys(%lasthash))) {
- 	my $value;
+           if (%typeparts) {
- 	if ($key =~ /timestamp/) {
+               my $hidden;
- 	  $value=scalar(localtime($lasthash{$key}));
+               foreach my $id (@currhidden) {
- 	} else {
+                   if ($key =~ /^\Q$id\E/) {
- 	  $value=$lasthash{$key};
+                       $hidden = 1;
- 	}
+                       last;
- 	$value=&unescape($value);
+                   }
- 	if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
+               }
- 	$prevattempts.='<td>'.$value.'&nbsp;</td>';
+               if ($hidden) {
+                   my ($id,$data) = ($key =~ /^(.+)\.([^.]+)$/);
+                   if (($data eq 'award') || ($data eq 'awarddetail')) {
+                       my $value = &format_previous_attempt_value($key,$lasthash{$key});
+                       if ($key =~/$regexp$/ && (defined &$gradesub)) {
+                           $value = &$gradesub($value);
+                       }
+                       $prevattempts.='<td>'.$value.'&nbsp;</td>';
+                   } else {
+                       $prevattempts.='<td>&nbsp;</td>';
+                   }
+               } else {
+                   my $value = &format_previous_attempt_value($key,$lasthash{$key});
+                   if ($key =~/$regexp$/ && (defined &$gradesub)) {
+                       $value = &$gradesub($value);
+                   }
+                   $prevattempts.='<td>'.$value.'&nbsp;</td>';
+               }
+           } else {
+ 	      my $value = &format_previous_attempt_value($key,$lasthash{$key});
+ 	      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 2624  sub relative_to_absolute {
+ Line 3575  sub relative_to_absolute {
      }
      $thisdir=~s-/[^/]*$--;
      foreach my $link (@rlinks) {
- 	unless (($link=~/^http:\/\//i) ||
+ 	unless (($link=~/^https?\:\/\//i) ||
  		($link=~/^\//) ||
  		($link=~/^javascript:/i) ||
  		($link=~/^mailto:/i) ||
- Line 2640  sub relative_to_absolute {
+ Line 3591  sub relative_to_absolute {
  =pod
- =item * get_student_view
+ =item * &get_student_view()
  show a snapshot of what student was looking at
- Line 2659  sub get_student_view {
+ Line 3610  sub get_student_view {
    }
    if (defined($target)) { $form{'grade_target'} = $target; }
    $feedurl=&Apache::lonnet::clutter($feedurl);
-   my $userview=&Apache::lonnet::ssi_body($feedurl,%form);
+   my ($userview,$response)=&Apache::lonnet::ssi_body($feedurl,%form);
    $userview=~s/\<body[^\>]*\>//gi;
    $userview=~s/\<\/body\>//gi;
    $userview=~s/\<html\>//gi;
- Line 2668  sub get_student_view {
+ Line 3619  sub get_student_view {
    $userview=~s/\<\/head\>//gi;
    $userview=~s/action\s*\=/would_be_action\=/gi;
    $userview=&relative_to_absolute($feedurl,$userview);
-   return $userview;
+   if (wantarray) {
+      return ($userview,$response);
+   } else {
+      return $userview;
+   }
+ }
+ sub get_student_view_with_retries {
+   my ($symb,$retries,$username,$domain,$courseid,$target,$moreenv) = @_;
+     my $ok = 0;                 # True if we got a good response.
+     my $content;
+     my $response;
+     # Try to get the student_view done. within the retries count:
+     do {
+          ($content, $response) = &get_student_view($symb,$username,$domain,$courseid,$target,$moreenv);
+          $ok      = $response->is_success;
+          if (!$ok) {
+             &Apache::lonnet::logthis("Failed get_student_view_with_retries on $symb: ".$response->is_success.', '.$response->code.', '.$response->message);
+          }
+          $retries--;
+     } while (!$ok && ($retries > 0));
+     if (!$ok) {
+        $content = '';          # On error return an empty content.
+     }
+     if (wantarray) {
+        return ($content, $response);
+     } else {
+        return $content;
+     }
  }
  =pod
- =item * get_student_answers()
+ =item * &get_student_answers()
  show a snapshot of how student was answering problem
- Line 2689  sub get_student_answers {
+ Line 3672  sub get_student_answers {
    }
    $moreenv{'grade_target'}='answer';
    %moreenv=(%form,%moreenv);
-   my $userview=&Apache::lonnet::ssi('/res/'.$feedurl,%moreenv);
+   $feedurl = &Apache::lonnet::clutter($feedurl);
+   my $userview=&Apache::lonnet::ssi($feedurl,%moreenv);
    return $userview;
  }
- Line 2713  sub submlink {
+ Line 3697  sub submlink {
      }
      if (!$symb) { $symb=&Apache::lonnet::symbread(); }
      $symb=&escape($symb);
-     if ($target) { $target="target=\"$target\""; }
+     if ($target) { $target=" target=\"$target\""; }
-     return '<a href="/adm/grades?&command=submission&'.
+     return
- 	'symb='.$symb.'&student='.$uname.
+         '<a href="/adm/grades?command=submission'.
- 	'&userdom='.$udom.'" '.$target.'>'.$text.'</a>';
+         '&amp;symb='.$symb.
+         '&amp;student='.$uname.
+         '&amp;userdom='.$udom.'"'.
+         $target.'>'.$text.'</a>';
  }
  ##############################################
- Line 2760  sub pprmlink {
+ Line 3747  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 2776  sub pprmlink {
+ Line 3763  sub pprmlink {
  sub timehash {
-     my @ltime=localtime(shift);
+     my ($thistime) = @_;
-     return ( 'seconds' => $ltime[0],
+     my $timezone = &Apache::lonlocal::gettimezone();
-              'minutes' => $ltime[1],
+     my $dt = DateTime->from_epoch(epoch => $thistime)
-              'hours'   => $ltime[2],
+                      ->set_time_zone($timezone);
-              'day'     => $ltime[3],
+     my $wday = $dt->day_of_week();
-              'month'   => $ltime[4]+1,
+     if ($wday == 7) { $wday = 0; }
-              'year'    => $ltime[5]+1900,
+     return ( 'second' => $dt->second(),
-              'weekday' => $ltime[6],
+              'minute' => $dt->minute(),
-              'dayyear' => $ltime[7]+1,
+              'hour'   => $dt->hour(),
-              'dlsav'   => $ltime[8] );
+              'day'     => $dt->day_of_month(),
+              'month'   => $dt->month(),
+              'year'    => $dt->year(),
+              'weekday' => $wday,
+              'dayyear' => $dt->day_of_year(),
+              'dlsav'   => $dt->is_dst() );
  }
  sub utc_string {
- Line 2795  sub utc_string {
+ Line 3787  sub utc_string {
  sub maketime {
      my %th=@_;
+     my ($epoch_time,$timezone,$dt);
+     $timezone = &Apache::lonlocal::gettimezone();
+     eval {
+         $dt = DateTime->new( year   => $th{'year'},
+                              month  => $th{'month'},
+                              day    => $th{'day'},
+                              hour   => $th{'hour'},
+                              minute => $th{'minute'},
+                              second => $th{'second'},
+                              time_zone => $timezone,
+                          );
+     };
+     if (!$@) {
+         $epoch_time = $dt->epoch;
+         if ($epoch_time) {
+             return $epoch_time;
+         }
+     }
      return POSIX::mktime(
          ($th{'seconds'},$th{'minutes'},$th{'hours'},
           $th{'day'},$th{'month'}-1,$th{'year'}-1900,0,0,-1));
- Line 2803  sub maketime {
+ Line 3813  sub maketime {
  #########################################
  sub findallcourses {
-     my ($roles) = @_;
+     my ($roles,$uname,$udom) = @_;
      my %roles;
      if (ref($roles)) { %roles = map { $_ => 1 } @{$roles}; }
      my %courses;
      my $now=time;
-     foreach my $key (keys(%env)) {
+     if (!defined($uname)) {
- 	if ( $key=~m{^user\.role\.(\w+)\./(\w+)/(\w+)/?(\w*)$} ||
+         $uname = $env{'user.name'};
-              $key=~m{^user\.role\.(cr/\w+/\w+/\w+)\./(\w+)/(\w+)}) {
+     }
- 	    my ($role,$domain,$id,$sec) = ($1,$2,$3,$4);
+     if (!defined($udom)) {
- 	    next if ($role eq 'ca' || $role eq 'aa');
+         $udom = $env{'user.domain'};
- 	    next if (%roles && !exists($roles{$role}));
+     }
- 	    my ($starttime,$endtime)=split(/\./,$env{$key});
+     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-             my $active=1;
+         my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname);
-             if ($starttime) {
+         if (!%roles) {
- 		if ($now<$starttime) { $active=0; }
+             %roles = (
-             }
+                        cc => 1,
-             if ($endtime) {
+                        co => 1,
-                 if ($now>$endtime) { $active=0; }
+                        in => 1,
-             }
+                        ep => 1,
-             if ($active) {
+                        ta => 1,
-                 if ($sec eq '') {
+                        cr => 1,
-                     $sec = 'none';
+                        st => 1,
+              );
+         }
+         foreach my $entry (keys(%roleshash)) {
+             my ($trole,$tend,$tstart) = split(/_/,$roleshash{$entry});
+             if ($trole =~ /^cr/) {
+                 next if (!exists($roles{$trole}) && !exists($roles{'cr'}));
+             } else {
+                 next if (!exists($roles{$trole}));
+             }
+             if ($tend) {
+                 next if ($tend < $now);
+             }
+             if ($tstart) {
+                 next if ($tstart > $now);
+             }
+             my ($cdom,$cnum,$sec,$cnumpart,$secpart,$role,$realsec);
+             (undef,$cdom,$cnumpart,$secpart) = split(/\//,$entry);
+             if ($secpart eq '') {
+                 ($cnum,$role) = split(/_/,$cnumpart);
+                 $sec = 'none';
+                 $realsec = '';
+             } else {
+                 $cnum = $cnumpart;
+                 ($sec,$role) = split(/_/,$secpart);
+                 $realsec = $sec;
+             }
+             $courses{$cdom.'_'.$cnum}{$sec} = $trole.'/'.$cdom.'/'.$cnum.'/'.$realsec;
+         }
+     } else {
+         foreach my $key (keys(%env)) {
+ 	    if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_courseid)/?(\w*)$} ||
+                  $key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_courseid)/?(\w*)$}) {
+ 	        my ($role,$cdom,$cnum,$sec) = ($1,$2,$3,$4);
+ 	        next if ($role eq 'ca' || $role eq 'aa');
+ 	        next if (%roles && !exists($roles{$role}));
+ 	        my ($starttime,$endtime)=split(/\./,$env{$key});
+                 my $active=1;
+                 if ($starttime) {
+ 		    if ($now<$starttime) { $active=0; }
+                 }
+                 if ($endtime) {
+                     if ($now>$endtime) { $active=0; }
+                 }
+                 if ($active) {
+                     if ($sec eq '') {
+                         $sec = 'none';
+                     }
+                     $courses{$cdom.'_'.$cnum}{$sec} =
+                                      $role.'/'.$cdom.'/'.$cnum.'/'.$sec;
                  }
-                 $courses{$domain.'_'.$id}{$sec} = 1;
              }
          }
      }
- Line 2836  sub findallcourses {
+ Line 3894  sub findallcourses {
  ###############################################
  sub blockcheck {
-     my ($setters,$activity) = @_;
+     my ($setters,$activity,$uname,$udom) = @_;
-     # Retrieve active student roles and active course coordinator/instructor roles
-     my %live_courses = &findallcourses();
+     if (!defined($udom)) {
+         $udom = $env{'user.domain'};
+     }
+     if (!defined($uname)) {
+         $uname = $env{'user.name'};
+     }
+     # If uname and udom are for a course, check for blocks in the course.
-     # Retrieve blocking times and identity of blocker for active courses
+     if (&Apache::lonnet::is_course($udom,$uname)) {
-     # unless user has 'evb' privilege.
+         my %records = &Apache::lonnet::dump('comm_block',$udom,$uname);
+         my ($startblock,$endblock)=&get_blocks($setters,$activity,$udom,$uname);
+         return ($startblock,$endblock);
+     }
      my $startblock = 0;
      my $endblock = 0;
+     my %live_courses = &findallcourses(undef,$uname,$udom);
+     # If uname is for a user, and activity is course-specific, i.e.,
+     # boards, chat or groups, check for blocking in current course only.
+     if (($activity eq 'boards' || $activity eq 'chat' ||
+          $activity eq 'groups') && ($env{'request.course.id'})) {
+         foreach my $key (keys(%live_courses)) {
+             if ($key ne $env{'request.course.id'}) {
+                 delete($live_courses{$key});
+             }
+         }
+     }
+     my $otheruser = 0;
+     my %own_courses;
+     if ((($uname ne $env{'user.name'})) || ($udom ne $env{'user.domain'})) {
+         # Resource belongs to user other than current user.
+         $otheruser = 1;
+         # Gather courses for current user
+         %own_courses =
+             &findallcourses(undef,$env{'user.name'},$env{'user.domain'});
+     }
+     # Gather active course roles - course coordinator, instructor,
+     # exam proctor, ta, student, or custom role.
      foreach my $course (keys(%live_courses)) {
-         my $cdom = $env{'course.'.$course.'.domain'};
+         my ($cdom,$cnum);
-         my $cnum = $env{'course.'.$course.'.num'};
+         if ((defined($env{'course.'.$course.'.domain'})) && (defined($env{'course.'.$course.'.num'}))) {
-         my $noblock = 0;
+             $cdom = $env{'course.'.$course.'.domain'};
+             $cnum = $env{'course.'.$course.'.num'};
+         } else {
+             ($cdom,$cnum) = split(/_/,$course);
+         }
+         my $no_ownblock = 0;
+         my $no_userblock = 0;
+         if ($otheruser && $activity ne 'com') {
+             # Check if current user has 'evb' priv for this
+             if (defined($own_courses{$course})) {
+                 foreach my $sec (keys(%{$own_courses{$course}})) {
+                     my $checkrole = 'cm./'.$cdom.'/'.$cnum;
+                     if ($sec ne 'none') {
+                         $checkrole .= '/'.$sec;
+                     }
+                     if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) {
+                         $no_ownblock = 1;
+                         last;
+                     }
+                 }
+             }
+             # if they have 'evb' priv and are currently not playing student
+             next if (($no_ownblock) &&
+                  ($env{'request.role'} !~ m{^st\./$cdom/$cnum}));
+         }
          foreach my $sec (keys(%{$live_courses{$course}})) {
-             my $role = 'cm./'.$cdom.'/'.$cnum;
+             my $checkrole = 'cm./'.$cdom.'/'.$cnum;
              if ($sec ne 'none') {
-                 $role .= '/'.$sec;
+                 $checkrole .= '/'.$sec;
              }
-             if (&Apache::lonnet::allowed('evb',undef,undef,$role)) {
+             if ($otheruser) {
-                 $noblock = 1;
+                 # Resource belongs to user other than current user.
-                 last;
+                 # Assemble privs for that user, and check for 'evb' priv.
+                 my ($trole,$tdom,$tnum,$tsec);
+                 my $entry = $live_courses{$course}{$sec};
+                 if ($entry =~ /^cr/) {
+                     ($trole,$tdom,$tnum,$tsec) =
+                       ($entry =~ m|^(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)/?(\w*)$|);
+                 } else {
+                     ($trole,$tdom,$tnum,$tsec) = split(/\//,$entry);
+                 }
+                 my ($spec,$area,$trest,%allroles,%userroles);
+                 $area = '/'.$tdom.'/'.$tnum;
+                 $trest = $tnum;
+                 if ($tsec ne '') {
+                     $area .= '/'.$tsec;
+                     $trest .= '/'.$tsec;
+                 }
+                 $spec = $trole.'.'.$area;
+                 if ($trole =~ /^cr/) {
+                     &Apache::lonnet::custom_roleprivs(\%allroles,$trole,
+                                                       $tdom,$spec,$trest,$area);
+                 } else {
+                     &Apache::lonnet::standard_roleprivs(\%allroles,$trole,
+                                                        $tdom,$spec,$trest,$area);
+                 }
+                 my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles);
+                 if ($userroles{'user.priv.'.$checkrole} =~ /evb\&([^\:]*)/) {
+                     if ($1) {
+                         $no_userblock = 1;
+                         last;
+                     }
+                 }
+             } else {
+                 # Resource belongs to current user
+                 # Check for 'evb' priv via lonnet::allowed().
+                 if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) {
+                     $no_ownblock = 1;
+                     last;
+                 }
              }
          }
          # if they have the evb priv and are currently not playing student
-         next if (($noblock) &&
+         next if (($no_ownblock) &&
-                  ($env{'request.role'} !~ m{^st\./$cdom/$cnum}));
+                  ($env{'request.role'} !~ m{^st\./\Q$cdom\E/\Q$cnum\E}));
+         next if ($no_userblock);
+         # Retrieve blocking times and identity of locker for course
+         # of specified user, unless user has 'evb' privilege.
+         my ($start,$end)=&get_blocks($setters,$activity,$cdom,$cnum);
+         if (($start != 0) &&
+             (($startblock == 0) || ($startblock > $start))) {
+             $startblock = $start;
+         }
+         if (($end != 0)  &&
+             (($endblock == 0) || ($endblock < $end))) {
+             $endblock = $end;
+         }
+     }
+     return ($startblock,$endblock);
+ }
-         $setters->{$course} = {};
+ sub get_blocks {
-         $setters->{$course}{'staff'} = [];
+     my ($setters,$activity,$cdom,$cnum) = @_;
-         $setters->{$course}{'times'} = [];
+     my $startblock = 0;
-         my %records = &Apache::lonnet::dump('comm_block',$cdom,$cnum);
+     my $endblock = 0;
-         foreach my $record (keys(%records)) {
+     my $course = $cdom.'_'.$cnum;
-             my ($start,$end) = ($record =~ m/^(\d+)____(\d+)$/);
+     $setters->{$course} = {};
-             if ($start <= time && $end >= time) {
+     $setters->{$course}{'staff'} = [];
-                 my ($staff_name,$staff_dom,$title,$blocks) =
+     $setters->{$course}{'times'} = [];
-                     &parse_block_record($records{$record});
+     my %records = &Apache::lonnet::dump('comm_block',$cdom,$cnum);
-                 if ($blocks->{$activity} eq 'on') {
+     foreach my $record (keys(%records)) {
-                     push(@{$$setters{$course}{'staff'}}, [$staff_name,$staff_dom]);                    push(@{$$setters{$course}{'times'}}, [$start,$end]);
+         my ($start,$end) = ($record =~ m/^(\d+)____(\d+)$/);
-                     if ( ($startblock == 0) || ($startblock > $1) ) {
+         if ($start <= time && $end >= time) {
-                         $startblock = $1;
+             my ($staff_name,$staff_dom,$title,$blocks) =
-                     }
+                 &parse_block_record($records{$record});
-                     if ( ($endblock == 0) || ($endblock < $2) ) {
+             if ($blocks->{$activity} eq 'on') {
-                         $endblock = $2;
+                 push(@{$$setters{$course}{'staff'}},[$staff_name,$staff_dom]);
-                     }
+                 push(@{$$setters{$course}{'times'}}, [$start,$end]);
+                 if ( ($startblock == 0) || ($startblock > $start) ) {
+                     $startblock = $start;
+                 }
+                 if ( ($endblock == 0) || ($endblock < $end) ) {
+                     $endblock = $end;
                  }
              }
          }
- Line 2909  sub parse_block_record {
+ Line 4085  sub parse_block_record {
      return ($setuname,$setudom,$title,$blocks);
  }
- sub build_block_table {
+ sub blocking_status {
-     my ($startblock,$endblock,$setters) = @_;
+   my ($activity,$uname,$udom) = @_;
-     my %lt = &Apache::lonlocal::texthash(
+   my %setters;
-         'cacb' => 'Currently active communication blocks',
-         'cour' => 'Course',
+   # check for active blocking
-         'dura' => 'Duration',
+   my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
-         'blse' => 'Block set by'
-     );
+   my $blocked = $startblock && $endblock ? 1 : 0;
-     my $output;
-     $output = '<br />'.$lt{'cacb'}.':<br />';
+   # caller just wants to know whether a block is active
-     $output .= &start_data_table();
+   if (!wantarray) { return $blocked; }
-     $output .= '
- <tr>
+   # build a link to a popup window containing the details
-  <th>'.$lt{'cour'}.'</th>
+   my $querystring  = "?activity=$activity";
-  <th>'.$lt{'dura'}.'</th>
+   # $uname and $udom decide whose portfolio the user is trying to look at
-  <th>'.$lt{'blse'}.'</th>
+      $querystring .= "&amp;udom=$udom"      if $udom;
- </tr>
+      $querystring .= "&amp;uname=$uname"    if $uname;
- ';
-     foreach my $course (keys(%{$setters})) {
+   my $output .= <<'END_MYBLOCK';
-         my %courseinfo=&Apache::lonnet::coursedescription($course);
+     function openWindow(url, wdwName, w, h, toolbar,scrollbar) {
-         for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
+         var options = "width=" + w + ",height=" + h + ",";
-             my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
+         options += "resizable=yes,scrollbars="+scrollbar+",status=no,";
-             my $fullname = &aboutmewrapper(&plainname($uname,$udom),$uname,$udom);
+         options += "menubar=no,toolbar="+toolbar+",location=no,directories=no";
-             my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
+         var newWin = window.open(url, wdwName, options);
-             $openblock = &Apache::lonlocal::locallocaltime($openblock);
+         newWin.focus();
-             $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
+     }
-             $output .= &Apache::loncommon::start_data_table_row().
+ END_MYBLOCK
-                        '<td>'.$courseinfo{'description'}.'</td>'.
-                        '<td>'.$openblock.' to '.$closeblock.'</td>'.
+   $output = Apache::lonhtmlcommon::scripttag($output);
-                        '<td>'.$fullname.'.</td>'.
-                         &Apache::loncommon::end_data_table_row();
+   my $popupUrl = "/adm/blockingstatus/$querystring";
+   my $text = mt('Communication Blocked');
+   $output .= <<"END_BLOCK";
+ <div class='LC_comblock'>
+   <a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'
+   title='$text'>
+   <img class='LC_noBorder LC_middle' title='$text' src='/res/adm/pages/comblock.png' alt='$text'/></a>
+   <a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'
+   title='$text'>$text</a>
+ </div>
+ END_BLOCK
+   return ($blocked, $output);
+ }
+ ###############################################
+ sub check_ip_acc {
+     my ($acc)=@_;
+     &Apache::lonxml::debug("acc is $acc");
+     if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) {
+         return 1;
+     }
+     my $allowed=0;
+     my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
+     my $name;
+     foreach my $pattern (split(',',$acc)) {
+         $pattern =~ s/^\s*//;
+         $pattern =~ s/\s*$//;
+         if ($pattern =~ /\*$/) {
+             #35.8.*
+             $pattern=~s/\*//;
+             if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
+         } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {
+             #35.8.3.[34-56]
+             my $low=$2;
+             my $high=$3;
+             $pattern=$1;
+             if ($ip =~ /^\Q$pattern\E/) {
+                 my $last=(split(/\./,$ip))[3];
+                 if ($last <=$high && $last >=$low) { $allowed=1; }
+             }
+         } elsif ($pattern =~ /^\*/) {
+             #*.msu.edu
+             $pattern=~s/\*//;
+             if (!defined($name)) {
+                 use Socket;
+                 my $netaddr=inet_aton($ip);
+                 ($name)=gethostbyaddr($netaddr,AF_INET);
+             }
+             if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
+         } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
+             #127.0.0.1
+             if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
+         } else {
+             #some.name.com
+             if (!defined($name)) {
+                 use Socket;
+                 my $netaddr=inet_aton($ip);
+                 ($name)=gethostbyaddr($netaddr,AF_INET);
+             }
+             if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
          }
+         if ($allowed) { last; }
      }
-     $output .= &end_data_table();
+     return $allowed;
  }
  ###############################################
- Line 2964  Returns: Determines which domain should
+ Line 4205  Returns: Determines which domain should
  ###############################################
  sub determinedomain {
      my $domain=shift;
-    if (! $domain) {
+     if (! $domain) {
          # Determine domain if we have not been given one
-         $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+         $domain = &Apache::lonnet::default_login_domain();
          if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
          if ($env{'request.role.domain'}) {
              $domain=$env{'request.role.domain'};
- Line 2975  sub determinedomain {
+ Line 4216  sub determinedomain {
      return $domain;
  }
  ###############################################
+ sub devalidate_domconfig_cache {
+     my ($udom)=@_;
+     &Apache::lonnet::devalidate_cache_new('domainconfig',$udom);
+ }
+ # ---------------------- Get domain configuration for a domain
+ sub get_domainconf {
+     my ($udom) = @_;
+     my $cachetime=1800;
+     my ($result,$cached)=&Apache::lonnet::is_cached_new('domainconfig',$udom);
+     if (defined($cached)) { return %{$result}; }
+     my %domconfig = &Apache::lonnet::get_dom('configuration',
+ 					     ['login','rolecolors','autoenroll'],$udom);
+     my (%designhash,%legacy);
+     if (keys(%domconfig) > 0) {
+         if (ref($domconfig{'login'}) eq 'HASH') {
+             if (keys(%{$domconfig{'login'}})) {
+                 foreach my $key (keys(%{$domconfig{'login'}})) {
+                     if (ref($domconfig{'login'}{$key}) eq 'HASH') {
+                         if ($key eq 'loginvia') {
+                             if (ref($domconfig{'login'}{'loginvia'}) eq 'HASH') {
+                                 my @ids = &Apache::lonnet::current_machine_ids();
+                                 foreach my $hostname (@ids) {
+                                     if (ref($domconfig{'login'}{'loginvia'}{$hostname}) eq 'HASH') {
+                                         if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) {
+                                             my $server = $domconfig{'login'}{'loginvia'}{$hostname}{'server'};
+                                             $designhash{$udom.'.login.loginvia'} = $server;
+                                             if ($domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'} eq 'custom') {
+                                                 $designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'custompath'};
+                                             } else {
+                                                  $designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'};
+                                             }
+                                             if ($domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}) {
+                                                 $designhash{$udom.'.login.loginvia_exempt_'.$hostname} = $domconfig{'login'}{'loginvia'}{$hostname}{'exempt'};
+                                             }
+                                         }
+                                     }
+                                 }
+                             }
+                         } else {
+                             foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
+                                 $designhash{$udom.'.login.'.$key.'_'.$img} =
+                                     $domconfig{'login'}{$key}{$img};
+                             }
+                         }
+                     } else {
+                         $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+                     }
+                 }
+             } else {
+                 $legacy{'login'} = 1;
+             }
+         } else {
+             $legacy{'login'} = 1;
+         }
+         if (ref($domconfig{'rolecolors'}) eq 'HASH') {
+             if (keys(%{$domconfig{'rolecolors'}})) {
+                 foreach my $role (keys(%{$domconfig{'rolecolors'}})) {
+                     if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') {
+                         foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) {
+                             $designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item};
+                         }
+                     }
+                 }
+             } else {
+                 $legacy{'rolecolors'} = 1;
+             }
+         } else {
+             $legacy{'rolecolors'} = 1;
+         }
+         if (ref($domconfig{'autoenroll'}) eq 'HASH') {
+             if ($domconfig{'autoenroll'}{'co-owners'}) {
+                 $designhash{$udom.'.autoassign.co-owners'}=$domconfig{'autoenroll'}{'co-owners'};
+             }
+         }
+         if (keys(%legacy) > 0) {
+             my %legacyhash = &get_legacy_domconf($udom);
+             foreach my $item (keys(%legacyhash)) {
+                 if ($item =~ /^\Q$udom\E\.login/) {
+                     if ($legacy{'login'}) {
+                         $designhash{$item} = $legacyhash{$item};
+                     }
+                 } else {
+                     if ($legacy{'rolecolors'}) {
+                         $designhash{$item} = $legacyhash{$item};
+                     }
+                 }
+             }
+         }
+     } else {
+         %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 2988  If the domain logo does not exist, a des
+ Line 4351  If the domain logo does not exist, a des
  ###############################################
  sub domainlogo {
      my $domain = &determinedomain(shift);
-      # See if there is a logo
+     my %designhash = &get_domainconf($domain);
-     if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') {
+     # See if there is a logo
- 	my $logo=&lonhttpdurl("/adm/lonDomLogos/$domain.gif");
+     if ($designhash{$domain.'.login.domlogo'} ne '') {
-         return '<img src="'.$logo.'" alt="'.$domain.'" />';
+         my $imgsrc = $designhash{$domain.'.login.domlogo'};
-     } elsif(exists($Apache::lonnet::domaindescription{$domain})) {
+         if ($imgsrc =~ m{^/(adm|res)/}) {
-         return $Apache::lonnet::domaindescription{$domain};
+ 	    if ($imgsrc =~ m{^/res/}) {
+ 		my $local_name = &Apache::lonnet::filelocation('',$imgsrc);
+ 		&Apache::lonnet::repcopy($local_name);
+ 	    }
+ 	   $imgsrc = &lonhttpdurl($imgsrc);
+         }
+         return '<img src="'.$imgsrc.'" alt="'.$domain.'" />';
+     } elsif (defined(&Apache::lonnet::domain($domain,'description'))) {
+         return &Apache::lonnet::domain($domain,'description');
      } else {
          return '';
      }
- Line 3015  Returns: value of designparamter $which
+ Line 4386  Returns: value of designparamter $which
  ##############################################
  sub designparm {
      my ($which,$domain)=@_;
-     if ($env{'browser.blackwhite'} eq 'on') {
- 	if ($which=~/\.(font|alink|vlink|link)$/) {
- 	    return '#000000';
- 	}
- 	if ($which=~/\.(pgbg|sidebg)$/) {
- 	    return '#FFFFFF';
- 	}
- 	if ($which=~/\.tabbg$/) {
- 	    return '#CCCCCC';
- 	}
-     }
      if (exists($env{'environment.color.'.$which})) {
- 	return $env{'environment.color.'.$which};
+         return $env{'environment.color.'.$which};
      }
      $domain=&determinedomain($domain);
-     if (exists($designhash{$domain.'.'.$which})) {
+     my %domdesign = &get_domainconf($domain);
- 	return $designhash{$domain.'.'.$which};
+     my $output;
+     if ($domdesign{$domain.'.'.$which} ne '') {
+         $output = $domdesign{$domain.'.'.$which};
+     } else {
+         $output = $defaultdesign{$which};
+     }
+     if (($which =~ /^(student|coordinator|author|admin)\.img$/) ||
+         ($which =~ /login\.(img|logo|domlogo|login)/)) {
+         if ($output =~ m{^/(adm|res)/}) {
+             if ($output =~ m{^/res/}) {
+                 my $local_name = &Apache::lonnet::filelocation('',$output);
+                 &Apache::lonnet::repcopy($local_name);
+             }
+             $output = &lonhttpdurl($output);
+         }
+     }
+     return $output;
+ }
+ ##############################################
+ =pod
+ =item * &authorspace()
+ Inputs: ./.
+ Returns: Path to the Construction Space of the current user's
+          accessed author space
+          The author space will be that of the current user
+          when accessing the own author space
+          and that of the co-author/assistent co-author
+          when accessing the co-author's/assistent co-author's
+          space
+ =cut
+ sub authorspace {
+     my $caname = '';
+     if ($env{'request.role'} =~ /^ca|^aa/) {
+         (undef,$caname) =
+             ($env{'request.role'}=~/($match_domain)\/($match_username)$/);
+     } else {
+         $caname = $env{'user.name'};
+     }
+     return '/priv/'.$caname.'/';
+ }
+ ##############################################
+ =pod
+ =item * &head_subbox()
+ Inputs: $content (contains HTML code with page functions, etc.)
+ Returns: HTML div with $content
+          To be included in page header
+ =cut
+ sub head_subbox {
+     my ($content)=@_;
+     my $output =
+         '<div id="LC_head_subbox">'
+        .$content
+        .'</div>'
+ }
+ ##############################################
+ =pod
+ =item * &CSTR_pageheader()
+ Inputs: ./.
+ Returns: HTML div with CSTR path and recent box
+          To be included on Construction Space pages
+ =cut
+ sub CSTR_pageheader {
+     # this is for resources; directories have customtitle, and crumbs
+             # and select recent are created in lonpubdir.pm
+     my ($uname,$thisdisfn)=
+         ($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
+     my $formaction='/priv/'.$uname.'/'.$thisdisfn;
+     $formaction=~s/\/+/\//g;
+     my $parentpath = '';
+     my $lastitem = '';
+     if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
+         $parentpath = $1;
+         $lastitem = $2;
      } else {
-         return $designhash{'default.'.$which};
+         $lastitem = $thisdisfn;
      }
+     my $output =
+          '<div>'
+         .&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
+         .'<b>'.&mt('Construction Space:').'</b> '
+         .'<form name="dirs" method="post" action="'.$formaction
+         .'" target="_top">' #FIXME lonpubdir: target="_parent"
+         .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv',undef,undef);
+     if ($lastitem) {
+         $output .=
+              '<span class="LC_filename">'
+             .$lastitem
+             .'</span>';
+     }
+     $output .=
+          '<br />'
+         #FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />"
+         .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
+         .'</form>'
+         .&Apache::lonmenu::constspaceform()
+         .'</div>';
+     return $output;
  }
  ###############################################
- Line 3044  sub designparm {
+ Line 4519  sub designparm {
  =back
- =head1 HTTP Helpers
+ =head1 HTML Helpers
  =over 4
- Line 3069  Inputs:
+ Line 4544  Inputs:
  =item * $forcereg, if page should register as content page (relevant for
              text interface only)
- =item * $customtitle, alternate text to use instead of $title
+ =item * $no_nav_bar, if true, keep the 'what is this' info but remove the
-                       in the title box that appears, this text
+                      navigational links
-                       is not auto translated like the $title is
- =item * $notopbar, if true, keep the 'what is this' info but remove the
-                    navigational links
  =item * $bgcolor, used to override the bgcolor on a webpage to a specific value
- =item * $notitle, if true keep the nav controls, but remove the title bar
- =item * $no_inline_link, if true and in remote mode, don't show the
-          'Switch To Inline Menu' link
  =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 3096  other decorations will be returned.
+ Line 4565  other decorations will be returned.
  =cut
  sub bodytag {
-     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
+     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
- 	$notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
+         $no_nav_bar,$bgcolor,$args)=@_;
+     my $public;
+     if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
+         || ($env{'user.name'} eq '') && ($env{'user.domain'} eq '')) {
+         $public = 1;
+     }
      if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
      $function = &get_users_function() if (!$function);
- Line 3106  sub bodytag {
+ Line 4580  sub bodytag {
      my $font =   &designparm($function.'.font',$domain);
      my $pgbg   = $bgcolor || &designparm($function.'.pgbg',$domain);
-     my %design = ( 'style'   => 'margin-top: 0px',
+     my %design = ( 'style'   => 'margin-top: 0',
  		   'bgcolor' => $pgbg,
  		   'text'    => $font,
                     'alink'   => &designparm($function.'.alink',$domain),
- Line 3117  sub bodytag {
+ Line 4591  sub bodytag {
   # role and realm
      my ($role,$realm) = split(/\./,$env{'request.role'},2);
      if ($role  eq 'ca') {
-         my ($rdom,$rname) = ($realm =~ m-^/(\w+)/(\w+)$-);
+         my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$});
-         $realm = &plainname($rname,$rdom).':'.$rdom;
+         $realm = &plainname($rname,$rdom);
      }
  # realm
      if ($env{'request.course.id'}) {
          if ($env{'request.role'} !~ /^cr/) {
              $role = &Apache::lonnet::plaintext($role,&course_type());
          }
+         if ($env{'request.course.sec'}) {
+             $role .= ('&nbsp;'x2).'-&nbsp;'.&mt('section:').'&nbsp;'.$env{'request.course.sec'};
+         }
  	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
      } else {
          $role = &Apache::lonnet::plaintext($role);
      }
      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
+     if ($bodyonly) {
- 	|| ($env{'request.state'} eq 'construct'
- 	    && $env{'environment.remote'} ne 'off' )) {
          return $bodytag;
-     } elsif ($env{'browser.interface'} eq 'textual') {
+     }
- # Accessibility
- 	$bodytag.=&Apache::lonmenu::menubuttons($forcereg,$forcereg);
- 	if (!$notitle) {
- 	    $bodytag.='<h1>LON-CAPA: '.$title.'</h1>';
- 	}
- 	return $bodytag;
-     }
      my $name = &plainname($env{'user.name'},$env{'user.domain'});
-     if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+     if ($public) {
  	undef($role);
      } else {
  	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
      }
-     my $roleinfo=(<<ENDROLE);
+     my $titleinfo = '<h1>'.$title.'</h1>';
- <td class="LC_title_bar_who">
- <div class="LC_title_bar_name">
-     $name
-     &nbsp;
- </div>
- <div class="LC_title_bar_role">
- $role&nbsp;
- </div>
- <div class="LC_title_bar_realm">
- $realm&nbsp;
- </div>
- </td>
- ENDROLE
-     my $titleinfo = '<span class="LC_title_bar_title">'.$title.'</span>';
-     if ($customtitle) {
-         $titleinfo = $customtitle;
-     }
      #
      # Extra info if you are the DC
      my $dc_info = '';
- Line 3190  ENDROLE
+ Line 4634  ENDROLE
                          $env{'course.'.$env{'request.course.id'}.
                                   '.domain'}.'/'})) {
          my $cid = $env{'request.course.id'};
-         $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
+         $dc_info = $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
          $dc_info =~ s/\s+$//;
-         $dc_info = '('.$dc_info.')';
      }
-     if ($env{'environment.remote'} eq 'off') {
+     $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
-         # No Remote
+     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
- 	if ($env{'request.state'} eq 'construct') {
- 	    $forcereg=1;
- 	}
- 	if (!$customtitle && $env{'request.state'} eq 'construct') {
+         if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') {
- 	    # this is for resources; directories have customtitle, and crumbs
+             return $bodytag;
-             # and select recent are created in lonpubdir.pm
+         }
- 	    my ($uname,$thisdisfn)=
- 		($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
+         if ($env{'request.state'} eq 'construct') { $forcereg=1; }
- 	    my $formaction='/priv/'.$uname.'/'.$thisdisfn;
- 	    $formaction=~s/\/+/\//g;
+         #    if ($env{'request.state'} eq 'construct') {
+         #        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
- 	    my $parentpath = '';
+         #    }
- 	    my $lastitem = '';
- 	    if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
- 		$parentpath = $1;
- 		$lastitem = $2;
+         if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
- 	    } else {
+              if ($dc_info) {
- 		$lastitem = $thisdisfn;
+                  $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
- 	    }
+              }
- 	    $titleinfo =
+              $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
- 		&Apache::loncommon::help_open_menu('','',3,'Authoring').
+                 <em>$realm</em> $dc_info</div>|;
- 		'<b>Construction Space</b>:&nbsp;'.
+             return $bodytag;
- 		'<form name="dirs" method="post" action="'.$formaction
- 		.'" target="_top"><tt><b>'
- 		.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<font size=\"+1\">$lastitem</font></b></tt><br />"
- 		.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
- 		.'</form>'
- 		.&Apache::lonmenu::constspaceform();
-         }
-         my $titletable;
- 	if (!$notitle) {
- 	    $titletable =
- 		'<table id="LC_title_bar">'.
-                          "<tr><td> $titleinfo $dc_info</td>".$roleinfo.
- 			 '</tr></table>';
- 	}
- 	if ($notopbar) {
- 	    $bodytag .= $titletable;
- 	} else {
- 	    if ($env{'request.state'} eq 'construct') {
-                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
- 							  $titletable);
-             } else {
-                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg).
- 		    $titletable;
-             }
          }
-         return $bodytag;
-     }
- #
+         unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
- # Top frame rendering, Remote is up
+             $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>|;
- #
+         }
-     my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
+         $bodytag .= Apache::lonhtmlcommon::scripttag(
-         $lonhttpdPort.$img.'" alt="'.$function.'" />';
+             Apache::lonmenu::utilityfunctions(), 'start');
-     # Explicit link to get inline menu
+         $bodytag .= Apache::lonmenu::primary_menu();
-     my $menu= ($no_inline_link?''
- 	       :'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
+         if ($dc_info) {
-     #
+             $dc_info = &dc_courseid_toggle($dc_info);
-     if ($notitle) {
+         }
- 	return $bodytag;
+         $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|;
-     }
-     return(<<ENDBODY);
+         #don't show menus for public users
- $bodytag
+         if (!$public){
- <table id="LC_title_bar" class="LC_with_remote">
+             $bodytag .= Apache::lonmenu::secondary_menu();
- <tr><td class="LC_title_bar_role_logo">$upperleft</td>
+             $bodytag .= Apache::lonmenu::serverform();
-     <td class="LC_title_bar_domain_logo">$messages&nbsp;</td>
+             $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
- </tr>
+             if ($env{'request.state'} eq 'construct') {
- <tr><td>$titleinfo $dc_info $menu</td>
+                 $bodytag .= &Apache::lonmenu::innerregister($forcereg,
- $roleinfo
+                                 $args->{'bread_crumbs'});
- </tr>
+             } elsif ($forcereg) {
- </table>
+                 $bodytag .= &Apache::lonmenu::innerregister($forcereg);
- ENDBODY
+             }
+         }else{
+             # this is to seperate menu from content when there's no secondary
+             # menu. Especially needed for public accessible ressources.
+             $bodytag .= '<hr style="clear:both" />';
+             $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
+         }
+         return $bodytag;
+ }
+ sub dc_courseid_toggle {
+     my ($dc_info) = @_;
+     return ' <span id="dccidtext" class="LC_cusr_subheading LC_nobreak">'.
+            '<a href="javascript:showCourseID();">'.
+            &mt('(More ...)').'</a></span>'.
+            '<div id="dccid" class="LC_dccid">'.$dc_info.'</div>';
  }
  sub make_attr_string {
- Line 3297  sub make_attr_string {
+ Line 4726  sub make_attr_string {
  		delete($attr_ref->{$key});
  	    }
  	}
- 	$attr_ref->{'onload'}  =
+ 	$attr_ref->{'onload'}  = $on_load;
- 	    &Apache::lonmenu::loadevents().  $on_load;
+ 	$attr_ref->{'onunload'}= $on_unload;
- 	$attr_ref->{'onunload'}=
- 	    &Apache::lonmenu::unloadevents().$on_unload;
-     }
- # Accessibility font enhance
-     if ($env{'browser.fontenhance'} eq 'on') {
- 	my $style;
- 	foreach my $key (keys(%{$attr_ref})) {
- 	    if (lc($key) eq 'style') {
- 		$style.=$attr_ref->{$key}.';';
- 		delete($attr_ref->{$key});
- 	    }
- 	}
- 	$attr_ref->{'style'}=$style.'; font-size: x-large;';
-     }
-     if ($env{'browser.blackwhite'} eq 'on') {
- 	delete($attr_ref->{'font'});
- 	delete($attr_ref->{'link'});
- 	delete($attr_ref->{'alink'});
- 	delete($attr_ref->{'vlink'});
- 	delete($attr_ref->{'bgcolor'});
- 	delete($attr_ref->{'background'});
      }
      my $attr_string;
- Line 3337  sub make_attr_string {
+ Line 4743  sub make_attr_string {
  =pod
- =back
- =head1 HTML Helpers
- =over 4
  =item * &endbodytag()
  Returns a uniform footer for LON-CAPA web pages.
- Inputs: none
+ Inputs: 1 - optional reference to an args hash
+ If in the hash, key for noredirectlink has a value which evaluates to true,
- =back
+ a 'Continue' link is not displayed if the page contains an
+ internal redirect in the <head></head> section,
+ i.e., $env{'internal.head.redirect'} exists
  =cut
  sub endbodytag {
+     my ($args) = @_;
      my $endbodytag='</body>';
      $endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag;
      if ( exists( $env{'internal.head.redirect'} ) ) {
- 	$endbodytag=
+         if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) {
- 	    "<br /><a href=\"$env{'internal.head.redirect'}\">".
+ 	    $endbodytag=
- 	    &mt('Continue').'</a>'.
+ 	        "<br /><a href=\"$env{'internal.head.redirect'}\">".
- 	    $endbodytag;
+ 	        &mt('Continue').'</a>'.
+ 	        $endbodytag;
+         }
      }
      return $endbodytag;
  }
  =pod
- =over 4
  =item * &standard_css()
  Returns a style sheet
- Line 3379  Inputs: (all optional)
+ Line 4782  Inputs: (all optional)
              function       -> force usage of a specific rolish color scheme
              bgcolor        -> override the default page bgcolor
- =back
  =cut
  sub standard_css {
- Line 3389  sub standard_css {
+ Line 4790  sub standard_css {
      my $img    = &designparm($function.'.img',   $domain);
      my $tabbg  = &designparm($function.'.tabbg', $domain);
      my $font   = &designparm($function.'.font',  $domain);
+     my $fontmenu = &designparm($function.'.fontmenu', $domain);
+ #second colour for later usage
      my $sidebg = &designparm($function.'.sidebg',$domain);
      my $pgbg_or_bgcolor =
  	         $bgcolor ||
- Line 3398  sub standard_css {
+ Line 4801  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_head      = $sidebg;
-     my $data_table_light     = '#EEEEEE';
+     my $data_table_light     = '#FAFAFA';
-     my $data_table_dark      = '#DDDDDD';
+     my $data_table_dark      = '#F0F0F0';
      my $data_table_darker    = '#CCCCCC';
      my $data_table_highlight = '#FFFF00';
      my $mail_new             = '#FFBB77';
- Line 3414  sub standard_css {
+ Line 4817  sub standard_css {
      my $mail_other           = '#99BBBB';
      my $mail_other_hover     = '#669999';
      my $table_header         = '#DDDDDD';
+     my $feedback_link_bg     = '#BBBBBB';
+     my $lg_border_color      = '#C8C8C8';
+     my $button_hover         = '#BF2317';
+     my $border = ($env{'browser.type'} eq 'explorer' ||
+       $env{'browser.type'} eq 'safari'     ) ? '0 2px 0 2px'
+                                              : '0 3px 0 4px';
-     my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'
- 	                                              : '0px 3px 0px 4px';
      return <<END;
- h1, h2, h3, th { font-family: $sans }
- a:focus { color: red; background: yellow }
+ /* needed for iframe to allow 100% height in FF */
- table.thinborder { border-collapse: collapse; }
+ body, html {
- table.thinborder tr th {  border-style: solid; border-width: 1px; background: $tabbg;}
+     margin: 0;
- table.thinborder tr td { border-style: solid; border-width: 1px}
+     padding: 0 0.5%;
+     height: 99%; /* to avoid scrollbars */
- form, .inline { display: inline; }
+ }
- .center { text-align: center; }
- .LC_filename {font-family: $mono;}
+ body {
+   font-family: $sans;
+   line-height:130%;
+   font-size:0.83em;
+   color:$font;
+ }
+ a:focus,
+ a:focus img {
+   color: red;
+   background: yellow;
+ }
+ form, .inline {
+   display: inline;
+ }
+ .LC_right {
+   text-align:right;
+ }
+ .LC_middle {
+   vertical-align:middle;
+ }
+ .LC_400Box {
+   width:400px;
+ }
+ .LC_iframecontainer {
+     width: 98%;
+     margin: 0;
+     position: fixed;
+     top: 8.5em;
+     bottom: 0;
+ }
+ .LC_iframecontainer iframe{
+     border: none;
+     width: 100%;
+     height: 100%;
+ }
+ .LC_filename {
+   font-family: $mono;
+   white-space:pre;
+   font-size: 120%;
+ }
+ .LC_fileicon {
+   border: none;
+   height: 1.3em;
+   vertical-align: text-bottom;
+   margin-right: 0.3em;
+   text-decoration:none;
+ }
  .LC_error {
    color: red;
    font-size: larger;
  }
  .LC_warning,
  .LC_diff_removed {
    color: red;
  }
+ .LC_info,
  .LC_success,
  .LC_diff_added {
    color: green;
  }
+ div.LC_confirm_box {
+   background-color: #FAFAFA;
+   border: 1px solid $lg_border_color;
+   margin-right: 0;
+   padding: 5px;
+ }
+ div.LC_confirm_box .LC_error img,
+ div.LC_confirm_box .LC_success img {
+   vertical-align: middle;
+ }
  .LC_icon {
-   border: 0px;
+   border: none;
+   vertical-align: middle;
+ }
+ .LC_docs_spacer {
+   width: 25px;
+   height: 1px;
+   border: none;
+ }
+ .LC_internal_info {
+   color: #999999;
+ }
+ .LC_discussion {
+   background: $tabbg;
+   border: 1px solid black;
+   margin: 2px;
+ }
+ .LC_disc_action_links_bar {
+   background: $tabbg;
+   border: none;
+   margin: 4px;
+ }
+ .LC_disc_action_left {
+   text-align: left;
+ }
+ .LC_disc_action_right {
+   text-align: right;
+ }
+ .LC_disc_new_item {
+   background: white;
+   border: 2px solid red;
+   margin: 2px;
+ }
+ .LC_disc_old_item {
+   background: white;
+   border: 1px solid black;
+   margin: 2px;
  }
  table.LC_pastsubmission {
- Line 3449  table.LC_pastsubmission {
+ Line 4972  table.LC_pastsubmission {
    margin: 2px;
  }
- table#LC_top_nav, table#LC_menubuttons {
+ table#LC_menubuttons {
    width: 100%;
    background: $pgbg;
    border: 2px;
    border-collapse: separate;
-   padding: 0px;
+   padding: 0;
+ }
+ table#LC_title_bar a {
+   color: $fontmenu;
+ }
+ table#LC_title_bar {
+   clear: both;
+   display: none;
  }
- table#LC_title_bar, table.LC_breadcrumbs, table#LC_nav_location,
+ table#LC_title_bar,
+ table.LC_breadcrumbs, /* obsolete? */
  table#LC_title_bar.LC_with_remote {
    width: 100%;
    border-color: $pgbg;
    border-style: solid;
    border-width: $border;
    background: $pgbg;
-   font-family: $sans;
+   color: $fontmenu;
    border-collapse: collapse;
-   padding: 0px;
+   padding: 0;
+   margin: 0;
  }
- table.LC_docs_path {
+ ul.LC_breadcrumb_tools_outerlist {
-   width: 100%;
+     margin: 0;
-   border: 0;
+     padding: 0;
-   background: $pgbg;
+     position: relative;
-   font-family: $sans;
+     list-style: none;
-   border-collapse: collapse;
+ }
-   padding: 0px;
+ ul.LC_breadcrumb_tools_outerlist li {
+     display: inline;
+ }
+ .LC_breadcrumb_tools_navigation {
+     padding: 0;
+     margin: 0;
+     float: left;
+ }
+ .LC_breadcrumb_tools_tools {
+     padding: 0;
+     margin: 0;
+     float: right;
  }
  table#LC_title_bar td {
    background: $tabbg;
  }
- table#LC_title_bar td.LC_title_bar_who {
-   background: $tabbg;
+ table#LC_menubuttons img {
-   color: $font;
+   border: none;
-   font: small $sans;
-   text-align: right;
  }
- span.LC_metadata {
-     font-family: $sans;
+ .LC_breadcrumbs_component {
+   float: right;
+   margin: 0 1em;
  }
- span.LC_title_bar_title {
+ .LC_breadcrumbs_component img {
-   font: bold x-large $sans;
+   vertical-align: middle;
  }
- table#LC_title_bar td.LC_title_bar_domain_logo {
-   background: $sidebg;
+ td.LC_table_cell_checkbox {
-   text-align: right;
+   text-align: center;
-   padding: 0px;
+ }
+ .LC_fontsize_small {
+   font-size: 70%;
  }
- table#LC_title_bar td.LC_title_bar_role_logo {
+ #LC_breadcrumbs {
+   clear:both;
    background: $sidebg;
-   padding: 0px;
+   border-bottom: 1px solid $lg_border_color;
+   line-height: 2.5em;
+   overflow: hidden;
+   margin: 0;
+   padding: 0;
  }
- table#LC_menubuttons_mainmenu {
+ #LC_head_subbox {
-   background: $pgbg;
+   clear:both;
-   border: 0px;
+   background: #F8F8F8; /* $sidebg; */
-   border-spacing: 1px;
+   border: 1px solid $sidebg;
-   padding: 0px 1px;
+   margin: 0 0 10px 0;
-   margin: 0px;
+   padding: 3px;
-   border-collapse: separate;
  }
- table#LC_menubuttons img, table#LC_menubuttons_mainmenu img {
-   border: 0px;
+ .LC_fontsize_medium {
+   font-size: 85%;
  }
- table#LC_top_nav td {
-   background: $tabbg;
+ .LC_fontsize_large {
-   border: 0px;
+   font-size: 120%;
-   font-size: small;
  }
- table#LC_top_nav td a, div#LC_top_nav a {
+ .LC_menubuttons_inline_text {
    color: $font;
-   font-family: $sans;
+   font-size: 90%;
- }
+   padding-left:3px;
- table#LC_top_nav td.LC_top_nav_logo {
-   background: $tabbg;
-   text-align: left;
-   white-space: nowrap;
-   width: 31px;
- }
- table#LC_top_nav td.LC_top_nav_logo img {
-   border: 0px;
-   vertical-align: bottom;
- }
- table#LC_top_nav td.LC_top_nav_exit,
- table#LC_top_nav td.LC_top_nav_help {
-   width: 2.0em;
  }
- table#LC_top_nav td.LC_top_nav_login {
-   width: 4.0em;
+ .LC_menubuttons_inline_text img{
-   text-align: center;
+   vertical-align: middle;
- }
- table.LC_breadcrumbs td, table.LC_docs_path td  {
-   background: $tabbg;
-   color: $font;
-   font-family: $sans;
-   font-size: smaller;
  }
- table.LC_breadcrumbs td.LC_breadcrumbs_component,
- table.LC_docs_path td.LC_docs_path_component {
+ li.LC_menubuttons_inline_text img,a {
-   background: $tabbg;
+   cursor:pointer;
-   color: $font;
-   font-family: $sans;
-   font-size: larger;
-   text-align: right;
  }
- td.LC_table_cell_checkbox {
-   text-align: center;
+ .LC_menubuttons_link {
+   text-decoration: none;
  }
- .LC_menubuttons_inline_text {
+ .LC_menubuttons_category {
    color: $font;
-   font-family: $sans;
+   background: $pgbg;
-   font-size: smaller;
+   font-size: larger;
+   font-weight: bold;
  }
  td.LC_menubuttons_text {
    color: $font;
-   font-family: $sans;
- }
- td.LC_menubuttons_img {
-   background: $tabbg;
  }
  .LC_current_location {
-   font-family: $sans;
    background: $tabbg;
  }
- .LC_new_mail {
-   font-family: $sans;
-   font-weight: bold;
- }
- table.LC_aboutme_port {
+ table.LC_data_table {
-   border: 0px;
-   border-collapse: collapse;
-   border-spacing: 0px;
- }
- 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_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th {
+ table.LC_nested_outer {
+   border: 1px solid #000000;
+   border-collapse: collapse;
+   border-spacing: 0;
+   width: 100%;
+ }
+ table.LC_innerpickbox,
+ table.LC_nested {
+   border: none;
+   border-collapse: collapse;
+   border-spacing: 0;
+   width: 100%;
+ }
+ .ui-accordion,
+ .ui-accordion table.LC_data_table,
+ .ui-accordion table.LC_nested_outer{
+   border: 0px;
+   border-spacing: 0px;
+   margin: 3px;
+ }
+ table.LC_data_table tr th,
+ table.LC_calendar tr th,
+ table.LC_prior_tries tr th,
+ table.LC_innerpickbox tr th {
    font-weight: bold;
    background-color: $data_table_head;
-   font-size: smaller;
+   color:$fontmenu;
+   font-size:90%;
+ }
+ table.LC_innerpickbox tr th,
+ table.LC_innerpickbox tr td {
+   vertical-align: top;
+ }
+ table.LC_data_table tr.LC_info_row > td {
+   background-color: #CCCCCC;
+   font-weight: bold;
+   text-align: left;
+ }
+ table.LC_data_table tr.LC_odd_row > td {
+   background-color: $data_table_light;
+   padding: 2px;
+   vertical-align: top;
  }
- table.LC_data_table tr td,
- table.LC_aboutme_port tr td {
+ table.LC_pick_box tr > td.LC_odd_row {
    background-color: $data_table_light;
+   vertical-align: top;
+ }
+ table.LC_data_table tr.LC_even_row > td {
+   background-color: $data_table_dark;
    padding: 2px;
+   vertical-align: top;
  }
- table.LC_data_table tr.LC_even_row td,
- table.LC_aboutme_port tr.LC_even_row td {
+ table.LC_pick_box tr > td.LC_even_row {
    background-color: $data_table_dark;
+   vertical-align: top;
  }
  table.LC_data_table tr.LC_data_table_highlight td {
    background-color: $data_table_darker;
  }
+ table.LC_data_table tr td.LC_leftcol_header {
+   background-color: $data_table_head;
+   font-weight: bold;
+ }
  table.LC_data_table tr.LC_empty_row td,
- table.LC_whatsnew tr.LC_empty_row td {
+ table.LC_nested tr.LC_empty_row td {
-   background-color: #FFFFFF;
    font-weight: bold;
    font-style: italic;
    text-align: center;
    padding: 8px;
  }
- table.LC_whatsnew tr.LC_empty_row td {
-   padding: 4ex
+ table.LC_data_table tr.LC_empty_row td {
+   background-color: $sidebg;
  }
+ table.LC_nested tr.LC_empty_row td {
+   background-color: #FFFFFF;
+ }
- table.LC_whatsnew {
+ table.LC_caption {
  }
- table.LC_whatsnew tr th,
+ table.LC_nested tr.LC_empty_row td {
- table.LC_whatsnew tr.LC_info_row td {
+   padding: 4ex
-   background-color: #CCC;
+ }
+ table.LC_nested_outer tr th {
+   font-weight: bold;
+   color:$fontmenu;
+   background-color: $data_table_head;
+   font-size: small;
+   border-bottom: 1px solid #000000;
+ }
+ table.LC_nested_outer tr td.LC_subheader {
+   background-color: $data_table_head;
    font-weight: bold;
    font-size: small;
+   border-bottom: 1px solid #000000;
    text-align: right;
  }
- table.LC_whatsnew tr td {
-   background-color: #FFF;
+ table.LC_nested tr.LC_info_row td {
+   background-color: #CCCCCC;
+   font-weight: bold;
    font-size: small;
+   text-align: center;
+ }
+ 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 {
+   background-color: #FFFFFF;
+   font-size: small;
+ }
+ table.LC_nested_outer tr th.LC_right_item,
+ table.LC_nested tr.LC_info_row td.LC_right_item,
+ table.LC_nested tr.LC_odd_row td.LC_right_item,
+ table.LC_nested tr td.LC_right_item {
    text-align: right;
  }
- table.LC_whatsnew tr td.LC_first_item {
+ .ui-accordion table.LC_nested tr.LC_odd_row td.LC_left_item,
+ .ui-accordion table.LC_nested tr.LC_even_row td.LC_left_item {
+   text-align: right;
+   width: 40%;
+   padding-right:10px;
+   vertical-align: top;
+   padding: 5px;
+ }
+ .ui-accordion table.LC_nested tr.LC_odd_row td.LC_right_item,
+ .ui-accordion table.LC_nested tr.LC_even_row td.LC_right_item {
    text-align: left;
+   width: 60%;
+   padding: 2px 4px;
  }
- table.LC_whatsnew tr.LC_odd_row td {
+ table.LC_nested tr.LC_odd_row td {
-   background-color: #EEE;
+   background-color: #EEEEEE;
  }
  table.LC_createuser {
  }
  table.LC_createuser tr.LC_section_row td {
-   font-size: smaller;
+   font-size: small;
  }
  table.LC_createuser tr.LC_info_row td  {
-   background-color: #CCC;
+   background-color: #CCCCCC;
    font-weight: bold;
    text-align: center;
  }
- Line 3664  table.LC_createuser tr.LC_info_row td  {
+ Line 5292  table.LC_createuser tr.LC_info_row td  {
  table.LC_calendar {
    border: 1px solid #000000;
    border-collapse: collapse;
+   width: 98%;
  }
  table.LC_calendar_pickdate {
    font-size: xx-small;
  }
  table.LC_calendar tr td {
    border: 1px solid #000000;
    vertical-align: top;
+   width: 14%;
  }
  table.LC_calendar tr td.LC_calendar_day_empty {
    background-color: $data_table_dark;
  }
  table.LC_calendar tr td.LC_calendar_day_current {
    background-color: $data_table_highlight;
  }
- table.LC_mail_list tr.LC_mail_new {
+ table.LC_data_table tr td.LC_mail_new {
    background-color: $mail_new;
  }
- table.LC_mail_list tr.LC_mail_new:hover {
+ table.LC_data_table tr.LC_mail_new:hover {
    background-color: $mail_new_hover;
  }
- table.LC_mail_list tr.LC_mail_read {
+ table.LC_data_table tr td.LC_mail_read {
    background-color: $mail_read;
  }
- table.LC_mail_list tr.LC_mail_read:hover {
+ /*
+ table.LC_data_table tr.LC_mail_read:hover {
    background-color: $mail_read_hover;
  }
- table.LC_mail_list tr.LC_mail_replied {
+ */
+ table.LC_data_table tr td.LC_mail_replied {
    background-color: $mail_replied;
  }
- table.LC_mail_list tr.LC_mail_replied:hover {
+ /*
+ table.LC_data_table tr.LC_mail_replied:hover {
    background-color: $mail_replied_hover;
  }
- table.LC_mail_list tr.LC_mail_other {
+ */
+ table.LC_data_table tr td.LC_mail_other {
    background-color: $mail_other;
  }
- table.LC_mail_list tr.LC_mail_other:hover {
+ /*
+ table.LC_data_table tr.LC_mail_other:hover {
    background-color: $mail_other_hover;
  }
+ */
- table#LC_portfolio_actions {
+ table.LC_data_table tr > td.LC_browser_file,
-   width: auto;
+ table.LC_data_table tr > td.LC_browser_file_published {
-   background: $pgbg;
+   background: #AAEE77;
-   border: 0px;
-   border-spacing: 2px 2px;
-   padding: 0px;
-   margin: 0px;
-   border-collapse: separate;
- }
- table#LC_portfolio_actions td.LC_label {
-   background: $tabbg;
-   text-align: right;
- }
- table#LC_portfolio_actions td.LC_value {
-   background: $tabbg;
  }
- table#LC_cstr_controls {
+ table.LC_data_table tr > td.LC_browser_file_locked,
-   width: 100%;
+ table.LC_data_table tr > td.LC_browser_file_unpublished {
-   border-collapse: collapse;
+   background: #FFAA99;
- }
- table#LC_cstr_controls tr td {
-   border: 4px solid $pgbg;
-   padding: 4px;
-   text-align: center;
-   background: $tabbg;
  }
- table#LC_cstr_controls tr th {
-   border: 4px solid $pgbg;
+ table.LC_data_table tr > td.LC_browser_file_obsolete {
-   background: $table_header;
+   background: #888888;
-   text-align: center;
-   font-family: $sans;
-   font-size: smaller;
  }
- table#LC_browser {
+ table.LC_data_table tr > td.LC_browser_file_modified,
+ table.LC_data_table tr > td.LC_browser_file_metamodified {
+   background: #F8F866;
  }
- table#LC_browser tr th {
-   background: $table_header;
+ table.LC_data_table tr.LC_browser_folder > td {
+   background: #E0E8FF;
  }
- table#LC_browser tr td {
-   padding: 2px;
+ table.LC_data_table tr > td.LC_roles_is {
+   /* background: #77FF77; */
  }
- table#LC_browser tr.LC_browser_file,
- table#LC_browser tr.LC_browser_file_published {
+ table.LC_data_table tr > td.LC_roles_future {
-   background: #CCFF88;
+   border-right: 8px solid #FFFF77;
  }
- table#LC_browser tr.LC_browser_file_locked,
- table#LC_browser tr.LC_browser_file_unpublished {
+ table.LC_data_table tr > td.LC_roles_will {
-   background: #FFAA99;
+   border-right: 8px solid #FFAA77;
  }
- table#LC_browser tr.LC_browser_file_obsolete {
-   background: #AAAAAA;
+ table.LC_data_table tr > td.LC_roles_expired {
+   border-right: 8px solid #FF7777;
  }
- table#LC_browser tr.LC_browser_file_modified,
- table#LC_browser tr.LC_browser_file_metamodified {
+ table.LC_data_table tr > td.LC_roles_will_not {
-   background: #FFFF77;
+   border-right: 8px solid #AAFF77;
  }
- table#LC_browser tr.LC_browser_folder {
-   background: #CCCCFF;
+ table.LC_data_table tr > td.LC_roles_selected {
+   border-right: 8px solid #11CC55;
  }
  span.LC_current_location {
-   font-size: x-large;
+   font-size:larger;
    background: $pgbg;
  }
  span.LC_parm_menu_item {
    font-size: larger;
-   font-family: $sans;
  }
  span.LC_parm_scope_all {
    color: red;
  }
  span.LC_parm_scope_folder {
    color: green;
  }
  span.LC_parm_scope_resource {
    color: orange;
  }
  span.LC_parm_part {
    color: blue;
  }
- span.LC_parm_folder, span.LC_parm_symb {
+ span.LC_parm_folder,
+ span.LC_parm_symb {
    font-size: x-small;
    font-family: $mono;
    color: #AAAAAA;
  }
- td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu,
+ ul.LC_parm_parmlist li {
- td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+   display: inline-block;
+   padding: 0.3em 0.8em;
+   vertical-align: top;
+   width: 150px;
+   border-top:1px solid $lg_border_color;
+ }
+ td.LC_parm_overview_level_menu,
+ td.LC_parm_overview_map_menu,
+ td.LC_parm_overview_parm_selectors,
+ td.LC_parm_overview_restrictions  {
    border: 1px solid black;
    border-collapse: collapse;
  }
  table.LC_parm_overview_restrictions td {
    border-width: 1px 4px 1px 4px;
    border-style: solid;
    border-color: $pgbg;
    text-align: center;
  }
  table.LC_parm_overview_restrictions th {
    background: $tabbg;
    border-width: 1px 4px 1px 4px;
    border-style: solid;
    border-color: $pgbg;
  }
  table#LC_helpmenu {
-   border: 0px;
+   border: none;
    height: 55px;
-   border-spacing: 0px;
+   border-spacing: 0;
  }
  table#LC_helpmenu fieldset legend {
    font-size: larger;
-   font-weight: bold;
  }
  table#LC_helpmenu_links {
    width: 100%;
    border: 1px solid black;
    background: $pgbg;
-   padding: 0px;
+   padding: 0;
    border-spacing: 1px;
  }
  table#LC_helpmenu_links tr td {
    padding: 1px;
    background: $tabbg;
- Line 3834  table#LC_helpmenu_links tr td {
+ Line 5485  table#LC_helpmenu_links tr td {
    font-weight: bold;
  }
- table#LC_helpmenu_links a:link, table#LC_helpmenu_links a:visited,
+ table#LC_helpmenu_links a:link,
+ table#LC_helpmenu_links a:visited,
  table#LC_helpmenu_links a:active {
    text-decoration: none;
    color: $font;
  }
  table#LC_helpmenu_links a:hover {
    text-decoration: underline;
    color: $vlink;
- Line 3848  table#LC_helpmenu_links a:hover {
+ Line 5501  table#LC_helpmenu_links a:hover {
    border: 1px solid #339933;
    margin: -1px;
  }
  .LC_chrt_popup_up {
    border: 1px solid yellow;
    margin: -1px;
  }
  .LC_chrt_popup {
    border: 1px solid #8888FF;
    background: #CCCCFF;
  }
  table.LC_pick_box {
-   width: 100%;
    border-collapse: separate;
    background: white;
    border: 1px solid black;
    border-spacing: 1px;
  }
  table.LC_pick_box td.LC_pick_box_title {
-   background: $tabbg;
+   background: $sidebg;
    font-weight: bold;
-   text-align: right;
+   text-align: left;
+   vertical-align: top;
    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;
+   padding: 0;
    height: 1px;
    background: black;
  }
  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;
+ }
+ span.LC_helpform_receipt_cat {
+   font-weight: bold;
+ }
  table.LC_group_priv_box {
    background: white;
    border: 1px solid black;
    border-spacing: 1px;
  }
  table.LC_group_priv_box td.LC_pick_box_title {
    background: $tabbg;
    font-weight: bold;
    text-align: right;
    width: 184px;
  }
  table.LC_group_priv_box td.LC_groups_fixed {
    background: $data_table_light;
    text-align: center;
  }
  table.LC_group_priv_box td.LC_groups_optional {
    background: $data_table_dark;
    text-align: center;
  }
  table.LC_group_priv_box td.LC_groups_functionality {
    background: $data_table_darker;
    text-align: center;
    font-weight: bold;
  }
  table.LC_group_priv td {
    text-align: left;
-   padding: 0px;
+   padding: 0;
  }
- table.LC_notify_front_page {
-   background: white;
-   border: 1px solid black;
-   padding: 8px;
- }
- table.LC_notify_front_page td {
-   padding: 8px;
- }
  .LC_navbuttons {
    margin: 2ex 0ex 2ex 0ex;
  }
  .LC_topic_bar {
-   font-family: $sans;
    font-weight: bold;
-   width: 100%;
    background: $tabbg;
-   vertical-align: middle;
+   margin: 1em 0em 1em 2em;
-   margin: 2ex 0ex 2ex 0ex;
+   padding: 3px;
+   font-size: 1.2em;
  }
  .LC_topic_bar span {
+   left: 0.5em;
+   position: absolute;
    vertical-align: middle;
+   font-size: 1.2em;
  }
- .LC_topic_bar img {
-   vertical-align: bottom;
- }
  table.LC_course_group_status {
    margin: 20px;
  }
  table.LC_status_selector td {
    vertical-align: top;
    text-align: center;
    padding: 4px;
  }
- table.LC_descriptive_input td.LC_description {
+ div.LC_feedback_link {
+   clear: both;
+   background: $sidebg;
+   width: 100%;
+   padding-bottom: 10px;
+   border: 1px $tabbg solid;
+   height: 22px;
+   line-height: 22px;
+   padding-top: 5px;
+ }
+ div.LC_feedback_link img {
+   height: 22px;
+   vertical-align:middle;
+ }
+ div.LC_feedback_link a {
+   text-decoration: none;
+ }
+ div.LC_comblock {
+   display:inline;
+   color:$font;
+   font-size:90%;
+ }
+ div.LC_feedback_link div.LC_comblock {
+   padding-left:5px;
+ }
+ div.LC_feedback_link div.LC_comblock a {
+   color:$font;
+ }
+ span.LC_feedback_link {
+   /* background: $feedback_link_bg; */
+   font-size: larger;
+ }
+ span.LC_message_link {
+   /* background: $feedback_link_bg; */
+   font-size: larger;
+   position: absolute;
+   right: 1em;
+ }
+ table.LC_prior_tries {
+   border: 1px solid #000000;
+   border-collapse: separate;
+   border-spacing: 1px;
+ }
+ table.LC_prior_tries td {
+   padding: 2px;
+ }
+ .LC_answer_correct {
+   background: lightgreen;
+   color: darkgreen;
+   padding: 6px;
+ }
+ .LC_answer_charged_try {
+   background: #FFAAAA;
+   color: darkred;
+   padding: 6px;
+ }
+ .LC_answer_not_charged_try,
+ .LC_answer_no_grade,
+ .LC_answer_late {
+   background: lightyellow;
+   color: black;
+   padding: 6px;
+ }
+ .LC_answer_previous {
+   background: lightblue;
+   color: darkblue;
+   padding: 6px;
+ }
+ .LC_answer_no_message {
+   background: #FFFFFF;
+   color: black;
+   padding: 6px;
+ }
+ .LC_answer_unknown {
+   background: orange;
+   color: black;
+   padding: 6px;
+ }
+ span.LC_prior_numerical,
+ span.LC_prior_string,
+ span.LC_prior_custom,
+ span.LC_prior_reaction,
+ span.LC_prior_math {
+   font-family: $mono;
+   white-space: pre;
+ }
+ span.LC_prior_string {
+   font-family: $mono;
+   white-space: pre;
+ }
+ table.LC_prior_option {
+   width: 100%;
+   border-collapse: collapse;
+ }
+ table.LC_prior_rank,
+ table.LC_prior_match {
+   border-collapse: collapse;
+ }
+ table.LC_prior_option tr td,
+ table.LC_prior_rank tr td,
+ table.LC_prior_match tr td {
+   border: 1px solid #000000;
+ }
+ .LC_nobreak {
+   white-space: nowrap;
+ }
+ span.LC_cusr_emph {
+   font-style: italic;
+ }
+ span.LC_cusr_subheading {
+   font-weight: normal;
+   font-size: 85%;
+ }
+ div.LC_docs_entry_move {
+   border: 1px solid #BBBBBB;
+   background: #DDDDDD;
+   width: 22px;
+   padding: 1px;
+   margin: 0;
+ }
+ table.LC_data_table tr > td.LC_docs_entry_commands,
+ table.LC_data_table tr > td.LC_docs_entry_parameter {
+   background: #DDDDDD;
+   font-size: x-small;
+ }
+ .LC_docs_entry_parameter {
+   white-space: nowrap;
+ }
+ .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;
+ }
+ 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: 0;
+   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;
-   text-align: right;
+ }
+ table.LC_double_column tr td.LC_right_col {
+   top: 2px;
+   right: 2px;
+   width: 47%;
+   vertical-align: top;
+ }
+ 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_show_user {
+ /*  border-left: 5px solid $sidebg; */
+   border-top: 5px solid #000000;
+   margin: 50px 0 0 0;
+   padding: 15px 0 5px 10px;
+ }
+ div.LC_grade_show_user_odd_row {
+ /*  border-left: 5px solid #000000; */
+ }
+ div.LC_grade_show_user div.LC_Box {
+   margin-right: 50px;
+ }
+ div.LC_grade_submissions,
+ div.LC_grade_message_center,
+ div.LC_grade_info_links {
+   margin: 5px;
+   width: 99%;
+   background: #FFFFFF;
+ }
+ div.LC_grade_submissions_header,
+ div.LC_grade_message_center_header {
+   font-weight: bold;
+   font-size: large;
+ }
+ div.LC_grade_submissions_body,
+ div.LC_grade_message_center_body {
+   border: 1px solid black;
+   width: 99%;
+   background: #FFFFFF;
+ }
+ table.LC_scantron_action {
+   width: 100%;
+ }
+ table.LC_scantron_action tr th {
+   font-weight:bold;
+   font-style:normal;
+ }
+ .LC_edit_problem_header,
+ div.LC_edit_problem_footer {
+   font-weight: normal;
+   font-size:  medium;
+   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_title {
+   font-weight: bold;
+   font-size: larger;
+   background: $tabbg;
+   padding: 3px;
+ }
+ table.LC_edit_problem_header_title {
+   width: 100%;
+   background: $tabbg;
+ }
+ div.LC_edit_problem_discards {
+   float: left;
+   padding-bottom: 5px;
+ }
+ div.LC_edit_problem_saves {
+   float: right;
+   padding-bottom: 5px;
+ }
+ img.stift {
+   border-width: 0;
+   vertical-align: middle;
+ }
+ table td.LC_mainmenu_col_fieldset {
+   vertical-align: top;
+ }
+ div.LC_createcourse {
+   margin: 10px 10px 10px 10px;
+ }
+ .LC_dccid {
+   margin: 0.2em 0 0 0;
+   padding: 0;
+   font-size: 90%;
+   display:none;
+ }
+ a:hover,
+ ol.LC_primary_menu a:hover,
+ ol#LC_MenuBreadcrumbs a:hover,
+ ol#LC_PathBreadcrumbs a:hover,
+ ul#LC_secondary_menu a:hover,
+ .LC_FormSectionClearButton input:hover
+ ul.LC_TabContent   li:hover a {
+   color:$button_hover;
+   text-decoration:none;
+ }
+ h1 {
+   padding: 0;
+   line-height:130%;
+ }
+ h2,
+ h3,
+ h4,
+ h5,
+ h6 {
+   margin: 5px 0 5px 0;
+   padding: 0;
+   line-height:130%;
+ }
+ .LC_hcell {
+   padding:3px 15px 3px 15px;
+   margin: 0;
+   background-color:$tabbg;
+   color:$fontmenu;
+   border-bottom:solid 1px $lg_border_color;
+ }
+ .LC_Box > .LC_hcell {
+   margin: 0 -10px 10px -10px;
+ }
+ .LC_noBorder {
+   border: 0;
+ }
+ .LC_FormSectionClearButton input {
+   background-color:transparent;
+   border: none;
+   cursor:pointer;
+   text-decoration:underline;
+ }
+ .LC_help_open_topic {
+   color: #FFFFFF;
+   background-color: #EEEEFF;
+   margin: 1px;
+   padding: 4px;
+   border: 1px solid #000033;
+   white-space: nowrap;
+   /* vertical-align: middle; */
+ }
+ dl,
+ ul,
+ div,
+ fieldset {
+   margin: 10px 10px 10px 0;
+   /* overflow: hidden; */
+ }
+ fieldset > legend {
+   font-weight: bold;
+   padding: 0 5px 0 5px;
+ }
+ #LC_nav_bar {
+   float: left;
+   margin: 0 0 2px 0;
+ }
+ #LC_realm {
+   margin: 0.2em 0 0 0;
+   padding: 0;
+   font-weight: bold;
+   text-align: center;
+ }
+ #LC_nav_bar em {
+   font-weight: bold;
+   font-style: normal;
+ }
+ ol.LC_primary_menu {
+   float: right;
+   margin: 0;
+ }
+ ol#LC_PathBreadcrumbs {
+   margin: 0;
+ }
+ ol.LC_primary_menu li {
+   display: inline;
+   padding: 5px 5px 0 10px;
+   vertical-align: top;
+ }
+ ol.LC_primary_menu li img {
+   vertical-align: bottom;
+   height: 1.1em;
+ }
+ ol.LC_primary_menu a {
+   color: RGB(80, 80, 80);
+   text-decoration: none;
+ }
+ ol.LC_primary_menu a.LC_new_message {
+   font-weight:bold;
+   color: darkred;
+ }
+ ol.LC_docs_parameters {
+   margin-left: 0;
+   padding: 0;
+   list-style: none;
+ }
+ ol.LC_docs_parameters li {
+   margin: 0;
+   padding-right: 20px;
+   display: inline;
+ }
+ ol.LC_docs_parameters li:before {
+   content: "\\002022 \\0020";
+ }
+ li.LC_docs_parameters_title {
+   font-weight: bold;
+ }
+ ol.LC_docs_parameters li.LC_docs_parameters_title:before {
+   content: "";
+ }
+ ul#LC_secondary_menu {
+   clear: both;
+   color: $fontmenu;
+   background: $tabbg;
+   list-style: none;
+   padding: 0;
+   margin: 0;
+   width: 100%;
+ }
+ ul#LC_secondary_menu li {
+   font-weight: bold;
+   line-height: 1.8em;
+   padding: 0 0.8em;
+   border-right: 1px solid black;
+   display: inline;
+   vertical-align: middle;
+ }
+ ul.LC_TabContent {
+   display:block;
+   background: $sidebg;
+   border-bottom: solid 1px $lg_border_color;
+   list-style:none;
+   margin: 0 -10px;
+   padding: 0;
+ }
+ ul.LC_TabContent li,
+ ul.LC_TabContentBigger li {
+   float:left;
+ }
+ ul#LC_secondary_menu li a {
+   color: $fontmenu;
+   text-decoration: none;
+ }
+ ul.LC_TabContent {
+   min-height:20px;
+ }
+ ul.LC_TabContent li {
+   vertical-align:middle;
+   padding: 0 16px 0 10px;
+   background-color:$tabbg;
+   border-bottom:solid 1px $lg_border_color;
+   border-right: solid 1px $font;
+ }
+ ul.LC_TabContent .right {
+   float:right;
+ }
+ ul.LC_TabContent li a,
+ ul.LC_TabContent li {
+   color:rgb(47,47,47);
+   text-decoration:none;
+   font-size:95%;
+   font-weight:bold;
+   min-height:20px;
+ }
+ ul.LC_TabContent li a:hover,
+ ul.LC_TabContent li a:focus {
+   color: $button_hover;
+   background:none;
+   outline:none;
+ }
+ ul.LC_TabContent li:hover {
+   color: $button_hover;
+   cursor:pointer;
+ }
+ ul.LC_TabContent li.active {
+   color: $font;
+   background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
+   border-bottom:solid 1px #FFFFFF;
+   cursor: default;
+ }
+ ul.LC_TabContent li.active a {
+   color:$font;
+   background:#FFFFFF;
+   outline: none;
+ }
+ #maincoursedoc {
+   clear:both;
+ }
+ ul.LC_TabContentBigger {
+   display:block;
+   list-style:none;
+   padding: 0;
+ }
+ ul.LC_TabContentBigger li {
+   vertical-align:bottom;
+   height: 30px;
+   font-size:110%;
+   font-weight:bold;
+   color: #737373;
+ }
+ ul.LC_TabContentBigger li.active {
+   position: relative;
+   top: 1px;
+ }
+ ul.LC_TabContentBigger li a {
+   background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat;
+   height: 30px;
+   line-height: 30px;
+   text-align: center;
+   display: block;
+   text-decoration: none;
+   outline: none;
+ }
+ ul.LC_TabContentBigger li.active a {
+   background:url('/adm/lonIcons/tabbgleft.gif') left top no-repeat;
+   color:$font;
+ }
+ ul.LC_TabContentBigger li b {
+   background: url('/adm/lonIcons/tabbgright.gif') no-repeat right bottom;
+   display: block;
+   float: left;
+   padding: 0 30px;
+   border-bottom: 1px solid $lg_border_color;
+ }
+ ul.LC_TabContentBigger li:hover b {
+   color:$button_hover;
+ }
+ ul.LC_TabContentBigger li.active b {
+   background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat;
+   color:$font;
+   border: 0;
+   cursor:default;
+ }
+ ul.LC_CourseBreadcrumbs {
+   background: $sidebg;
+   line-height: 32px;
+   padding-left: 10px;
+   margin: 0 0 10px 0;
+   list-style-position: inside;
+ }
+ ol#LC_MenuBreadcrumbs,
+ ol#LC_PathBreadcrumbs {
+   padding-left: 10px;
+   margin: 0;
+   height: 2.5em;  /* equal to #LC_breadcrumbs line-height */
+ }
+ ol#LC_MenuBreadcrumbs li,
+ ol#LC_PathBreadcrumbs li,
+ ul.LC_CourseBreadcrumbs li {
+   display: inline;
+   white-space: normal;
+ }
+ ol#LC_MenuBreadcrumbs li a,
+ ul.LC_CourseBreadcrumbs li a {
+   text-decoration: none;
+   font-size:90%;
+ }
+ ol#LC_MenuBreadcrumbs h1 {
+   display: inline;
+   font-size: 90%;
+   line-height: 2.5em;
+   margin: 0;
+   padding: 0;
+ }
+ ol#LC_PathBreadcrumbs li a {
+   text-decoration:none;
+   font-size:100%;
+   font-weight:bold;
+ }
+ .LC_Box {
+   border: solid 1px $lg_border_color;
+   padding: 0 10px 10px 10px;
+ }
+ .LC_AboutMe_Image {
+   float:left;
+   margin-right:10px;
+ }
+ .LC_Clear_AboutMe_Image {
+   clear:left;
+ }
+ dl.LC_ListStyleClean dt {
+   padding-right: 5px;
+   display: table-header-group;
+ }
+ dl.LC_ListStyleClean dd {
+   display: table-row;
+ }
+ .LC_ListStyleClean,
+ .LC_ListStyleSimple,
+ .LC_ListStyleNormal,
+ .LC_ListStyleSpecial {
+   /* display:block; */
+   list-style-position: inside;
+   list-style-type: none;
+   overflow: hidden;
+   padding: 0;
+ }
+ .LC_ListStyleSimple li,
+ .LC_ListStyleSimple dd,
+ .LC_ListStyleNormal li,
+ .LC_ListStyleNormal dd,
+ .LC_ListStyleSpecial li,
+ .LC_ListStyleSpecial dd {
+   margin: 0;
+   padding: 5px 5px 5px 10px;
+   clear: both;
+ }
+ .LC_ListStyleClean li,
+ .LC_ListStyleClean dd {
+   padding-top: 0;
+   padding-bottom: 0;
+ }
+ .LC_ListStyleSimple dd,
+ .LC_ListStyleSimple li {
+   border-bottom: solid 1px $lg_border_color;
+ }
+ .LC_ListStyleSpecial li,
+ .LC_ListStyleSpecial dd {
+   list-style-type: none;
+   background-color: RGB(220, 220, 220);
+   margin-bottom: 4px;
+ }
+ table.LC_SimpleTable {
+   margin:5px;
+   border:solid 1px $lg_border_color;
+ }
+ table.LC_SimpleTable tr {
+   padding: 0;
+   border:solid 1px $lg_border_color;
+ }
+ table.LC_SimpleTable thead {
+   background:rgb(220,220,220);
+ }
+ div.LC_columnSection {
+   display: block;
+   clear: both;
+   overflow: hidden;
+   margin: 0;
+ }
+ div.LC_columnSection>* {
+   float: left;
+   margin: 10px 20px 10px 0;
+   overflow:hidden;
+ }
+ table em {
    font-weight: bold;
+   font-style: normal;
+ }
+ table.LC_tableBrowseRes,
+ table.LC_tableOfContent {
+   border:none;
+   border-spacing: 1px;
+   padding: 3px;
+   background-color: #FFFFFF;
+   font-size: 90%;
+ }
+ table.LC_tableOfContent {
+   border-collapse: collapse;
+ }
+ table.LC_tableBrowseRes a,
+ table.LC_tableOfContent a {
+   background-color: transparent;
+   text-decoration: none;
+ }
+ table.LC_tableOfContent img {
+   border: none;
+   height: 1.3em;
+   vertical-align: text-bottom;
+   margin-right: 0.3em;
+ }
+ a#LC_content_toolbar_firsthomework {
+   background-image:url(/res/adm/pages/open-first-problem.gif);
+ }
+ a#LC_content_toolbar_everything {
+   background-image:url(/res/adm/pages/show-all.gif);
+ }
+ a#LC_content_toolbar_uncompleted {
+   background-image:url(/res/adm/pages/show-incomplete-problems.gif);
+ }
+ #LC_content_toolbar_clearbubbles {
+   background-image:url(/res/adm/pages/mark-discussionentries-read.gif);
+ }
+ a#LC_content_toolbar_changefolder {
+   background : url(/res/adm/pages/close-all-folders.gif) top center ;
+ }
+ a#LC_content_toolbar_changefolder_toggled {
+   background-image:url(/res/adm/pages/open-all-folders.gif);
+ }
+ ul#LC_toolbar li a:hover {
+   background-position: bottom center;
+ }
+ ul#LC_toolbar {
+   padding: 0;
+   margin: 2px;
+   list-style:none;
+   position:relative;
+   background-color:white;
+ }
+ ul#LC_toolbar li {
+   border:1px solid white;
+   padding: 0;
+   margin: 0;
+   float: left;
+   display:inline;
+   vertical-align:middle;
+ }
+ a.LC_toolbarItem {
+   display:block;
+   padding: 0;
+   margin: 0;
+   height: 32px;
+   width: 32px;
+   color:white;
+   border: none;
+   background-repeat:no-repeat;
+   background-color:transparent;
+ }
+ ul.LC_funclist {
+     margin: 0;
+     padding: 0.5em 1em 0.5em 0;
+ }
+ ul.LC_funclist > li:first-child {
+     font-weight:bold;
+     margin-left:0.8em;
+ }
+ ul.LC_funclist + ul.LC_funclist {
+     /*
+        left border as a seperator if we have more than
+        one list
+     */
+     border-left: 1px solid $sidebg;
+     /*
+        this hides the left border behind the border of the
+        outer box if element is wrapped to the next 'line'
+     */
+     margin-left: -1px;
+ }
+ ul.LC_funclist li {
+   display: inline;
+   white-space: nowrap;
+   margin: 0 0 0 25px;
+   line-height: 150%;
+ }
+ .ui-accordion .LC_advanced_toggle {
+   float: right;
+   font-size: 90%;
+   padding: 0px 4px
+ }
+ .LC_hidden {
+   display: none;
  }
  END
- Line 3953  END
+ Line 6512  END
  =pod
- =over 4
  =item * &headtag()
  Returns a uniform footer for LON-CAPA web pages.
- Line 3978  Inputs: $title - optional title for the
+ Line 6535  Inputs: $title - optional title for the
              no_auto_mt_title
                             -> prevent &mt()ing the title arg
- =back
  =cut
  sub headtag {
- Line 4003  sub headtag {
+ Line 6558  sub headtag {
      if (!$args->{'frameset'}) {
  	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
      }
-     if ($args->{'force_register'}) {
+     if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
- 	$result .= &Apache::lonmenu::registerurl(1);
+         $result .= Apache::lonxml::display_title();
      }
      if (!$args->{'no_nav_bar'}
  	&& !$args->{'only_body'}
- Line 4030  ADDMETA
+ Line 6585  ADDMETA
      $result .= '<title> LON-CAPA '.$title.'</title>'
  	.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'
  	.$head_extra;
-     return $result;
+     return $result.'</head>';
  }
  =pod
- =over 4
  =item * &font_settings()
  Returns neccessary <meta> to set the proper encoding
  Inputs: none
- =back
  =cut
  sub font_settings {
      my $headerstring='';
-     if (($env{'browser.os'} eq 'mac') && (!$env{'browser.mathml'})) {
+     if (!$env{'browser.mathml'} && $env{'browser.unicode'}) {
- 	$headerstring.=
- 	    '<meta Content-Type="text/html; charset=x-mac-roman" />';
-     } elsif (!$env{'browser.mathml'} && $env{'browser.unicode'}) {
  	$headerstring.=
  	    '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
      }
- Line 4061  sub font_settings {
+ Line 6609  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{'browser.mathml'}) {
  	$output='<?xml version="1.0"?>'
              #.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'."\n"
- Line 4088  sub xml_begin {
+ Line 6630  sub xml_begin {
              .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '
  	    .'xmlns="http://www.w3.org/1999/xhtml">';
      } else {
- 	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>';
+ 	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
+            .'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">';
      }
      return $output;
  }
  =pod
- =over 4
+ =item * &start_page()
- =item * &endheadtag()
- Returns a uniform </head> for LON-CAPA web pages.
- Inputs: none
- =back
- =cut
- sub endheadtag {
+ Returns a complete <html> .. <body> section for LON-CAPA web pages.
-     return '</head>';
- }
- =pod
+ Inputs:
  =over 4
- =item * &head()
+ $title - optional title for the page
- Returns a uniform complete <head>..</head> section for LON-CAPA web pages.
+ $head_extra - optional extra HTML to incude inside the <head>
- Inputs: $title - optional title for the page
+ $args - additional optional args supported are:
-         $head_extra - optional extra HTML to put inside the <head>
- =back
- =cut
+ =over 8
- sub head {
+              only_body      -> is true will set &bodytag() onlybodytag
-     my ($title,$head_extra,$args) = @_;
-     return &headtag($title,$head_extra,$args).&endheadtag();
- }
- =pod
- =over 4
- =item * &start_page()
- Returns a complete <html> .. <body> section for LON-CAPA web pages.
- Inputs: $title - optional title for the page
-         $head_extra - optional extra HTML to incude inside the <head>
-         $args - additional optional args supported are:
-                   only_body      -> is true will set &bodytag() onlybodytag
                                      arg on
-                   no_nav_bar     -> is true will set &bodytag() notopbar arg on
+              no_nav_bar     -> is true will set &bodytag() no_nav_bar arg on
-                   add_entries    -> additional attributes to add to the  <body>
+              add_entries    -> additional attributes to add to the  <body>
-                   domain         -> force to color decorate a page for a
+              domain         -> force to color decorate a page for a
                                      specific domain
-                   function       -> force usage of a specific rolish color
+              function       -> force usage of a specific rolish color
                                      scheme
-                   redirect       -> see &headtag()
+              redirect       -> see &headtag()
-                   bgcolor        -> override the default page bg color
+              bgcolor        -> override the default page bg color
-                   js_ready       -> return a string ready for being used in
+              js_ready       -> return a string ready for being used in
                                      a javascript writeln
-                   html_encode    -> return a string ready for being used in
+              html_encode    -> return a string ready for being used in
                                      a html attribute
-                   force_register -> if is true will turn on the &bodytag()
+              force_register -> if is true will turn on the &bodytag()
                                      $forcereg arg
-                   body_title     -> alternate text to use instead of $title
+              frameset       -> if true will start with a <frameset>
-                                     in the title box that appears, this text
-                                     is not auto translated like the $title is
-                   frameset       -> if true will start with a <frameset>
                                      rather than <body>
-                   no_title       -> if true the title bar won't be shown
+              skip_phases    -> hash ref of
-                   skip_phases    -> hash ref of
                                      head -> skip the <html><head> generation
                                      body -> skip all <body> generation
+              no_auto_mt_title -> prevent &mt()ing the title arg
+              inherit_jsmath -> when creating popup window in a page,
+                                     should it have jsmath forced on by the
+                                     current page
+              bread_crumbs ->             Array containing breadcrumbs
+              bread_crumbs_components ->  if exists show it as headline else show only the breadcrumbs
-                   no_inline_link -> if true and in remote mode, don't show the
+ =back
-                                     'Switch To Inline Menu' link
-                   no_auto_mt_title -> prevent &mt()ing the title arg
  =back
- Line 4180  Inputs: $title - optional title for the
+ Line 6691  Inputs: $title - optional title for the
  sub start_page {
      my ($title,$head_extra,$args) = @_;
      #&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
+ #SD
+ #I don't see why we copy certain elements of %$args to %head_args
+ #head args is passed to headtag() and this routine only reads those
+ #keys that are needed. There doesn't happen any writes or any processing
+ #of other keys.
+ #proposal: just pass $args to headtag instead of \%head_args and delete
+ #marked lines
+ #<- MARK
      my %head_args;
      foreach my $arg ('redirect','force_register','domain','function',
  		     'bgcolor','frameset','no_nav_bar','only_body',
- Line 4188  sub start_page {
+ Line 6707  sub start_page {
  	    $head_args{$arg} = $args->{$arg};
  	}
      }
+ #MARK ->
      $env{'internal.start_page'}++;
      my $result;
      if (! exists($args->{'skip_phases'}{'head'}) ) {
- 	$result.=
+         $result .=
- 	    &xml_begin().
+                   &xml_begin() . &headtag($title,$head_extra,\%head_args);
- 	    &headtag($title,$head_extra,\%head_args).&endheadtag();
+ #replace prev line by
+ #                 &xml_begin() . &headtag($title, $head_extra, $args);
      }
      if (! exists($args->{'skip_phases'}{'body'}) ) {
- Line 4202  sub start_page {
+ Line 6724  sub start_page {
  	    my $attr_string = &make_attr_string($args->{'force_register'},
  						$args->{'add_entries'});
  	    $result .= "\n<frameset $attr_string>\n";
- 	} else {
+         } else {
- 	    $result .=
+             $result .=
- 		&bodytag($title,
+                 &bodytag($title,
- 			 $args->{'function'},       $args->{'add_entries'},
+                          $args->{'function'},       $args->{'add_entries'},
- 			 $args->{'only_body'},      $args->{'domain'},
+                          $args->{'only_body'},      $args->{'domain'},
- 			 $args->{'force_register'}, $args->{'body_title'},
+                          $args->{'force_register'}, $args->{'no_nav_bar'},
- 			 $args->{'no_nav_bar'},     $args->{'bgcolor'},
+                          $args->{'bgcolor'},        $args);
- 			 $args->{'no_title'},       $args->{'no_inline_link'},
+         }
- 			 $args);
- 	}
      }
      if ($args->{'js_ready'}) {
- 	$result = &js_ready($result);
+ 		$result = &js_ready($result);
      }
      if ($args->{'html_encode'}) {
- 	$result = &html_encode($result);
+ 		$result = &html_encode($result);
      }
-     return $result;
- }
- =pod
- =over 4
+     # Preparation for new and consistent functionlist at top of screen
+     # if ($args->{'functionlist'}) {
- =item * &head()
+     #            $result .= &build_functionlist();
+     #}
- Returns a complete </body></html> section for LON-CAPA web pages.
+     # Don't add anything more if only_body wanted or in const space
- Inputs:         $args - additional optional args supported are:
+     return $result if    $args->{'only_body'}
-                  js_ready     -> return a string ready for being used in
+                       || $env{'request.state'} eq 'construct';
-                                  a javascript writeln
-                  html_encode  -> return a string ready for being used in
+     #Breadcrumbs
-                                  a html attribute
+     if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
-                  frameset     -> if true will start with a <frameset>
+ 		&Apache::lonhtmlcommon::clear_breadcrumbs();
-                                  rather than <body>
+ 		#if any br links exists, add them to the breadcrumbs
+ 		if (exists($args->{'bread_crumbs'}) and ref($args->{'bread_crumbs'}) eq 'ARRAY') {
+ 			foreach my $crumb (@{$args->{'bread_crumbs'}}){
+ 				&Apache::lonhtmlcommon::add_breadcrumb($crumb);
+ 			}
+ 		}
- =cut
+ 		#if bread_crumbs_component exists show it as headline else show only the breadcrumbs
+ 		if(exists($args->{'bread_crumbs_component'})){
+ 			$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
+ 		}else{
+ 			$result .= &Apache::lonhtmlcommon::breadcrumbs();
+ 		}
+     }
+     return $result;
+ }
  sub end_page {
      my ($args) = @_;
- Line 4258  sub end_page {
+ Line 6786  sub end_page {
      if ($args->{'frameset'}) {
  	$result .= '</frameset>';
      } else {
- 	$result .= &endbodytag();
+ 	$result .= &endbodytag($args);
      }
      $result .= "\n</html>";
- Line 4330  sub simple_error_page {
+ Line 6858  sub simple_error_page {
  }
  {
-     my $row_count;
+     my @row_count;
+     sub start_data_table_count {
+         unshift(@row_count, 0);
+         return;
+     }
+     sub end_data_table_count {
+         shift(@row_count);
+         return;
+     }
      sub start_data_table {
  	my ($add_class) = @_;
  	my $css_class = (join(' ','LC_data_table',$add_class));
- 	undef($row_count);
+ 	&start_data_table_count();
  	return '<table class="'.$css_class.'">'."\n";
      }
      sub end_data_table {
- 	undef($row_count);
+ 	&end_data_table_count();
  	return '</table>'."\n";;
      }
      sub start_data_table_row {
- 	my ($add_class) = @_;
+ 	my ($add_class, $id) = @_;
- 	$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));
+ 	$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
- 	return  '<tr class="'.$css_class.'">'."\n";;
+         $id = (' id="'.$id.'"') unless ($id eq '');
+         return  '<tr class="'.$css_class.'"'.$id.'>'."\n";
      }
      sub continue_data_table_row {
- 	my ($add_class) = @_;
+ 	my ($add_class, $id) = @_;
- 	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));
+ 	$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
- 	return  '<tr class="'.$css_class.'">'."\n";;
+         $id = (' id="'.$id.'"') unless ($id eq '');
+         return  '<tr class="'.$css_class.'"'.$id.'>'."\n";
      }
      sub end_data_table_row {
- Line 4363  sub simple_error_page {
+ Line 6904  sub simple_error_page {
      }
      sub start_data_table_empty_row {
- 	$row_count++;
+ #	$row_count[0]++;
  	return  '<tr class="LC_empty_row" >'."\n";;
      }
- Line 4378  sub simple_error_page {
+ Line 6919  sub simple_error_page {
      sub end_data_table_header_row {
  	return '</tr>'."\n";;
      }
+     sub data_table_caption {
+         my $caption = shift;
+         return "<caption class=\"LC_caption\">$caption</caption>";
+     }
+ }
+ =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 4393  Returns either 'student','coordinator','
+ Line 6990  Returns either 'student','coordinator','
  ###############################################
  sub get_users_function {
-     my $function = 'student';
+     my $function = 'norole';
-     if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
+     if ($env{'request.role'}=~/^(st)/) {
+         $function='student';
+     }
+     if ($env{'request.role'}=~/^(cc|co|in|ta|ep)/) {
          $function='coordinator';
      }
      if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
          $function='admin';
      }
-     if (($env{'request.role'}=~/^(au|ca)/) ||
+     if (($env{'request.role'}=~/^(au|ca|aa)/) ||
          ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
          $function='author';
      }
- Line 4411  sub get_users_function {
+ Line 7011  sub get_users_function {
  =pod
- =item * &check_user_status
+ =item * &show_course()
+ Used by lonmenu.pm and lonroles.pm to determine whether to use the word
+ 'Courses' or 'Roles' in inline navigation and on screen displaying user's roles.
+ Inputs:
+ None
+ Outputs:
+ Scalar: 1 if 'Course' to be used, 0 otherwise.
+ =cut
+ ###############################################
+ sub show_course {
+     my $course = !$env{'user.adv'};
+     if (!$env{'user.adv'}) {
+         foreach my $env (keys(%env)) {
+             next if ($env !~ m/^user\.priv\./);
+             if ($env !~ m/^user\.priv\.(?:st|cm)/) {
+                 $course = 0;
+                 last;
+             }
+         }
+     }
+     return $course;
+ }
+ ###############################################
+ =pod
+ =item * &check_user_status()
  Determines current status of supplied role for a
  specific user. Roles can be active, previous or future.
- Line 4433  sub check_user_status {
+ Line 7065  sub check_user_status {
      my $active_chk = 'none';
      my $now = time;
      if (@uroles > 0) {
-         if (($role eq 'cc') || ($sec eq '') || (!defined($sec))) {
+         if (($role eq 'cc') || ($role eq 'co') || ($sec eq '') || (!defined($sec))) {
              $srchstr = '/'.$cdom.'/'.$crs.'_'.$role;
          } else {
              $srchstr = '/'.$cdom.'/'.$crs.'/'.$sec.'_'.$role;
- Line 4584  previous, future, or all.
+ Line 7216  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 4598  of the possibility of multiple values fo
+ Line 7235  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 4618  sub get_course_users {
+ Line 7255  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 4637  sub get_course_users {
+ Line 7275  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 4645  sub get_course_users {
+ Line 7282  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 4697  sub get_course_users {
+ Line 7355  sub get_course_users {
                      $usec = 'none';
                  }
                  if ($uname ne '' && $udom ne '') {
-                     if ($end < $now) {
+                     if ($hidepriv) {
+                         if ((&Apache::lonnet::privileged($uname,$udom)) &&
+                             (!$nothide{$uname.':'.$udom})) {
+                             next;
+                         }
+                     }
+                     if ($end > 0 && $end < $now) {
                          $status = 'previous';
                      } elsif ($start > $now) {
                          $status = 'future';
- Line 4719  sub get_course_users {
+ Line 7383  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 4728  sub get_course_users {
+ Line 7395  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 4756  sub get_user_info {
+ Line 7433  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 4772  Incoming parameters:
+ Line 7451  Incoming parameters:
 . user's domain
  Returns:
 . Disk quota (in Mb) assigned to student.
+. (Optional) Type of setting: custom or default
+    (individually assigned or default for user's
+    institutional status).
+. (Optional) - User's institutional status (e.g., faculty, staff
+    or student - types as defined in localenroll::inst_usertypes
+    for user's domain, which determines default quota for user.
+. (Optional) - Default quota which would apply to the user.
  If a value has been stored in the user's environment,
- it will return that, otherwise it returns the default
+ it will return that, otherwise it returns the maximal default
- for users in the domain.
+ defined for the user's instituional status(es) in the domain.
  =cut
- Line 4785  for users in the domain.
+ Line 7471  for users in the domain.
  sub get_user_quota {
      my ($uname,$udom) = @_;
-     my $quota;
+     my ($quota,$quotatype,$settingstatus,$defquota);
      if (!defined($udom)) {
          $udom = $env{'user.domain'};
      }
- Line 4795  sub get_user_quota {
+ Line 7481  sub get_user_quota {
      if (($udom eq '' || $uname eq '') ||
          ($udom eq 'public') && ($uname eq 'public')) {
          $quota = 0;
+         $quotatype = 'default';
+         $defquota = 0;
      } else {
+         my $inststatus;
          if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) {
              $quota = $env{'environment.portfolioquota'};
+             $inststatus = $env{'environment.inststatus'};
          } else {
-             my %userenv = &Apache::lonnet::dump('environment',$udom,$uname);
+             my %userenv =
+                 &Apache::lonnet::get('environment',['portfolioquota',
+                                      'inststatus'],$udom,$uname);
              my ($tmp) = keys(%userenv);
              if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
                  $quota = $userenv{'portfolioquota'};
+                 $inststatus = $userenv{'inststatus'};
              } else {
                  undef(%userenv);
              }
          }
+         ($defquota,$settingstatus) = &default_quota($udom,$inststatus);
          if ($quota eq '') {
-             $quota = &default_quota($udom);
+             $quota = $defquota;
+             $quotatype = 'default';
+         } else {
+             $quotatype = 'custom';
          }
      }
-     return $quota;
+     if (wantarray) {
+         return ($quota,$quotatype,$settingstatus,$defquota);
+     } else {
+         return $quota;
+     }
  }
  ###############################################
- Line 4820  sub get_user_quota {
+ Line 7521  sub get_user_quota {
  =item * &default_quota()
- Retrieves default quota assigned for storage of user portfolio files
+ Retrieves default quota assigned for storage of user portfolio files,
+ given an (optional) user's institutional status.
  Incoming parameters:
 . domain
+. (Optional) institutional status(es).  This is a : separated list of
+    status types (e.g., faculty, staff, student etc.)
+    which apply to the user for whom the default is being retrieved.
+    If the institutional status string in undefined, the domain
+    default quota will be returned.
  Returns:
 . Default disk quota (in Mb) for user portfolios in the domain.
+. (Optional) institutional type which determined the value of the
+    default quota.
  If a value has been stored in the domain's configuration db,
  it will return that, otherwise it returns 20 (for backwards
  compatibility with domains which have not set up a configuration
  db file; the original statically defined portfolio quota was 20 Mb).
+ If the user's status includes multiple types (e.g., staff and student),
+ the largest default quota which applies to the user determines the
+ default quota returned.
+ =back
  =cut
  ###############################################
  sub default_quota {
-     my ($udom) = @_;
+     my ($udom,$inststatus) = @_;
-     my %defaults = &Apache::lonnet::get_dom('configuration',
+     my ($defquota,$settingstatus);
-                                             ['portfolioquota'],$udom);
+     my %quotahash = &Apache::lonnet::get_dom('configuration',
-     if ($defaults{'portfolioquota'} ne '') {
+                                             ['quotas'],$udom);
-         return $defaults{'portfolioquota'};
+     if (ref($quotahash{'quotas'}) eq 'HASH') {
+         if ($inststatus ne '') {
+             my @statuses = map { &unescape($_); } split(/:/,$inststatus);
+             foreach my $item (@statuses) {
+                 if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
+                     if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') {
+                         if ($defquota eq '') {
+                             $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
+                             $settingstatus = $item;
+                         } elsif ($quotahash{'quotas'}{'defaultquota'}{$item} > $defquota) {
+                             $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
+                             $settingstatus = $item;
+                         }
+                     }
+                 } else {
+                     if ($quotahash{'quotas'}{$item} ne '') {
+                         if ($defquota eq '') {
+                             $defquota = $quotahash{'quotas'}{$item};
+                             $settingstatus = $item;
+                         } elsif ($quotahash{'quotas'}{$item} > $defquota) {
+                             $defquota = $quotahash{'quotas'}{$item};
+                             $settingstatus = $item;
+                         }
+                     }
+                 }
+             }
+         }
+         if ($defquota eq '') {
+             if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
+                 $defquota = $quotahash{'quotas'}{'defaultquota'}{'default'};
+             } else {
+                 $defquota = $quotahash{'quotas'}{'default'};
+             }
+             $settingstatus = 'default';
+         }
+     } else {
+         $settingstatus = 'default';
+         $defquota = 20;
+     }
+     if (wantarray) {
+         return ($defquota,$settingstatus);
      } else {
-         return '20';
+         return $defquota;
      }
  }
- Line 4886  sub get_secgrprole_info {
+ Line 7641  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{'form.form'} eq 'requestcrs'));
+         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 = 'javascript:helpMenu('."'display'".')';
+                     my %usertypetext = (
+                         official   => 'institutional',
+                         unofficial => 'non-institutional',
+                     );
+                     $new_user_create = '<p class="LC_warning">'
+                                       .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")
+                                       .' '
+                                       .&mt('Please contact the [_1]helpdesk[_2] for assistance.'
+                                           ,'<a href="'.$helplink.'">','</a>')
+                                       .'</p><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">
+ // <![CDATA[
+ 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
+ END_BLOCK
+     $output .= &Apache::lonhtmlcommon::start_pick_box().
+                &Apache::lonhtmlcommon::row_title($lt{'doma'}).
+                $domform.
+                &Apache::lonhtmlcommon::row_closure().
+                &Apache::lonhtmlcommon::row_title($lt{'usr'}).
+                $srchbysel.
+                $srchtypesel.
+                '<input type="text" size="15" name="srchterm" value="'.$srchterm.'" />'.
+                $srchinsel.
+                &Apache::lonhtmlcommon::row_closure(1).
+                &Apache::lonhtmlcommon::end_pick_box().
+                '<br />';
+     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 [_1], but the $text{'item'} $text{'do'} not exist in the institutional directory.",'<span class="LC_cusr_emph">'.$domdesc.'</span>').'<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 Student/Employee ID field.");
+         }
+     } elsif ($mode eq 'selfcreate') {
+         if ($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.");
+         }
+     } 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',
+                         inststatus => 'Affiliation',
+                    );
+     return %fieldtitles;
+ }
+ sub sorted_inst_types {
+     my ($dom) = @_;
+     my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
+     my $othertitle = &mt('All users');
+     if ($env{'request.course.id'}) {
+         $othertitle  = &mt('Any users');
+     }
+     my @types;
+     if (ref($order) eq 'ARRAY') {
+         @types = @{$order};
+     }
+     if (@types == 0) {
+         if (ref($usertypes) eq 'HASH') {
+             @types = sort(keys(%{$usertypes}));
+         }
+     }
+     if (keys(%{$usertypes}) > 0) {
+         $othertitle = &mt('Other users');
+     }
+     return ($othertitle,$usertypes,\@types);
+ }
+ sub get_institutional_codes {
+     my ($settings,$allcourses,$LC_code) = @_;
+ # Get complete list of course sections to update
+     my @currsections = ();
+     my @currxlists = ();
+     my $coursecode = $$settings{'internal.coursecode'};
+     if ($$settings{'internal.sectionnums'} ne '') {
+         @currsections = split(/,/,$$settings{'internal.sectionnums'});
+     }
+     if ($$settings{'internal.crosslistings'} ne '') {
+         @currxlists = split(/,/,$$settings{'internal.crosslistings'});
+     }
+     if (@currxlists > 0) {
+         foreach (@currxlists) {
+             if (m/^([^:]+):(\w*)$/) {
+                 unless (grep/^$1$/,@{$allcourses}) {
+                     push @{$allcourses},$1;
+                     $$LC_code{$1} = $2;
+                 }
+             }
+         }
+     }
+     if (@currsections > 0) {
+         foreach (@currsections) {
+             if (m/^(\w+):(\w*)$/) {
+                 my $sec = $coursecode.$1;
+                 my $lc_sec = $2;
+                 unless (grep/^$sec$/,@{$allcourses}) {
+                     push @{$allcourses},$sec;
+                     $$LC_code{$sec} = $lc_sec;
+                 }
+             }
+         }
+     }
+     return;
+ }
+ sub get_standard_codeitems {
+     return ('Year','Semester','Department','Number','Section');
+ }
+ =pod
+ =head1 Slot Helpers
+ =over 4
+ =item * sorted_slots()
+ Sorts an array of slot names in order of slot start time (earliest first).
+ Inputs:
+ =over 4
+ slotsarr  - Reference to array of unsorted slot names.
+ slots     - Reference to hash of hash, where outer hash keys are slot names.
+ =back
+ Returns:
+ =over 4
+ sorted   - An array of slot names sorted by the start time of the slot.
+ =back
+ =back
+ =cut
+ sub sorted_slots {
+     my ($slotsarr,$slots) = @_;
+     my @sorted;
+     if ((ref($slotsarr) eq 'ARRAY') && (ref($slots) eq 'HASH')) {
+         @sorted =
+             sort {
+                      if (ref($slots->{$a}) && ref($slots->{$b})) {
+                          return $slots->{$a}{'starttime'} <=> $slots->{$b}{'starttime'}
+                      }
+                      if (ref($slots->{$a})) { return -1;}
+                      if (ref($slots->{$b})) { return 1;}
+                      return 0;
+                  } @{$slotsarr};
+     }
+     return @sorted;
+ }
  =pod
- =item * get_unprocessed_cgi($query,$possible_names)
+ =head1 HTTP Helpers
+ =over 4
+ =item * &get_unprocessed_cgi($query,$possible_names)
  Modify the %env hash to contain unprocessed CGI form parameters held in
  $query.  The parameters listed in $possible_names (an array reference),
- Line 4917  sub get_unprocessed_cgi {
+ Line 8188  sub get_unprocessed_cgi {
  =pod
- =item * cacheheader()
+ =item * &cacheheader()
  returns cache-controlling header code
- Line 4934  sub cacheheader {
+ Line 8205  sub cacheheader {
  =pod
- =item * no_cache($r)
+ =item * &no_cache($r)
  specifies header code to not have cache
- Line 4970  sub content_type {
+ Line 8241  sub content_type {
  =pod
- =item * add_to_env($name,$value)
+ =item * &add_to_env($name,$value)
  adds $name to the %env hash with value
  $value, if $name already exists, the entry is converted to an array
- Line 4997  sub add_to_env {
+ Line 8268  sub add_to_env {
  =pod
- =item * get_env_multiple($name)
+ =item * &get_env_multiple($name)
  gets $name from the %env hash, it seemlessly handles the cases where multiple
  values may be defined and end up as an array ref.
- Line 5020  sub get_env_multiple {
+ Line 8291  sub get_env_multiple {
      return(@values);
  }
+ sub ask_for_embedded_content {
+     my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
+     my $upload_output = '
+    <form name="upload_embedded" action="'.$actionurl.'"
+                   method="post" enctype="multipart/form-data">';
+     $upload_output .= $state;
+     $upload_output .= '<b>Upload embedded files</b>:<br />'.&start_data_table();
+     my $num = 0;
+     foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) {
+         $upload_output .= &start_data_table_row().
+             '<td>'.$embed_file.'</td><td>';
+         if ($args->{'ignore_remote_references'}
+             && $embed_file =~ m{^\w+://}) {
+             $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
+         } elsif ($args->{'error_on_invalid_names'}
+             && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
+             $upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';
+         } else {
+             $upload_output .='
+            <input name="embedded_item_'.$num.'" type="file" value="" />
+            <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
+             my $attrib = join(':',@{$$allfiles{$embed_file}});
+             $upload_output .=
+                 "\n\t\t".
+                 '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.
+                 $attrib.'" />';
+             if (exists($$codebase{$embed_file})) {
+                 $upload_output .=
+                     "\n\t\t".
+                     '<input name="codebase_'.$num.'" type="hidden" value="'.
+                     &escape($$codebase{$embed_file}).'" />';
+             }
+         }
+         $upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();
+         $num++;
+     }
+     $upload_output .= &Apache::loncommon::end_data_table().'<br />
+    <input type ="hidden" name="number_embedded_items" value="'.$num.'" />
+    <input type ="submit" value="'.&mt('Upload Listed Files').'" />
+    '.&mt('(only files for which a location has been provided will be uploaded)').'
+    </form>';
+     return $upload_output;
+ }
+ sub upload_embedded {
+     my ($context,$dirpath,$uname,$udom,$dir_root,$url_root,$group,$disk_quota,
+         $current_disk_usage) = @_;
+     my $output;
+     for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) {
+         next if (!exists($env{'form.embedded_item_'.$i.'.filename'}));
+         my $orig_uploaded_filename =
+             $env{'form.embedded_item_'.$i.'.filename'};
+         $env{'form.embedded_orig_'.$i} =
+             &unescape($env{'form.embedded_orig_'.$i});
+         my ($path,$fname) =
+             ($env{'form.embedded_orig_'.$i} =~ m{(.*/)([^/]*)});
+         # no path, whole string is fname
+         if (!$fname) { $fname = $env{'form.embedded_orig_'.$i} };
+         $path = $env{'form.currentpath'}.$path;
+         $fname = &Apache::lonnet::clean_filename($fname);
+         # See if there is anything left
+         next if ($fname eq '');
+         # Check if file already exists as a file or directory.
+         my ($state,$msg);
+         if ($context eq 'portfolio') {
+             my $port_path = $dirpath;
+             if ($group ne '') {
+                 $port_path = "groups/$group/$port_path";
+             }
+             ($state,$msg) = &check_for_upload($path,$fname,$group,'embedded_item_'.$i,
+                                               $dir_root,$port_path,$disk_quota,
+                                               $current_disk_usage,$uname,$udom);
+             if ($state eq 'will_exceed_quota'
+                 || $state eq 'file_locked'
+                 || $state eq 'file_exists' ) {
+                 $output .= $msg;
+                 next;
+             }
+         } elsif (($context eq 'author') || ($context eq 'testbank')) {
+             ($state,$msg) = &check_for_existing($path,$fname,'embedded_item_'.$i);
+             if ($state eq 'exists') {
+                 $output .= $msg;
+                 next;
+             }
+         }
+         # Check if extension is valid
+         if (($fname =~ /\.(\w+)$/) &&
+             (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
+             $output .= &mt('Invalid file extension ([_1]) - reserved for LONCAPA use - rename the file with a different extension and re-upload. ',$1);
+             next;
+         } elsif (($fname =~ /\.(\w+)$/) &&
+                  (!defined(&Apache::loncommon::fileembstyle($1)))) {
+             $output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);
+             next;
+         } elsif ($fname=~/\.(\d+)\.(\w+)$/) {
+             $output .= &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2);
+             next;
+         }
+         $env{'form.embedded_item_'.$i.'.filename'}=$fname;
+         if ($context eq 'portfolio') {
+             my $result=
+                 &Apache::lonnet::userfileupload('embedded_item_'.$i,'',
+                                                 $dirpath.$path);
+             if ($result !~ m|^/uploaded/|) {
+                 $output .= '<span class="LC_error">'
+                       .&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'
+                            ,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i})
+                       .'</span><br />';
+                 next;
+             } else {
+                 $output .= '<p>'.&mt('Uploaded [_1]','<span class="LC_filename">'.
+                            $path.$fname.'</span>').'</p>';
+             }
+         } else {
+ # Save the file
+             my $target = $env{'form.embedded_item_'.$i};
+             my $fullpath = $dir_root.$dirpath.'/'.$path;
+             my $dest = $fullpath.$fname;
+             my $url = $url_root.$dirpath.'/'.$path.$fname;
+             my @parts=split(/\//,$fullpath);
+             my $count;
+             my $filepath = $dir_root;
+             for ($count=4;$count<=$#parts;$count++) {
+                 $filepath .= "/$parts[$count]";
+                 if ((-e $filepath)!=1) {
+                     mkdir($filepath,0770);
+                 }
+             }
+             my $fh;
+             if (!open($fh,'>'.$dest)) {
+                 &Apache::lonnet::logthis('Failed to create '.$dest);
+                 $output .= '<span class="LC_error">'.
+                            &mt('An error occurred while trying to upload [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}).
+                            '</span><br />';
+             } else {
+                 if (!print $fh $env{'form.embedded_item_'.$i}) {
+                     &Apache::lonnet::logthis('Failed to write to '.$dest);
+                     $output .= '<span class="LC_error">'.
+                               &mt('An error occurred while writing the file [_1] for embedded element [_2].',$orig_uploaded_filename,$env{'form.embedded_orig_'.$i}).
+                               '</span><br />';
+                 } else {
+                     if ($context eq 'testbank') {
+                         $output .= &mt('Embedded file uploaded successfully:').
+                                    '&nbsp;<a href="'.$url.'">'.
+                                    $orig_uploaded_filename.'</a><br />';
+                     } else {
+                         $output .= '<span class=\"LC_fontsize_large\">'.
+                                    &mt('View embedded file: [_1]','<a href="'.$url.'">'.
+                                    $orig_uploaded_filename.'</a>').'</span><br />';
+                     }
+                 }
+                 close($fh);
+             }
+         }
+     }
+     return $output;
+ }
+ sub check_for_existing {
+     my ($path,$fname,$element) = @_;
+     my ($state,$msg);
+     if (-d $path.'/'.$fname) {
+         $state = 'exists';
+         $msg = &mt('Unable to upload [_1]. A directory by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$path);
+     } elsif (-e $path.'/'.$fname) {
+         $state = 'exists';
+         $msg = &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$path);
+     }
+     if ($state eq 'exists') {
+         $msg = '<span class="LC_error">'.$msg.'</span><br />';
+     }
+     return ($state,$msg);
+ }
+ sub check_for_upload {
+     my ($path,$fname,$group,$element,$portfolio_root,$port_path,
+         $disk_quota,$current_disk_usage,$uname,$udom) = @_;
+     my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)
+     my $getpropath = 1;
+     my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,
+                                             $getpropath);
+     my $found_file = 0;
+     my $locked_file = 0;
+     foreach my $line (@dir_list) {
+         my ($file_name)=split(/\&/,$line,2);
+         if ($file_name eq $fname){
+             $file_name = $path.$file_name;
+             if ($group ne '') {
+                 $file_name = $group.$file_name;
+             }
+             $found_file = 1;
+             if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
+                 $locked_file = 1;
+             }
+         }
+     }
+     if (($current_disk_usage + $filesize) > $disk_quota){
+         my $msg = '<span class="LC_error">'.
+                 &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.
+                   '<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',$disk_quota,$current_disk_usage);
+         return ('will_exceed_quota',$msg);
+     } elsif ($found_file) {
+         if ($locked_file) {
+             my $msg = '<span class="LC_error">';
+             $msg .= &mt('Unable to upload [_1]. A locked file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>','<span class="LC_filename">'.$port_path.$env{'form.currentpath'}.'</span>');
+             $msg .= '</span><br />';
+             $msg .= &mt('You will be able to rename or delete existing [_1] after a grade has been assigned.','<span class="LC_filename">'.$fname.'</span>');
+             return ('file_locked',$msg);
+         } else {
+             my $msg = '<span class="LC_error">';
+             $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$port_path.$env{'form.currentpath'});
+             $msg .= '</span>';
+             $msg .= '<br />';
+             $msg .= &mt('To upload, rename or delete existing [_1] in [_2].','<span class="LC_filename">'.$fname.'</span>', $port_path.$env{'form.currentpath'});
+             return ('file_exists',$msg);
+         }
+     }
+ }
  =pod
- Line 5029  sub get_env_multiple {
+ Line 8526  sub get_env_multiple {
  =over 4
- =item * upfile_store($r)
+ =item * &upfile_store($r)
  Store uploaded file, $r should be the HTTP Request object,
  needs $env{'form.upfile'}
- Line 5059  sub upfile_store {
+ Line 8556  sub upfile_store {
  =pod
- =item * load_tmp_file($r)
+ =item * &load_tmp_file($r)
  Load uploaded file from tmp, $r should be the HTTP Request object,
  needs $env{'form.datatoken'},
- Line 5083  sub load_tmp_file {
+ Line 8580  sub load_tmp_file {
  =pod
- =item * upfile_record_sep()
+ =item * &upfile_record_sep()
  Separate uploaded file into records
  returns array of records,
- Line 5105  sub upfile_record_sep {
+ Line 8602  sub upfile_record_sep {
  =pod
- =item * record_sep($record)
+ =item * &record_sep($record)
  Separate a record into fields $record should be an item from the upfile_record_sep(), needs $env{'form.upfiletype'}
- Line 5137  sub record_sep {
+ Line 8634  sub record_sep {
              $i++;
          }
      } else {
-         my @allfields=split(/\,/,$record);
+         my $separator=',';
+         if ($env{'form.upfiletype'} eq 'semisv') {
+             $separator=';';
+         }
          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 5163  sub record_sep {
+ Line 8687  sub record_sep {
  =pod
- =item * upfile_select_html()
+ =item * &upfile_select_html()
  Return HTML code to select a file from the users machine and specify
  the file type.
- Line 5175  the file type.
+ Line 8699  the file type.
  sub upfile_select_html {
      my %Types = (
                   csv   => &mt('CSV (comma separated values, spreadsheet)'),
+                  semisv => &mt('Semicolon separated values'),
                   space => &mt('Space separated'),
                   tab   => &mt('Tabulator separated'),
  #                 xml   => &mt('HTML/XML'),
                   );
      my $Str = '<input type="file" name="upfile" size="50" />'.
-         '<br />Type: <select name="upfiletype">';
+         '<br />'.&mt('Type').': <select name="upfiletype">';
      foreach my $type (sort(keys(%Types))) {
          $Str .= '<option value="'.$type.'" >'.$Types{$type}."</option>\n";
      }
- Line 5209  sub get_samples {
+ Line 8734  sub get_samples {
  =pod
- =item * csv_print_samples($r,$records)
+ =item * &csv_print_samples($r,$records)
  Prints a table of sample values from each column uploaded $r is an
  Apache Request ref, $records is an arrayref from
- Line 5221  Apache Request ref, $records is an array
+ Line 8746  Apache Request ref, $records is an array
  ######################################################
  sub csv_print_samples {
      my ($r,$records) = @_;
-     my $samples = &get_samples($records,3);
+     my $samples = &get_samples($records,5);
-     $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('<th>'.&mt('Column [_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 5244  sub csv_print_samples {
+ Line 8770  sub csv_print_samples {
  =pod
- =item * csv_print_select_table($r,$records,$d)
+ =item * &csv_print_select_table($r,$records,$d)
  Prints a table to create associations between values and table columns.
- Line 5261  sub csv_print_select_table {
+ Line 8787  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().'<td>'.$display.'</td>');
- 	$r->print('<td><select name=f'.$i.
+ 	$r->print('<td><select name="f'.$i.'"'.
  		  ' onchange="javascript:flip(this.form,'.$i.');">');
  	$r->print('<option value="none"></option>');
  	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
  	    $r->print('<option value="'.$sample.'"'.
                        ($sample eq $defaultcol ? ' selected="selected" ' : '').
-                       '>Column '.($sample+1).'</option>');
+                       '>'.&mt('Column [_1]',($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 5288  sub csv_print_select_table {
+ Line 8816  sub csv_print_select_table {
  =pod
- =item * csv_samples_select_table($r,$records,$d)
+ =item * &csv_samples_select_table($r,$records,$d)
  Prints a table of sample values from the upload and can make associate samples to internal names.
- Line 5304  sub csv_samples_select_table {
+ Line 8832  sub csv_samples_select_table {
      my ($r,$records,$d) = @_;
      my $i=0;
      #
-     my $samples = &get_samples($records,3);
+     my $max_samples = 5;
-     $r->print('<table border=2><tr><th>'.
+     my $samples = &get_samples($records,$max_samples);
-               &mt('Field').'</th><th>'.&mt('Samples').'</th></tr>');
+     $r->print(&start_data_table().
+               &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 5318  sub csv_samples_select_table {
+ Line 8849  sub csv_samples_select_table {
                        $display.'</option>');
  	}
  	$r->print('</select></td><td>');
- 	foreach my $line (0..2) {
+ 	foreach my $line (0..($max_samples-1)) {
  	    if (defined($samples->[$line]{$key})) {
  		$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 5335  sub csv_samples_select_table {
+ Line 8867  sub csv_samples_select_table {
  =pod
- =item clean_excel_name($name)
+ =item * &clean_excel_name($name)
  Returns a replacement for $name which does not contain any illegal characters.
- Line 5354  sub clean_excel_name {
+ Line 8886  sub clean_excel_name {
  =pod
- =item * check_if_partid_hidden($id,$symb,$udom,$uname)
+ =item * &check_if_partid_hidden($id,$symb,$udom,$uname)
  Returns either 1 or undef
- Line 5395  sub check_if_partid_hidden {
+ Line 8927  sub check_if_partid_hidden {
  =over 4
- =item get_cgi_id
+ =item * &get_cgi_id()
  Inputs: none
- Line 5419  sub get_cgi_id {
+ Line 8951  sub get_cgi_id {
  =pod
- =item DrawBarGraph
+ =item * &DrawBarGraph()
  Facilitates the plotting of data in a (stacked) bar graph.
  Puts plot definition data into the users environment in order for
- Line 5554  sub DrawBarGraph {
+ Line 9086  sub DrawBarGraph {
          $ValuesHash{$id.'.'.$key} = $value;
      }
      #
-     &Apache::lonnet::appenv(%ValuesHash);
+     &Apache::lonnet::appenv(\%ValuesHash);
      return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
  }
- Line 5563  sub DrawBarGraph {
+ Line 9095  sub DrawBarGraph {
  =pod
- =item DrawXYGraph
+ =item * &DrawXYGraph()
  Facilitates the plotting of data in an XY graph.
  Puts plot definition data into the users environment in order for
- Line 5644  sub DrawXYGraph {
+ Line 9176  sub DrawXYGraph {
          $ValuesHash{$id.'.'.$key} = $value;
      }
      #
-     &Apache::lonnet::appenv(%ValuesHash);
+     &Apache::lonnet::appenv(\%ValuesHash);
      return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
  }
- Line 5653  sub DrawXYGraph {
+ Line 9185  sub DrawXYGraph {
  =pod
- =item DrawXYYGraph
+ =item * &DrawXYYGraph()
  Facilitates the plotting of data in an XY graph with two Y axes.
  Puts plot definition data into the users environment in order for
- Line 5746  sub DrawXYYGraph {
+ Line 9278  sub DrawXYYGraph {
          $ValuesHash{$id.'.'.$key} = $value;
      }
      #
-     &Apache::lonnet::appenv(%ValuesHash);
+     &Apache::lonnet::appenv(\%ValuesHash);
      return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
  }
- Line 5763  Bad place for them but what the hell.
+ Line 9295  Bad place for them but what the hell.
  =over 4
- =item &chartlink
+ =item * &chartlink()
  Returns a link to the chart for a specific student.
- Line 5802  sub chartlink {
+ Line 9334  sub chartlink {
  =over 4
- =item &restore_course_settings
+ =item * &restore_course_settings()
- =item &store_course_settings
+ =item * &store_course_settings()
  Restores/Store indicated form parameters from the course environment.
  Will not overwrite existing values of the form parameters.
- Line 5824  a hash ref describing the data to be sto
+ Line 9356  a hash ref describing the data to be sto
  Returns: both routines return nothing
+ =back
  =cut
  #######################################################
  #######################################################
  sub store_course_settings {
+     return &store_settings($env{'request.course.id'},@_);
+ }
+ sub store_settings {
      # save to the environment
      # appenv the same items, just to be safe
-     my $courseid = $env{'request.course.id'};
      my $udom  = $env{'user.domain'};
      my $uname = $env{'user.name'};
-     my ($prefix,$Settings) = @_;
+     my ($context,$prefix,$Settings) = @_;
      my %SaveHash;
      my %AppHash;
      while (my ($setting,$type) = each(%$Settings)) {
-         my $basename = join('.','internal',$courseid,$prefix,$setting);
+         my $basename = join('.','internal',$context,$prefix,$setting);
          my $envname = 'environment.'.$basename;
          if (exists($env{'form.'.$setting})) {
              # Save this value away
- Line 5873  sub store_course_settings {
+ Line 9410  sub store_course_settings {
                                   'got error:'.$put_result);
      }
      # Make sure these settings stick around in this session, too
-     &Apache::lonnet::appenv(%AppHash);
+     &Apache::lonnet::appenv(\%AppHash);
      return;
  }
  sub restore_course_settings {
-     my $courseid = $env{'request.course.id'};
+     return &restore_settings($env{'request.course.id'},@_);
-     my ($prefix,$Settings) = @_;
+ }
+ sub restore_settings {
+     my ($context,$prefix,$Settings) = @_;
      while (my ($setting,$type) = each(%$Settings)) {
          next if (exists($env{'form.'.$setting}));
-         my $envname = 'environment.internal.'.$courseid.'.'.$prefix.
+         my $envname = 'environment.internal.'.$context.'.'.$prefix.
              '.'.$setting;
          if (exists($env{$envname})) {
              if ($type eq 'scalar') {
- Line 5898  sub restore_course_settings {
+ Line 9438  sub restore_course_settings {
      }
  }
+ #######################################################
+ #######################################################
+ =pod
+ =head1 Domain E-mail Routines
+ =over 4
+ =item * &build_recipient_list()
+ Build recipient lists for five types of e-mail:
+ (a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
+ (d) Help requests, (e) Course requests needing approval,  generated by
+ lonerrorhandler.pm, CHECKRPMS, loncron, lonsupportreq.pm and
+ loncoursequeueadmin.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.
+ =back
+ =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 (exists($domconfig{'contacts'}{$mailing})) {
+             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);
+         }
+     } elsif ($origmail ne '') {
+         push(@recipients,$origmail);
+     }
+     if (defined($defmail)) {
+         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;
+ }
+ ############################################################
+ ############################################################
+ =pod
+ =head1 Course Catalog Routines
+ =over 4
+ =item * &gather_categories()
+ Converts category definitions - keys of categories hash stored in
+ coursecategories in configuration.db on the primary library server in a
+ domain - to an array.  Also generates javascript and idx hash used to
+ generate Domain Coordinator interface for editing Course Categories.
+ Inputs:
+ categories (reference to hash of category definitions).
+ cats (reference to array of arrays/hashes which encapsulates hierarchy of
+       categories and subcategories).
+ idx (reference to hash of counters used in Domain Coordinator interface for
+       editing Course Categories).
+ jsarray (reference to array of categories used to create Javascript arrays for
+          Domain Coordinator interface for editing Course Categories).
+ Returns: nothing
+ Side effects: populates cats, idx and jsarray.
+ =cut
+ sub gather_categories {
+     my ($categories,$cats,$idx,$jsarray) = @_;
+     my %counters;
+     my $num = 0;
+     foreach my $item (keys(%{$categories})) {
+         my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$item);
+         if ($container eq '' && $depth == 0) {
+             $cats->[$depth][$categories->{$item}] = $cat;
+         } else {
+             $cats->[$depth]{$container}[$categories->{$item}] = $cat;
+         }
+         my ($escitem,$tail) = split(/:/,$item,2);
+         if ($counters{$tail} eq '') {
+             $counters{$tail} = $num;
+             $num ++;
+         }
+         if (ref($idx) eq 'HASH') {
+             $idx->{$item} = $counters{$tail};
+         }
+         if (ref($jsarray) eq 'ARRAY') {
+             push(@{$jsarray->[$counters{$tail}]},$item);
+         }
+     }
+     return;
+ }
+ =pod
+ =item * &extract_categories()
+ Used to generate breadcrumb trails for course categories.
+ Inputs:
+ categories (reference to hash of category definitions).
+ cats (reference to array of arrays/hashes which encapsulates hierarchy of
+       categories and subcategories).
+ trails (reference to array of breacrumb trails for each category).
+ allitems (reference to hash - key is category key
+          (format: escaped(name):escaped(parent category):depth in hierarchy).
+ idx (reference to hash of counters used in Domain Coordinator interface for
+       editing Course Categories).
+ jsarray (reference to array of categories used to create Javascript arrays for
+          Domain Coordinator interface for editing Course Categories).
+ subcats (reference to hash of arrays containing all subcategories within each
+          category, -recursive)
+ Returns: nothing
+ Side effects: populates trails and allitems hash references.
+ =cut
+ sub extract_categories {
+     my ($categories,$cats,$trails,$allitems,$idx,$jsarray,$subcats) = @_;
+     if (ref($categories) eq 'HASH') {
+         &gather_categories($categories,$cats,$idx,$jsarray);
+         if (ref($cats->[0]) eq 'ARRAY') {
+             for (my $i=0; $i<@{$cats->[0]}; $i++) {
+                 my $name = $cats->[0][$i];
+                 my $item = &escape($name).'::0';
+                 my $trailstr;
+                 if ($name eq 'instcode') {
+                     $trailstr = &mt('Official courses (with institutional codes)');
+                 } elsif ($name eq 'communities') {
+                     $trailstr = &mt('Communities');
+                 } else {
+                     $trailstr = $name;
+                 }
+                 if ($allitems->{$item} eq '') {
+                     push(@{$trails},$trailstr);
+                     $allitems->{$item} = scalar(@{$trails})-1;
+                 }
+                 my @parents = ($name);
+                 if (ref($cats->[1]{$name}) eq 'ARRAY') {
+                     for (my $j=0; $j<@{$cats->[1]{$name}}; $j++) {
+                         my $category = $cats->[1]{$name}[$j];
+                         if (ref($subcats) eq 'HASH') {
+                             push(@{$subcats->{$item}},&escape($category).':'.&escape($name).':1');
+                         }
+                         &recurse_categories($cats,2,$category,$trails,$allitems,\@parents,$subcats);
+                     }
+                 } else {
+                     if (ref($subcats) eq 'HASH') {
+                         $subcats->{$item} = [];
+                     }
+                 }
+             }
+         }
+     }
+     return;
+ }
+ =pod
+ =item *&recurse_categories()
+ Recursively used to generate breadcrumb trails for course categories.
+ Inputs:
+ cats (reference to array of arrays/hashes which encapsulates hierarchy of
+       categories and subcategories).
+ depth (current depth in hierarchy of categories and sub-categories - 0 indexed).
+ category (current course category, for which breadcrumb trail is being generated).
+ trails (reference to array of breadcrumb trails for each category).
+ allitems (reference to hash - key is category key
+          (format: escaped(name):escaped(parent category):depth in hierarchy).
+ parents (array containing containers directories for current category,
+          back to top level).
+ Returns: nothing
+ Side effects: populates trails and allitems hash references
+ =cut
+ sub recurse_categories {
+     my ($cats,$depth,$category,$trails,$allitems,$parents,$subcats) = @_;
+     my $shallower = $depth - 1;
+     if (ref($cats->[$depth]{$category}) eq 'ARRAY') {
+         for (my $k=0; $k<@{$cats->[$depth]{$category}}; $k++) {
+             my $name = $cats->[$depth]{$category}[$k];
+             my $item = &escape($category).':'.&escape($parents->[-1]).':'.$shallower;
+             my $trailstr = join(' -&gt; ',(@{$parents},$category));
+             if ($allitems->{$item} eq '') {
+                 push(@{$trails},$trailstr);
+                 $allitems->{$item} = scalar(@{$trails})-1;
+             }
+             my $deeper = $depth+1;
+             push(@{$parents},$category);
+             if (ref($subcats) eq 'HASH') {
+                 my $subcat = &escape($name).':'.$category.':'.$depth;
+                 for (my $j=@{$parents}; $j>=0; $j--) {
+                     my $higher;
+                     if ($j > 0) {
+                         $higher = &escape($parents->[$j]).':'.
+                                   &escape($parents->[$j-1]).':'.$j;
+                     } else {
+                         $higher = &escape($parents->[$j]).'::'.$j;
+                     }
+                     push(@{$subcats->{$higher}},$subcat);
+                 }
+             }
+             &recurse_categories($cats,$deeper,$name,$trails,$allitems,$parents,
+                                 $subcats);
+             pop(@{$parents});
+         }
+     } else {
+         my $item = &escape($category).':'.&escape($parents->[-1]).':'.$shallower;
+         my $trailstr = join(' -&gt; ',(@{$parents},$category));
+         if ($allitems->{$item} eq '') {
+             push(@{$trails},$trailstr);
+             $allitems->{$item} = scalar(@{$trails})-1;
+         }
+     }
+     return;
+ }
+ =pod
+ =item *&assign_categories_table()
+ Create a datatable for display of hierarchical categories in a domain,
+ with checkboxes to allow a course to be categorized.
+ Inputs:
+ cathash - reference to hash of categories defined for the domain (from
+           configuration.db)
+ currcat - scalar with an & separated list of categories assigned to a course.
+ type    - scalar contains course type (Course or Community).
+ Returns: $output (markup to be displayed)
+ =cut
+ sub assign_categories_table {
+     my ($cathash,$currcat,$type) = @_;
+     my $output;
+     if (ref($cathash) eq 'HASH') {
+         my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
+         &extract_categories($cathash,\@cats,\@trails,\%allitems,\%idx,\@jsarray);
+         $maxdepth = scalar(@cats);
+         if (@cats > 0) {
+             my $itemcount = 0;
+             if (ref($cats[0]) eq 'ARRAY') {
+                 my @currcategories;
+                 if ($currcat ne '') {
+                     @currcategories = split('&',$currcat);
+                 }
+                 my $table;
+                 for (my $i=0; $i<@{$cats[0]}; $i++) {
+                     my $parent = $cats[0][$i];
+                     next if ($parent eq 'instcode');
+                     if ($type eq 'Community') {
+                         next unless ($parent eq 'communities');
+                     } else {
+                         next if ($parent eq 'communities');
+                     }
+                     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                     my $item = &escape($parent).'::0';
+                     my $checked = '';
+                     if (@currcategories > 0) {
+                         if (grep(/^\Q$item\E$/,@currcategories)) {
+                             $checked = ' checked="checked"';
+                         }
+                     }
+                     my $parent_title = $parent;
+                     if ($parent eq 'communities') {
+                         $parent_title = &mt('Communities');
+                     }
+                     $table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
+                               '<input type="checkbox" name="usecategory" value="'.
+                               $item.'"'.$checked.' />'.$parent_title.'</span>'.
+                               '<input type="hidden" name="catname" value="'.$parent.'" /></td>';
+                     my $depth = 1;
+                     push(@path,$parent);
+                     $table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
+                     pop(@path);
+                     $table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
+                     $itemcount ++;
+                 }
+                 if ($itemcount) {
+                     $output = &Apache::loncommon::start_data_table().
+                               $table.
+                               &Apache::loncommon::end_data_table();
+                 }
+             }
+         }
+     }
+     return $output;
+ }
+ =pod
+ =item *&assign_category_rows()
+ Create a datatable row for display of nested categories in a domain,
+ with checkboxes to allow a course to be categorized,called recursively.
+ Inputs:
+ itemcount - track row number for alternating colors
+ cats - reference to array of arrays/hashes which encapsulates hierarchy of
+       categories and subcategories.
+ depth - current depth in hierarchy of categories and sub-categories - 0 indexed.
+ parent - parent of current category item
+ path - Array containing all categories back up through the hierarchy from the
+        current category to the top level.
+ currcategories - reference to array of current categories assigned to the course
+ Returns: $output (markup to be displayed).
+ =cut
+ sub assign_category_rows {
+     my ($itemcount,$cats,$depth,$parent,$path,$currcategories) = @_;
+     my ($text,$name,$item,$chgstr);
+     if (ref($cats) eq 'ARRAY') {
+         my $maxdepth = scalar(@{$cats});
+         if (ref($cats->[$depth]) eq 'HASH') {
+             if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {
+                 my $numchildren = @{$cats->[$depth]{$parent}};
+                 my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                 $text .= '<td><table class="LC_datatable">';
+                 for (my $j=0; $j<$numchildren; $j++) {
+                     $name = $cats->[$depth]{$parent}[$j];
+                     $item = &escape($name).':'.&escape($parent).':'.$depth;
+                     my $deeper = $depth+1;
+                     my $checked = '';
+                     if (ref($currcategories) eq 'ARRAY') {
+                         if (@{$currcategories} > 0) {
+                             if (grep(/^\Q$item\E$/,@{$currcategories})) {
+                                 $checked = ' checked="checked"';
+                             }
+                         }
+                     }
+                     $text .= '<tr><td><span class="LC_nobreak"><label>'.
+                              '<input type="checkbox" name="usecategory" value="'.
+                              $item.'"'.$checked.' />'.$name.'</label></span>'.
+                              '<input type="hidden" name="catname" value="'.$name.'" />'.
+                              '</td><td>';
+                     if (ref($path) eq 'ARRAY') {
+                         push(@{$path},$name);
+                         $text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories);
+                         pop(@{$path});
+                     }
+                     $text .= '</td></tr>';
+                 }
+                 $text .= '</table></td>';
+             }
+         }
+     }
+     return $text;
+ }
+ ############################################################
+ ############################################################
  sub commit_customrole {
-     my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
+     my ($udom,$uname,$url,$three,$four,$five,$start,$end,$context) = @_;
-     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(
-                  $udom,$uname,$url,$three,$four,$five,$end,$start).
+                  $udom,$uname,$url,$three,$four,$five,$end,$start,undef,undef,$context).
                   '</b><br />';
      return $output;
  }
  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,'','',$context);
-                    $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,'','',$context);
+                 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;
              }
          }
          if (($expire_role_result eq 'ok') || ($secchange == 0)) {
-             $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid);
+             $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid,'',$context);
              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 5987  sub commit_studentrole {
+ Line 10031  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;
+     my $lctype = lc($args->{'crstype'});
+     if ($lctype ne 'community') {
+         $lctype = 'course';
+     }
+     if ($clonehome eq 'no_host') {
+         if ($args->{'crstype'} eq 'Community') {
+             $clonemsg = &mt('No new community created.').$linefeed.&mt('A new community could not be cloned from the specified original - [_1] - because it is a non-existent community.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
+         } else {
+             $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 ($args->{'crstype'} eq 'Community') {
+             if ($clonedesc{'type'} ne 'Community') {
+                  $clonemsg = &mt('No new community created.').$linefeed.&mt('A new community could not be cloned from the specified original - [_1] - because it is a course not a community.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
+                 return ($can_clone, $clonemsg, $cloneid, $clonehome);
+             }
+         }
+ 	if (($env{'request.role.domain'} eq $args->{'clonedomain'}) &&
+             (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) {
+ 	    $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 $ccrole = 'cc';
+                 if ($args->{'crstype'} eq 'Community') {
+                     $ccrole = 'co';
+                 }
+ 	        my %roleshash =
+ 		    &Apache::lonnet::get_my_roles($args->{'ccuname'},
+ 					 $args->{'ccdomain'},
+                                          'userroles',['active'],[$ccrole],
+ 					 [$args->{'clonedomain'}]);
+ 	        if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
+                     $can_clone = 1;
+                 } elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},$args->{'ccuname'},$args->{'ccdomain'})) {
+                     $can_clone = 1;
+                 } else {
+                     if ($args->{'crstype'} eq 'Community') {
+                         $clonemsg = &mt('No new community created.').$linefeed.&mt('The new community could not be cloned from the existing community because the new community owner ([_1]) does not have cloning rights in the existing community ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+                     } 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,$cnum,$category) = @_;
      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 6004  sub construct_course {
+ Line 10133  sub construct_course {
                                               $args->{'crscode'},
                                               $args->{'ccuname'}.':'.
                                               $args->{'ccdomain'},
-                                              $args->{'crstype'});
+                                              $args->{'crstype'},
+                                              $cnum,$context,$category);
      # Note: The testing routines depend on this being output; see
      # 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;
+     if ($$courseid =~ /^error:/) {
+         return (0,$outcome);
+     }
  #
  # Check if created correctly
  #
-     ($$crsudom,$$crsunum)=($$courseid=~/^\/(\w+)\/(\w+)$/);
+     ($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid);
      my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
-     $outcome .= &mt('Created on').': '.$crsuhome.'<br>';
+     if ($crsuhome eq 'no_host') {
- #
+         $outcome .= &mt('Course creation failed, unrecognized course home server.').$linefeed;
- # Are we cloning?
+         return (0,$outcome);
+     }
+     $outcome .= &mt('Created on').': '.$crsuhome.$linefeed;
  #
-     my $cloneid='';
+ # Do the cloning
-     if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
+ #
- 	$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
+     if ($can_clone && $cloneid) {
-         my ($clonecrsudom,$clonecrsunum)=($cloneid=~/^\/(\w+)\/(\w+)$/);
+ 	$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,$args->{'datemode'},$args->{'dateshift'});
  # Restore URL
- 	    $cenv{'url'}=$oldcenv{'url'};
+ 	$cenv{'url'}=$oldcenv{'url'};
  # Restore title
- 	    $cenv{'description'}=$oldcenv{'description'};
+ 	$cenv{'description'}=$oldcenv{'description'};
- # restore grading mode
+ # Restore creation date, creator and creation context.
- 	    if (defined($oldcenv{'grading'})) {
+         $cenv{'internal.created'}=$oldcenv{'internal.created'};
- 		$cenv{'grading'}=$oldcenv{'grading'};
+         $cenv{'internal.creator'}=$oldcenv{'internal.creator'};
- 	    }
+         $cenv{'internal.creationcontext'}=$oldcenv{'internal.creationcontext'};
  # Mark as cloned
- 	    $cenv{'clonedfrom'}=$cloneid;
+ 	$cenv{'clonedfrom'}=$cloneid;
- 	    delete($cenv{'default_enrollment_start_date'});
+ # Need to clone grading mode
- 	    delete($cenv{'default_enrollment_end_date'});
+         my %newenv=&Apache::lonnet::get('environment',['grading'],$$crsudom,$$crsunum);
- 	}
+         $cenv{'grading'}=$newenv{'grading'};
+ # Do not clone these environment entries
+         &Apache::lonnet::del('environment',
+                   ['default_enrollment_start_date',
+                    'default_enrollment_end_date',
+                    'question.email',
+                    'policy.email',
+                    'comment.email',
+                    'pch.users.denied',
+                    'plc.users.denied',
+                    'hidefromcat',
+                    'categories'],
+                    $$crsudom,$$crsunum);
      }
  #
  # Set environment (will override cloned, if existing)
  #
- Line 6073  sub construct_course {
+ Line 10220  sub construct_course {
      } else {
          $cenv{'internal.courseowner'} = $args->{'curruser'};
      }
      my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner.
      if ($args->{'crssections'}) {
          $cenv{'internal.sectionnums'} = '';
- Line 6133  sub construct_course {
+ Line 10279  sub construct_course {
      }
      if ($args->{'notify_dc'}) {
          if ($uname ne '') {
-             push(@notified,$uname.'@'.$udom);
+             push(@notified,$uname.':'.$udom);
          }
      }
      if (@notified > 0) {
- Line 6151  sub construct_course {
+ Line 10297  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 6171  sub construct_course {
+ Line 10330  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 6196  sub construct_course {
+ Line 10360  sub construct_course {
  # if specified, key authority is not course, but user
  # only active if keyaccess is yes
      if ($args->{'keyauth'}) {
- 	$args->{'keyauth'}=~s/[^\w\@]//g;
+ 	my ($user,$domain) = split(':',$args->{'keyauth'});
- 	if ($args->{'keyauth'}) {
+ 	$user = &LONCAPA::clean_username($user);
- 	    $cenv{'keyauth'}=$args->{'keyauth'};
+ 	$domain = &LONCAPA::clean_username($domain);
+ 	if ($user ne '' && $domain ne '') {
+ 	    $cenv{'keyauth'}=$user.':'.$domain;
  	}
      }
- Line 6226  sub construct_course {
+ Line 10392  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 6237  sub construct_course {
+ Line 10403  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 6253  sub construct_course {
+ Line 10419  sub construct_course {
          $outcome .= ($fatal?$errtext:'read ok').' - ';
          my $title; my $url;
          if ($args->{'firstres'} eq 'syl') {
- 	    $title='Syllabus';
+ 	    $title=&mt('Syllabus');
              $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
          } else {
-             $title='Navigate Contents';
+             $title=&mt('Table of Contents');
              $url='/adm/navmaps';
          }
- Line 6264  sub construct_course {
+ Line 10430  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);
  }
  ############################################################
  ############################################################
+ #SD
+ # only Community and Course, or anything else?
  sub course_type {
      my ($cid) = @_;
      if (!defined($cid)) {
- Line 6288  sub group_term {
+ Line 10457  sub group_term {
      my $crstype = &course_type();
      my %names = (
                    'Course' => 'group',
-                   'Group' => 'team',
+                   'Community' => 'group',
                  );
      return $names{$crstype};
  }
+ sub course_types {
+     my @types = ('official','unofficial','community');
+     my %typename = (
+                          official   => 'Official course',
+                          unofficial => 'Unofficial course',
+                          community  => 'Community',
+                    );
+     return (\@types,\%typename);
+ }
  sub icon {
      my ($file)=@_;
-     my $curfext = (split(/\./,$file))[-1];
+     my $curfext = lc((split(/\./,$file))[-1]);
      my $iconname=$Apache::lonnet::perlvar{'lonIconsURL'}.'/unknown.gif';
      my $embstyle = &Apache::loncommon::fileembstyle($curfext);
      if (!(!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn')) {
- Line 6310  sub icon {
+ Line 10489  sub icon {
  }
  sub lonhttpdurl {
+ #
+ # Had been used for "small fry" static images on separate port 8080.
+ # Modify here if lightweight http functionality desired again.
+ # Currently eliminated due to increasing firewall issues.
+ #
      my ($url)=@_;
-     my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
+     return $url;
-     if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }
-     return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
  }
  sub connection_aborted {
- Line 6349  sub escape_url {
+ Line 10531  sub escape_url {
      return join('/',@urlslices).'/'.$lastitem;
  }
- # -------------------------------------------------------- Initliaze user login
+ sub compare_arrays {
+     my ($arrayref1,$arrayref2) = @_;
+     my (@difference,%count);
+     @difference = ();
+     %count = ();
+     if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) {
+         foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; }
+         foreach my $element (keys(%count)) {
+             if ($count{$element} == 1) {
+                 push(@difference,$element);
+             }
+         }
+     }
+     return @difference;
+ }
+ # -------------------------------------------------------- Initialize user login
  sub init_user_environment {
      my ($r, $username, $domain, $authhost, $form, $args) = @_;
      my $lonids=$Apache::lonnet::perlvar{'lonIDsDir'};
- Line 6391  sub init_user_environment {
+ Line 10589  sub init_user_environment {
  	}
  # Give them a new cookie
  	my $id = ($args->{'robot'} ? 'robot'.$args->{'robot'}
- 		                   : $now);
+ 		                   : $now.$$.int(rand(10000)));
  	$cookie="$username\_$id\_$domain\_$authhost";
  # Initialize roles
- Line 6403  sub init_user_environment {
+ Line 10601  sub init_user_environment {
      my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml,
          $clientunicode,$clientos) = &decode_user_agent($r);
- # -------------------------------------- Any accessibility options to remember?
-     if (($form->{'interface'}) && ($form->{'remember'} eq 'true')) {
- 	foreach my $option ('imagesuppress','appletsuppress',
- 			    'embedsuppress','fontenhance','blackwhite') {
- 	    if ($form->{$option} eq 'true') {
- 		&Apache::lonnet::put('environment',{$option => 'on'},
- 				     $domain,$username);
- 	    } else {
- 		&Apache::lonnet::del('environment',[$option],
- 				     $domain,$username);
- 	    }
- 	}
-     }
  # ------------------------------------------------------------- Get environment
      my %userenv = &Apache::lonnet::dump('environment',$domain,$username);
      my ($tmp) = keys(%userenv);
      if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
- 	# default remote control to off
- 	if ($userenv{'remote'} ne 'on') { $userenv{'remote'} = 'off'; }
      } else {
  	undef(%userenv);
      }
      if (($userenv{'interface'}) && (!$form->{'interface'})) {
  	$form->{'interface'}=$userenv{'interface'};
      }
-     $env{'environment.remote'}=$userenv{'remote'};
      if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; }
  # --------------- Do not trust query string to be put directly into environment
-     foreach my $option ('imagesuppress','appletsuppress',
+     foreach my $option ('interface','localpath','localres') {
- 			'embedsuppress','fontenhance','blackwhite',
+         $form->{$option}=~s/[\n\r\=]//gs;
- 			'interface','localpath','localres') {
- 	$form->{$option}=~s/[\n\r\=]//gs;
      }
  # --------------------------------------------------------- Write first profile
- Line 6463  sub init_user_environment {
+ Line 10643  sub init_user_environment {
  	    $initial_env{"browser.localres"}   = $form->{'localres'};
          }
- 	if ($public) {
- 	    $initial_env{"environment.remote"} = "off";
- 	}
  	if ($form->{'interface'}) {
  	    $form->{'interface'}=~s/\W//gs;
  	    $initial_env{"browser.interface"} = $form->{'interface'};
  	    $env{'browser.interface'}=$form->{'interface'};
- 	    foreach my $option ('imagesuppress','appletsuppress',
- 				'embedsuppress','fontenhance','blackwhite') {
- 		if (($form->{$option} eq 'true') ||
- 		    ($userenv{$option} eq 'on')) {
- 		    $initial_env{"browser.$option"} = "on";
- 		}
- 	    }
  	}
+         my %is_adv = ( is_adv => $env{'user.adv'} );
+         my %domdef = &Apache::lonnet::get_domain_defaults($domain);
+         foreach my $tool ('aboutme','blog','portfolio') {
+             $userenv{'availabletools.'.$tool} =
+                 &Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
+                                                   undef,\%userenv,\%domdef,\%is_adv);
+         }
+         foreach my $crstype ('official','unofficial','community') {
+             $userenv{'canrequest.'.$crstype} =
+                 &Apache::lonnet::usertools_access($username,$domain,$crstype,
+                                                   'reload','requestcourses',
+                                                   \%userenv,\%domdef,\%is_adv);
+         }
  	$env{'user.environment'} = "$lonids/$cookie.id";
  	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
- Line 6491  sub init_user_environment {
+ Line 10677  sub init_user_environment {
  	    }
  	    untie(%disk_env);
  	} else {
- 	    &Apache::lonnet::logthis("<font color=\"blue\">WARNING: ".
+ 	    &Apache::lonnet::logthis("<span style=\"color:blue;\">WARNING: ".
- 			   'Could not create environment storage in lonauth: '.$!.'</font>');
+ 			   'Could not create environment storage in lonauth: '.$!.'</span>');
  	    return 'error: '.$!;
  	}
      }
- Line 6506  sub init_user_environment {
+ Line 10692  sub init_user_environment {
  sub _add_to_env {
      my ($idf,$env_data,$prefix) = @_;
-     while (my ($key,$value) = each(%$env_data)) {
+     if (ref($env_data) eq 'HASH') {
- 	$idf->{$prefix.$key} = $value;
+         while (my ($key,$value) = each(%$env_data)) {
- 	$env{$prefix.$key}   = $value;
+ 	    $idf->{$prefix.$key} = $value;
+ 	    $env{$prefix.$key}   = $value;
+         }
+     }
+ }
+ # --- Get the symbolic name of a problem and the url
+ sub get_symb {
+     my ($request,$silent) = @_;
+     (my $url=$env{'form.url'}) =~ s-^https?\://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+     my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
+     if ($symb eq '') {
+         if (!$silent) {
+             $request->print("Unable to handle ambiguous references:$url:.");
+             return ();
+         }
+     }
+     &Apache::lonenc::check_decrypt(\$symb);
+     return ($symb);
+ }
+ # --------------------------------------------------------------Get annotation
+ sub get_annotation {
+     my ($symb,$enc) = @_;
+     my $key = $symb;
+     if (!$enc) {
+         $key =
+             &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
      }
+     my %annotation=&Apache::lonnet::get('nohist_annotations',[$key]);
+     return $annotation{$key};
  }
+ sub clean_symb {
+     my ($symb,$delete_enc) = @_;
+     &Apache::lonenc::check_decrypt(\$symb);
+     my $enc = $env{'request.enc'};
+     if ($delete_enc) {
+         delete($env{'request.enc'});
+     }
+     return ($symb,$enc);
+ }
  =pod

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

Removed from v.1.476
changed lines
	Added in v.1.981