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.429 and 1.695

-version 1.429, 2006/07/17 19:47:20
+version 1.695, 2008/11/28 14:36:50
  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 LONCAPA;
+ use Apache::lonclonecourse();
+ 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 80  my %scprtag;
+ Line 159  my %scprtag;
  my %fe; my %fd; my %fm;
  my %category_extensions;
- # ---------------------------------------------- Designs
- my %designhash;
  # ---------------------------------------------- Thesaurus variables
  #
  # %Keywords:
- Line 149  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 224  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 244  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 256  of the element the selection from the se
+ Line 319  of the element the selection from the se
  sub browser_and_searcher_javascript {
      my ($mode)=@_;
      if (!defined($mode)) { $mode='edit'; }
-     my $resurl=&lastresurl();
+     my $resurl=&escape_single(&lastresurl());
      return <<END;
  // <!-- BEGIN LON-CAPA Internal
      var editbrowser = null;
- Line 267  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 285  sub browser_and_searcher_javascript {
+ Line 349  sub browser_and_searcher_javascript {
  	}
          url += 'element=' + elementname + '';
          var title = 'Browser';
-         var options = 'scrollbars=1,resizable=1,menubar=1,location=1';
+         var options = 'scrollbars=1,resizable=1,menubar=0,toolbar=1,location=1';
          options += ',width=700,height=600';
          editbrowser = open(url,title,options,'1');
          editbrowser.focus();
- Line 306  sub browser_and_searcher_javascript {
+ Line 370  sub browser_and_searcher_javascript {
  	}
          url += 'element=' + elementname + '';
          var title = 'Search';
-         var options = 'scrollbars=1,resizable=1,menubar=0';
+         var options = 'scrollbars=1,resizable=1,menubar=0,toolbar=1,location=1';
          options += ',width=700,height=600';
          editsearcher = open(url,title,options,'1');
          editsearcher.focus();
- Line 328  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 344  sub studentbrowser_javascript {
+ Line 408  sub studentbrowser_javascript {
     return (<<'ENDSTDBRW');
  <script type="text/javascript" language="Javascript" >
      var stdeditbrowser;
-     function openstdbrowser(formname,uname,udom,roleflag) {
+     function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
          var url = '/adm/pickstudent?';
          var filter;
-         eval('filter=document.'+formname+'.'+uname+'.value;');
+ 	if (!ignorefilter) {
+ 	    eval('filter=document.'+formname+'.'+uname+'.value;');
+ 	}
          if (filter != null) {
             if (filter != '') {
                 url += 'filter='+filter+'&';
- Line 384  sub selectstudent_link {
+ Line 450  sub selectstudent_link {
     return '';
  }
+ sub authorbrowser_javascript {
+     return <<"ENDAUTHORBRW";
+ <script type="text/javascript">
+ 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)=@_;
+     my ($domainfilter,$sec_element,$formname)=@_;
      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');
-    return (<<ENDSTDBRW);
+    my $output = '
- <script type="text/javascript" language="Javascript" >
+ <script type="text/javascript">
-     var stdeditbrowser;
+     var stdeditbrowser;'."\n";
+    $output .= <<"ENDSTDBRW";
      function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
          var url = '/adm/pickcourse?';
-         var filter;
+         var domainfilter = '';
-         if (filter != null) {
+         var formid = getFormIdByName(formname);
-            if (filter != '') {
+         if (formid > -1) {
-                url += 'filter='+filter+'&';
+             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;
+                 }
+             }
          }
-         var domainfilter='$domainfilter';
          if (domainfilter != null) {
             if (domainfilter != '') {
                 url += 'domainfilter='+domainfilter+'&';
- Line 407  sub coursebrowser_javascript {
+ Line 499  sub coursebrowser_javascript {
          url += 'form=' + formname + '&cnumelement='+uname+
  	                            '&cdomelement='+udom+
                                      '&cnameelement='+desc;
-         if (extra_element !=null && extra_element != '' && formname == 'rolechoice') {
+         if (extra_element !=null && extra_element != '') {
-             url += '&roleelement='+extra_element;
+             if (formname == 'rolechoice' || formname == 'studentform') {
-             if (domainfilter == null || domainfilter == '') {
+                 url += '&roleelement='+extra_element;
-                 url += '&domainfilter='+extra_element;
+                 if (domainfilter == null || domainfilter == '') {
+                     url += '&domainfilter='+extra_element;
+                 }
              }
+             else {
+                 if (formname == 'portform') {
+                     url += '&setroles='+extra_element;
+                 }
+             }
          }
          if (multflag !=null && multflag != '') {
              url += '&multiple='+multflag;
- Line 434  sub coursebrowser_javascript {
+ Line 533  sub coursebrowser_javascript {
          stdeditbrowser = open(url,title,options,'1');
          stdeditbrowser.focus();
      }
- </script>
+     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;
+     }
  ENDSTDBRW
+     if ($sec_element ne '') {
+         $output .= &setsec_javascript($sec_element,$formname);
+     }
+     $output .= '
+ </script>';
+     return $output;
  }
+ sub setsec_javascript {
+     my ($sec_element,$formname) = @_;
+     my $setsections = qq|
+ function setSect(sectionlist) {
+     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) {
+         document.$formname.$sec_element.multiple=false;
+         document.$formname.$sec_element.size=1;
+         document.$formname.$sec_element.options[0] = new Option('No existing sections','',false,false)
+     } else {
+         if (numSections == 1) {
+             document.$formname.$sec_element.multiple=false;
+             document.$formname.$sec_element.size=1;
+             document.$formname.$sec_element.options[0] = new Option('Select','',true,true);
+             document.$formname.$sec_element.options[1] = new Option('No section','',false,false)
+             document.$formname.$sec_element.options[2] = new Option(sectionsArray[0],sectionsArray[0],false,false);
+         } else {
+             for (var i=0; i<numSections; i++) {
+                 document.$formname.$sec_element.options[i] = new Option(sectionsArray[i],sectionsArray[i],false,false)
+             }
+             document.$formname.$sec_element.multiple=true
+             if (numSections < 3) {
+                 document.$formname.$sec_element.size=numSections;
+             } else {
+                 document.$formname.$sec_element.size=3;
+             }
+             document.$formname.$sec_element.options[0].selected = false
+         }
+     }
+ }
+ |;
+     return $setsections;
+ }
  sub selectcourse_link {
     my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
-     return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
+    return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select [_1]',$selecttype)."</a>";
+         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>";
+ }
+ sub selectauthor_link {
+    my ($form,$udom)=@_;
+    return '<a href="javascript:openauthorbrowser('."'$form','$udom'".');">'.
+           &mt('Select Author').'</a>';
  }
  sub check_uncheck_jscript {
- Line 460  function uncheckAll(field) {
+ Line 628  function uncheckAll(field) {
      if (field.length > 0) {
          for (i = 0; i < field.length; i++) {
              field[i].checked = false ;
-         }     } else {
+         }
+     } else {
          field.checked = false ;
      }
  }
- Line 468  ENDSCRT
+ Line 637  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;
+ }
  =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 495  linked_select_forms takes the following
+ Line 736  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 511  $menu{$choice1}->{'select2'}.
+ Line 754  $menu{$choice1}->{'select2'}.
                             B2 => "Choice B2",
                             B3 => "Choice B3",
                             B4 => "Choice B4"
-                            }
+                            },
+                        order => ['B4','B3','B1','B2'],
                     },
                 A2 => { text =>"Choice A2" ,
                         default => "C2",
- Line 519  $menu{$choice1}->{'select2'}.
+ Line 763  $menu{$choice1}->{'select2'}.
                             C1 => "Choice C1",
                             C2 => "Choice C2",
                             C3 => "Choice C3"
-                            }
+                            },
+                        order => ['C2','C1','C3'],
                     },
                 A3 => { text =>"Choice A3" ,
                         default => "D6",
- Line 531  $menu{$choice1}->{'select2'}.
+ Line 776  $menu{$choice1}->{'select2'}.
                             D5 => "Choice D5",
                             D6 => "Choice D6",
                             D7 => "Choice D7"
-                            }
+                            },
+                        order => ['D4','D3','D2','D1','D7','D6','D5'],
                     }
                 );
- Line 543  sub linked_select_forms {
+ Line 789  sub linked_select_forms {
          $firstdefault,
          $firstselectname,
          $secondselectname,
-         $hashref
+         $hashref,
+         $menuorder,
          ) = @_;
      my $second = "document.$formname.$secondselectname";
      my $first = "document.$formname.$firstselectname";
- Line 557  sub linked_select_forms {
+ Line 804  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 596  function select1_changed() {
+ Line 846  function select1_changed() {
  END
      # output the initial values for the selection lists
      $result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed()\">\n";
-     foreach my $value (sort(keys(%$hashref))) {
+     my @order = sort(keys(%{$hashref}));
+     if (ref($menuorder) eq 'ARRAY') {
+         @order = @{$menuorder};
+     }
+     foreach my $value (@order) {
          $result.="    <option value=\"$value\" ";
          $result.=" selected=\"selected\" " if ($value eq $firstdefault);
          $result.=">".&mt($hashref->{$value}->{'text'})."</option>\n";
- Line 606  END
+ Line 860  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 618  END
+ Line 877  END
  =pod
- =item * help_open_topic($topic, $text, $stayOnPage, $width, $height)
+ =item * &help_open_topic($topic,$text,$stayOnPage,$width,$height)
  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 644  sub help_open_topic {
+ Line 903  sub help_open_topic {
      my ($topic, $text, $stayOnPage, $width, $height) = @_;
      $text = "" if (not defined $text);
      $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual' ||
+     if ($env{'browser.interface'} eq 'textual') {
- 	$env{'environment.remote'} eq 'off' ) {
  	$stayOnPage=1;
      }
      $width = 350 if (not defined $width);
- Line 655  sub help_open_topic {
+ Line 913  sub help_open_topic {
      my $template = "";
      my $link;
      $topic=~s/\W/\_/g;
-     if (!$stayOnPage)
+     if (!$stayOnPage) {
-     {
  	$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
-     }
+     } else {
-     else
-     {
  	$link = "/adm/help/${filename}.hlp";
      }
      # Add the text
-     if ($text ne "")
+     if ($text ne "") {
-     {
  	$template .=
-   "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
+             "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
-   "<td bgcolor='#5555FF'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+             "<td bgcolor='#5555FF'><span class=\"LC_nobreak\"><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
      }
      # 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";
-  <a href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
+  <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
  ENDTEMPLATE
-     if ($text ne '') { $template.='</td></tr></table>' };
+     if ($text ne '') { $template.='</span></td></tr></table>' };
      return $template;
  }
- Line 698  sub helpLatexCheatsheet {
+ Line 952  sub helpLatexCheatsheet {
      }
      return '<table><tr><td>'.
  	$addOther .
- 	&Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols',
+ 	&Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
  					    undef,undef,600)
  	.'</td><td>'.
- 	&Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols',
+ 	&Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
  					    undef,undef,600)
+ 	.'</td><td>'.
+ 	&Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
+ 	                                    undef,undef,600)
  	.'</td></tr></table>';
  }
- sub help_open_menu {
+ sub general_help {
-     my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) = @_;
+     my $helptopic='Student_Intro';
-     $text = "" if (not defined $text);
+     if ($env{'request.role'}=~/^(ca|au)/) {
-     $stayOnPage = 0 if (not defined $stayOnPage);
+ 	$helptopic='Authoring_Intro';
-     if ($env{'browser.interface'} eq 'textual' ||
+     } elsif ($env{'request.role'}=~/^cc/) {
-         $env{'environment.remote'} eq 'off' ) {
+ 	$helptopic='Course_Coordination_Intro';
-         $stayOnPage=1;
+     } elsif ($env{'request.role'}=~/^dc/) {
+         $helptopic='Domain_Coordination_Intro';
      }
-     $width = 620 if (not defined $width);
+     return $helptopic;
-     $height = 600 if (not defined $height);
+ }
-     my $link='';
-     my $title = &mt('Get help');
+ sub update_help_link {
+     my ($topic,$component_help,$faq,$bug,$stayOnPage) = @_;
      my $origurl = $ENV{'REQUEST_URI'};
      $origurl=~s|^/~|/priv/|;
      my $timestamp = time;
      foreach my $datum (\$topic,\$component_help,\$faq,\$bug,\$origurl) {
          $$datum = &escape($$datum);
      }
-     if (!$stayOnPage) {
-          $link = "javascript:helpMenu('open')";
-     } else {
-         $link = "javascript:helpMenu('display')";
-     }
      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 $details_link = "/adm/helpmenu?page=body&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp";
+     my $output .= <<"ENDOUTPUT";
-     my $template;
+ <script type="text/javascript">
-     if ($text ne "") {
+ banner_link = '$banner_link';
- 	$template .=
+ </script>
-   "<table bgcolor='#CC3300' cellspacing='1' cellpadding='1' border='0'><tr>".
+ ENDOUTPUT
-   "<td bgcolor='#CC6600'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+     return $output;
+ }
+ # now just updates the help link and generates a blue icon
+ sub help_open_menu {
+     my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text)
+ 	= @_;
+     $stayOnPage = 0 if (not defined $stayOnPage);
+     # only use pop-up help (stayOnPage == 0)
+     # if environment.remote is on (using remote control UI)
+     if ($env{'browser.interface'} eq 'textual' ||
+     	$env{'environment.remote'} eq 'off' ) {
+         $stayOnPage=1;
+     }
+     my $output;
+     if ($component_help) {
+ 	if (!$text) {
+ 	    $output=&help_open_topic($component_help,undef,$stayOnPage,
+ 				       $width,$height);
+ 	} else {
+ 	    my $help_text;
+ 	    $help_text=&unescape($topic);
+ 	    $output='<table><tr><td>'.
+ 		&help_open_topic($component_help,$help_text,$stayOnPage,
+ 				 $width,$height).'</td></tr></table>';
+ 	}
      }
+     my $banner_link = &update_help_link($topic,$component_help,$faq,$bug,$stayOnPage);
+     return $output.$banner_link;
+ }
+ sub top_nav_help {
+     my ($text) = @_;
+     $text = &mt($text);
+     my $stay_on_page =
+ 	($env{'browser.interface'}  eq 'textual' ||
+ 	 $env{'environment.remote'} eq 'off' );
+     my $link = ($stay_on_page) ? "javascript:helpMenu('display')"
+ 	                     : "javascript:helpMenu('open')";
+     my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);
+     my $title = &mt('Get help');
+     return <<"END";
+ $banner_link
+  <a href="$link" title="$title">$text</a>
+ END
+ }
+ sub help_menu_js {
+     my ($text) = @_;
+     my $stayOnPage =
+ 	($env{'browser.interface'}  eq 'textual' ||
+ 	 $env{'environment.remote'} eq 'off' );
+     my $width = 620;
+     my $height = 600;
+     my $helptopic=&general_help();
+     my $details_link = '/adm/help/'.$helptopic.'.hlp';
      my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
-     my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");
      my $start_page =
          &Apache::loncommon::start_page('Help Menu', undef,
  				       {'frameset'    => 1,
  					'js_ready'    => 1,
  					'add_entries' => {
  					    'border' => '0',
- 					    'rows'   => "105,*",},});
+ 					    'rows'   => "110,*",},});
      my $end_page =
          &Apache::loncommon::end_page({'frameset' => 1,
  				      'js_ready' => 1,});
-     $template .= <<"ENDTEMPLATE";
+     my $template .= <<"ENDTEMPLATE";
-  <script type="text/javascript">
+ <script type="text/javascript">
  // <!-- BEGIN LON-CAPA Internal
  // <![CDATA[
+ var banner_link = '';
  function helpMenu(target) {
      var caller = this;
      if (target == 'open') {
- Line 773  function helpMenu(target) {
+ Line 1086  function helpMenu(target) {
      return;
  }
  function writeHelp(caller) {
-     caller.document.writeln('$start_page<frame name="bannerframe"  src="$banner_link" /><frame name="bodyframe" src="$details_link" /> $end_page')
+     caller.document.writeln('$start_page<frame name="bannerframe"  src="'+banner_link+'" /><frame name="bodyframe" src="$details_link" /> $end_page')
      caller.document.close()
      caller.focus()
  }
  // ]]>
  // END LON-CAPA Internal -->
-  </script>
+ </script>
-  <a href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help Menu)" /></a>
  ENDTEMPLATE
-     if ($component_help) {
- 	if (!$text) {
- 	    $template=&help_open_topic($component_help,undef,$stayOnPage,
- 				       $width,$height).' '.$template;
- 	} else {
- 	    my $help_text;
- 	    $help_text=&unescape($topic);
- 	    $template='<table><tr><td>'.
- 		&help_open_topic($component_help,$help_text,$stayOnPage,
- 				 $width,$height).'</td><td>'.$template.
- 				 '</td></tr></table>';
- 	}
-     }
-     if ($text ne '') { $template.='</td></tr></table>' };
      return $template;
  }
- Line 830  sub help_open_bug {
+ Line 1128  sub help_open_bug {
      {
  	$template .=
    "<table bgcolor='#AA3333' cellspacing='1' cellpadding='1' border='0'><tr>".
-   "<td bgcolor='#FF5555'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+   "<td bgcolor='#FF5555'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
      }
      # Add the graphic
      my $title = &mt('Report a Bug');
      my $bugicon=&lonhttpdurl("/adm/lonMisc/smallBug.gif");
      $template .= <<"ENDTEMPLATE";
-  <a href="$link" title="$title"><img src="$bugicon" border="0" alt="(Bug: $topic)" /></a>
+  <a target="_top" href="$link" title="$title"><img src="$bugicon" border="0" alt="(Bug: $topic)" /></a>
  ENDTEMPLATE
      if ($text ne '') { $template.='</td></tr></table>' };
      return $template;
- Line 875  sub help_open_faq {
+ Line 1173  sub help_open_faq {
      {
  	$template .=
    "<table bgcolor='#337733' cellspacing='1' cellpadding='1' border='0'><tr>".
-   "<td bgcolor='#448844'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+   "<td bgcolor='#448844'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
      }
      # Add the graphic
      my $title = &mt('View the FAQ');
      my $faqicon=&lonhttpdurl("/adm/lonMisc/smallFAQ.gif");
      $template .= <<"ENDTEMPLATE";
-  <a href="$link" title="$title"><img src="$faqicon" border="0" alt="(FAQ: $topic)" /></a>
+  <a target="_top" href="$link" title="$title"><img src="$faqicon" border="0" alt="(FAQ: $topic)" /></a>
  ENDTEMPLATE
      if ($text ne '') { $template.='</td></tr></table>' };
      return $template;
- Line 894  ENDTEMPLATE
+ Line 1192  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 949  DOMBASED
+ Line 1247  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 973  sub changable_area {
+ Line 1271  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">
+ $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 986  sub changable_area {
+ Line 1415  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 1007  sub csv_translate {
+ Line 1436  sub csv_translate {
  =pod
- =item * define_excel_formats
+ =item * &define_excel_formats()
  Define some commonly used Excel cell formats.
- Line 1063  sub define_excel_formats {
+ Line 1492  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 1106  sub create_workbook {
+ Line 1535  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 1131  sub create_text_file {
+ Line 1560  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(&mt('Problems occurred in creating the output file. '
-                   "This error has been logged.  ".
+                      .'This error has been logged. '
-                   "Please alert your LON-CAPA administrator.");
+                      .'Please alert your LON-CAPA administrator.'));
      }
      return ($fh,$filename)
  }
- Line 1149  sub create_text_file {
+ Line 1578  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 {
+ 	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
  	return &select_form($name,$value,%domains);
      }
  }
- Line 1192  sub domain_select {
+ Line 1599  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 1219  sub multiple_select_form {
+ Line 1630  sub multiple_select_form {
          }
      }
      $output.="\n<select name='$name' size='$size' multiple='1'>";
-     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 1234  sub multiple_select_form {
+ Line 1653  sub multiple_select_form {
  =pod
- =item * select_form($defdom,$name,%hash)
+ =item * &select_form($defdom,$name,%hash)
  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.
- Line 1262  sub select_form {
+ Line 1681  sub select_form {
      return $selectform;
  }
+ # For display filters
+ sub display_filter {
+     if (!$env{'form.show'}) { $env{'form.show'}=10; }
+     if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }
+     return '<nobr><label>'.&mt('Records [_1]',
+ 			       &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
+ 							   (&mt('all'),10,20,50,100,1000,10000))).
+ 	   '</label></nobr> <nobr>'.
+            &mt('Filter [_1]',
+ 	   &select_form($env{'form.displayfilter'},
+ 			'displayfilter',
+ 			('currentfolder' => 'Current folder/page',
+ 			 'containing' => 'Containing phrase',
+ 			 'none' => 'None'))).
+ 			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></nobr>';
+ }
  sub gradeleveldescription {
      my $gradelevel=shift;
      my %gradelevels=(0 => 'Not specified',
- Line 1303  sub select_level_form {
+ Line 1740  sub select_level_form {
  =pod
- =item * select_dom_form($defdom,$name,$includeempty)
+ =item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc)
  Returns a string containing a <select name='$name' size='1'> form to
  allow a user to select the domain to preform an operation in.
- Line 1312  See loncreateuser.pm for an example invo
+ Line 1749  See loncreateuser.pm for an example invo
  If the $includeempty flag is set, it also includes an empty choice ("no domain
  selected");
+ If the $showdomdesc flag is set, the domain name is followed by the domain description.
  =cut
  #-------------------------------------------
  sub select_dom_form {
-     my ($defdom,$name,$includeempty) = @_;
+     my ($defdom,$name,$includeempty,$showdomdesc) = @_;
-     my @domains = get_domains();
+     my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
      if ($includeempty) { @domains=('',@domains); }
      my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
      foreach my $dom (@domains) {
          $selectdomain.="<option value=\"$dom\" ".
-             ($dom eq $defdom ? 'selected="selected" ' : '').
+             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
-                 ">$dom</option>\n";
+         if ($showdomdesc) {
+             if ($dom ne '') {
+                 my $domdesc = &Apache::lonnet::domain($dom,'description');
+                 if ($domdesc ne '') {
+                     $selectdomain .= ' ('.$domdesc.')';
+                 }
+             }
+         }
+         $selectdomain .= "</option>\n";
      }
      $selectdomain.="</select>";
      return $selectdomain;
- Line 1333  sub select_dom_form {
+ Line 1780  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.
- #-------------------------------------------
- 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)
+ See loncreateuser.pm for example of use.
- 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>'.&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 1473  sub decode_user_agent {
+ Line 1940  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 1497  See loncreateuser.pm for invocation and
+ Line 1962  See loncreateuser.pm for invocation and
  =back
- =back
+ See loncreateuser.pm for invocation and use examples.
  =cut
- Line 1527  END
+ Line 1992  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 1622  sub authform_nochange{
+ Line 2084  sub authform_nochange{
                kerb_def_dom => 'MSU.EDU',
                @_,
            );
-     my $result = '<label>'.&mt('[_1] Do not change login data',
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
-                      '<input type="radio" name="login" value="nochange" '.
+     my $result;
-                      'checked="checked" onclick="'.
+     if (keys(%can_assign) == 0) {
+         $result = &mt('Under you current role you are not permitted to change login settings for this user');
+     } else {
+         $result = '<label>'.&mt('[_1] Do not change login data',
+                   '<input type="radio" name="login" value="nochange" '.
+                   'checked="checked" onclick="'.
              "javascript:changed_radio('nochange',$in{'formname'});".'" />').
  	    '</label>';
+     }
      return $result;
  }
- sub authform_kerberos{
+ sub authform_kerberos {
      my %in = (
                formname => 'document.cu',
                kerb_def_dom => 'MSU.EDU',
                kerb_def_auth => 'krb4',
                @_,
                );
-     my ($check4,$check5,$krbarg);
+     my ($check4,$check5,$krbcheck,$krbarg,$krbver,$result,$authtype,
+         $autharg,$jscall);
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
      if ($in{'kerb_def_auth'} eq 'krb5') {
-        $check5 = " checked=\"on\"";
+        $check5 = ' checked="on"';
      } else {
-        $check4 = " checked=\"on\"";
+        $check4 = ' checked="on"';
      }
      $krbarg = $in{'kerb_def_dom'};
+     if (defined($in{'curr_authtype'})) {
-     my $krbcheck = "";
+         if ($in{'curr_authtype'} eq 'krb') {
-     if ( grep/^curr_authtype$/,(keys %in) ) {
+             $krbcheck = ' checked="on"';
-         if ($in{'curr_authtype'} =~ m/^krb/) {
+             if (defined($in{'mode'})) {
-             $krbcheck = " checked=\"on\"";
+                 if ($in{'mode'} eq 'modifyuser') {
-             if ( grep/^curr_autharg$/,(keys %in) ) {
+                     $krbcheck = '';
+                 }
+             }
+             if (defined($in{'curr_kerb_ver'})) {
+                 if ($in{'curr_krb_ver'} eq '5') {
+                     $check5 = ' checked="on"';
+                     $check4 = '';
+                 } else {
+                     $check4 = ' checked="on"';
+                     $check5 = '';
+                 }
+             }
+             if (defined($in{'curr_autharg'})) {
                  $krbarg = $in{'curr_autharg'};
              }
+             if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
+                 if (defined($in{'curr_autharg'})) {
+                     $result =
+     &mt('Currently Kerberos authenticated with domain [_1] Version [_2].',
+         $in{'curr_autharg'},$krbver);
+                 } else {
+                     $result =
+     &mt('Currently Kerberos authenticated, Version [_1].',$krbver);
+                 }
+                 return $result;
+             }
+         }
+     } else {
+         if ($authnum == 1) {
+             $authtype = '<input type="hidden" name="login" value="krb">';
+         }
+     }
+     if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
+         return;
+     } 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'});";
-     my $jscall = "javascript:changed_radio('krb',$in{'formname'});";
+     if ($authtype eq '') {
-     my $result .= &mt
+         $authtype = '<input type="radio" name="login" value="krb" '.
+                     'onclick="'.$jscall.'" onchange="'.$jscall.'"'.
+                     $krbcheck.' />';
+     }
+     if (($can_assign{'krb4'} && $can_assign{'krb5'}) ||
+         ($can_assign{'krb4'} && !$can_assign{'krb5'} &&
+          $in{'curr_authtype'} eq 'krb5') ||
+         (!$can_assign{'krb4'} && $can_assign{'krb5'} &&
+          $in{'curr_authtype'} eq 'krb4')) {
+         $result .= &mt
          ('[_1] Kerberos authenticated with domain [_2] '.
           '[_3] Version 4 [_4] Version 5 [_5]',
-          '<label><input type="radio" name="login" value="krb" '.
+          '<label>'.$authtype,
-              'onclick="'.$jscall.'" onchange="'.$jscall.'"'.$krbcheck.' />',
           '</label><input type="text" size="10" name="krbarg" '.
               'value="'.$krbarg.'" '.
               'onchange="'.$jscall.'" />',
           '<label><input type="radio" name="krbver" value="4" '.$check4.' />',
           '</label><label><input type="radio" name="krbver" value="5" '.$check5.' />',
  	 '</label>');
+     } elsif ($can_assign{'krb4'}) {
+         $result .= &mt
+         ('[_1] Kerberos authenticated with domain [_2] '.
+          '[_3] Version 4 [_4]',
+          '<label>'.$authtype,
+          '</label><input type="text" size="10" name="krbarg" '.
+              'value="'.$krbarg.'" '.
+              'onchange="'.$jscall.'" />',
+          '<label><input type="hidden" name="krbver" value="4" />',
+          '</label>');
+     } elsif ($can_assign{'krb5'}) {
+         $result .= &mt
+         ('[_1] Kerberos authenticated with domain [_2] '.
+          '[_3] Version 5 [_4]',
+          '<label>'.$authtype,
+          '</label><input type="text" size="10" name="krbarg" '.
+              'value="'.$krbarg.'" '.
+              'onchange="'.$jscall.'" />',
+          '<label><input type="hidden" name="krbver" value="5" />',
+          '</label>');
+     }
      return $result;
  }
  sub authform_internal{
-     my %args = (
+     my %in = (
                  formname => 'document.cu',
                  kerb_def_dom => 'MSU.EDU',
                  @_,
                  );
+     my ($intcheck,$intarg,$result,$authtype,$autharg,$jscall);
-     my $intcheck = "";
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
-     my $intarg = 'value=""';
+     if (defined($in{'curr_authtype'})) {
-     if ( grep/^curr_authtype$/,(keys %args) ) {
+         if ($in{'curr_authtype'} eq 'int') {
-         if ($args{'curr_authtype'} eq 'int') {
+             if ($can_assign{'int'}) {
-             $intcheck = " checked=\"on\"";
+                 $intcheck = 'checked="on" ';
-             if ( grep/^curr_autharg$/,(keys %args) ) {
+                 if (defined($in{'mode'})) {
-                 $intarg = "value=\"$args{'curr_autharg'}\"";
+                     if ($in{'mode'} eq 'modifyuser') {
+                         $intcheck = '';
+                     }
+                 }
+                 if (defined($in{'curr_autharg'})) {
+                     $intarg = $in{'curr_autharg'};
+                 }
+             } else {
+                 $result = &mt('Currently internally authenticated.');
+                 return $result;
              }
          }
+     } else {
+         if ($authnum == 1) {
+             $authtype = '<input type="hidden" name="login" value="int">';
+         }
      }
+     if (!$can_assign{'int'}) {
-     my $jscall = "javascript:changed_radio('int',$args{'formname'});";
+         return;
-     my $result.=&mt
+     } elsif ($authtype eq '') {
+         if (defined($in{'mode'})) {
+             if ($in{'mode'} eq 'modifycourse') {
+                 if ($authnum == 1) {
+                     $authtype = '<input type="hidden" name="login" value="int">';
+                 }
+             }
+         }
+     }
+     $jscall = "javascript:changed_radio('int',$in{'formname'});";
+     if ($authtype eq '') {
+         $authtype = '<input type="radio" name="login" value="int" '.$intcheck.
+                     ' onchange="'.$jscall.'" onclick="'.$jscall.'" />';
+     }
+     $autharg = '<input type="password" size="10" name="intarg" value="'.
+                $intarg.'" onchange="'.$jscall.'" />';
+     $result = &mt
          ('[_1] Internally authenticated (with initial password [_2])',
-          '<label><input type="radio" name="login" value="int" '.$intcheck.
+          '<label>'.$authtype,'</label>'.$autharg);
-              ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
+     $result.="<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
-          '</label><input type="text" size="10" name="intarg" '.$intarg.
-              ' onchange="'.$jscall.'" />');
      return $result;
  }
- Line 1704  sub authform_local{
+ Line 2268  sub authform_local{
                kerb_def_dom => 'MSU.EDU',
                @_,
                );
+     my ($loccheck,$locarg,$result,$authtype,$autharg,$jscall);
-     my $loccheck = "";
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
-     my $locarg = 'value=""';
+     if (defined($in{'curr_authtype'})) {
-     if ( grep/^curr_authtype$/,(keys %in) ) {
          if ($in{'curr_authtype'} eq 'loc') {
-             $loccheck = " checked=\"on\"";
+             if ($can_assign{'loc'}) {
-             if ( grep/^curr_autharg$/,(keys %in) ) {
+                 $loccheck = 'checked="on" ';
-                 $locarg = "value=\"$in{'curr_autharg'}\"";
+                 if (defined($in{'mode'})) {
+                     if ($in{'mode'} eq 'modifyuser') {
+                         $loccheck = '';
+                     }
+                 }
+                 if (defined($in{'curr_autharg'})) {
+                     $locarg = $in{'curr_autharg'};
+                 }
+             } else {
+                 $result = &mt('Currently using local (institutional) authentication.');
+                 return $result;
              }
          }
+     } else {
+         if ($authnum == 1) {
+             $authtype = '<input type="hidden" name="login" value="loc">';
+         }
      }
+     if (!$can_assign{'loc'}) {
-     my $jscall = "javascript:changed_radio('loc',$in{'formname'});";
+         return;
-     my $result.=&mt('[_1] Local Authentication with argument [_2]',
+     } elsif ($authtype eq '') {
-                     '<label><input type="radio" name="login" value="loc" '.$loccheck.
+         if (defined($in{'mode'})) {
-                         ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
+             if ($in{'mode'} eq 'modifycourse') {
-                     '</label><input type="text" size="10" name="locarg" '.$locarg.
+                 if ($authnum == 1) {
-                         ' onchange="'.$jscall.'" />');
+                     $authtype = '<input type="hidden" name="login" value="loc">';
+                 }
+             }
+         }
+     }
+     $jscall = "javascript:changed_radio('loc',$in{'formname'});";
+     if ($authtype eq '') {
+         $authtype = '<input type="radio" name="login" value="loc" '.
+                     $loccheck.' onchange="'.$jscall.'" onclick="'.
+                     $jscall.'" />';
+     }
+     $autharg = '<input type="text" size="10" name="locarg" value="'.
+                $locarg.'" onchange="'.$jscall.'" />';
+     $result = &mt('[_1] Local Authentication with argument [_2]',
+                   '<label>'.$authtype,'</label>'.$autharg);
      return $result;
  }
- Line 1731  sub authform_filesystem{
+ Line 2322  sub authform_filesystem{
                kerb_def_dom => 'MSU.EDU',
                @_,
                );
-     my $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
+     my ($fsyscheck,$result,$authtype,$autharg,$jscall);
-     my $result.= &mt
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
+     if (defined($in{'curr_authtype'})) {
+         if ($in{'curr_authtype'} eq 'fsys') {
+             if ($can_assign{'fsys'}) {
+                 $fsyscheck = 'checked="on" ';
+                 if (defined($in{'mode'})) {
+                     if ($in{'mode'} eq 'modifyuser') {
+                         $fsyscheck = '';
+                     }
+                 }
+             } else {
+                 $result = &mt('Currently Filesystem Authenticated.');
+                 return $result;
+             }
+         }
+     } else {
+         if ($authnum == 1) {
+             $authtype = '<input type="hidden" name="login" value="fsys">';
+         }
+     }
+     if (!$can_assign{'fsys'}) {
+         return;
+     } elsif ($authtype eq '') {
+         if (defined($in{'mode'})) {
+             if ($in{'mode'} eq 'modifycourse') {
+                 if ($authnum == 1) {
+                     $authtype = '<input type="hidden" name="login" value="fsys">';
+                 }
+             }
+         }
+     }
+     $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
+     if ($authtype eq '') {
+         $authtype = '<input type="radio" name="login" value="fsys" '.
+                     $fsyscheck.' onchange="'.$jscall.'" onclick="'.
+                     $jscall.'" />';
+     }
+     $autharg = '<input type="text" size="10" name="fsysarg" value=""'.
+                ' onchange="'.$jscall.'" />';
+     $result = &mt
          ('[_1] Filesystem Authenticated (with initial password [_2])',
           '<label><input type="radio" name="login" value="fsys" '.
-          'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
+          $fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-          '</label><input type="text" size="10" name="fsysarg" value="" '.
+          '</label><input type="password" size="10" name="fsysarg" value="" '.
                    'onchange="'.$jscall.'" />');
      return $result;
  }
- ###############################################################
+ sub get_assignable_auth {
- ##    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 1787  sub get_auth_defaults {
+ Line 2425  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 1811  sub get_kerberos_defaults {
+ Line 2458  sub get_kerberos_defaults {
      return ($krbdef,$krbdefdom);
  }
- =pod
- =back
- =cut
  ###############################################################
  ##                Thesaurus Functions                        ##
- Line 1827  sub get_kerberos_defaults {
+ Line 2469  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 1864  sub initialize_keywords {
+ Line 2506  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 1872  sub initialize_keywords {
+ Line 2514  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 1893  sub keyword {
+ Line 2535  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 1951  sub get_related_words {
+ Line 2593  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 1964  if $first is set to 'lastname' then it r
+ Line 2606  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 1979  sub plainname {
+ Line 2622  sub plainname {
  # -------------------------------------------------------------------- Nickname
  =pod
- =item * nickname($uname,$udom)
+ =item * &nickname($uname,$udom)
  Gets a users name and returns it as a string as
- Line 1995  if the user does not
+ Line 2638  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 2010  sub nickname {
+ Line 2654  sub nickname {
  sub getnames {
      my ($uname,$udom)=@_;
+     return if (!defined($uname) || !defined($udom));
+     if ($udom eq 'public' && $uname eq 'public') {
+ 	return ('lastname' => &mt('Public'));
+     }
      my $id=$uname.':'.$udom;
      my ($names,$cached)=&Apache::lonnet::is_cached_new('namescache',$id);
      if ($cached) {
- Line 2023  sub getnames {
+ Line 2671  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') {
+ 	return;
+     }
+     if (!$udom) { $udom=$env{'user.domain'}; }
+     if (!$uname) { $uname=$env{'user.name'}; }
+     my $id=$uname.':'.$udom;
+     my ($names,$cached)=&Apache::lonnet::is_cached_new('emailscache',$id);
+     if ($cached) {
+ 	return %{$names};
+     } else {
+ 	my %loadnames=&Apache::lonnet::get('environment',
+                     			   ['notification','critnotification',
+ 					    'permanentemail'],
+ 					   $udom,$uname);
+ 	&Apache::lonnet::do_cache_new('emailscache',$id,\%loadnames);
+ 	return %loadnames;
+     }
+ }
+ sub flush_email_cache {
+     my ($uname,$udom)=@_;
+     if (!$udom)  { $udom =$env{'user.domain'}; }
+     if (!$uname) { $uname=$env{'user.name'};   }
+     return if ($udom eq 'public' && $uname eq 'public');
+     my $id=$uname.':'.$udom;
+     &Apache::lonnet::devalidate_cache_new('emailscache',$id);
+ }
  # ------------------------------------------------------------------ Screenname
  =pod
- =item * screenname($uname,$udom)
+ =item * &screenname($uname,$udom)
  Gets a users screenname and returns it as a string
- Line 2047  sub screenname {
+ Line 2741  sub screenname {
  sub messagewrapper {
      my ($link,$username,$domain,$subject,$text)=@_;
      return
-         '<a href="/adm/email?compose=individual&'.
+         '<a href="/adm/email?compose=individual&amp;'.
-         'recname='.$username.'&recdom='.$domain.
+         'recname='.$username.'&amp;recdom='.$domain.
- 	'&subject='.&escape($subject).'&text='.&escape($text).'" '.
+ 	'&amp;subject='.&escape($subject).'&amp;text='.&escape($text).'" '.
          'title="'.&mt('Send message').'">'.$link.'</a>';
  }
  # --------------------------------------------------------------- Notes Wrapper
- Line 2063  sub noteswrapper {
+ Line 2757  sub noteswrapper {
  sub aboutmewrapper {
      my ($link,$username,$domain,$target)=@_;
+     if (!defined($username)  && !defined($domain)) {
+         return;
+     }
      return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
- 	($target?' target="$target"':'').' title="'.&mt('View this users personal page').'">'.$link.'</a>';
+ 	($target?' target="$target"':'').' title="'.&mt("View this user's personal page").'">'.$link.'</a>';
  }
  # ------------------------------------------------------------ Syllabus Wrapper
- Line 2093  sub track_student_link {
+ Line 2790  sub track_student_link {
          $target = '';
      }
      if ($start) { $link.='&amp;start='.$start; }
-     return qq{<a href="$link" title="$title" $target>$linktext</a>};
+     $title = &mt($title);
+     $linktext = &mt($linktext);
+     return qq{<a href="$link" title="$title" $target>$linktext</a>}.
+ 	&help_open_topic('View_recent_activity');
+ }
+ # ===================================================== 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
- Line 2104  sub track_student_link {
+ Line 2817  sub track_student_link {
  =over 4
- =item * languageids()
+ =item * &languageids()
  returns list of all language ids
- Line 2116  sub languageids {
+ Line 2829  sub languageids {
  =pod
- =item * languagedescription()
+ =item * &languagedescription()
  returns description of a specified language id
- Line 2141  sub supportedlanguagecode {
+ Line 2854  sub supportedlanguagecode {
  =pod
- =item * copyrightids()
+ =item * &copyrightids()
  returns list of all copyrights
- Line 2153  sub copyrightids {
+ Line 2866  sub copyrightids {
  =pod
- =item * copyrightdescription()
+ =item * &copyrightdescription()
  returns description of a specified copyright id
- Line 2165  sub copyrightdescription {
+ Line 2878  sub copyrightdescription {
  =pod
- =item * source_copyrightids()
+ =item * &source_copyrightids()
  returns list of all source copyrights
- Line 2177  sub source_copyrightids {
+ Line 2890  sub source_copyrightids {
  =pod
- =item * source_copyrightdescription()
+ =item * &source_copyrightdescription()
  returns description of a specified source copyright id
- Line 2189  sub source_copyrightdescription {
+ Line 2902  sub source_copyrightdescription {
  =pod
- =item * filecategories()
+ =item * &filecategories()
  returns list of all file categories
- Line 2201  sub filecategories {
+ Line 2914  sub filecategories {
  =pod
- =item * filecategorytypes()
+ =item * &filecategorytypes()
  returns list of file types belonging to a given file
  category
- Line 2215  sub filecategorytypes {
+ Line 2928  sub filecategorytypes {
  =pod
- =item * fileembstyle()
+ =item * &fileembstyle()
  returns embedding style for a specified file type
- Line 2239  sub filecategoryselect {
+ Line 2952  sub filecategoryselect {
  =pod
- =item * filedescription()
+ =item * &filedescription()
  returns description for a specified file type
- Line 2253  sub filedescription {
+ Line 2966  sub filedescription {
  =pod
- =item * filedescriptionex()
+ =item * &filedescriptionex()
  returns description for a specified file type with
  extra formatting
- Line 2285  sub fileextensions {
+ Line 2998  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 2297  sub display_languages {
+ Line 3010  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=split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'});
+ 	    return $preferred_langs[0];
-     }
-     my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0];
-     if ($browser) {
- 	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$browser));
-     }
-     if ($Apache::lonnet::domain_lang_def{$env{'user.domain'}}) {
- 	@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;
+     my %possibilities = map { $_ => 1 } (@$possible_langs);
+     my @preferred_possibilities;
+     foreach my $preferred_lang (@preferred_langs) {
+ 	if (exists($possibilities{$preferred_lang})) {
+ 	    push(@preferred_possibilities, $preferred_lang);
+ 	}
+     }
+     if( wantarray ) {
+ 	return @preferred_possibilities;
+     }
+     return $preferred_possibilities[0];
  }
  ###############################################################
- Line 2346  sub preferred_languages {
+ Line 3043  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 2390  sub get_previous_attempt {
+ Line 3087  sub get_previous_attempt {
  	  $lasthash{$key}=$returnhash{$version.':'.$key};
          }
        }
-       $prevattempts='<table border="0" width="100%"><tr><td bgcolor="#777777">';
+       $prevattempts=&start_data_table().&start_data_table_header_row();
-       $prevattempts.='<table border="0" width="100%"><tr bgcolor="#e6ffff"><td>History</td>';
+       $prevattempts.='<th>'.&mt('History').'</th>';
        foreach my $key (sort(keys(%lasthash))) {
  	my ($ign,@parts) = split(/\./,$key);
  	if ($#parts > 0) {
  	  my $data=$parts[-1];
  	  pop(@parts);
- 	  $prevattempts.='<td>Part '.join('.',@parts).'<br />'.$data.'&nbsp;</td>';
+ 	  $prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.'&nbsp;</th>';
  	} else {
  	  if ($#parts == 0) {
  	    $prevattempts.='<th>'.$parts[0].'</th>';
- Line 2406  sub get_previous_attempt {
+ Line 3103  sub get_previous_attempt {
  	  }
  	}
        }
+       $prevattempts.=&end_data_table_header_row();
        if ($getattempt eq '') {
  	for ($version=1;$version<=$returnhash{'version'};$version++) {
- 	  $prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Transaction '.$version.'</td>';
+ 	  $prevattempts.=&start_data_table_row().
+ 	      '<td>'.&mt('Transaction [_1]',$version).'</td>';
  	    foreach my $key (sort(keys(%lasthash))) {
- 	       my $value;
+ 		my $value = &format_previous_attempt_value($key,
- 	       if ($key =~ /timestamp/) {
+ 							   $returnhash{$version.':'.$key});
- 		  $value=scalar(localtime($returnhash{$version.':'.$key}));
+ 		$prevattempts.='<td>'.$value.'&nbsp;</td>';
- 	       } else {
- 		  $value=$returnhash{$version.':'.$key};
- 	       }
- 	       $prevattempts.='<td>'.&unescape($value).'&nbsp;</td>';
  	    }
+ 	  $prevattempts.=&end_data_table_row();
  	 }
        }
-       $prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Current</td>';
+       $prevattempts.=&start_data_table_row().'<td>'.&mt('Current').'</td>';
        foreach my $key (sort(keys(%lasthash))) {
- 	my $value;
+ 	my $value = &format_previous_attempt_value($key,$lasthash{$key});
- 	if ($key =~ /timestamp/) {
- 	  $value=scalar(localtime($lasthash{$key}));
- 	} else {
- 	  $value=$lasthash{$key};
- 	}
- 	$value=&unescape($value);
  	if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
  	$prevattempts.='<td>'.$value.'&nbsp;</td>';
        }
-       $prevattempts.='</tr></table></td></tr></table>';
+       $prevattempts.= &end_data_table_row().&end_data_table();
      } else {
-       $prevattempts='Nothing submitted - no attempts.';
+       $prevattempts=
+ 	  &start_data_table().&start_data_table_row().
+ 	  '<td>'.&mt('Nothing submitted - no attempts.').'</td>'.
+ 	  &end_data_table_row().&end_data_table();
      }
    } else {
-     $prevattempts='No data.';
+     $prevattempts=
+ 	  &start_data_table().&start_data_table_row().
+ 	  '<td>'.&mt('No data.').'</td>'.
+ 	  &end_data_table_row().&end_data_table();
    }
  }
+ sub format_previous_attempt_value {
+     my ($key,$value) = @_;
+     if ($key =~ /timestamp/) {
+ 	$value = &Apache::lonlocal::locallocaltime($value);
+     } elsif (ref($value) eq 'ARRAY') {
+ 	$value = '('.join(', ', @{ $value }).')';
+     } else {
+ 	$value = &unescape($value);
+     }
+     return $value;
+ }
  sub relative_to_absolute {
      my ($url,$output)=@_;
      my $parser=HTML::TokeParser->new(\$output);
- Line 2478  sub relative_to_absolute {
+ Line 3187  sub relative_to_absolute {
  =pod
- =item * get_student_view
+ =item * &get_student_view()
  show a snapshot of what student was looking at
- Line 2497  sub get_student_view {
+ Line 3206  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 2506  sub get_student_view {
+ Line 3215  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 2527  sub get_student_answers {
+ Line 3268  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 2546  sub submlink {
+ Line 3288  sub submlink {
      my ($text,$uname,$udom,$symb,$target)=@_;
      if (!($uname && $udom)) {
  	(my $cursymb, my $courseid,$udom,$uname)=
- 	    &Apache::lonxml::whichuser($symb);
+ 	    &Apache::lonnet::whichuser($symb);
  	if (!$symb) { $symb=$cursymb; }
      }
      if (!$symb) { $symb=&Apache::lonnet::symbread(); }
- Line 2592  sub pprmlink {
+ Line 3334  sub pprmlink {
      my ($text,$uname,$udom,$symb,$target)=@_;
      if (!($uname && $udom)) {
  	(my $cursymb, my $courseid,$udom,$uname)=
- 	    &Apache::lonxml::whichuser($symb);
+ 	    &Apache::lonnet::whichuser($symb);
  	if (!$symb) { $symb=$cursymb; }
      }
      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 2614  sub pprmlink {
+ Line 3356  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 2633  sub utc_string {
+ Line 3380  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 2641  sub maketime {
+ Line 3406  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+)} ) {
+         $uname = $env{'user.name'};
- 	    my ($role,$domain,$id) = ($1,$2,$3);
+     }
- 	    next if ($role eq 'ca' || $role eq 'aa');
+     if (!defined($udom)) {
- 	    next if (%roles && !exists($roles{$role}));
+         $udom = $env{'user.domain'};
- 	    my ($starttime,$endtime)=split(/\./,$env{$key});
+     }
-             my $active=1;
+     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-             if ($starttime) {
+         my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname);
- 		if ($now<$starttime) { $active=0; }
+         if (!%roles) {
+             %roles = (
+                        cc => 1,
+                        in => 1,
+                        ep => 1,
+                        ta => 1,
+                        cr => 1,
+                        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 ($endtime) {
+             if ($tstart) {
-                 if ($now>$endtime) { $active=0; }
+                 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;
+                 }
              }
-             if ($active) { $courses{$domain.'_'.$id}=1; }
          }
      }
-     return keys(%courses);
+     return %courses;
  }
  ###############################################
+ sub blockcheck {
+     my ($setters,$activity,$uname,$udom) = @_;
+     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.
+     if (&Apache::lonnet::is_course($udom,$uname)) {
+         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,$cnum);
+         if ((defined($env{'course.'.$course.'.domain'})) && (defined($env{'course.'.$course.'.num'}))) {
+             $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 $checkrole = 'cm./'.$cdom.'/'.$cnum;
+             if ($sec ne 'none') {
+                 $checkrole .= '/'.$sec;
+             }
+             if ($otheruser) {
+                 # Resource belongs to user other than current user.
+                 # 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 (($no_ownblock) &&
+                  ($env{'request.role'} !~ m{^st\./\Q$cdom\E/\Q$cnum\E}));
+         next if ($no_userblock);
+         # Retrieve blocking times and identity of blocker 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);
+ }
+ sub get_blocks {
+     my ($setters,$activity,$cdom,$cnum) = @_;
+     my $startblock = 0;
+     my $endblock = 0;
+     my $course = $cdom.'_'.$cnum;
+     $setters->{$course} = {};
+     $setters->{$course}{'staff'} = [];
+     $setters->{$course}{'times'} = [];
+     my %records = &Apache::lonnet::dump('comm_block',$cdom,$cnum);
+     foreach my $record (keys(%records)) {
+         my ($start,$end) = ($record =~ m/^(\d+)____(\d+)$/);
+         if ($start <= time && $end >= time) {
+             my ($staff_name,$staff_dom,$title,$blocks) =
+                 &parse_block_record($records{$record});
+             if ($blocks->{$activity} eq 'on') {
+                 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;
+                 }
+             }
+         }
+     }
+     return ($startblock,$endblock);
+ }
+ sub parse_block_record {
+     my ($record) = @_;
+     my ($setuname,$setudom,$title,$blocks);
+     if (ref($record) eq 'HASH') {
+         ($setuname,$setudom) = split(/:/,$record->{'setter'});
+         $title = &unescape($record->{'event'});
+         $blocks = $record->{'blocks'};
+     } else {
+         my @data = split(/:/,$record,3);
+         if (scalar(@data) eq 2) {
+             $title = $data[1];
+             ($setuname,$setudom) = split(/@/,$data[0]);
+         } else {
+             ($setuname,$setudom,$title) = @data;
+         }
+         $blocks = { 'com' => 'on' };
+     }
+     return ($setuname,$setudom,$title,$blocks);
+ }
+ sub build_block_table {
+     my ($startblock,$endblock,$setters) = @_;
+     my %lt = &Apache::lonlocal::texthash(
+         'cacb' => 'Currently active communication blocks',
+         'cour' => 'Course',
+         'dura' => 'Duration',
+         'blse' => 'Block set by'
+     );
+     my $output;
+     $output = '<br />'.$lt{'cacb'}.':<br />';
+     $output .= &start_data_table();
+     $output .= '
+ <tr>
+  <th>'.$lt{'cour'}.'</th>
+  <th>'.$lt{'dura'}.'</th>
+  <th>'.$lt{'blse'}.'</th>
+ </tr>
+ ';
+     foreach my $course (keys(%{$setters})) {
+         my %courseinfo=&Apache::lonnet::coursedescription($course);
+         for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
+             my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
+             my $fullname = &plainname($uname,$udom);
+             if (defined($env{'user.name'}) && defined($env{'user.domain'})
+                 && $env{'user.name'} ne 'public'
+                 && $env{'user.domain'} ne 'public') {
+                 $fullname = &aboutmewrapper($fullname,$uname,$udom);
+             }
+             my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
+             $openblock = &Apache::lonlocal::locallocaltime($openblock);
+             $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
+             $output .= &Apache::loncommon::start_data_table_row().
+                        '<td>'.$courseinfo{'description'}.'</td>'.
+                        '<td>'.$openblock.' to '.$closeblock.'</td>'.
+                        '<td>'.$fullname.'</td>'.
+                         &Apache::loncommon::end_data_table_row();
+         }
+     }
+     $output .= &end_data_table();
+ }
+ sub blocking_status {
+     my ($activity,$uname,$udom) = @_;
+     my %setters;
+     my ($blocked,$output,$ownitem,$is_course);
+     my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
+     if ($startblock && $endblock) {
+         $blocked = 1;
+         if (wantarray) {
+             my $category;
+             if ($activity eq 'boards') {
+                 $category = 'Discussion posts in this course';
+             } elsif ($activity eq 'blogs') {
+                 $category = 'Blogs';
+             } elsif ($activity eq 'port') {
+                 if (defined($uname) && defined($udom)) {
+                     if ($uname eq $env{'user.name'} &&
+                         $udom eq $env{'user.domain'}) {
+                         $ownitem = 1;
+                     }
+                 }
+                 $is_course = &Apache::lonnet::is_course($udom,$uname);
+                 if ($ownitem) {
+                     $category = 'Your portfolio files';
+                 } elsif ($is_course) {
+                     my $coursedesc;
+                     foreach my $course (keys(%setters)) {
+                         my %courseinfo =
+                              &Apache::lonnet::coursedescription($course);
+                         $coursedesc = $courseinfo{'description'};
+                     }
+                     $category = "Group files in the course '$coursedesc'";
+                 } else {
+                     $category = 'Portfolio files belonging to ';
+                     if ($env{'user.name'} eq 'public' &&
+                         $env{'user.domain'} eq 'public') {
+                         $category .= &plainname($uname,$udom);
+                     } else {
+                         $category .= &aboutmewrapper(&plainname($uname,$udom),$uname,$udom);
+                     }
+                 }
+             } elsif ($activity eq 'groups') {
+                 $category = 'Groups in this course';
+             }
+             my $showstart = &Apache::lonlocal::locallocaltime($startblock);
+             my $showend = &Apache::lonlocal::locallocaltime($endblock);
+             $output = '<br />'.&mt('[_1] will be inaccessible between [_2] and [_3] because communication is being blocked.',$category,$showstart,$showend).'<br />';
+             if (!($activity eq 'port' && !($ownitem) && !($is_course))) {
+                 $output .= &build_block_table($startblock,$endblock,\%setters);
+             }
+         }
+     }
+     if (wantarray) {
+         return ($blocked,$output);
+     } else {
+         return $blocked;
+     }
+ }
+ ###############################################
+ 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; }
+     }
+     return $allowed;
+ }
  ###############################################
  =pod
- Line 2685  Returns: Determines which domain should
+ Line 3849  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'};
          if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
- Line 2696  sub determinedomain {
+ Line 3860  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'],$udom);
+     my (%designhash,%legacy);
+     if (keys(%domconfig) > 0) {
+         if (ref($domconfig{'login'}) eq 'HASH') {
+             if (keys(%{$domconfig{'login'}})) {
+                 foreach my $key (keys(%{$domconfig{'login'}})) {
+                     $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+                 }
+             } else {
+                 $legacy{'login'} = 1;
+             }
+         } else {
+             $legacy{'login'} = 1;
+         }
+         if (ref($domconfig{'rolecolors'}) eq 'HASH') {
+             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 (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 2709  If the domain logo does not exist, a des
+ Line 3960  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 2737  Returns: value of designparamter $which
+ Line 3996  Returns: value of designparamter $which
  sub designparm {
      my ($which,$domain)=@_;
      if ($env{'browser.blackwhite'} eq 'on') {
- 	if ($which=~/\.(font|alink|vlink|link)$/) {
+ 	if ($which=~/\.(font|alink|vlink|link|textcol)$/) {
  	    return '#000000';
  	}
- 	if ($which=~/\.(pgbg|sidebg)$/) {
+ 	if ($which=~/\.(pgbg|sidebg|bgcol)$/) {
  	    return '#FFFFFF';
  	}
  	if ($which=~/\.tabbg$/) {
- Line 2751  sub designparm {
+ Line 4010  sub designparm {
  	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 {
-         return $designhash{'default.'.$which};
+         $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;
  }
  ###############################################
- Line 2765  sub designparm {
+ Line 4037  sub designparm {
  =back
- =head1 HTTP Helpers
+ =head1 HTML Helpers
  =over 4
- Line 2804  Inputs:
+ Line 4076  Inputs:
  =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
  Returns: A uniform header for LON-CAPA web pages.
- Line 2815  other decorations will be returned.
+ Line 4093  other decorations will be returned.
  sub bodytag {
      my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
- 	$notopbar,$bgcolor,$notitle,$no_inline_link)=@_;
+ 	$notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
-     $title=&mt($title);
+     if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
      $function = &get_users_function() if (!$function);
      my $img =    &designparm($function.'.img',$domain);
- Line 2830  sub bodytag {
+ Line 4108  sub bodytag {
                     'alink'   => &designparm($function.'.alink',$domain),
  		   'vlink'   => &designparm($function.'.vlink',$domain),
  		   'link'    => &designparm($function.'.link',$domain),);
-     @$addentries{keys(%design)} = @design{keys(%design)};
+     @design{keys(%$addentries)} = @$addentries{keys(%$addentries)};
   # 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'}) {
- Line 2847  sub bodytag {
+ Line 4125  sub bodytag {
      } 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,$addentries);
+     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
- Line 2875  sub bodytag {
+ Line 4149  sub bodytag {
      }
      my $name = &plainname($env{'user.name'},$env{'user.domain'});
+     if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+ 	undef($role);
+     } else {
+ 	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
+     }
      my $roleinfo=(<<ENDROLE);
  <td class="LC_title_bar_who">
- Line 2907  ENDROLE
+ Line 4186  ENDROLE
          $dc_info = '('.$dc_info.')';
      }
-     if ($env{'environment.remote'} eq 'off') {
+     if (($env{'environment.remote'} eq 'off') || ($args->{'suppress_header_logos'})) {
          # No Remote
  	if ($env{'request.state'} eq 'construct') {
  	    $forcereg=1;
- Line 2930  ENDROLE
+ Line 4209  ENDROLE
  		$lastitem = $thisdisfn;
  	    }
  	    $titleinfo =
- 		&Apache::loncommon::help_open_menu('','',3,'Authoring').
+ 		&Apache::loncommon::help_open_menu('','',3,'Authoring')
- 		'<b>Construction Space</b>:&nbsp;'.
+ 		.'<b>'.&mt('Construction Space').'</b>:&nbsp;'
- 		'<form name="dirs" method="post" action="'.$formaction
+ 		.'<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()')
- Line 2965  ENDROLE
+ Line 4244  ENDROLE
  # Top frame rendering, Remote is up
  #
-     my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
+     my $imgsrc = $img;
-         $lonhttpdPort.$img.'" alt="'.$function.'" />';
+     if ($img =~ /^\/adm/) {
+         $imgsrc = &lonhttpdurl($img);
+     }
+     my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
      # Explicit link to get inline menu
      my $menu= ($no_inline_link?''
- Line 3049  sub make_attr_string {
+ Line 4331  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 3091  Inputs: (all optional)
+ Line 4370  Inputs: (all optional)
              function       -> force usage of a specific rolish color scheme
              bgcolor        -> override the default page bgcolor
- =back
  =cut
  sub standard_css {
- Line 3110  sub standard_css {
+ Line 4387  sub standard_css {
      my $vlink  = &designparm($function.'.vlink', $domain);
      my $link   = &designparm($function.'.link',  $domain);
-     my $sans                 = 'Arial,Helvetica,sans-serif';
+     my $sans                 = 'Verdana,Arial,Helvetica,sans-serif';
      my $mono                 = 'monospace';
      my $data_table_head      = $tabbg;
      my $data_table_light     = '#EEEEEE';
-     my $data_table_dark      = '#DDD';
+     my $data_table_dark      = '#DDDDDD';
-     my $data_table_darker    = '#CCC';
+     my $data_table_darker    = '#CCCCCC';
      my $data_table_highlight = '#FFFF00';
      my $mail_new             = '#FFBB77';
      my $mail_new_hover       = '#DD9955';
- Line 3126  sub standard_css {
+ Line 4403  sub standard_css {
      my $mail_other           = '#99BBBB';
      my $mail_other_hover     = '#669999';
      my $table_header         = '#DDDDDD';
+     my $feedback_link_bg     = '#BBBBBB';
+     my $border = ($env{'browser.type'} eq 'explorer' ||
+ 		  $env{'browser.type'} eq 'safari'     ) ? '0px 2px 0px 2px'
+ 	                                                 : '0px 3px 0px 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 }
- table.thinborder { border-collapse: collapse; }
+ table.thinborder,
- table.thinborder tr th {  border-style: solid; border-width: 1px; background: $tabbg;}
- table.thinborder tr td { border-style: solid; border-width: 1px}
+ table.thinborder tr th {
+   border-style: solid;
+   border-width: 1px;
+   background: $tabbg;
+ }
+ table.thinborder tr td {
+   border-style: solid;
+   border-width: 1px
+ }
  form, .inline { display: inline; }
  .center { text-align: center; }
- .LC_filename {font-family: $mono;}
+ .LC_filename {font-family: $mono; white-space:pre;}
  .LC_error {
    color: red;
    font-size: larger;
  }
- .LC_warning {
+ .LC_warning,
+ .LC_diff_removed {
    color: red;
  }
- .LC_success {
+ .LC_info,
+ .LC_success,
+ .LC_diff_added {
    color: green;
  }
+ .LC_unknown {
+   color: yellow;
+ }
+ .LC_icon {
+   border: 0px;
+ }
+ .LC_indexer_icon {
+   border: 0px;
+   height: 22px;
+ }
+ .LC_docs_spacer {
+   width: 25px;
+   height: 1px;
+   border: 0px;
+ }
+ .LC_internal_info {
+   color: #999;
+ }
+ table.LC_pastsubmission {
+   border: 1px solid black;
+   margin: 2px;
+ }
- table#LC_top_nav, table#LC_menubuttons {
+ table#LC_top_nav, table#LC_menubuttons,table#LC_nav_location {
    width: 100%;
    background: $pgbg;
    border: 2px;
- Line 3158  table#LC_top_nav, table#LC_menubuttons {
+ Line 4476  table#LC_top_nav, table#LC_menubuttons {
    padding: 0px;
  }
- table#LC_title_bar, table.LC_breadcrumbs, table#LC_nav_location,
+ table#LC_title_bar, table.LC_breadcrumbs,
  table#LC_title_bar.LC_with_remote {
    width: 100%;
    border-color: $pgbg;
- Line 3189  table#LC_title_bar td.LC_title_bar_who {
+ Line 4507  table#LC_title_bar td.LC_title_bar_who {
    font: small $sans;
    text-align: right;
  }
+ span.LC_metadata {
+     font-family: $sans;
+ }
  span.LC_title_bar_title {
    font: bold x-large $sans;
  }
- Line 3203  table#LC_title_bar td.LC_title_bar_role_
+ Line 4524  table#LC_title_bar td.LC_title_bar_role_
  }
  table#LC_menubuttons_mainmenu {
-   background: $pgbg;
+   width: 100%;
    border: 0px;
    border-spacing: 1px;
    padding: 0px 1px;
- Line 3224  table#LC_top_nav td a, div#LC_top_nav a
+ Line 4545  table#LC_top_nav td a, div#LC_top_nav a
  }
  table#LC_top_nav td.LC_top_nav_logo {
    background: $tabbg;
-   text-align: right;
+   text-align: left;
    white-space: nowrap;
-   font-weight: bold;
+   width: 31px;
  }
  table#LC_top_nav td.LC_top_nav_logo img {
-   margin-left: 0.2em;
+   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;
+   text-align: center;
+ }
  table.LC_breadcrumbs td, table.LC_docs_path td  {
    background: $tabbg;
    color: $font;
- Line 3249  table.LC_docs_path td.LC_docs_path_compo
+ Line 4578  table.LC_docs_path td.LC_docs_path_compo
  td.LC_table_cell_checkbox {
    text-align: center;
  }
+ table#LC_mainmenu td.LC_mainmenu_column {
+     vertical-align: top;
+ }
  .LC_menubuttons_inline_text {
    color: $font;
- Line 3256  td.LC_table_cell_checkbox {
+ Line 4588  td.LC_table_cell_checkbox {
    font-size: smaller;
  }
+ .LC_menubuttons_link {
+   text-decoration: none;
+ }
+ #2008--9-5: new menu style sheet.Changed category
+ .LC_menubuttons_category {
+   color: $font;
+   background: $pgbg;
+   font-family: $sans;
+   font-size: larger;
+   font-weight: bold;
+ }
  td.LC_menubuttons_text {
+   width: 90%;
    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;
+   background: $tabbg;
    font-weight: bold;
  }
+ .LC_rolesmenu_is {
+   font-family: $sans;
+ }
+ .LC_rolesmenu_selected {
+   font-family: $sans;
+ }
+ .LC_rolesmenu_future {
+   font-family: $sans;
+ }
+ .LC_rolesmenu_will {
+   font-family: $sans;
+ }
+ .LC_rolesmenu_will_not {
+   font-family: $sans;
+ }
+ .LC_rolesmenu_expired {
+   font-family: $sans;
+ }
+ .LC_rolesinfo {
+   font-family: $sans;
+ }
+ .LC_dropadd_labeltext {
+   font-family: $sans;
+   text-align: right;
+ }
+ .LC_preferences_labeltext {
+   font-family: $sans;
+   text-align: right;
+ }
+ .LC_roleslog_note {
+   font-size: smaller;
+ }
+ table.LC_aboutme_port {
+   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: 0px;
+   width: 100%;
+ }
+ table.LC_nested {
+   border: 0px;
+   border-collapse: collapse;
+   border-spacing: 0px;
+   width: 100%;
+ }
+ table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th,
+ table.LC_prior_tries tr th {
    font-weight: bold;
    background-color: $data_table_head;
    font-size: smaller;
  }
- table.LC_data_table tr td {
+ table.LC_data_table tr.LC_odd_row > td,
+ table.LC_aboutme_port tr td {
    background-color: $data_table_light;
    padding: 2px;
  }
- table.LC_data_table tr.LC_even_row td {
+ table.LC_data_table tr.LC_even_row > td,
+ table.LC_aboutme_port tr.LC_even_row td {
    background-color: $data_table_dark;
  }
  table.LC_data_table tr.LC_data_table_highlight td {
    background-color: $data_table_darker;
  }
- table.LC_data_table tr.LC_empty_row td {
+ 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_nested tr.LC_empty_row td {
    background-color: #FFFFFF;
    font-weight: bold;
    font-style: italic;
    text-align: center;
    padding: 8px;
  }
+ table.LC_nested tr.LC_empty_row td {
+   padding: 4ex
+ }
+ table.LC_nested_outer tr th {
+   font-weight: bold;
+   background-color: $data_table_head;
+   font-size: smaller;
+   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_nested tr.LC_info_row td {
+   background-color: #CCC;
+   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: #FFF;
+   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_nested tr.LC_odd_row td {
+   background-color: #EEE;
+ }
+ table.LC_createuser {
+ }
+ table.LC_createuser tr.LC_section_row td {
+   font-size: smaller;
+ }
+ table.LC_createuser tr.LC_info_row td  {
+   background-color: #CCC;
+   font-weight: bold;
+   text-align: center;
+ }
  table.LC_calendar {
    border: 1px solid #000000;
- Line 3345  table.LC_mail_list tr.LC_mail_other {
+ Line 4814  table.LC_mail_list tr.LC_mail_other {
  table.LC_mail_list tr.LC_mail_other:hover {
    background-color: $mail_other_hover;
  }
+ table.LC_mail_list tr.LC_mail_even {
+ }
+ table.LC_mail_list tr.LC_mail_odd {
+ }
  table#LC_portfolio_actions {
    width: auto;
- Line 3401  table#LC_browser tr.LC_browser_file_unpu
+ Line 4875  table#LC_browser tr.LC_browser_file_unpu
  table#LC_browser tr.LC_browser_file_obsolete {
    background: #AAAAAA;
  }
- table#LC_browser tr.LC_browser_file_modified {
+ table#LC_browser tr.LC_browser_file_modified,
+ table#LC_browser tr.LC_browser_file_metamodified {
    background: #FFFF77;
  }
  table#LC_browser tr.LC_browser_folder {
- Line 3497  table#LC_helpmenu_links a:hover {
+ Line 4972  table#LC_helpmenu_links a:hover {
    border: 1px solid #8888FF;
    background: #CCCCFF;
  }
  table.LC_pick_box {
-   width: 100%;
    border-collapse: separate;
    background: white;
    border: 1px solid black;
- Line 3512  table.LC_pick_box td.LC_pick_box_title {
+ Line 4985  table.LC_pick_box td.LC_pick_box_title {
    width: 184px;
    padding: 8px;
  }
+ table.LC_pick_box td.LC_selfenroll_pick_box_title {
+   background: $tabbg;
+   font-weight: bold;
+   text-align: right;
+   width: 350px;
+   padding: 8px;
+ }
+ table.LC_pick_box td.LC_pick_box_value {
+   text-align: left;
+   padding: 8px;
+ }
+ table.LC_pick_box td.LC_pick_box_select {
+   text-align: left;
+   padding: 8px;
+ }
  table.LC_pick_box td.LC_pick_box_separator {
    padding: 0px;
    height: 1px;
- Line 3520  table.LC_pick_box td.LC_pick_box_separat
+ Line 5009  table.LC_pick_box td.LC_pick_box_separat
  table.LC_pick_box td.LC_pick_box_submit {
    text-align: right;
  }
+ table.LC_pick_box td.LC_evenrow_value {
+   text-align: left;
+   padding: 8px;
+   background-color: $data_table_light;
+ }
+ table.LC_pick_box td.LC_oddrow_value {
+   text-align: left;
+   padding: 8px;
+   background-color: $data_table_light;
+ }
+ table.LC_helpform_receipt {
+   width: 620px;
+   border-collapse: separate;
+   background: white;
+   border: 1px solid black;
+   border-spacing: 1px;
+ }
+ table.LC_helpform_receipt td.LC_pick_box_title {
+   background: $tabbg;
+   font-weight: bold;
+   text-align: right;
+   width: 184px;
+   padding: 8px;
+ }
+ table.LC_helpform_receipt td.LC_evenrow_value {
+   text-align: left;
+   padding: 8px;
+   background-color: $data_table_light;
+ }
+ table.LC_helpform_receipt td.LC_oddrow_value {
+   text-align: left;
+   padding: 8px;
+   background-color: $data_table_light;
+ }
+ table.LC_helpform_receipt td.LC_pick_box_separator {
+   padding: 0px;
+   height: 1px;
+   background: black;
+ }
+ span.LC_helpform_receipt_cat {
+   font-weight: bold;
+ }
  table.LC_group_priv_box {
    background: white;
    border: 1px solid black;
- Line 3588  table.LC_descriptive_input td.LC_descrip
+ Line 5118  table.LC_descriptive_input td.LC_descrip
    text-align: right;
    font-weight: bold;
  }
+ div.LC_feedback_link {
+   clear: both;
+   background: white;
+   width: 100%;
+ }
+ 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: #AAFFAA;
+   color: black;
+ }
+ .LC_answer_charged_try {
+   background: #FFAAAA ! important;
+   color: black;
+ }
+ .LC_answer_not_charged_try,
+ .LC_answer_no_grade,
+ .LC_answer_late {
+   background: #FFFFAA;
+   color: black;
+ }
+ .LC_answer_previous {
+   background: #AAAAFF;
+   color: black;
+ }
+ .LC_answer_no_message {
+   background: #FFFFFF;
+   color: black;
+ }
+ .LC_answer_unknown {
+   background: orange;
+   color: black;
+ }
+ span.LC_prior_numerical,
+ span.LC_prior_string,
+ span.LC_prior_custom,
+ span.LC_prior_reaction,
+ span.LC_prior_math {
+   font-family: monospace;
+   white-space: pre;
+ }
+ span.LC_prior_string {
+   font-family: monospace;
+   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;
+ }
+ span.LC_nobreak {
+   white-space: nowrap;
+ }
+ span.LC_cusr_emph {
+   font-style: italic;
+ }
+ span.LC_cusr_subheading {
+   font-weight: normal;
+   font-size: 85%;
+ }
+ table.LC_docs_documents {
+   background: #BBBBBB;
+   border-width: 0px;
+   border-collapse: collapse;
+ }
+ table.LC_docs_documents td.LC_docs_document {
+   border: 2px solid black;
+   padding: 4px;
+ }
+ .LC_docs_course_commands div {
+   float: left;
+   border: 4px solid #AAAAAA;
+   padding: 4px;
+   background: #DDDDCC;
+ }
+ .LC_docs_entry_move {
+   border: 0px;
+   border-collapse: collapse;
+ }
+ .LC_docs_entry_move td {
+   border: 2px solid #BBBBBB;
+   background: #DDDDDD;
+ }
+ .LC_docs_editor td.LC_docs_entry_commands {
+   background: #DDDDDD;
+   font-size: x-small;
+ }
+ .LC_docs_copy {
+   color: #000099;
+ }
+ .LC_docs_cut {
+   color: #550044;
+ }
+ .LC_docs_rename {
+   color: #009900;
+ }
+ .LC_docs_remove {
+   color: #990000;
+ }
+ .LC_docs_reinit_warn,
+ .LC_docs_ext_edit {
+   font-size: x-small;
+ }
+ .LC_docs_editor td.LC_docs_entry_title,
+ .LC_docs_editor td.LC_docs_entry_icon {
+   background: #FFFFBB;
+ }
+ .LC_docs_editor td.LC_docs_entry_parameter {
+   background: #BBBBFF;
+   font-size: x-small;
+   white-space: nowrap;
+ }
+ table.LC_docs_adddocs td,
+ table.LC_docs_adddocs th {
+   border: 1px solid #BBBBBB;
+   padding: 4px;
+   background: #DDDDDD;
+ }
+ table.LC_sty_begin {
+   background: #BBFFBB;
+ }
+ table.LC_sty_end {
+   background: #FFBBBB;
+ }
+ table.LC_double_column {
+   border-width: 0px;
+   border-collapse: collapse;
+   width: 100%;
+   padding: 2px;
+ }
+ table.LC_double_column tr td.LC_left_col {
+   top: 2px;
+   left: 2px;
+   width: 47%;
+   vertical-align: top;
+ }
+ table.LC_double_column tr td.LC_right_col {
+   top: 2px;
+   right: 2px;
+   width: 47%;
+   vertical-align: top;
+ }
+ span.LC_role_level {
+   font-weight: bold;
+ }
+ div.LC_left_float {
+   float: left;
+   padding-right: 5%;
+   padding-bottom: 4px;
+ }
+ div.LC_clear_float_header {
+   padding-bottom: 2px;
+ }
+ div.LC_clear_float_footer {
+   padding-top: 10px;
+   clear: both;
+ }
+ div.LC_grade_select_mode {
+   font-family: $sans;
+ }
+ div.LC_grade_select_mode div div {
+   margin: 5px;
+ }
+ div.LC_grade_select_mode_selector {
+   margin: 5px;
+   float: left;
+ }
+ div.LC_grade_select_mode_selector_header {
+   font: bold medium $sans;
+ }
+ div.LC_grade_select_mode_type {
+   clear: left;
+ }
+ div.LC_grade_show_user {
+   margin-top: 20px;
+   border: 1px solid black;
+ }
+ div.LC_grade_user_name {
+   background: #DDDDEE;
+   border-bottom: 1px solid black;
+   font: bold large $sans;
+ }
+ div.LC_grade_show_user_odd_row div.LC_grade_user_name {
+   background: #DDEEDD;
+ }
+ div.LC_grade_show_problem,
+ div.LC_grade_submissions,
+ div.LC_grade_message_center,
+ div.LC_grade_info_links,
+ div.LC_grade_assign {
+   margin: 5px;
+   width: 99%;
+   background: #FFFFFF;
+ }
+ div.LC_grade_show_problem_header,
+ div.LC_grade_submissions_header,
+ div.LC_grade_message_center_header,
+ div.LC_grade_assign_header {
+   font: bold large $sans;
+ }
+ div.LC_grade_show_problem_problem,
+ div.LC_grade_submissions_body,
+ div.LC_grade_message_center_body,
+ div.LC_grade_assign_body {
+   border: 1px solid black;
+   width: 99%;
+   background: #FFFFFF;
+ }
+ span.LC_grade_check_note {
+   font: normal medium $sans;
+   display: inline;
+   position: absolute;
+   right: 1em;
+ }
+ table.LC_scantron_action {
+   width: 100%;
+ }
+ table.LC_scantron_action tr th {
+   font: normal bold $sans;
+ }
+ div.LC_edit_problem_header,
+ div.LC_edit_problem_footer {
+   font: normal medium $sans;
+   margin: 2px;
+ }
+ div.LC_edit_problem_header,
+ div.LC_edit_problem_header div,
+ div.LC_edit_problem_footer,
+ div.LC_edit_problem_footer div,
+ div.LC_edit_problem_editxml_header,
+ div.LC_edit_problem_editxml_header div {
+   margin-top: 5px;
+ }
+ div.LC_edit_problem_header_edit_row {
+   background: $tabbg;
+   padding: 3px;
+   margin-bottom: 5px;
+ }
+ div.LC_edit_problem_header_title {
+   font: larger bold $sans;
+   background: $tabbg;
+   padding: 3px;
+ }
+ table.LC_edit_problem_header_title {
+   font: larger bold $sans;
+   width: 100%;
+   border-color: $pgbg;
+   border-style: solid;
+   border-width: $border;
+   background: $tabbg;
+   border-collapse: collapse;
+   padding: 0px
+ }
+ div.LC_edit_problem_discards {
+   float: left;
+   padding-bottom: 5px;
+ }
+ div.LC_edit_problem_saves {
+   float: right;
+   padding-bottom: 5px;
+ }
+ hr.LC_edit_problem_divide {
+   clear: both;
+   color: $tabbg;
+   background-color: $tabbg;
+   height: 3px;
+   border: 0px;
+ }
+ img.stift{
+   border-width:0;
+   vertical-align:middle;
+ }
+ table#LC_mainmenu{
+  margin-top:10px;
+  width:80%;
+ }
+ table#LC_mainmenu td.LC_mainmenu_col_fieldset{
+   vertical-align: top;
+   width: 45%;
+ }
+ .LC_mainmenu_fieldset_category {
+   color: $font;
+   background: $pgbg;
+   font-family: $sans;
+   font-size: small;
+   font-weight: bold;
+ }
+ fieldset#LC_mainmenu_fieldset {
+   margin:0px 10px 10px 0px;
+ }
+ /* ---- Remove when done ----
+ # The following styles is part of the redesign of LON-CAPA and are
+ # subject to change during this project.
+ # Don't rely on their current functionality as they might be
+ # changed or removed.
+ # --------------------------*/
+ body {
+ 	font-family: Tahoma, Arial,Helvetica,sans-serif;
+ 	font-size: 0.85em;
+ 	line-height: 130%;
+ 	color: RGB(45, 45, 45);
+ }
+ a:link,a:visited {
+ 	/*color: RGB(0, 118, 127);*/
+ 	/*text-decoration: underline;*/
+ }
+ a:hover{
+ 	text-decoration:none;
+ }
+ /*a:hover,
+ UL.smallMenu A:hover,
+ UL.MenuBreadcrumbs A:hover,
+ UL#TabMainMenuContent A:hover{
+ 	color: rgb(200, 10, 50);
+ }*/
+ h1 {
+ 	padding:5px 10px 5px 20px;
+ 	line-height:130%;
+ }
+ h2,h4,h6 {
+ 	/*color: RGB(0, 118, 127);*/
+ }
+ h2,h3,h4,h5,h6
+ {
+ margin:5px 0px 5px 0px;
+ line-height:130%;
+ }
+ .right {
+ 	text-align: right;
+ }
+ .center {
+ 	text-align: center;
+ }
+ .left {
+ 	text-align: left;
+ }
+ .HeadRight {
+ 	text-align: right;
+ 	float: right;
+ 	margin: 0px;
+ 	padding: 0px;
+ 	 right:0;
+         position:absolute;
+ }
+ img {
+ /*	border: 0px; */
+ }
+ .personalBgColor {
+ 	background: RGB(237, 239, 0) url(images/headHighlight.png) repeat-y left top;
+ }
+ p {
+ 	padding: 10px;
+ }
+ DL,UL,Div,Fieldset {
+ 	/*margin: 10px;*/
+ 	overflow:hidden;
+ }
+ OL.smallMenu {
+ 	margin: 0px 0px 0px 0px;
+ }
+ OL.smallMenu li {
+ 	display: inline;
+ 	padding: 5px 5px 0px 10px;
+ 	vertical-align: top;
+ }
+ OL.smallMenu li img {
+ 	vertical-align: bottom;
+ }
+ OL.smallMenu A {
+ 	font-size: 90%;
+ 	color: RGB(80, 80, 80);
+ 	text-decoration: none;
+ }
+ OL#TabMainMenuContent {
+ 	margin: 0px 0px 10px 0px;
+ 	padding: 0px;
+ }
+ OL#TabMainMenuContent LI {
+ 	display: inline;
+ 	vertical-align: bottom;
+ 	border-bottom: solid 1px RGB(175, 175, 175);
+ 	border-right: solid 1px RGB(175, 175, 175);
+ 	padding: 5px 15px 5px 15px;
+ 	margin-right:4px;
+ 	line-height: 140%;
+ 	font-weight: bold;
+ 	overflow:hidden;
+ 	background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left top;
+ }
+ OL#TabMainMenuContent LI A {
+ 	color: RGB(47, 47, 47);
+ 	text-decoration: none;
+ }
+ OL#TabMainMenuContent DIV.columnSection {
+ 	margin-bottom: 0px;
+ }
+ OL#MenuBreadcrumbs {
+ 	border-top: solid 1px RGB(255, 255, 255);
+ 	height: 20px;
+ 	line-height: 20px;
+ 	vertical-align: bottom;
+ 	margin: 0px 0px 30px 0px;
+ 	padding-left: 10px;
+ 	list-style-position: inside;
+ 	background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left
+ 		top;
+ }
+ OL#MenuBreadcrumbs li {
+ 	background: url(images/pfeil_white.png) no-repeat left center;
+ 	display: inline;
+ 	padding: 0px 0px 0px 10px;
+ 	vertical-align: bottom;
+ 	overflow:hidden;
+ }
+ OL#MenuBreadcrumbs LI A {
+ 	text-decoration: none;
+ 	font-size:90%;
+ }
+ h4.hcell {
+ 	padding: 3px 10px 3px 10px;
+ 	margin: 0px;
+ 	background: RGB(0, 118, 127);
+ 	color: white;
+ 	border: outset 1px;
+ }
+ DIV.DivContentBoxSpecial
+ {
+ 	border: solid 1px RGB(100, 100, 100);
+ }
+ FIELDSET
+ {
+ 	/*width:78%;*/
+ }
+ DIV.DivContentBox,
+ DIV.DivContentBoxSpecial {
+ 	width: 80%;
+ 	margin:10px;
+ }
+ FIELDSET legend,DL DT {
+ 	font-weight: bold;
+ 	font-size: 110%;
+ 	/*padding-left: 0px;*/
+ /*	margin-left: 0px;*/
+ }
+ DIV.DivImportant {
+ 	background: url(images/important.png) no-repeat center top;
+ 	padding: 100px 10px 10px 10px;
+ 	width: 200px;
+ 	border: double 4px RGB(200, 200, 200);
+ }
+ DL.ListStyleClean DT {
+ 	padding-right: 5px;
+ 	display: table-header-group;
+ }
+ DL.ListStyleClean DD {
+ 	display: table-row;
+ }
+ .ListStyleClean,
+ .ListStyleSimple,
+ .ListStyleNormal,
+ .ListStyleNormal_Border,
+ .ListStyleSpecial
+ 	{
+ 	/*display:block;	*/
+ 	width: 400px;
+ 	list-style-position: inside;
+ 	list-style-type: none;
+ 	overflow: hidden;
+ 	padding: 0px;
+ }
+ .ListStyleClean li,
+ .ListStyleSimple li,
+ .ListStyleSimple DD,
+ .ListStyleNormal li,
+ .ListStyleNormal DD,
+ .ListStyleSpecial li,
+ .ListStyleSpecial DD
+ 	{
+ 	margin: 0px;
+ 	padding: 5px 5px 5px 10px;
+ 	clear: both;
+ 	/*display:block;*/
+ }
+ .ListStyleClean LI,
+ .ListStyleClean DD {
+ 	padding-top: 0px;
+ 	padding-bottom: 0px;
+ }
+ .ListStyleSimple DD,
+ .ListStyleSimple LI{
+ 	border-bottom: solid 1px RGB(150, 150, 150);
+ }
+ .ListStyleSpecial LI,
+ .ListStyleSpecial DD {
+ 	list-style-type: none;
+ 	background-color: RGB(220, 220, 220);
+ 	margin-bottom: 4px;
+ }
+ table.SimpleTable *{
+ 	padding:10px;
+ 	}
+ table.SimpleTable td {
+ 	vertical-align:top;
+ 	border:solid 1px RGB(210,210,210);
+ }
+ table.SimpleTable thead{
+ 	 background:rgb(210,210,210);
+ }
+ DIV.columnSection {
+ 	display: block;
+ 	clear: both;
+ 	overflow: hidden;
+ 	margin:0px;
+ }
+ DIV.columnSection>* {
+ 	float: left;
+ 	margin: 10px 20px 10px 0px;
+ 	overflow:hidden;
+ }
+ DIV.columnSection>FIELDSET,
+ DIV.columnSection>DIV.DivContentBox,
+ DIV.columnSection>DIV.DivContentBoxSpecial
+ 	{
+ 	width: 480px;
+ }
+ .LC_loginpage_container {
+ 	text-align:left;
+ 	margin : 0 auto;
+ 	width:65%;
+ 	padding: 10px;
+ 	height: auto;
+ 	background-color:#FFFFFF;
+ 	border:1px solid #CCCCCC;
+ }
+ .LC_loginpage_loginContainer {
+ 	float:left;
+ 	width:60%;
+ }
+ .LC_loginpage_loginInfo {
+ 	margin-top:20px;
+ 	margin-left:20px;
+ 	float:left;
+ 	width:30%;
+ 	border:1px solid #CCCCCC;
+ 	padding:10px;
+ }
+ .LC_loginpage_space {
+ 	clear:both;
+ 	margin-bottom:20px;
+ 	border-bottom: 1px solid #CCCCCC;
+ }
+ .LC_loginpage_fieldset{
+ 	border: 1px solid #CCCCCC;
+ 	margin: 0 auto;
+ }
+ .LC_loginpage_legend{
+ 	padding: 2px;
+ 	margin: 0px;
+ 	font-size:14px;
+ 	font-weight:bold;
+ }
  END
  }
  =pod
- =over 4
  =item * &headtag()
  Returns a uniform footer for LON-CAPA web pages.
- Line 3616  Inputs: $title - optional title for the
+ Line 5820  Inputs: $title - optional title for the
                                 domain
              function       -> force usage of a specific rolish color scheme
              bgcolor        -> override the default page bgcolor
+             no_auto_mt_title
- =back
+                            -> prevent &mt()ing the title arg
  =cut
- Line 3628  sub headtag {
+ Line 5832  sub headtag {
      my $domain   = $args->{'domain'}   || &determinedomain();
      my $bgcolor  = $args->{'bgcolor'}  || &designparm($function.'.pgbg',$domain);
      my $url = join(':',$env{'user.name'},$env{'user.domain'},
+ 		   $Apache::lonnet::perlvar{'lonVersion'},
  		   #time(),
  		   $env{'environment.color.timestamp'},
  		   $function,$domain,$bgcolor);
- Line 3636  sub headtag {
+ Line 5841  sub headtag {
      my $result =
  	'<head>'.
- 	&font_settings().
+ 	&font_settings();
- 	&Apache::lonhtmlcommon::htmlareaheaders();
+     if (!$args->{'frameset'}) {
+ 	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
+     }
      if ($args->{'force_register'}) {
  	$result .= &Apache::lonmenu::registerurl(1);
      }
+     if (!$args->{'no_nav_bar'}
+ 	&& !$args->{'only_body'}
+ 	&& !$args->{'frameset'}) {
+ 	$result .= &help_menu_js();
+     }
      if (ref($args->{'redirect'})) {
  	my ($time,$url,$inhibit_continue) = @{$args->{'redirect'}};
- Line 3657  ADDMETA
+ Line 5869  ADDMETA
      if (!defined($title)) {
  	$title = 'The LearningOnline Network with CAPA';
      }
+     if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
-     $result .= '<title> LON-CAPA '.&mt($title).'</title>'
+     $result .= '<title> LON-CAPA '.$title.'</title>'
  	.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'
  	.$head_extra;
      return $result;
- Line 3666  ADDMETA
+ Line 5878  ADDMETA
  =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 3692  sub font_settings {
+ Line 5897  sub font_settings {
  =pod
- =over 4
  =item * &xml_begin()
  Returns the needed doctype and <html>
  Inputs: none
- =back
  =cut
  sub xml_begin {
      my $output='';
-     &Apache::lonhtmlcommon::init_htmlareafields();
+     if ($env{'internal.start_page'}==1) {
+ 	&Apache::lonhtmlcommon::init_htmlareafields();
+     }
      if ($env{'browser.mathml'}) {
  	$output='<?xml version="1.0"?>'
- Line 3726  sub xml_begin {
+ Line 5929  sub xml_begin {
  =pod
- =over 4
  =item * &endheadtag()
  Returns a uniform </head> for LON-CAPA web pages.
  Inputs: none
- =back
  =cut
  sub endheadtag {
- Line 3744  sub endheadtag {
+ Line 5943  sub endheadtag {
  =pod
- =over 4
  =item * &head()
  Returns a uniform complete <head>..</head> section for LON-CAPA web pages.
- Inputs: $title - optional title for the page
+ Inputs:
-         $head_extra - optional extra HTML to put inside the <head>
+ =over 4
+ $title - optional title for the page
+ $head_extra - optional extra HTML to put inside the <head>
  =back
- Line 3764  sub head {
+ Line 5966  sub head {
  =pod
- =over 4
  =item * &start_page()
  Returns a complete <html> .. <body> section for LON-CAPA web pages.
- Inputs: $title - optional title for the page
+ Inputs:
-         $head_extra - optional extra HTML to incude inside the <head>
-         $args - additional optional args supported are:
+ =over 4
-                   only_body      -> is true will set &bodytag() onlybodytag
+ $title - optional title for the page
+ $head_extra - optional extra HTML to incude inside the <head>
+ $args - additional optional args supported are:
+ =over 8
+              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() notopbar 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
+              body_title     -> alternate text to use instead of $title
                                      in the title box that appears, this text
                                      is not auto translated like the $title is
-                   frameset       -> if true will start with a <frameset>
+              frameset       -> if true will start with a <frameset>
                                      rather than <body>
-                   no_title       -> if true the title bar won't be shown
+              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_inline_link -> if true and in remote mode, don't show the
-                   no_inline_link -> if true and in remote mode, don't show the
                                      'Switch To Inline Menu' link
+              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
+ =back
  =back
- Line 3811  sub start_page {
+ Line 6025  sub start_page {
      #&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
      my %head_args;
      foreach my $arg ('redirect','force_register','domain','function',
- 		     'bgcolor') {
+ 		     'bgcolor','frameset','no_nav_bar','only_body',
+ 		     'no_auto_mt_title') {
  	if (defined($args->{$arg})) {
  	    $head_args{$arg} = $args->{$arg};
  	}
- Line 3837  sub start_page {
+ Line 6052  sub start_page {
  			 $args->{'only_body'},      $args->{'domain'},
  			 $args->{'force_register'}, $args->{'body_title'},
  			 $args->{'no_nav_bar'},     $args->{'bgcolor'},
- 			 $args->{'no_title'},       $args->{'no_inline_link'});
+ 			 $args->{'no_title'},       $args->{'no_inline_link'},
+ 			 $args);
  	}
      }
- Line 3853  sub start_page {
+ Line 6069  sub start_page {
  =pod
- =over 4
  =item * &head()
  Returns a complete </body></html> section for LON-CAPA web pages.
- Line 3866  Inputs:         $args - additional optio
+ Line 6080  Inputs:         $args - additional optio
                                   a html attribute
                   frameset     -> if true will start with a <frameset>
                                   rather than <body>
+                  dicsussion   -> if true will get discussion from
+                                   lonxml::xmlend
+                                  (you can pass the target and parser arguments
+                                   through optional 'target' and 'parser' args
+                                   to this routine)
  =cut
- Line 3885  sub end_page {
+ Line 6104  sub end_page {
      if ($args->{'frameset'}) {
  	$result .= '</frameset>';
      } else {
- 	$result .= &endbodytag();
+ 	$result .= &endbodytag($args);
      }
      $result .= "\n</html>";
- Line 3957  sub simple_error_page {
+ Line 6176  sub simple_error_page {
  }
  {
-     my $row_count;
+     my @row_count;
      sub start_data_table {
  	my ($add_class) = @_;
  	my $css_class = (join(' ','LC_data_table',$add_class));
- 	undef($row_count);
+ 	unshift(@row_count,0);
  	return '<table class="'.$css_class.'">'."\n";
      }
      sub end_data_table {
- 	undef($row_count);
+ 	shift(@row_count);
  	return '</table>'."\n";;
      }
      sub start_data_table_row {
  	my ($add_class) = @_;
- 	$row_count++;
+ 	$row_count[0]++;
- 	my $css_class = ($row_count % 2)?'':'LC_even_row';
+ 	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
+ 	$css_class = (join(' ',$css_class,$add_class));
+ 	return  '<tr class="'.$css_class.'">'."\n";;
+     }
+     sub continue_data_table_row {
+ 	my ($add_class) = @_;
+ 	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
  	$css_class = (join(' ',$css_class,$add_class));
  	return  '<tr class="'.$css_class.'">'."\n";;
      }
- Line 3983  sub simple_error_page {
+ Line 6209  sub simple_error_page {
      }
      sub start_data_table_empty_row {
- 	$row_count++;
+ 	$row_count[0]++;
  	return  '<tr class="LC_empty_row" >'."\n";;
      }
- Line 4000  sub simple_error_page {
+ Line 6226  sub simple_error_page {
      }
  }
+ =pod
+ =item * &inhibit_menu_check($arg)
+ Checks for a inhibitmenu state and generates output to preserve it
+ Inputs:         $arg - can be any of
+                      - undef - in which case the return value is a string
+                                to add  into arguments list of a uri
+                      - 'input' - in which case the return value is a HTML
+                                  <form> <input> field of type hidden to
+                                  preserve the value
+                      - a url - in which case the return value is the url with
+                                the neccesary cgi args added to preserve the
+                                inhibitmenu state
+                      - a ref to a url - no return value, but the string is
+                                         updated to include the neccessary cgi
+                                         args to preserve the inhibitmenu state
+ =cut
+ sub inhibit_menu_check {
+     my ($arg) = @_;
+     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
+     if ($arg eq 'input') {
+ 	if ($env{'form.inhibitmenu'}) {
+ 	    return '<input type="hidden" name="inhibitmenu" value="'.$env{'form.inhibitmenu'}.'" />';
+ 	} else {
+ 	    return
+ 	}
+     }
+     if ($env{'form.inhibitmenu'}) {
+ 	if (ref($arg)) {
+ 	    $$arg .= '?inhibitmenu='.$env{'form.inhibitmenu'};
+ 	} elsif ($arg eq '') {
+ 	    $arg .= 'inhibitmenu='.$env{'form.inhibitmenu'};
+ 	} else {
+ 	    $arg .= '?inhibitmenu='.$env{'form.inhibitmenu'};
+ 	}
+     }
+     if (!ref($arg)) {
+ 	return $arg;
+     }
+ }
  ###############################################
  =pod
+ =back
+ =head1 User Information Routines
+ =over 4
  =item * &get_users_function()
  Used by &bodytag to determine the current users primary role.
- Line 4031  sub get_users_function {
+ Line 6308  sub get_users_function {
  =pod
- =item * &check_user_status
+ =item * &check_user_status()
  Determines current status of supplied role for a
  specific user. Roles can be active, previous or future.
- Line 4204  previous, future, or all.
+ Line 6481  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 4218  of the possibility of multiple values fo
+ Line 6500  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 4238  sub get_course_users {
+ Line 6520  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 4257  sub get_course_users {
+ Line 6540  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 4265  sub get_course_users {
+ Line 6547  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::getkeys('nohist_userroles',$cdom,$cnum);
+         my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
-         foreach my $person (@coursepersonnel) {
+         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;
+             my $status;
              my ($role,$user,$usec) = ($person =~ /^([^:]*):([^:]+:[^:]+):([^:]*)/);
              $user =~ s/:$//;
-             if (($role) && (grep(/^\Q$role\E$/,@{$roles}))) {
+             my ($end,$start) = split(/:/,$coursepersonnel{$person});
+             if ($end == -1 || $start == -1) {
+                 next;
+             }
+             if (($role) && ((grep(/^\Q$role\E$/,@{$roles})) ||
+                 (grep(/^cr$/,@{$roles}) && $role =~ /^cr\//))) {
                  my ($uname,$udom) = split(/:/,$user);
                  if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {
                      if (grep(/^all$/,@{$sections})) {
- Line 4310  sub get_course_users {
+ Line 6620  sub get_course_users {
                      $usec = 'none';
                  }
                  if ($uname ne '' && $udom ne '') {
-                     my $status = &check_user_status($udom,$uname,$cdom,$cnum,$role,
+                     if ($hidepriv) {
-                                                     $usec);
+                         if ((&Apache::lonnet::privileged($uname,$udom)) &&
+                             (!$nothide{$uname.':'.$udom})) {
+                             next;
+                         }
+                     }
+                     if ($end > 0 && $end < $now) {
+                         $status = 'previous';
+                     } elsif ($start > $now) {
+                         $status = 'future';
+                     } else {
+                         $status = 'active';
+                     }
                      foreach my $type (keys(%{$types})) {
                          if ($status eq $type) {
                              if (!grep(/^\Q$type\E$/,@{$$users{$role}{$user}})) {
- Line 4327  sub get_course_users {
+ Line 6648  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 4336  sub get_course_users {
+ Line 6660  sub get_course_users {
                  my %csettings = &Apache::lonnet::get('environment',['internal.courseowner'],$cdom,$cnum);
                  if ( defined($csettings{'internal.courseowner'}) ) {
                      my $owner = $csettings{'internal.courseowner'};
-                     @{$$users{'ow'}{$owner.':'.$cdom}} = 'any';
+                     next if ($owner eq '');
+                     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 4361  sub get_user_info {
+ Line 6698  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;
  }
+ ###############################################
+ =pod
+ =item * &get_user_quota()
+ Retrieves quota assigned for storage of portfolio files for a user
+ Incoming parameters:
+. user's username
+. 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 maximal default
+ defined for the user's instituional status(es) in the domain.
+ =cut
+ ###############################################
+ sub get_user_quota {
+     my ($uname,$udom) = @_;
+     my ($quota,$quotatype,$settingstatus,$defquota);
+     if (!defined($udom)) {
+         $udom = $env{'user.domain'};
+     }
+     if (!defined($uname)) {
+         $uname = $env{'user.name'};
+     }
+     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::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 = $defquota;
+             $quotatype = 'default';
+         } else {
+             $quotatype = 'custom';
+         }
+     }
+     if (wantarray) {
+         return ($quota,$quotatype,$settingstatus,$defquota);
+     } else {
+         return $quota;
+     }
+ }
+ ###############################################
+ =pod
+ =item * &default_quota()
+ 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.
+ =cut
+ ###############################################
+ sub default_quota {
+     my ($udom,$inststatus) = @_;
+     my ($defquota,$settingstatus);
+     my %quotahash = &Apache::lonnet::get_dom('configuration',
+                                             ['quotas'],$udom);
+     if (ref($quotahash{'quotas'}) eq 'HASH') {
+         if ($inststatus ne '') {
+             my @statuses = split(/:/,$inststatus);
+             foreach my $item (@statuses) {
+                 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 '') {
+             $defquota = $quotahash{'quotas'}{'default'};
+             $settingstatus = 'default';
+         }
+     } else {
+         $settingstatus = 'default';
+         $defquota = 20;
+     }
+     if (wantarray) {
+         return ($defquota,$settingstatus);
+     } else {
+         return $defquota;
+     }
+ }
  sub get_secgrprole_info {
      my ($cdom,$cnum,$needroles,$type)  = @_;
      my %sections_count = &get_sections($cdom,$cnum);
- Line 4401  sub get_secgrprole_info {
+ Line 6888  sub get_secgrprole_info {
      return (\@sections,\@groups,$allroles,$rolehash,$accesshash);
  }
+ sub user_picker {
+     my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype) = @_;
+     my $currdom = $dom;
+     my %curr_selected = (
+                         srchin => 'dom',
+                         srchby => 'lastname',
+                       );
+     my $srchterm;
+     if ((ref($srch) eq 'HASH') && ($env{'form.origform'} ne 'crtusername')) {
+         if ($srch->{'srchby'} ne '') {
+             $curr_selected{'srchby'} = $srch->{'srchby'};
+         }
+         if ($srch->{'srchin'} ne '') {
+             $curr_selected{'srchin'} = $srch->{'srchin'};
+         }
+         if ($srch->{'srchtype'} ne '') {
+             $curr_selected{'srchtype'} = $srch->{'srchtype'};
+         }
+         if ($srch->{'srchdomain'} ne '') {
+             $currdom = $srch->{'srchdomain'};
+         }
+         $srchterm = $srch->{'srchterm'};
+     }
+     my %lt=&Apache::lonlocal::texthash(
+                     'usr'       => 'Search criteria',
+                     'doma'      => 'Domain/institution to search',
+                     'uname'     => 'username',
+                     'lastname'  => 'last name',
+                     'lastfirst' => 'last name, first name',
+                     'crs'       => 'in this course',
+                     'dom'       => 'in selected LON-CAPA domain',
+                     'alc'       => 'all LON-CAPA',
+                     'instd'     => 'in institutional directory for selected domain',
+                     'exact'     => 'is',
+                     'contains'  => 'contains',
+                     'begins'    => 'begins with',
+                     'youm'      => "You must include some text to search for.",
+                     'thte'      => "The text you are searching for must contain at least two characters when using a 'begins' type search.",
+                     'thet'      => "The text you are searching for must contain at least three characters when using a 'contains' type search.",
+                     'yomc'      => "You must choose a domain when using an institutional directory search.",
+                     'ymcd'      => "You must choose a domain when using a domain search.",
+                     'whus'      => "When using searching by last,first you must include a comma as separator between last name and first name.",
+                     'whse'      => "When searching by last,first you must include at least one character in the first name.",
+                      'thfo'     => "The following need to be corrected before the search can be run:",
+                                        );
+     my $domform = &select_dom_form($currdom,'srchdomain',1,1);
+     my $srchinsel = ' <select name="srchin">';
+     my @srchins = ('crs','dom','alc','instd');
+     foreach my $option (@srchins) {
+         # FIXME 'alc' option unavailable until
+         #       loncreateuser::print_user_query_page()
+         #       has been completed.
+         next if ($option eq 'alc');
+         next if ($option eq 'crs' && !$env{'request.course.id'});
+         if ($curr_selected{'srchin'} eq $option) {
+             $srchinsel .= '
+    <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+         } else {
+             $srchinsel .= '
+    <option value="'.$option.'">'.$lt{$option}.'</option>';
+         }
+     }
+     $srchinsel .= "\n  </select>\n";
+     my $srchbysel =  ' <select name="srchby">';
+     foreach my $option ('lastname','lastfirst','uname') {
+         if ($curr_selected{'srchby'} eq $option) {
+             $srchbysel .= '
+    <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+         } else {
+             $srchbysel .= '
+    <option value="'.$option.'">'.$lt{$option}.'</option>';
+          }
+     }
+     $srchbysel .= "\n  </select>\n";
+     my $srchtypesel = ' <select name="srchtype">';
+     foreach my $option ('begins','contains','exact') {
+         if ($curr_selected{'srchtype'} eq $option) {
+             $srchtypesel .= '
+    <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+         } else {
+             $srchtypesel .= '
+    <option value="'.$option.'">'.$lt{$option}.'</option>';
+         }
+     }
+     $srchtypesel .= "\n  </select>\n";
+     my ($newuserscript,$new_user_create);
+     if ($forcenewuser) {
+         if (ref($srch) eq 'HASH') {
+             if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $env{'request.role.domain'}) {
+                 if ($cancreate) {
+                     $new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" /> </p>';
+                 } else {
+                     my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+                     my %usertypetext = (
+                         official   => 'institutional',
+                         unofficial => 'non-institutional',
+                     );
+                     $new_user_create = '<br /><span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';
+                 }
+             }
+         }
+         $newuserscript = <<"ENDSCRIPT";
+ function setSearch(createnew,callingForm) {
+     if (createnew == 1) {
+         for (var i=0; i<callingForm.srchby.length; i++) {
+             if (callingForm.srchby.options[i].value == 'uname') {
+                 callingForm.srchby.selectedIndex = i;
+             }
+         }
+         for (var i=0; i<callingForm.srchin.length; i++) {
+             if ( callingForm.srchin.options[i].value == 'dom') {
+ 		callingForm.srchin.selectedIndex = i;
+             }
+         }
+         for (var i=0; i<callingForm.srchtype.length; i++) {
+             if (callingForm.srchtype.options[i].value == 'exact') {
+                 callingForm.srchtype.selectedIndex = i;
+             }
+         }
+         for (var i=0; i<callingForm.srchdomain.length; i++) {
+             if (callingForm.srchdomain.options[i].value == '$env{'request.role.domain'}') {
+                 callingForm.srchdomain.selectedIndex = i;
+             }
+         }
+     }
+ }
+ ENDSCRIPT
+     }
+     my $output = <<"END_BLOCK";
+ <script type="text/javascript">
+ function validateEntry(callingForm) {
+     var checkok = 1;
+     var srchin;
+     for (var i=0; i<callingForm.srchin.length; i++) {
+ 	if ( callingForm.srchin[i].checked ) {
+ 	    srchin = callingForm.srchin[i].value;
+ 	}
+     }
+     var srchtype = callingForm.srchtype.options[callingForm.srchtype.selectedIndex].value;
+     var srchby = callingForm.srchby.options[callingForm.srchby.selectedIndex].value;
+     var srchdomain = callingForm.srchdomain.options[callingForm.srchdomain.selectedIndex].value;
+     var srchterm =  callingForm.srchterm.value;
+     var srchin = callingForm.srchin.options[callingForm.srchin.selectedIndex].value;
+     var msg = "";
+     if (srchterm == "") {
+         checkok = 0;
+         msg += "$lt{'youm'}\\n";
+     }
+     if (srchtype== 'begins') {
+         if (srchterm.length < 2) {
+             checkok = 0;
+             msg += "$lt{'thte'}\\n";
+         }
+     }
+     if (srchtype== 'contains') {
+         if (srchterm.length < 3) {
+             checkok = 0;
+             msg += "$lt{'thet'}\\n";
+         }
+     }
+     if (srchin == 'instd') {
+         if (srchdomain == '') {
+             checkok = 0;
+             msg += "$lt{'yomc'}\\n";
+         }
+     }
+     if (srchin == 'dom') {
+         if (srchdomain == '') {
+             checkok = 0;
+             msg += "$lt{'ymcd'}\\n";
+         }
+     }
+     if (srchby == 'lastfirst') {
+         if (srchterm.indexOf(",") == -1) {
+             checkok = 0;
+             msg += "$lt{'whus'}\\n";
+         }
+         if (srchterm.indexOf(",") == srchterm.length -1) {
+             checkok = 0;
+             msg += "$lt{'whse'}\\n";
+         }
+     }
+     if (checkok == 0) {
+         alert("$lt{'thfo'}\\n"+msg);
+         return;
+     }
+     if (checkok == 1) {
+         callingForm.submit();
+     }
+ }
+ $newuserscript
+ </script>
+ $new_user_create
+ <table>
+  <tr>
+   <td>$lt{'doma'}:</td>
+   <td>$domform</td>
+   </td>
+  </tr>
+  <tr>
+   <td>$lt{'usr'}:</td>
+   <td>$srchbysel
+       $srchtypesel
+       <input type="text" size="15" name="srchterm" value="$srchterm" />
+       $srchinsel
+   </td>
+  </tr>
+ </table>
+ <br />
+ END_BLOCK
+     return $output;
+ }
+ sub user_rule_check {
+     my ($usershash,$checks,$alerts,$rulematch,$inst_results,$curr_rules,$got_rules) = @_;
+     my $response;
+     if (ref($usershash) eq 'HASH') {
+         foreach my $user (keys(%{$usershash})) {
+             my ($uname,$udom) = split(/:/,$user);
+             next if ($udom eq '' || $uname eq '');
+             my ($id,$newuser);
+             if (ref($usershash->{$user}) eq 'HASH') {
+                 $newuser = $usershash->{$user}->{'newuser'};
+                 $id = $usershash->{$user}->{'id'};
+             }
+             my $inst_response;
+             if (ref($checks) eq 'HASH') {
+                 if (defined($checks->{'username'})) {
+                     ($inst_response,%{$inst_results->{$user}}) =
+                         &Apache::lonnet::get_instuser($udom,$uname);
+                 } elsif (defined($checks->{'id'})) {
+                     ($inst_response,%{$inst_results->{$user}}) =
+                         &Apache::lonnet::get_instuser($udom,undef,$id);
+                 }
+             } else {
+                 ($inst_response,%{$inst_results->{$user}}) =
+                     &Apache::lonnet::get_instuser($udom,$uname);
+                 return;
+             }
+             if (!$got_rules->{$udom}) {
+                 my %domconfig = &Apache::lonnet::get_dom('configuration',
+                                                   ['usercreation'],$udom);
+                 if (ref($domconfig{'usercreation'}) eq 'HASH') {
+                     foreach my $item ('username','id') {
+                         if (ref($domconfig{'usercreation'}{$item.'_rule'}) eq 'ARRAY') {
+                             $$curr_rules{$udom}{$item} =
+                                 $domconfig{'usercreation'}{$item.'_rule'};
+                         }
+                     }
+                 }
+                 $got_rules->{$udom} = 1;
+             }
+             foreach my $item (keys(%{$checks})) {
+                 if (ref($$curr_rules{$udom}) eq 'HASH') {
+                     if (ref($$curr_rules{$udom}{$item}) eq 'ARRAY') {
+                         if (@{$$curr_rules{$udom}{$item}} > 0) {
+                             my %rule_check = &Apache::lonnet::inst_rulecheck($udom,$uname,$id,$item,$$curr_rules{$udom}{$item});
+                             foreach my $rule (@{$$curr_rules{$udom}{$item}}) {
+                                 if ($rule_check{$rule}) {
+                                     $$rulematch{$user}{$item} = $rule;
+                                     if ($inst_response eq 'ok') {
+                                         if (ref($inst_results) eq 'HASH') {
+                                             if (ref($inst_results->{$user}) eq 'HASH') {
+                                                 if (keys(%{$inst_results->{$user}}) == 0) {
+                                                     $$alerts{$item}{$udom}{$uname} = 1;
+                                                 }
+                                             }
+                                         }
+                                     }
+                                     last;
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
+         }
+     }
+     return;
+ }
+ sub user_rule_formats {
+     my ($domain,$domdesc,$curr_rules,$check) = @_;
+     my %text = (
+                  'username' => 'Usernames',
+                  'id'       => 'IDs',
+                );
+     my $output;
+     my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($domain,$check);
+     if ((ref($rules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) {
+         if (@{$ruleorder} > 0) {
+             $output = '<br />'.&mt("$text{$check} with the following format(s) may <span class=\"LC_cusr_emph\">only</span> be used for verified users at [_1]:",$domdesc).' <ul>';
+             foreach my $rule (@{$ruleorder}) {
+                 if (ref($curr_rules) eq 'ARRAY') {
+                     if (grep(/^\Q$rule\E$/,@{$curr_rules})) {
+                         if (ref($rules->{$rule}) eq 'HASH') {
+                             $output .= '<li>'.$rules->{$rule}{'name'}.': '.
+                                         $rules->{$rule}{'desc'}.'</li>';
+                         }
+                     }
+                 }
+             }
+             $output .= '</ul>';
+         }
+     }
+     return $output;
+ }
+ sub instrule_disallow_msg {
+     my ($checkitem,$domdesc,$count,$mode) = @_;
+     my $response;
+     my %text = (
+                   item   => 'username',
+                   items  => 'usernames',
+                   match  => 'matches',
+                   do     => 'does',
+                   action => 'a username',
+                   one    => 'one',
+                );
+     if ($count > 1) {
+         $text{'item'} = 'usernames';
+         $text{'match'} ='match';
+         $text{'do'} = 'do';
+         $text{'action'} = 'usernames',
+         $text{'one'} = 'ones';
+     }
+     if ($checkitem eq 'id') {
+         $text{'items'} = 'IDs';
+         $text{'item'} = 'ID';
+         $text{'action'} = 'an ID';
+         if ($count > 1) {
+             $text{'item'} = 'IDs';
+             $text{'action'} = 'IDs';
+         }
+     }
+     $response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for [_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',
+                    );
+     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;
+ }
  =pod
- =item * get_unprocessed_cgi($query,$possible_names)
+ =back
+ =head1 HTTP Helpers
+ =over 4
+ =item * &get_unprocessed_cgi($query,$possible_names)
  Modify the %env hash to contain unprocessed CGI form parameters held in
  $query.  The parameters listed in $possible_names (an array reference),
- Line 4432  sub get_unprocessed_cgi {
+ Line 7377  sub get_unprocessed_cgi {
  =pod
- =item * cacheheader()
+ =item * &cacheheader()
  returns cache-controlling header code
- Line 4449  sub cacheheader {
+ Line 7394  sub cacheheader {
  =pod
- =item * no_cache($r)
+ =item * &no_cache($r)
  specifies header code to not have cache
- Line 4485  sub content_type {
+ Line 7430  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 4512  sub add_to_env {
+ Line 7457  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 4535  sub get_env_multiple {
+ Line 7480  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 .= '<font size="+2">'.
+                                    &mt('View embedded file: [_1]','<a href="'.$url.'">'.
+                                    $orig_uploaded_filename.'</a>').'</font><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
  =back
  =head1 CSV Upload/Handling functions
  =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 4574  sub upfile_store {
+ Line 7745  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 4598  sub load_tmp_file {
+ Line 7769  sub load_tmp_file {
  =pod
- =item * upfile_record_sep()
+ =item * &upfile_record_sep()
  Separate uploaded file into records
  returns array of records,
- Line 4620  sub upfile_record_sep {
+ Line 7791  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 4652  sub record_sep {
+ Line 7823  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) {
+ # Found the end of a quote, again looking for separator
+                   $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;
              }
-             $components{&takeleft($i)}=$field;
+ # single or double quotation marks after a separator indicate beginning of a quote
- 	    $i++;
+ # 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 4678  sub record_sep {
+ Line 7876  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 4690  the file type.
+ Line 7888  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'),
- Line 4724  sub get_samples {
+ Line 7923  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 4736  Apache Request ref, $records is an array
+ Line 7935  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('</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 4759  sub csv_print_samples {
+ Line 7959  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 4776  sub csv_print_select_table {
+ Line 7976  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.
  		  ' onchange="javascript:flip(this.form,'.$i.');">');
- Line 4789  sub csv_print_select_table {
+ Line 7990  sub csv_print_select_table {
  	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 4803  sub csv_print_select_table {
+ Line 8005  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 4819  sub csv_samples_select_table {
+ Line 8021  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 4833  sub csv_samples_select_table {
+ Line 8038  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 4850  sub csv_samples_select_table {
+ Line 8056  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 4869  sub clean_excel_name {
+ Line 8075  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 4910  sub check_if_partid_hidden {
+ Line 8116  sub check_if_partid_hidden {
  =over 4
- =item get_cgi_id
+ =item * &get_cgi_id()
  Inputs: none
- Line 4934  sub get_cgi_id {
+ Line 8140  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 5069  sub DrawBarGraph {
+ Line 8275  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 5078  sub DrawBarGraph {
+ Line 8284  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 5159  sub DrawXYGraph {
+ Line 8365  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 5168  sub DrawXYGraph {
+ Line 8374  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 5261  sub DrawXYYGraph {
+ Line 8467  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 5278  Bad place for them but what the hell.
+ Line 8484  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 5317  sub chartlink {
+ Line 8523  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 5339  a hash ref describing the data to be sto
+ Line 8545  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 5388  sub store_course_settings {
+ Line 8599  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 5413  sub restore_course_settings {
+ Line 8627  sub restore_course_settings {
      }
  }
+ #######################################################
+ #######################################################
+ =pod
+ =head1 Domain E-mail Routines
+ =over 4
+ =item * &build_recipient_list()
+ Build recipient lists for three types of e-mail:
+ (a) Error Reports, (b) Package Updates, (c) Help requests, generated by
+ lonerrorhandler.pm, CHECKRPMS and lonsupportreq.pm respectively.
+ Inputs:
+ defmail (scalar - email address of default recipient),
+ mailing type (scalar - errormail, packagesmail, or helpdeskmail),
+ defdom (domain for which to retrieve configuration settings),
+ origmail (scalar - email address of recipient from loncapa.conf,
+ i.e., predates configuration by DC via domainprefs.pm
+ Returns: comma separated list of addresses to which to send e-mail.
+ =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 (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
+             my @contacts = ('adminemail','supportemail');
+             foreach my $item (@contacts) {
+                 if ($domconfig{'contacts'}{$mailing}{$item}) {
+                     my $addr = $domconfig{'contacts'}{$item};
+                     if (!grep(/^\Q$addr\E$/,@recipients)) {
+                         push(@recipients,$addr);
+                     }
+                 }
+                 $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
+             }
+         }
+     } elsif ($origmail ne '') {
+         push(@recipients,$origmail);
+     }
+     if (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)');
+                 } 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.
+ Returns: $output (markup to be displayed)
+ =cut
+ sub assign_categories_table {
+     my ($cathash,$currcat) = @_;
+     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') {
+                 $output = &Apache::loncommon::start_data_table();
+                 my @currcategories;
+                 if ($currcat ne '') {
+                     @currcategories = split('&',$currcat);
+                 }
+                 for (my $i=0; $i<@{$cats[0]}; $i++) {
+                     my $parent = $cats[0][$i];
+                     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                     next if ($parent eq 'instcode');
+                     my $item = &escape($parent).'::0';
+                     my $checked = '';
+                     if (@currcategories > 0) {
+                         if (grep(/^\Q$item\E$/,@currcategories)) {
+                             $checked = ' checked="checked" ';
+                         }
+                     }
+                     $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
+                                '<input type="checkbox" name="usecategory" value="'.
+                                $item.'"'.$checked.' />'.$parent.'</span>'.
+                                '<input type="hidden" name="catname" value="'.$parent.'" /></td>';
+                     my $depth = 1;
+                     push(@path,$parent);
+                     $output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
+                     pop(@path);
+                     $output .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
+                     $itemcount ++;
+                 }
+                 $output .= &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,$context) = @_;
+     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,undef,undef,$context).
+                  '</b><br />';
+     return $output;
+ }
+ sub commit_standardrole {
+     my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_;
+     my ($output,$logmsg,$linefeed);
+     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,$context);
+         if (($result =~ /^error/) || ($result eq 'not_in_class') ||
+             ($result eq 'unknown_course') || ($result eq 'refused')) {
+             $output = $logmsg.' '.&mt('Error: ').$result."\n";
+         } else {
+             $output = $logmsg.$linefeed.&mt('Assigning').' '.$three.' in '.$url.
+                ($start?', '.&mt('starting').' '.localtime($start):'').
+                ($end?', '.&mt('ending').' '.localtime($end):'').': ';
+             if ($context eq 'auto') {
+                 $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):'').': ';
+         my $result = &Apache::lonnet::assignrole($udom,$uname,$url,$three,$end,$start,'','',$context);
+         if ($context eq 'auto') {
+             $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,$context) = @_;
+     my ($result,$linefeed,$oldsecurl,$newsecurl);
+     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;
+         if ($oldsec ne '-1') {
+             if ($oldsec ne $sec) {
+                 $secchange = 1;
+                 my $now = time;
+                 my $uurl='/'.$cid;
+                 $uurl=~s/\_/\//g;
+                 if ($oldsec) {
+                     $uurl.='/'.$oldsec;
+                 }
+                 $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,'',$context);
+             if ($modify_section_result =~ /^ok/) {
+                 if ($secchange == 1) {
+                     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') {
+                     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 {
+                     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 {
+                 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) {
+             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 .= &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;
+ }
+ ############################################################
+ ############################################################
+ sub check_clone {
+     my ($args,$linefeed) = @_;
+     my $cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
+     my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid);
+     my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
+     my $clonemsg;
+     my $can_clone = 0;
+     if ($clonehome eq 'no_host') {
+         $clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
+     } else {
+ 	my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
+ 	if ($env{'request.role.domain'} eq $args->{'clonedomain'}) {
+ 	    $can_clone = 1;
+ 	} else {
+ 	    my %clonehash = &Apache::lonnet::get('environment',['cloners'],
+ 						 $args->{'clonedomain'},$args->{'clonecourse'});
+ 	    my @cloners = split(/,/,$clonehash{'cloners'});
+             if (grep(/^\*$/,@cloners)) {
+                 $can_clone = 1;
+             } elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {
+                 $can_clone = 1;
+             } else {
+ 	        my %roleshash =
+ 		    &Apache::lonnet::get_my_roles($args->{'ccuname'},
+ 					 $args->{'ccdomain'},
+                                          'userroles',['active'],['cc'],
+ 					 [$args->{'clonedomain'}]);
+ 	        if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
+ 		    $can_clone = 1;
+ 	        } else {
+                     $clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+ 	        }
+ 	    }
+         }
+     }
+     return ($can_clone, $clonemsg, $cloneid, $clonehome);
+ }
+ sub construct_course {
+     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_;
+     my $outcome;
+     my $linefeed =  '<br />'."\n";
+     if ($context eq 'auto') {
+         $linefeed = "\n";
+     }
+ #
+ # Are we cloning?
+ #
+     my ($can_clone, $clonemsg, $cloneid, $clonehome);
+     if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
+ 	($can_clone, $clonemsg, $cloneid, $clonehome) = &check_clone($args,$linefeed);
+ 	if ($context ne 'auto') {
+             if ($clonemsg ne '') {
+ 	        $clonemsg = '<span class="LC_error">'.$clonemsg.'</span>';
+             }
+ 	}
+ 	$outcome .= $clonemsg.$linefeed;
+         if (!$can_clone) {
+ 	    return (0,$outcome);
+ 	}
+     }
+ #
+ # Open course
+ #
+     my $crstype = lc($args->{'crstype'});
+     my %cenv=();
+     $$courseid=&Apache::lonnet::createcourse($args->{'course_domain'},
+                                              $args->{'cdescr'},
+                                              $args->{'curl'},
+                                              $args->{'course_home'},
+                                              $args->{'nonstandard'},
+                                              $args->{'crscode'},
+                                              $args->{'ccuname'}.':'.
+                                              $args->{'ccdomain'},
+                                              $args->{'crstype'});
+     # 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]',$crstype,$$courseid).$linefeed;
+ #
+ # Check if created correctly
+ #
+     ($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid);
+     my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
+     $outcome .= &mt('Created on').': '.$crsuhome.$linefeed;
+ #
+ # Do the cloning
+ #
+     if ($can_clone && $cloneid) {
+ 	$clonemsg = &mt('Cloning [_1] from [_2]',$crstype,$clonehome);
+ 	if ($context ne 'auto') {
+ 	    $clonemsg = '<span class="LC_success">'.$clonemsg.'</span>';
+ 	}
+ 	$outcome .= $clonemsg.$linefeed;
+ 	my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
+ # Copy all files
+ 	&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid,$args->{'datemode'},$args->{'dateshift'});
+ # Restore URL
+ 	$cenv{'url'}=$oldcenv{'url'};
+ # Restore title
+ 	$cenv{'description'}=$oldcenv{'description'};
+ # Mark as cloned
+ 	$cenv{'clonedfrom'}=$cloneid;
+ # Need to clone grading mode
+         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'],
+                    $$crsudom,$$crsunum);
+     }
+ #
+ # Set environment (will override cloned, if existing)
+ #
+     my @sections = ();
+     my @xlists = ();
+     if ($args->{'crstype'}) {
+         $cenv{'type'}=$args->{'crstype'};
+     }
+     if ($args->{'crsid'}) {
+         $cenv{'courseid'}=$args->{'crsid'};
+     }
+     if ($args->{'crscode'}) {
+         $cenv{'internal.coursecode'}=$args->{'crscode'};
+     }
+     if ($args->{'crsquota'} ne '') {
+         $cenv{'internal.coursequota'}=$args->{'crsquota'};
+     } else {
+         $cenv{'internal.coursequota'}=$args->{'crsquota'} = 20;
+     }
+     if ($args->{'ccuname'}) {
+         $cenv{'internal.courseowner'} = $args->{'ccuname'}.
+                                         ':'.$args->{'ccdomain'};
+     } 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'} = '';
+         if ($args->{'crssections'} =~ m/,/) {
+             @sections = split/,/,$args->{'crssections'};
+         } else {
+             $sections[0] = $args->{'crssections'};
+         }
+         if (@sections > 0) {
+             foreach my $item (@sections) {
+                 my ($sec,$gp) = split/:/,$item;
+                 my $class = $args->{'crscode'}.$sec;
+                 my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'});
+                 $cenv{'internal.sectionnums'} .= $item.',';
+                 unless ($addcheck eq 'ok') {
+                     push @badclasses, $class;
+                 }
+             }
+             $cenv{'internal.sectionnums'} =~ s/,$//;
+         }
+     }
+ # do not hide course coordinator from staff listing,
+ # even if privileged
+     $cenv{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
+ # add crosslistings
+     if ($args->{'crsxlist'}) {
+         $cenv{'internal.crosslistings'}='';
+         if ($args->{'crsxlist'} =~ m/,/) {
+             @xlists = split/,/,$args->{'crsxlist'};
+         } else {
+             $xlists[0] = $args->{'crsxlist'};
+         }
+         if (@xlists > 0) {
+             foreach my $item (@xlists) {
+                 my ($xl,$gp) = split/:/,$item;
+                 my $addcheck =  &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$xl,$cenv{'internal.courseowner'});
+                 $cenv{'internal.crosslistings'} .= $item.',';
+                 unless ($addcheck eq 'ok') {
+                     push @badclasses, $xl;
+                 }
+             }
+             $cenv{'internal.crosslistings'} =~ s/,$//;
+         }
+     }
+     if ($args->{'autoadds'}) {
+         $cenv{'internal.autoadds'}=$args->{'autoadds'};
+     }
+     if ($args->{'autodrops'}) {
+         $cenv{'internal.autodrops'}=$args->{'autodrops'};
+     }
+ # check for notification of enrollment changes
+     my @notified = ();
+     if ($args->{'notify_owner'}) {
+         if ($args->{'ccuname'} ne '') {
+             push(@notified,$args->{'ccuname'}.':'.$args->{'ccdomain'});
+         }
+     }
+     if ($args->{'notify_dc'}) {
+         if ($uname ne '') {
+             push(@notified,$uname.':'.$udom);
+         }
+     }
+     if (@notified > 0) {
+         my $notifylist;
+         if (@notified > 1) {
+             $notifylist = join(',',@notified);
+         } else {
+             $notifylist = $notified[0];
+         }
+         $cenv{'internal.notifylist'} = $notifylist;
+     }
+     if (@badclasses > 0) {
+         my %lt=&Apache::lonlocal::texthash(
+                 'tclb' => 'The courses listed below were included as sections or crosslistings affiliated with your new LON-CAPA course.  However, if automated course roster updates are enabled for this class, these particular sections/crosslistings will not contribute towards enrollment, because the user identified as the course owner for this LON-CAPA 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'
+         );
+         my $badclass_msg = $cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.
+                            ' ('.$lt{'adby'}.')';
+         if ($context eq 'auto') {
+             $outcome .= $badclass_msg.$linefeed;
+             $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;
+     }
+     $cenv{'internal.autostart'}=$args->{'enrollstart'};
+     $cenv{'internal.autoend'}=$args->{'enrollend'};
+     $cenv{'default_enrollment_start_date'}=$args->{'startaccess'};
+     $cenv{'default_enrollment_end_date'}=$args->{'endaccess'};
+     if ($args->{'showphotos'}) {
+       $cenv{'internal.showphotos'}=$args->{'showphotos'};
+     }
+     $cenv{'internal.authtype'} = $args->{'authtype'};
+     $cenv{'internal.autharg'} = $args->{'autharg'};
+     if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) {
+         if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'}  eq '') {
+             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');
+             if ($context eq 'auto') {
+                 $outcome .= $krb_msg;
+             } else {
+                 $outcome .= '<span class="LC_error">'.$krb_msg.'</span>';
+             }
+             $outcome .= $linefeed;
+         }
+     }
+     if (($args->{'ccdomain'}) && ($args->{'ccuname'})) {
+        if ($args->{'setpolicy'}) {
+            $cenv{'policy.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
+        }
+        if ($args->{'setcontent'}) {
+            $cenv{'question.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
+        }
+     }
+     if ($args->{'reshome'}) {
+ 	$cenv{'reshome'}=$args->{'reshome'}.'/';
+ 	$cenv{'reshome'}=~s/\/+$/\//;
+     }
+ #
+ # course has keyed access
+ #
+     if ($args->{'setkeys'}) {
+        $cenv{'keyaccess'}='yes';
+     }
+ # if specified, key authority is not course, but user
+ # only active if keyaccess is yes
+     if ($args->{'keyauth'}) {
+ 	my ($user,$domain) = split(':',$args->{'keyauth'});
+ 	$user = &LONCAPA::clean_username($user);
+ 	$domain = &LONCAPA::clean_username($domain);
+ 	if ($user ne '' && $domain ne '') {
+ 	    $cenv{'keyauth'}=$user.':'.$domain;
+ 	}
+     }
+     if ($args->{'disresdis'}) {
+         $cenv{'pch.roles.denied'}='st';
+     }
+     if ($args->{'disablechat'}) {
+         $cenv{'plc.roles.denied'}='st';
+     }
+     # Record we've not yet viewed the Course Initialization Helper for this
+     # course
+     $cenv{'course.helper.not.run'} = 1;
+     #
+     # Use new Randomseed
+     #
+     $cenv{'rndseed'}=&Apache::lonnet::latest_rnd_algorithm_id();;
+     $cenv{'receiptalg'}=&Apache::lonnet::latest_receipt_algorithm_id();;
+     #
+     # The encryption code and receipt prefix for this course
+     #
+     $cenv{'internal.encseed'}=$Apache::lonnet::perlvar{'lonReceipt'}.$$.time.int(rand(9999));
+     $cenv{'internal.encpref'}=100+int(9*rand(99));
+     #
+     # By default, use standard grading
+     if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; }
+     $outcome .= $linefeed.&mt('Setting environment').': '.
+           &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).$linefeed;
+ #
+ # Open all assignments
+ #
+     if ($args->{'openall'}) {
+        my $storeunder=$$crsudom.'_'.$$crsunum.'.0.opendate';
+        my %storecontent = ($storeunder         => time,
+                            $storeunder.'.type' => 'date_start');
+        $outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput
+                  ('resourcedata',\%storecontent,$$crsudom,$$crsunum).$linefeed;
+    }
+ #
+ # Set first page
+ #
+     unless (($args->{'nonstandard'}) || ($args->{'firstres'} eq 'blank')
+ 	    || ($cloneid)) {
+ 	use LONCAPA::map;
+ 	$outcome .= &mt('Setting first resource').': ';
+ 	my $map = '/uploaded/'.$$crsudom.'/'.$$crsunum.'/default.sequence';
+         my ($errtext,$fatal)=&LONCAPA::map::mapread($map);
+         $outcome .= ($fatal?$errtext:'read ok').' - ';
+         my $title; my $url;
+         if ($args->{'firstres'} eq 'syl') {
+ 	    $title=&mt('Syllabus');
+             $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
+         } else {
+             $title=&mt('Navigate Contents');
+             $url='/adm/navmaps';
+         }
+         $LONCAPA::map::resources[1]=$title.':'.$url.':false:start:res';
+ 	(my $outtext,$errtext) = &LONCAPA::map::storemap($map,1);
+ 	if ($errtext) { $fatal=2; }
+         $outcome .= ($fatal?$errtext:'write ok').$linefeed;
+     }
+     return (1,$outcome);
+ }
  ############################################################
  ############################################################
- Line 5439  sub group_term {
+ Line 9589  sub group_term {
  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 5454  sub icon {
+ Line 9604  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 5492  sub escape_url {
+ Line 9645  sub escape_url {
      my $lastitem = &escape(pop(@urlslices));
      return join('/',@urlslices).'/'.$lastitem;
  }
+ # -------------------------------------------------------- Initliaze user login
+ sub init_user_environment {
+     my ($r, $username, $domain, $authhost, $form, $args) = @_;
+     my $lonids=$Apache::lonnet::perlvar{'lonIDsDir'};
+     my $public=($username eq 'public' && $domain eq 'public');
+ # See if old ID present, if so, remove
+     my ($filename,$cookie,$userroles);
+     my $now=time;
+     if ($public) {
+ 	my $max_public=100;
+ 	my $oldest;
+ 	my $oldest_time=0;
+ 	for(my $next=1;$next<=$max_public;$next++) {
+ 	    if (-e $lonids."/publicuser_$next.id") {
+ 		my $mtime=(stat($lonids."/publicuser_$next.id"))[9];
+ 		if ($mtime<$oldest_time || !$oldest_time) {
+ 		    $oldest_time=$mtime;
+ 		    $oldest=$next;
+ 		}
+ 	    } else {
+ 		$cookie="publicuser_$next";
+ 		last;
+ 	    }
+ 	}
+ 	if (!$cookie) { $cookie="publicuser_$oldest"; }
+     } else {
+ 	# if this isn't a robot, kill any existing non-robot sessions
+ 	if (!$args->{'robot'}) {
+ 	    opendir(DIR,$lonids);
+ 	    while ($filename=readdir(DIR)) {
+ 		if ($filename=~/^$username\_\d+\_$domain\_$authhost\.id$/) {
+ 		    unlink($lonids.'/'.$filename);
+ 		}
+ 	    }
+ 	    closedir(DIR);
+ 	}
+ # Give them a new cookie
+ 	my $id = ($args->{'robot'} ? 'robot'.$args->{'robot'}
+ 		                   : $now.$$.int(rand(10000)));
+ 	$cookie="$username\_$id\_$domain\_$authhost";
+ # Initialize roles
+ 	$userroles=&Apache::lonnet::rolesinit($domain,$username,$authhost);
+     }
+ # ------------------------------------ Check browser type and MathML capability
+     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',
+ 			'embedsuppress','fontenhance','blackwhite',
+ 			'interface','localpath','localres') {
+ 	$form->{$option}=~s/[\n\r\=]//gs;
+     }
+ # --------------------------------------------------------- Write first profile
+     {
+ 	my %initial_env =
+ 	    ("user.name"          => $username,
+ 	     "user.domain"        => $domain,
+ 	     "user.home"          => $authhost,
+ 	     "browser.type"       => $clientbrowser,
+ 	     "browser.version"    => $clientversion,
+ 	     "browser.mathml"     => $clientmathml,
+ 	     "browser.unicode"    => $clientunicode,
+ 	     "browser.os"         => $clientos,
+ 	     "server.domain"      => $Apache::lonnet::perlvar{'lonDefDomain'},
+ 	     "request.course.fn"  => '',
+ 	     "request.course.uri" => '',
+ 	     "request.course.sec" => '',
+ 	     "request.role"       => 'cm',
+ 	     "request.role.adv"   => $env{'user.adv'},
+ 	     "request.host"       => $ENV{'REMOTE_ADDR'},);
+         if ($form->{'localpath'}) {
+ 	    $initial_env{"browser.localpath"}  = $form->{'localpath'};
+ 	    $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";
+ 		}
+ 	    }
+ 	}
+ 	$env{'user.environment'} = "$lonids/$cookie.id";
+ 	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
+ 		 &GDBM_WRCREAT(),0640)) {
+ 	    &_add_to_env(\%disk_env,\%initial_env);
+ 	    &_add_to_env(\%disk_env,\%userenv,'environment.');
+ 	    &_add_to_env(\%disk_env,$userroles);
+ 	    if (ref($args->{'extra_env'})) {
+ 		&_add_to_env(\%disk_env,$args->{'extra_env'});
+ 	    }
+ 	    untie(%disk_env);
+ 	} else {
+ 	    &Apache::lonnet::logthis("<font color=\"blue\">WARNING: ".
+ 			   'Could not create environment storage in lonauth: '.$!.'</font>');
+ 	    return 'error: '.$!;
+ 	}
+     }
+     $env{'request.role'}='cm';
+     $env{'request.role.adv'}=$env{'user.adv'};
+     $env{'browser.type'}=$clientbrowser;
+     return $cookie;
+ }
+ sub _add_to_env {
+     my ($idf,$env_data,$prefix) = @_;
+     if (ref($env_data) eq 'HASH') {
+         while (my ($key,$value) = each(%$env_data)) {
+ 	    $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-^http://($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) = @_;
+     &Apache::lonenc::check_decrypt(\$symb);
+     my $enc = $env{'request.enc'};
+     delete($env{'request.enc'});
+     return ($symb,$enc);
+ }
  =pod
  =back

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

Removed from v.1.429
changed lines
	Added in v.1.695