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.329 and 1.636.2.3

-version 1.329, 2006/04/10 19:54:54
+version 1.636.2.3, 2008/03/18 23:00:51
  Line 59  use Apache::lonnet;
  use GDBM_File;
  use POSIX qw(strftime mktime);
  use Apache::lonmenu();
+ use Apache::lonenc();
  use Apache::lonlocal;
  use HTML::Entities;
+ use Apache::lonhtmlcommon();
+ use Apache::loncoursedata();
+ use Apache::lontexconvert();
+ use Apache::lonclonecourse();
+ use LONCAPA qw(:DEFAULT :match);
+ # ---------------------------------------------- Designs
+ use vars qw(%defaultdesign);
  my $readit;
  ##
  ## Global Variables
  ##
- Line 73  my %language;
+ Line 83  my %language;
  my %supported_language;
  my %cprtag;
  my %scprtag;
- my %fe; my %fd;
+ my %fe; my %fd; my %fm;
  my %category_extensions;
- # ---------------------------------------------- Designs
- my %designhash;
  # ---------------------------------------------- Thesaurus variables
  #
  # %Keywords:
- Line 104  BEGIN {
+ Line 110  BEGIN {
          my $langtabfile = $Apache::lonnet::perlvar{'lonTabDir'}.
                                     '/language.tab';
          if ( open(my $fh,"<$langtabfile") ) {
-             while (<$fh>) {
+             while (my $line = <$fh>) {
-                 next if /^\#/;
+                 next if ($line=~/^\#/);
-                 chomp;
+                 chomp($line);
-                 my ($key,$two,$country,$three,$enc,$val,$sup)=(split(/\t/,$_));
+                 my ($key,$two,$country,$three,$enc,$val,$sup)=(split(/\t/,$line));
                  $language{$key}=$val.' - '.$enc;
                  if ($sup) {
                      $supported_language{$key}=$sup;
- Line 121  BEGIN {
+ Line 127  BEGIN {
          my $copyrightfile = $Apache::lonnet::perlvar{'lonIncludes'}.
                                    '/copyright.tab';
          if ( open (my $fh,"<$copyrightfile") ) {
-             while (<$fh>) {
+             while (my $line = <$fh>) {
-                 next if /^\#/;
+                 next if ($line=~/^\#/);
-                 chomp;
+                 chomp($line);
-                 my ($key,$val)=(split(/\s+/,$_,2));
+                 my ($key,$val)=(split(/\s+/,$line,2));
                  $cprtag{$key}=$val;
              }
              close($fh);
          }
      }
- # ------------------------------------------------------------------ source copyrights
+ # ----------------------------------------------------------- source copyrights
      {
          my $sourcecopyrightfile = $Apache::lonnet::perlvar{'lonIncludes'}.
                                    '/source_copyright.tab';
          if ( open (my $fh,"<$sourcecopyrightfile") ) {
-             while (<$fh>) {
+             while (my $line = <$fh>) {
-                 next if /^\#/;
+                 next if ($line =~ /^\#/);
-                 chomp;
+                 chomp($line);
-                 my ($key,$val)=(split(/\s+/,$_,2));
+                 my ($key,$val)=(split(/\s+/,$line,2));
                  $scprtag{$key}=$val;
              }
              close($fh);
          }
      }
- # -------------------------------------------------------------- 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 (<$fh>) {
+         }
- 		    next if /^\#/;
+         close($fh);
- 		    chomp;
- 		    my ($key,$val)=(split(/\=/,$_));
- 		    if ($val) { $designhash{$domain.'.'.$key}=$val; }
- 		}
- 		close($fh);
- 	    }
- 	}
      }
-     closedir(DIR);
  # ------------------------------------------------------------- file categories
      {
          my $categoryfile = $Apache::lonnet::perlvar{'lonTabDir'}.
                                    '/filecategories.tab';
          if ( open (my $fh,"<$categoryfile") ) {
-             while (<$fh>) {
+ 	    while (my $line = <$fh>) {
-                 next if /^\#/;
+ 		next if ($line =~ /^\#/);
-                 chomp;
+ 		chomp($line);
-                 my ($extension,$category)=(split(/\s+/,$_,2));
+                 my ($extension,$category)=(split(/\s+/,$line,2));
                  push @{$category_extensions{lc($category)}},$extension;
              }
              close($fh);
- Line 190  BEGIN {
+ Line 184  BEGIN {
          my $typesfile = $Apache::lonnet::perlvar{'lonTabDir'}.
                 '/filetypes.tab';
          if ( open (my $fh,"<$typesfile") ) {
-             while (<$fh>) {
+             while (my $line = <$fh>) {
-                 next if (/^\#/);
+ 		next if ($line =~ /^\#/);
-                 chomp;
+ 		chomp($line);
-                 my ($ending,$emb,$descr)=split(/\s+/,$_,3);
+                 my ($ending,$emb,$mime,$descr)=split(/\s+/,$line,4);
                  if ($descr ne '') {
                      $fe{$ending}=lc($emb);
                      $fd{$ending}=$descr;
+                     if ($mime ne 'unk') { $fm{$ending}=$mime; }
                  }
              }
              close($fh);
- Line 251  of the element the selection from the se
+ Line 246  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 262  sub browser_and_searcher_javascript {
+ Line 257  sub browser_and_searcher_javascript {
          }
          url += 'catalogmode=interactive&';
          url += 'mode=$mode&';
+         url += 'inhibitmenu=yes&';
          url += 'form=' + formname + '&';
          if (only != null) {
              url += 'only=' + only + '&';
- Line 280  sub browser_and_searcher_javascript {
+ Line 276  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 301  sub browser_and_searcher_javascript {
+ Line 297  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 339  sub studentbrowser_javascript {
+ Line 335  sub studentbrowser_javascript {
     return (<<'ENDSTDBRW');
  <script type="text/javascript" language="Javascript" >
      var stdeditbrowser;
-     function openstdbrowser(formname,uname,udom,roleflag) {
+     function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
          var url = '/adm/pickstudent?';
          var filter;
-         eval('filter=document.'+formname+'.'+uname+'.value;');
+ 	if (!ignorefilter) {
+ 	    eval('filter=document.'+formname+'.'+uname+'.value;');
+ 	}
          if (filter != null) {
             if (filter != '') {
                 url += 'filter='+filter+'&';
- Line 380  sub selectstudent_link {
+ Line 378  sub selectstudent_link {
  }
  sub coursebrowser_javascript {
-     my ($domainfilter)=@_;
+     my ($domainfilter,$sec_element,$formname)=@_;
-    return (<<ENDSTDBRW);
+     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');
- <script type="text/javascript" language="Javascript" >
+    my $output = '
-     var stdeditbrowser;
+ <script type="text/javascript">
-     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag) {
+     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 401  sub coursebrowser_javascript {
+ Line 407  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;
          }
+         if (crstype == 'Course/Group') {
+             if (formname == 'cu') {
+                 crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
+                 if (crstype == "") {
+                     alert("$crs_or_grp_alert");
+                     return;
+                 }
+             }
+         }
+         if (crstype !=null && crstype != '') {
+             url += '&type='+crstype;
+         }
          var title = 'Course_Browser';
          var options = 'scrollbars=1,resizable=1,menubar=0';
          options += ',width=700,height=600';
          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)=@_;
+    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.'");'."'>".&mt('Select Course')."</a>";
+         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>";
  }
  sub check_uncheck_jscript {
- Line 442  function uncheckAll(field) {
+ Line 530  function uncheckAll(field) {
      if (field.length > 0) {
          for (i = 0; i < field.length; i++) {
              field[i].checked = false ;
-         }     } else {
+         }
+     } else {
          field.checked = false ;
      }
  }
- Line 459  linked_select_forms returns a string con
+ Line 548  linked_select_forms returns a string con
  and html for two <select> menus.  The select menus will be linked in that
  changing the value of the first menu will result in new values being placed
  in the second menu.  The values in the select menu will appear in alphabetical
- order.
+ order unless a defined order is provided.
  linked_select_forms takes the following ordered inputs:
- Line 477  linked_select_forms takes the following
+ Line 566  linked_select_forms takes the following
  =item * $hashref, a reference to a hash containing the data for the menus.
+ =item * $menuorder, the order of values in the first menu
  =back
  Below is an example of such a hash.  Only the 'text', 'default', and
- Line 493  $menu{$choice1}->{'select2'}.
+ Line 584  $menu{$choice1}->{'select2'}.
                             B2 => "Choice B2",
                             B3 => "Choice B3",
                             B4 => "Choice B4"
-                            }
+                            },
+                        order => ['B4','B3','B1','B2'],
                     },
                 A2 => { text =>"Choice A2" ,
                         default => "C2",
- Line 501  $menu{$choice1}->{'select2'}.
+ Line 593  $menu{$choice1}->{'select2'}.
                             C1 => "Choice C1",
                             C2 => "Choice C2",
                             C3 => "Choice C3"
-                            }
+                            },
+                        order => ['C2','C1','C3'],
                     },
                 A3 => { text =>"Choice A3" ,
                         default => "D6",
- Line 513  $menu{$choice1}->{'select2'}.
+ Line 606  $menu{$choice1}->{'select2'}.
                             D5 => "Choice D5",
                             D6 => "Choice D6",
                             D7 => "Choice D7"
-                            }
+                            },
+                        order => ['D4','D3','D2','D1','D7','D6','D5'],
                     }
                 );
- Line 525  sub linked_select_forms {
+ Line 619  sub linked_select_forms {
          $firstdefault,
          $firstselectname,
          $secondselectname,
-         $hashref
+         $hashref,
+         $menuorder,
          ) = @_;
      my $second = "document.$formname.$secondselectname";
      my $first = "document.$formname.$firstselectname";
- Line 539  sub linked_select_forms {
+ Line 634  sub linked_select_forms {
          $result.="select2data.d_$s1 = new Object();\n";
          $result.="select2data.d_$s1.def = new String('".
              $hashref->{$s1}->{'default'}."');\n";
          $result.="select2data.d_$s1.values = new Array(";
          my @s2values = sort(keys( %{ $hashref->{$s1}->{'select2'} } ));
+         if (ref($hashref->{$s1}->{'order'}) eq 'ARRAY') {
+             @s2values = @{$hashref->{$s1}->{'order'}};
+         }
          $result.="\"@s2values\");\n";
          $result.="select2data.d_$s1.texts = new Array(";
          my @s2texts;
- Line 578  function select1_changed() {
+ Line 676  function select1_changed() {
  END
      # output the initial values for the selection lists
      $result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed()\">\n";
-     foreach my $value (sort(keys(%$hashref))) {
+     my @order = sort(keys(%{$hashref}));
+     if (ref($menuorder) eq 'ARRAY') {
+         @order = @{$menuorder};
+     }
+     foreach my $value (@order) {
          $result.="    <option value=\"$value\" ";
          $result.=" selected=\"selected\" " if ($value eq $firstdefault);
          $result.=">".&mt($hashref->{$value}->{'text'})."</option>\n";
- Line 588  END
+ Line 690  END
      $result .= $middletext;
      $result .= "<select size=\"1\" name=\"$secondselectname\">\n";
      my $seconddefault = $hashref->{$firstdefault}->{'default'};
-     foreach my $value (sort(keys(%select2))) {
+     my @secondorder = sort(keys(%select2));
+     if (ref($hashref->{$firstdefault}->{'order'}) eq 'ARRAY') {
+         @secondorder = @{$hashref->{$firstdefault}->{'order'}};
+     }
+     foreach my $value (@secondorder) {
          $result.="    <option value=\"$value\" ";
          $result.=" selected=\"selected\" " if ($value eq $seconddefault);
          $result.=">".&mt($select2{$value})."</option>\n";
- Line 626  sub help_open_topic {
+ Line 733  sub help_open_topic {
      my ($topic, $text, $stayOnPage, $width, $height) = @_;
      $text = "" if (not defined $text);
      $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual' ||
+     if ($env{'browser.interface'} eq 'textual') {
- 	$env{'environment.remote'} eq 'off' ) {
  	$stayOnPage=1;
      }
      $width = 350 if (not defined $width);
- Line 637  sub help_open_topic {
+ Line 743  sub help_open_topic {
      my $template = "";
      my $link;
      $topic=~s/\W/\_/g;
-     if (!$stayOnPage)
+     if (!$stayOnPage) {
-     {
  	$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
-     }
+     } else {
-     else
-     {
  	$link = "/adm/help/${filename}.hlp";
      }
      # Add the text
-     if ($text ne "")
+     if ($text ne "") {
-     {
  	$template .=
-   "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
+             "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
-   "<td bgcolor='#5555FF'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+             "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
      }
      # Add the graphic
      my $title = &mt('Online Help');
      my $helpicon=&lonhttpdurl("/adm/help/gif/smallHelp.gif");
      $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>' };
      return $template;
- Line 680  sub helpLatexCheatsheet {
+ Line 782  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></tr></table>';
  }
- sub help_open_menu {
+ sub general_help {
-     my ($color,$topic,$component_help,$function,$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;
      }
-     $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 (\$color,\$function,\$topic,\$component_help,\$faq,\$bug,\$origurl) {
+     foreach my $datum (\$topic,\$component_help,\$faq,\$bug,\$origurl) {
-         $$_ = &Apache::lonnet::escape($$_);
+         $$datum = &escape($$datum);
      }
-     if (!$stayOnPage) {
-          $link = "javascript:helpMenu('open')";
+     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";
-     } else {
+     my $output .= <<"ENDOUTPUT";
-         $link = "javascript:helpMenu('display')";
+ <script type="text/javascript">
+ banner_link = '$banner_link';
+ </script>
+ ENDOUTPUT
+     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 $banner_link = "/adm/helpmenu?page=banner&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";
+     my $output;
-     my $details_link = "/adm/helpmenu?page=body&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";
+     if ($component_help) {
-     my $template;
+ 	if (!$text) {
-     if ($text ne "") {
+ 	    $output=&help_open_topic($component_help,undef,$stayOnPage,
- 	$template .=
+ 				       $width,$height);
-   "<table bgcolor='#CC3300' cellspacing='1' cellpadding='1' border='0'><tr>".
+ 	} else {
-   "<td bgcolor='#CC6600'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+ 	    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 $html=&Apache::lonxml::xmlbegin();
+     my $start_page =
-     my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");
+         &Apache::loncommon::start_page('Help Menu', undef,
-     $template .= <<"ENDTEMPLATE";
+ 				       {'frameset'    => 1,
-  <script type="text/javascript">
+ 					'js_ready'    => 1,
+ 					'add_entries' => {
+ 					    'border' => '0',
+ 					    'rows'   => "110,*",},});
+     my $end_page =
+         &Apache::loncommon::end_page({'frameset' => 1,
+ 				      'js_ready' => 1,});
+     my $template .= <<"ENDTEMPLATE";
+ <script type="text/javascript">
  // <!-- BEGIN LON-CAPA Internal
  // <![CDATA[
+ var banner_link = '';
  function helpMenu(target) {
      var caller = this;
      if (target == 'open') {
- Line 745  function helpMenu(target) {
+ Line 911  function helpMenu(target) {
      return;
  }
  function writeHelp(caller) {
-     caller.document.writeln('$html<head><title>LON-CAPA Help Menu</title><meta http-equiv="pragma" content="no-cache"></head>')
+     caller.document.writeln('$start_page<frame name="bannerframe"  src="'+banner_link+'" /><frame name="bodyframe" src="$details_link" /> $end_page')
-     caller.document.writeln("<frameset rows='105,*' border='0'><frame name='bannerframe'  src='$banner_link'><frame name='bodyframe' src='$details_link'></frameset>")
-     caller.document.writeln("</html>")
      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=&Apache::lonnet::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 789  sub help_open_bug {
+ Line 938  sub help_open_bug {
      $topic=~s/\W+/\+/g;
      my $link='';
      my $template='';
-     my $url=$Apache::lonnet::perlvar{'BugzillaHost'}.'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.
+     my $url=$Apache::lonnet::perlvar{'BugzillaHost'}.'enter_bug.cgi?product=LON-CAPA&amp;bug_file_loc='.
- 	&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'&component='.$topic;
+ 	&escape($ENV{'REQUEST_URI'}).'&amp;component='.$topic;
      if (!$stayOnPage)
      {
  	$link = "javascript:void(open('$url', 'Bugzilla', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
- Line 804  sub help_open_bug {
+ Line 953  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 849  sub help_open_faq {
+ Line 998  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 947  sub changable_area {
+ Line 1096  sub changable_area {
  =pod
- =back
+ =item * viewport_geometry_js {
+ Provides javascript object (Geometry) which can provide information about the viewport geometry for the client browser.
+ =cut
+ sub viewport_geometry_js {
+     return <<"GEOMETRY";
+ var Geometry = {};
+ function init_geometry() {
+     if (Geometry.init) { return };
+     Geometry.init=1;
+     if (window.innerHeight) {
+         Geometry.getViewportHeight   = function() { return window.innerHeight; };
+         Geometry.getViewportWidth   = function() { return window.innerWidth; };
+         Geometry.getHorizontalScroll = function() { return window.pageXOffset; };
+         Geometry.getVerticalScroll   = function() { return window.pageYOffset; };
+     }
+     else if (document.documentElement && document.documentElement.clientHeight) {
+         Geometry.getViewportHeight =
+             function() { return document.documentElement.clientHeight; };
+         Geometry.getViewportWidth =
+             function() { return document.documentElement.clientWidth; };
+         Geometry.getHorizontalScroll =
+             function() { return document.documentElement.scrollLeft; };
+         Geometry.getVerticalScroll =
+             function() { return document.documentElement.scrollTop; };
+     }
+     else if (document.body.clientHeight) {
+         Geometry.getViewportHeight =
+             function() { return document.body.clientHeight; };
+         Geometry.getViewportWidth =
+             function() { return document.body.clientWidth; };
+         Geometry.getHorizontalScroll =
+             function() { return document.body.scrollLeft; };
+         Geometry.getVerticalScroll =
+             function() { return document.body.scrollTop; };
+     }
+ }
+ GEOMETRY
+ }
+ =pod
+ =item * viewport_size_js {
+ Provides a javascript function to set values of two form elements - width and height (elements are passed in as arguments to the javascript function) to the dimensions of the user's browser window.
+ =cut
+ sub viewport_size_js {
+     my $geometry = &viewport_geometry_js();
+     return <<"DIMS";
+ $geometry
+ function getViewportDims(width,height) {
+     init_geometry();
+     width.value = Geometry.getViewportWidth();
+     height.value = Geometry.getViewportHeight();
+     return;
+ }
+ DIMS
+ }
+ =pod
+ =item * resize_textarea_js
+ emits the needed javascript to resize a textarea to be as big as possible
+ creates a function resize_textrea that takes two IDs first should be
+ the id of the element to resize, second should be the id of a div that
+ surrounds everything that comes after the textarea, this routine needs
+ to be attached to the <body> for the onload and onresize events.
+ =cut
+ sub resize_textarea_js {
+     my $geometry = &viewport_geometry_js();
+     return <<"RESIZE";
+     <script type="text/javascript">
+ $geometry
+ function getX(element) {
+     var x = 0;
+     while (element) {
+ 	x += element.offsetLeft;
+ 	element = element.offsetParent;
+     }
+     return x;
+ }
+ function getY(element) {
+     var y = 0;
+     while (element) {
+ 	y += element.offsetTop;
+ 	element = element.offsetParent;
+     }
+     return y;
+ }
+ function resize_textarea(textarea_id,bottom_id) {
+     init_geometry();
+     var textarea        = document.getElementById(textarea_id);
+     //alert(textarea);
+     var textarea_top    = getY(textarea);
+     var textarea_height = textarea.offsetHeight;
+     var bottom          = document.getElementById(bottom_id);
+     var bottom_top      = getY(bottom);
+     var bottom_height   = bottom.offsetHeight;
+     var window_height   = Geometry.getViewportHeight();
+     var fudge           = 23;
+     var new_height      = window_height-fudge-textarea_top-bottom_height;
+     if (new_height < 300) {
+ 	new_height = 300;
+     }
+     textarea.style.height=new_height+'px';
+ }
+ </script>
+ RESIZE
+ }
+ =pod
+ =back
  =head1 Excel and CSV file utility routines
  =over 4
- Line 1082  sub create_workbook {
+ Line 1363  sub create_workbook {
  =item * create_text_file
- Create a file to write to and eventually make available to the usre.
+ Create a file to write to and eventually make available to the user.
  If file creation fails, outputs an error message on the request object and
  return undefs.
- Line 1123  sub create_text_file {
+ Line 1404  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 (sort values(%Apache::lonnet::hostdom)) {
- 	push (@domains,$_) unless $seen{$_}++;
-     }
-     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 1166  sub domain_select {
+ Line 1425  sub domain_select {
  =pod
+ =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
- Line 1173  Returns a string containing a <select> e
+ Line 1436  Returns a string containing a <select> e
  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 1193  sub multiple_select_form {
+ Line 1456  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="'.$key.'" ';
+         $output.='<option value="'.&HTML::Entities::encode($key,'"<>&').'" ';
          $output.='selected="selected" ' if ($selected{$key});
          $output.='>'.$hash->{$key}."</option>\n";
      }
- Line 1226  sub select_form {
+ Line 1497  sub select_form {
      } else {
  	@keys=sort(keys(%hash));
      }
-     foreach (@keys) {
+     foreach my $key (@keys) {
-         $selectform.="<option value=\"$_\" ".
+         $selectform.=
-             ($_ eq $def ? 'selected="selected" ' : '').
+ 	    '<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.
-                 ">".&mt($hash{$_})."</option>\n";
+             ($key eq $def ? 'selected="selected" ' : '').
+                 ">".&mt($hash{$key})."</option>\n";
      }
      $selectform.="</select>";
      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 1276  sub select_level_form {
+ Line 1566  sub select_level_form {
  =pod
- =item * select_dom_form($defdom,$name,$includeempty)
+ =item * select_dom_form($defdom,$name,$includeempty,$showdomdesc)
  Returns a string containing a <select name='$name' size='1'> form to
  allow a user to select the domain to preform an operation in.
- Line 1285  See loncreateuser.pm for an example invo
+ Line 1575  See loncreateuser.pm for an example invo
  If the $includeempty flag is set, it also includes an empty choice ("no domain
  selected");
+ If the $showdomdesc flag is set, the domain name is followed by the domain description.
  =cut
  #-------------------------------------------
  sub select_dom_form {
-     my ($defdom,$name,$includeempty) = @_;
+     my ($defdom,$name,$includeempty,$showdomdesc) = @_;
-     my @domains = 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 (@domains) {
+     foreach my $dom (@domains) {
-         $selectdomain.="<option value=\"$_\" ".
+         $selectdomain.="<option value=\"$dom\" ".
-             ($_ eq $defdom ? 'selected="selected" ' : '').
+             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$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 1306  sub select_dom_form {
+ Line 1606  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
- 'kirk.lite.msu.edu'.  All of the keys will be for machines in the
- given $domain.
- =cut
- #-------------------------------------------
- sub get_library_servers {
-     my $domain = shift;
-     my %library_servers;
-     foreach (keys(%Apache::lonnet::libserv)) {
-         if ($Apache::lonnet::hostdom{$_} eq $domain) {
-             $library_servers{$_} = $Apache::lonnet::hostname{$_};
-         }
-     }
-     return %library_servers;
- }
- #-------------------------------------------
- =pod
+ input: 4 arguments (two required, two optional) -
+     $domain - domain of new user
+     $name - name of form element
+     $default - Value of 'default' causes a default item to be first
+                             option, and selected by default.
+     $hide - Value of 'hide' causes hiding of the name of the server,
+                             if 1 server found, or default, if 0 found.
+ output: returns 2 items:
+ (a) form element which contains either:
+    (i) <select name="$name">
+         <option value="$hostid1">$hostid $servers{$hostid}</option>
+         <option value="$hostid2">$hostid $servers{$hostid}</option>
+        </select>
+        form item if there are multiple library servers in $domain, or
+    (ii) an <input type="hidden" name="$name" value="$hostid" /> form item
+        if there is only one library server in $domain.
- =item * home_server_option_list($domain)
+ (b) number of library servers found.
- returns a string which contains an <option> list to be used in a
+ See loncreateuser.pm for example of use.
- <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 (sort keys(%servers)) {
+     my $numlib = keys(%servers);
-         $result.=
+     if ($numlib > 1) {
-             '<option value="'.$_.'">'.$_.' '.$servers{$_}."</option>\n";
+         $result .= '<select name="'.$name.'" />'."\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 1499  END
+ Line 1820  END
      }
      my $radioval = "'nochange'";
-     if (exists($in{'curr_authtype'}) &&
+     if (defined($in{'curr_authtype'})) {
-         defined($in{'curr_authtype'}) &&
+         if ($in{'curr_authtype'} ne '') {
-         $in{'curr_authtype'} ne '') {
+             $radioval = "'".$in{'curr_authtype'}."arg'";
-         $radioval = "'$in{'curr_authtype'}arg'";
+         }
      }
      my $argfield = 'null';
-     if ( grep/^mode$/,(keys %in) ) {
+     if (defined($in{'mode'})) {
          if ($in{'mode'} eq 'modifycourse')  {
-             if ( grep/^curr_authtype$/,(keys %in) ) {
+             if (defined($in{'curr_autharg'})) {
-                 $radioval = "'$in{'curr_authtype'}'";
+                 if ($in{'curr_autharg'} ne '') {
-             }
-             if ( grep/^curr_autharg$/,(keys %in) ) {
-                 unless ($in{'curr_autharg'} eq '') {
                      $argfield = "'$in{'curr_autharg'}'";
                  }
              }
- Line 1594  sub authform_nochange{
+ Line 1912  sub authform_nochange{
                kerb_def_dom => 'MSU.EDU',
                @_,
            );
-     my $result = '<label>'.&mt('[_1] Do not change login data',
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
-                      '<input type="radio" name="login" value="nochange" '.
+     my $result;
-                      'checked="checked" onclick="'.
+     if (keys(%can_assign) == 0) {
+         $result = &mt('Under you current role you are not permitted to change login settings for this user');
+     } else {
+         $result = '<label>'.&mt('[_1] Do not change login data',
+                   '<input type="radio" name="login" value="nochange" '.
+                   'checked="checked" onclick="'.
              "javascript:changed_radio('nochange',$in{'formname'});".'" />').
  	    '</label>';
+     }
      return $result;
  }
- sub authform_kerberos{
+ sub authform_kerberos {
      my %in = (
                formname => 'document.cu',
                kerb_def_dom => 'MSU.EDU',
                kerb_def_auth => 'krb4',
                @_,
                );
-     my ($check4,$check5,$krbarg);
+     my ($check4,$check5,$krbcheck,$krbarg,$krbver,$result,$authtype,
+         $autharg,$jscall);
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
      if ($in{'kerb_def_auth'} eq 'krb5') {
-        $check5 = " checked=\"on\"";
+        $check5 = ' checked="on"';
      } else {
-        $check4 = " checked=\"on\"";
+        $check4 = ' checked="on"';
      }
      $krbarg = $in{'kerb_def_dom'};
+     if (defined($in{'curr_authtype'})) {
-     my $krbcheck = "";
+         if ($in{'curr_authtype'} eq 'krb') {
-     if ( grep/^curr_authtype$/,(keys %in) ) {
+             $krbcheck = ' checked="on"';
-         if ($in{'curr_authtype'} =~ m/^krb/) {
+             if (defined($in{'mode'})) {
-             $krbcheck = " checked=\"on\"";
+                 if ($in{'mode'} eq 'modifyuser') {
-             if ( grep/^curr_autharg$/,(keys %in) ) {
+                     $krbcheck = '';
+                 }
+             }
+             if (defined($in{'curr_kerb_ver'})) {
+                 if ($in{'curr_krb_ver'} eq '5') {
+                     $check5 = ' checked="on"';
+                     $check4 = '';
+                 } else {
+                     $check4 = ' checked="on"';
+                     $check5 = '';
+                 }
+             }
+             if (defined($in{'curr_autharg'})) {
                  $krbarg = $in{'curr_autharg'};
              }
+             if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
+                 if (defined($in{'curr_autharg'})) {
+                     $result =
+     &mt('Currently Kerberos authenticated with domain [_1] Version [_2].',
+         $in{'curr_autharg'},$krbver);
+                 } else {
+                     $result =
+     &mt('Currently Kerberos authenticated, Version [_1].',$krbver);
+                 }
+                 return $result;
+             }
+         }
+     } else {
+         if ($authnum == 1) {
+             $authtype = '<input type="hidden" name="login" value="krb">';
          }
      }
+     if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
-     my $jscall = "javascript:changed_radio('krb',$in{'formname'});";
+         return;
-     my $result .= &mt
+     } elsif ($authtype eq '') {
+         if (defined($in{'mode'})) {
+             if ($in{'mode'} eq 'modifycourse') {
+                 if ($authnum == 1) {
+                     $authtype = '<input type="hidden" name="login" value="krb">';
+                 }
+             }
+         }
+     }
+     $jscall = "javascript:changed_radio('krb',$in{'formname'});";
+     if ($authtype eq '') {
+         $authtype = '<input type="radio" name="login" value="krb" '.
+                     'onclick="'.$jscall.'" onchange="'.$jscall.'"'.
+                     $krbcheck.' />';
+     }
+     if (($can_assign{'krb4'} && $can_assign{'krb5'}) ||
+         ($can_assign{'krb4'} && !$can_assign{'krb5'} &&
+          $in{'curr_authtype'} eq 'krb5') ||
+         (!$can_assign{'krb4'} && $can_assign{'krb5'} &&
+          $in{'curr_authtype'} eq 'krb4')) {
+         $result .= &mt
          ('[_1] Kerberos authenticated with domain [_2] '.
           '[_3] Version 4 [_4] Version 5 [_5]',
-          '<label><input type="radio" name="login" value="krb" '.
+          '<label>'.$authtype,
-              'onclick="'.$jscall.'" onchange="'.$jscall.'"'.$krbcheck.' />',
           '</label><input type="text" size="10" name="krbarg" '.
               'value="'.$krbarg.'" '.
               'onchange="'.$jscall.'" />',
           '<label><input type="radio" name="krbver" value="4" '.$check4.' />',
           '</label><label><input type="radio" name="krbver" value="5" '.$check5.' />',
  	 '</label>');
+     } elsif ($can_assign{'krb4'}) {
+         $result .= &mt
+         ('[_1] Kerberos authenticated with domain [_2] '.
+          '[_3] Version 4 [_4]',
+          '<label>'.$authtype,
+          '</label><input type="text" size="10" name="krbarg" '.
+              'value="'.$krbarg.'" '.
+              'onchange="'.$jscall.'" />',
+          '<label><input type="hidden" name="krbver" value="4" />',
+          '</label>');
+     } elsif ($can_assign{'krb5'}) {
+         $result .= &mt
+         ('[_1] Kerberos authenticated with domain [_2] '.
+          '[_3] Version 5 [_4]',
+          '<label>'.$authtype,
+          '</label><input type="text" size="10" name="krbarg" '.
+              'value="'.$krbarg.'" '.
+              'onchange="'.$jscall.'" />',
+          '<label><input type="hidden" name="krbver" value="5" />',
+          '</label>');
+     }
      return $result;
  }
  sub authform_internal{
-     my %args = (
+     my %in = (
                  formname => 'document.cu',
                  kerb_def_dom => 'MSU.EDU',
                  @_,
                  );
+     my ($intcheck,$intarg,$result,$authtype,$autharg,$jscall);
-     my $intcheck = "";
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
-     my $intarg = 'value=""';
+     if (defined($in{'curr_authtype'})) {
-     if ( grep/^curr_authtype$/,(keys %args) ) {
+         if ($in{'curr_authtype'} eq 'int') {
-         if ($args{'curr_authtype'} eq 'int') {
+             if ($can_assign{'int'}) {
-             $intcheck = " checked=\"on\"";
+                 $intcheck = 'checked="on" ';
-             if ( grep/^curr_autharg$/,(keys %args) ) {
+                 if (defined($in{'mode'})) {
-                 $intarg = "value=\"$args{'curr_autharg'}\"";
+                     if ($in{'mode'} eq 'modifyuser') {
+                         $intcheck = '';
+                     }
+                 }
+                 if (defined($in{'curr_autharg'})) {
+                     $intarg = $in{'curr_autharg'};
+                 }
+             } else {
+                 $result = &mt('Currently internally authenticated.');
+                 return $result;
              }
          }
+     } else {
+         if ($authnum == 1) {
+             $authtype = '<input type="hidden" name="login" value="int">';
+         }
      }
+     if (!$can_assign{'int'}) {
-     my $jscall = "javascript:changed_radio('int',$args{'formname'});";
+         return;
-     my $result.=&mt
+     } elsif ($authtype eq '') {
+         if (defined($in{'mode'})) {
+             if ($in{'mode'} eq 'modifycourse') {
+                 if ($authnum == 1) {
+                     $authtype = '<input type="hidden" name="login" value="int">';
+                 }
+             }
+         }
+     }
+     $jscall = "javascript:changed_radio('int',$in{'formname'});";
+     if ($authtype eq '') {
+         $authtype = '<input type="radio" name="login" value="int" '.$intcheck.
+                     ' onchange="'.$jscall.'" onclick="'.$jscall.'" />';
+     }
+     $autharg = '<input type="password" size="10" name="intarg" value="'.
+                $intarg.'" onchange="'.$jscall.'" />';
+     $result = &mt
          ('[_1] Internally authenticated (with initial password [_2])',
-          '<label><input type="radio" name="login" value="int" '.$intcheck.
+          '<label>'.$authtype,'</label>'.$autharg);
-              ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
+     $result.="<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
-          '</label><input type="text" size="10" name="intarg" '.$intarg.
-              ' onchange="'.$jscall.'" />');
      return $result;
  }
- Line 1676  sub authform_local{
+ Line 2096  sub authform_local{
                kerb_def_dom => 'MSU.EDU',
                @_,
                );
+     my ($loccheck,$locarg,$result,$authtype,$autharg,$jscall);
-     my $loccheck = "";
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
-     my $locarg = 'value=""';
+     if (defined($in{'curr_authtype'})) {
-     if ( grep/^curr_authtype$/,(keys %in) ) {
          if ($in{'curr_authtype'} eq 'loc') {
-             $loccheck = " checked=\"on\"";
+             if ($can_assign{'loc'}) {
-             if ( grep/^curr_autharg$/,(keys %in) ) {
+                 $loccheck = 'checked="on" ';
-                 $locarg = "value=\"$in{'curr_autharg'}\"";
+                 if (defined($in{'mode'})) {
+                     if ($in{'mode'} eq 'modifyuser') {
+                         $loccheck = '';
+                     }
+                 }
+                 if (defined($in{'curr_autharg'})) {
+                     $locarg = $in{'curr_autharg'};
+                 }
+             } else {
+                 $result = &mt('Currently using local (institutional) authentication.');
+                 return $result;
              }
          }
+     } else {
+         if ($authnum == 1) {
+             $authtype = '<input type="hidden" name="login" value="loc">';
+         }
      }
+     if (!$can_assign{'loc'}) {
-     my $jscall = "javascript:changed_radio('loc',$in{'formname'});";
+         return;
-     my $result.=&mt('[_1] Local Authentication with argument [_2]',
+     } elsif ($authtype eq '') {
-                     '<label><input type="radio" name="login" value="loc" '.$loccheck.
+         if (defined($in{'mode'})) {
-                         ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
+             if ($in{'mode'} eq 'modifycourse') {
-                     '</label><input type="text" size="10" name="locarg" '.$locarg.
+                 if ($authnum == 1) {
-                         ' onchange="'.$jscall.'" />');
+                     $authtype = '<input type="hidden" name="login" value="loc">';
+                 }
+             }
+         }
+     }
+     $jscall = "javascript:changed_radio('loc',$in{'formname'});";
+     if ($authtype eq '') {
+         $authtype = '<input type="radio" name="login" value="loc" '.
+                     $loccheck.' onchange="'.$jscall.'" onclick="'.
+                     $jscall.'" />';
+     }
+     $autharg = '<input type="text" size="10" name="locarg" value="'.
+                $locarg.'" onchange="'.$jscall.'" />';
+     $result = &mt('[_1] Local Authentication with argument [_2]',
+                   '<label>'.$authtype,'</label>'.$autharg);
      return $result;
  }
- Line 1703  sub authform_filesystem{
+ Line 2150  sub authform_filesystem{
                kerb_def_dom => 'MSU.EDU',
                @_,
                );
-     my $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
+     my ($fsyscheck,$result,$authtype,$autharg,$jscall);
-     my $result.= &mt
+     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
+     if (defined($in{'curr_authtype'})) {
+         if ($in{'curr_authtype'} eq 'fsys') {
+             if ($can_assign{'fsys'}) {
+                 $fsyscheck = 'checked="on" ';
+                 if (defined($in{'mode'})) {
+                     if ($in{'mode'} eq 'modifyuser') {
+                         $fsyscheck = '';
+                     }
+                 }
+             } else {
+                 $result = &mt('Currently Filesystem Authenticated.');
+                 return $result;
+             }
+         }
+     } else {
+         if ($authnum == 1) {
+             $authtype = '<input type="hidden" name="login" value="fsys">';
+         }
+     }
+     if (!$can_assign{'fsys'}) {
+         return;
+     } elsif ($authtype eq '') {
+         if (defined($in{'mode'})) {
+             if ($in{'mode'} eq 'modifycourse') {
+                 if ($authnum == 1) {
+                     $authtype = '<input type="hidden" name="login" value="fsys">';
+                 }
+             }
+         }
+     }
+     $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
+     if ($authtype eq '') {
+         $authtype = '<input type="radio" name="login" value="fsys" '.
+                     $fsyscheck.' onchange="'.$jscall.'" onclick="'.
+                     $jscall.'" />';
+     }
+     $autharg = '<input type="text" size="10" name="fsysarg" value=""'.
+                ' onchange="'.$jscall.'" />';
+     $result = &mt
          ('[_1] Filesystem Authenticated (with initial password [_2])',
           '<label><input type="radio" name="login" value="fsys" '.
-          'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
+          $fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-          '</label><input type="text" size="10" name="fsysarg" value="" '.
+          '</label><input type="password" size="10" name="fsysarg" value="" '.
                    'onchange="'.$jscall.'" />');
      return $result;
  }
+ sub get_assignable_auth {
+     my ($dom) = @_;
+     if ($dom eq '') {
+         $dom = $env{'request.role.domain'};
+     }
+     my %can_assign = (
+                           krb4 => 1,
+                           krb5 => 1,
+                           int  => 1,
+                           loc  => 1,
+                      );
+     my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
+     if (ref($domconfig{'usercreation'}) eq 'HASH') {
+         if (ref($domconfig{'usercreation'}{'authtypes'}) eq 'HASH') {
+             my $authhash = $domconfig{'usercreation'}{'authtypes'};
+             my $context;
+             if ($env{'request.role'} =~ /^au/) {
+                 $context = 'author';
+             } elsif ($env{'request.role'} =~ /^dc/) {
+                 $context = 'domain';
+             } elsif ($env{'request.course.id'}) {
+                 $context = 'course';
+             }
+             if ($context) {
+                 if (ref($authhash->{$context}) eq 'HASH') {
+                    %can_assign = %{$authhash->{$context}};
+                 }
+             }
+         }
+     }
+     my $authnum = 0;
+     foreach my $key (keys(%can_assign)) {
+         if ($can_assign{$key}) {
+             $authnum ++;
+         }
+     }
+     if ($can_assign{'krb4'} && $can_assign{'krb5'}) {
+         $authnum --;
+     }
+     return ($authnum,%can_assign);
+ }
  ###############################################################
  ##    Get Authentication Defaults for Domain                 ##
  ###############################################################
- Line 1741  If target_domain is not found in domain.
+ Line 2269  If target_domain is not found in domain.
  #-------------------------------------------
  sub get_auth_defaults {
      my $domain=shift;
-     return ($Apache::lonnet::domain_auth_def{$domain},$Apache::lonnet::domain_auth_arg_def{$domain});
+     return (&Apache::lonnet::domain($domain,'auth_def'),
+ 	    &Apache::lonnet::domain($domain,'auth_arg_def'));
  }
  ###############################################################
  ##   End Get Authentication Defaults for Domain              ##
- Line 1834  sub initialize_keywords {
+ Line 2364  sub initialize_keywords {
      }
      untie %thesaurus_db;
      # Remove special values from %Keywords.
-     foreach ('total.count','average.count') {
+     foreach my $value ('total.count','average.count') {
-         delete($Keywords{$_}) if (exists($Keywords{$_}));
+         delete($Keywords{$value}) if (exists($Keywords{$value}));
-     }
+   }
      return 1;
  }
- Line 1890  sub get_related_words {
+ Line 2420  sub get_related_words {
          return ();
      }
      my @Words=();
+     my $count=0;
      if (exists($thesaurus_db{$keyword})) {
-         $_ = $thesaurus_db{$keyword};
+ 	# The first element is the number of times
-         (undef,@Words) = split/:/;  # The first element is the number of times
+ 	# the word appears.  We do not need it now.
-                                     # the word appears.  We do not need it now.
+ 	my (undef,@RelatedWords) = (split(/:/,$thesaurus_db{$keyword}));
-         for (my $i=0;$i<=$#Words;$i++) {
+ 	my (undef,$mostfrequentcount)=split(/\,/,$RelatedWords[0]);
-             ($Words[$i],undef)= split/\,/,$Words[$i];
+ 	my $threshold=$mostfrequentcount/10;
+         foreach my $possibleword (@RelatedWords) {
+             my ($word,$wordcount)=split(/\,/,$possibleword);
+             if ($wordcount>$threshold) {
+ 		push(@Words,$word);
+                 $count++;
+                 if ($count>10) { last; }
+ 	    }
          }
      }
      untie %thesaurus_db;
- Line 1928  if $first is set to 'lastname' then it r
+ Line 2466  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 1936  sub plainname {
+ Line 2475  sub plainname {
      $name=~s/^\s+//;
      $name=~s/\s+$//;
      $name=~s/\s+/ /g;
-     if ($name !~ /\S/) { $name=$uname.'@'.$udom; }
+     if ($name !~ /\S/) { $name=$uname.':'.$udom; }
      return $name;
  }
- Line 1959  if the user does not
+ Line 2498  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 1974  sub nickname {
+ Line 2514  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 1987  sub getnames {
+ Line 2531  sub getnames {
      }
  }
+ # -------------------------------------------------------------------- getemails
+ =pod
+ =item * getemails($uname,$udom)
+ Gets a user's email information and returns it as a hash with keys:
+ notification, critnotification, permanentemail
+ For notification and critnotification, values are comma-separated lists
+ of e-mail address(es); for permanentemail, value is a single e-mail address.
+ =cut
+ sub getemails {
+     my ($uname,$udom)=@_;
+     if ($udom eq 'public' && $uname eq 'public') {
+ 	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
- Line 2009  sub screenname {
+ Line 2596  sub screenname {
  # ------------------------------------------------------------- Message Wrapper
  sub messagewrapper {
-     my ($link,$username,$domain)=@_;
+     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.
+ 	'&amp;subject='.&escape($subject).'&amp;text='.&escape($text).'" '.
          'title="'.&mt('Send message').'">'.$link.'</a>';
  }
  # --------------------------------------------------------------- Notes Wrapper
- Line 2026  sub noteswrapper {
+ Line 2614  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 2056  sub track_student_link {
+ Line 2647  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 2172  category
+ Line 2779  category
  =cut
  sub filecategorytypes {
-     return @{$category_extensions{lc($_[0])}};
+     my ($cat) = @_;
+     return @{$category_extensions{lc($cat)}};
  }
  =pod
- Line 2187  sub fileembstyle {
+ Line 2795  sub fileembstyle {
      return $fe{lc(shift(@_))};
  }
+ sub filemimetype {
+     return $fm{lc(shift(@_))};
+ }
  sub filecategoryselect {
      my ($name,$value)=@_;
- Line 2243  sub fileextensions {
+ Line 2855  sub fileextensions {
  sub display_languages {
      my %languages=();
-     foreach (&preferred_languages()) {
+     foreach my $lang (&preferred_languages()) {
- 	$languages{$_}=1;
+ 	$languages{$lang}=1;
      }
      &get_unprocessed_cgi($ENV{'QUERY_STRING'},['displaylanguage']);
      if ($env{'form.displaylanguage'}) {
- 	foreach (split(/\s*(\,|\;|\:)\s*/,$env{'form.displaylanguage'})) {
+ 	foreach my $lang (split(/\s*(\,|\;|\:)\s*/,$env{'form.displaylanguage'})) {
- 	    $languages{$_}=1;
+ 	    $languages{$lang}=1;
          }
      }
      return %languages;
- Line 2262  sub preferred_languages {
+ Line 2874  sub preferred_languages {
  	         $env{'course.'.$env{'request.course.id'}.'.languages'}));
      }
      if ($env{'environment.languages'}) {
- 	@languages=split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'});
+ 	@languages=(@languages,
+ 		    split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}));
      }
-     my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0];
+     my $browser=$ENV{'HTTP_ACCEPT_LANGUAGE'};
      if ($browser) {
- 	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$browser));
+ 	my @browser =
+ 	    map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser));
+ 	push(@languages,@browser);
      }
-     if ($Apache::lonnet::domain_lang_def{$env{'user.domain'}}) {
+     if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) {
  	@languages=(@languages,
- 		$Apache::lonnet::domain_lang_def{$env{'user.domain'}});
+ 		    &Apache::lonnet::domain($env{'user.domain'},
+ 					    'lang_def'));
      }
-     if ($Apache::lonnet::domain_lang_def{$env{'request.role.domain'}}) {
+     if (&Apache::lonnet::domain($env{'request.role.domain'},'lang_def')) {
  	@languages=(@languages,
- 		$Apache::lonnet::domain_lang_def{$env{'request.role.domain'}});
+ 		    &Apache::lonnet::domain($env{'request.role.domain'},
+ 					    'lang_def'));
      }
-     if ($Apache::lonnet::domain_lang_def{
+     if (&Apache::lonnet::domain($Apache::lonnet::perlvar{'lonDefDomain'},
- 	                          $Apache::lonnet::perlvar{'lonDefDomain'}}) {
+ 				'lang_def')) {
  	@languages=(@languages,
- 		$Apache::lonnet::domain_lang_def{
+ 		    &Apache::lonnet::domain($Apache::lonnet::perlvar{'lonDefDomain'},
-                                   $Apache::lonnet::perlvar{'lonDefDomain'}});
+ 					    'lang_def'));
      }
  # turn "en-ca" into "en-ca,en"
      my @genlanguages;
-     foreach (@languages) {
+     foreach my $lang (@languages) {
- 	unless ($_=~/\w/) { next; }
+ 	unless ($lang=~/\w/) { next; }
- 	push (@genlanguages,$_);
+ 	push(@genlanguages,$lang);
- 	if ($_=~/(\-|\_)/) {
+ 	if ($lang=~/(\-|\_)/) {
- 	    push (@genlanguages,(split(/(\-|\_)/,$_))[0]);
+ 	    push(@genlanguages,(split(/(\-|\_)/,$lang))[0]);
  	}
      }
+     #uniqueify the languages list
+     my %count;
+     @genlanguages = map { $count{$_}++ == 0 ? $_ : () } @genlanguages;
      return @genlanguages;
  }
+ sub languages {
+     my ($possible_langs) = @_;
+     my @preferred_langs = &preferred_languages();
+     if (!ref($possible_langs)) {
+ 	if( wantarray ) {
+ 	    return @preferred_langs;
+ 	} else {
+ 	    return $preferred_langs[0];
+ 	}
+     }
+     my %possibilities = map { $_ => 1 } (@$possible_langs);
+     my @preferred_possibilities;
+     foreach my $preferred_lang (@preferred_langs) {
+ 	if (exists($possibilities{$preferred_lang})) {
+ 	    push(@preferred_possibilities, $preferred_lang);
+ 	}
+     }
+     if( wantarray ) {
+ 	return @preferred_possibilities;
+     }
+     return $preferred_possibilities[0];
+ }
  ###############################################################
  ##               Student Answer Attempts                     ##
  ###############################################################
- Line 2344  sub get_previous_attempt {
+ Line 2987  sub get_previous_attempt {
        my %lasthash=();
        my $version;
        for ($version=1;$version<=$returnhash{'version'};$version++) {
-         foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
+         foreach my $key (sort(split(/\:/,$returnhash{$version.':keys'}))) {
- 	  $lasthash{$_}=$returnhash{$version.':'.$_};
+ 	  $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 (sort(keys %lasthash)) {
+       foreach my $key (sort(keys(%lasthash))) {
- 	my ($ign,@parts) = split(/\./,$_);
+ 	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 2364  sub get_previous_attempt {
+ Line 3007  sub get_previous_attempt {
  	  }
  	}
        }
+       $prevattempts.=&end_data_table_header_row();
        if ($getattempt eq '') {
  	for ($version=1;$version<=$returnhash{'version'};$version++) {
- 	  $prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Transaction '.$version.'</td>';
+ 	  $prevattempts.=&start_data_table_row().
- 	    foreach (sort(keys %lasthash)) {
+ 	      '<td>'.&mt('Transaction [_1]',$version).'</td>';
- 	       my $value;
+ 	    foreach my $key (sort(keys(%lasthash))) {
- 	       if ($_ =~ /timestamp/) {
+ 		my $value = &format_previous_attempt_value($key,
- 		  $value=scalar(localtime($returnhash{$version.':'.$_}));
+ 							   $returnhash{$version.':'.$key});
- 	       } else {
+ 		$prevattempts.='<td>'.$value.'&nbsp;</td>';
- 		  $value=$returnhash{$version.':'.$_};
- 	       }
- 	       $prevattempts.='<td>'.&Apache::lonnet::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 (sort(keys %lasthash)) {
+       foreach my $key (sort(keys(%lasthash))) {
- 	my $value;
+ 	my $value = &format_previous_attempt_value($key,$lasthash{$key});
- 	if ($_ =~ /timestamp/) {
+ 	if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
- 	  $value=scalar(localtime($lasthash{$_}));
- 	} else {
- 	  $value=$lasthash{$_};
- 	}
- 	$value=&Apache::lonnet::unescape($value);
- 	if ($_ =~/$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 2419  sub relative_to_absolute {
+ Line 3074  sub relative_to_absolute {
  	}
      }
      $thisdir=~s-/[^/]*$--;
-     foreach (@rlinks) {
+     foreach my $link (@rlinks) {
- 	unless (($_=~/^http:\/\//i) ||
+ 	unless (($link=~/^http:\/\//i) ||
- 		($_=~/^\//) ||
+ 		($link=~/^\//) ||
- 		($_=~/^javascript:/i) ||
+ 		($link=~/^javascript:/i) ||
- 		($_=~/^mailto:/i) ||
+ 		($link=~/^mailto:/i) ||
- 		($_=~/^\#/)) {
+ 		($link=~/^\#/)) {
- 	    my $newlocation=&Apache::lonnet::hreflocation($thisdir,$_);
+ 	    my $newlocation=&Apache::lonnet::hreflocation($thisdir,$link);
- 	    $output=~s/(\"|\'|\=\s*)$_(\"|\'|\s|\>)/$1$newlocation$2/;
+ 	    $output=~s/(\"|\'|\=\s*)\Q$link\E(\"|\'|\s|\>)/$1$newlocation$2/;
  	}
      }
  # -------------------------------------------------- Deal with Applet codebases
- Line 2485  sub get_student_answers {
+ Line 3140  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 2504  sub submlink {
+ Line 3160  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(); }
-     $symb=&Apache::lonnet::escape($symb);
+     $symb=&escape($symb);
      if ($target) { $target="target=\"$target\""; }
      return '<a href="/adm/grades?&command=submission&'.
  	'symb='.$symb.'&student='.$uname.
- Line 2550  sub pprmlink {
+ Line 3206  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=&Apache::lonnet::escape($symb);
+     $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 2584  sub timehash {
+ Line 3240  sub timehash {
               'dlsav'   => $ltime[8] );
  }
+ sub utc_string {
+     my ($date)=@_;
+     return strftime("%Y%m%dT%H%M%SZ",gmtime($date));
+ }
  sub maketime {
      my %th=@_;
      return POSIX::mktime(
- Line 2594  sub maketime {
+ Line 3255  sub maketime {
  #########################################
  sub findallcourses {
-     my %courses=();
+     my ($roles,$uname,$udom) = @_;
+     my %roles;
+     if (ref($roles)) { %roles = map { $_ => 1 } @{$roles}; }
+     my %courses;
      my $now=time;
-     foreach (keys %env) {
+     if (!defined($uname)) {
- 	if ($_=~/^user\.role\.\w+\.\/(\w+)\/(\w+)/) {
+         $uname = $env{'user.name'};
- 	    my ($starttime,$endtime)=$env{$_};
+     }
-             my $active=1;
+     if (!defined($udom)) {
-             if ($starttime) {
+         $udom = $env{'user.domain'};
- 		if ($now<$starttime) { $active=0; }
+     }
+     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+         my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname);
+         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 ($endtime) {
+             if ($tend) {
-                 if ($now>$endtime) { $active=0; }
+                 next if ($tend < $now);
+             }
+             if ($tstart) {
+                 next if ($tstart > $now);
+             }
+             my ($cdom,$cnum,$sec,$cnumpart,$secpart,$role,$realsec);
+             (undef,$cdom,$cnumpart,$secpart) = split(/\//,$entry);
+             if ($secpart eq '') {
+                 ($cnum,$role) = split(/_/,$cnumpart);
+                 $sec = 'none';
+                 $realsec = '';
+             } else {
+                 $cnum = $cnumpart;
+                 ($sec,$role) = split(/_/,$secpart);
+                 $realsec = $sec;
+             }
+             $courses{$cdom.'_'.$cnum}{$sec} = $trole.'/'.$cdom.'/'.$cnum.'/'.$realsec;
+         }
+     } else {
+         foreach my $key (keys(%env)) {
+ 	    if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_courseid)/?(\w*)$} ||
+                  $key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_courseid)/?(\w*)$}) {
+ 	        my ($role,$cdom,$cnum,$sec) = ($1,$2,$3,$4);
+ 	        next if ($role eq 'ca' || $role eq 'aa');
+ 	        next if (%roles && !exists($roles{$role}));
+ 	        my ($starttime,$endtime)=split(/\./,$env{$key});
+                 my $active=1;
+                 if ($starttime) {
+ 		    if ($now<$starttime) { $active=0; }
+                 }
+                 if ($endtime) {
+                     if ($now>$endtime) { $active=0; }
+                 }
+                 if ($active) {
+                     if ($sec eq '') {
+                         $sec = 'none';
+                     }
+                     $courses{$cdom.'_'.$cnum}{$sec} =
+                                      $role.'/'.$cdom.'/'.$cnum.'/'.$sec;
+                 }
              }
-             if ($active) { $courses{$1.'_'.$2}=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;
+     }
+ }
  ###############################################
  =pod
- Line 2632  Returns: Determines which domain should
+ Line 3644  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 2643  sub determinedomain {
+ Line 3655  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 2656  If the domain logo does not exist, a des
+ Line 3755  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 2679  Returns: value of designparamter $which
+ Line 3786  Returns: value of designparamter $which
  =cut
  ##############################################
  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$/) {
  	    return '#CCCCCC';
  	}
      }
-     if ($env{'environment.color.'.$which}) {
+     if (exists($env{'environment.color.'.$which})) {
  	return $env{'environment.color.'.$which};
      }
      $domain=&determinedomain($domain);
-     if ($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 2711  sub designparm {
+ Line 3832  sub designparm {
  =back
- =head1 HTTP Helpers
+ =head1 HTML Helpers
  =over 4
- Line 2743  Inputs:
+ Line 3864  Inputs:
  =item * $notopbar, if true, keep the 'what is this' info but remove the
                     navigational links
- =item * $bgcolor, used to override the bg coor on a webpage to a specific value
+ =item * $bgcolor, used to override the bgcolor on a webpage to a specific value
+ =item * $notitle, if true keep the nav controls, but remove the title bar
+ =item * $no_inline_link, if true and in remote mode, don't show the
+          'Switch To Inline Menu' link
+ =item * $args, optional argument valid values are
+             no_auto_mt_title -> prevents &mt()ing the title arg
+             inherit_jsmath -> when creating popup window in a page,
+                               should it have jsmath forced on by the
+                               current page
  =back
- Line 2756  other decorations will be returned.
+ Line 3888  other decorations will be returned.
  sub bodytag {
      my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
- 	$notopbar,$bgcolor)=@_;
+ 	$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);
+     my $img =    &designparm($function.'.img',$domain);
-     my $pgbg= $bgcolor || &designparm($function.'.pgbg',$domain);
+     my $font =   &designparm($function.'.font',$domain);
-     my $tabbg=&designparm($function.'.tabbg',$domain);
+     my $pgbg   = $bgcolor || &designparm($function.'.pgbg',$domain);
-     my $font=&designparm($function.'.font',$domain);
-     my $link=&designparm($function.'.link',$domain);
+     my %design = ( 'style'   => 'margin-top: 0px',
-     my $alink=&designparm($function.'.alink',$domain);
+ 		   'bgcolor' => $pgbg,
-     my $vlink=&designparm($function.'.vlink',$domain);
+ 		   'text'    => $font,
-     my $sidebg=&designparm($function.'.sidebg',$domain);
+                    'alink'   => &designparm($function.'.alink',$domain),
- # Accessibility font enhance
+ 		   'vlink'   => &designparm($function.'.vlink',$domain),
-     my $addstyle='';
+ 		   'link'    => &designparm($function.'.link',$domain),);
-     if ($env{'browser.fontenhance'} eq 'on') {
+     @design{keys(%$addentries)} = @$addentries{keys(%$addentries)};
- 	$addstyle=' font-size: x-large;';
-     }
   # role and realm
-     my ($role,$realm)
+     my ($role,$realm) = split(/\./,$env{'request.role'},2);
-        =&Apache::lonnet::plaintext((split(/\./,$env{'request.role'}))[0]);
+     if ($role  eq 'ca') {
+         my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$});
+         $realm = &plainname($rname,$rdom);
+     }
  # realm
      if ($env{'request.course.id'}) {
- 	$realm=
+         if ($env{'request.role'} !~ /^cr/) {
-          $env{'course.'.$env{'request.course.id'}.'.description'};
+             $role = &Apache::lonnet::plaintext($role,&course_type());
+         }
+ 	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
+     } else {
+         $role = &Apache::lonnet::plaintext($role);
      }
-     unless ($realm) { $realm='&nbsp;'; }
+     if (!$realm) { $realm='&nbsp;'; }
  # Set messages
      my $messages=&domainlogo($domain);
- # Port for miniserver
-     my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
+     my $extra_body_attr = &make_attr_string($forcereg,\%design);
-     if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
-     my $extra_body_attr;
-     if ($forcereg) {
- 	if (ref($addentries)) {
- 	    $addentries->{'onload'}   = &Apache::lonmenu::loadevents().
- 		$addentries->{'onload'};
- 	    $addentries->{'onunload'} = &Apache::lonmenu::unloadevents().
- 		$addentries->{'onunload'};
- 	} else {
- 	    $extra_body_attr.=' onload="'.&Apache::lonmenu::loadevents().
- 		'" onunload="'.&Apache::lonmenu::unloadevents().'"';
- 	}
-     }
-     if (!ref($addentries)) {
- 	$extra_body_attr .= $addentries;
-     } else {
- 	foreach my $attr (keys(%$addentries)) {
- 	    $extra_body_attr .= " $attr=\"".$addentries->{$attr}.'" ';
- 	}
-     }
  # construct main body tag
-     my $bodytag = <<END;
+     my $bodytag = "<body $extra_body_attr>".
- <style type="text/css">
+ 	&Apache::lontexconvert::init_math_support($args->{'inherit_jsmath'});
- h1, h2, h3, th { font-family: Arial, Helvetica, sans-serif }
- a:focus { color: red; background: yellow }
- table.thinborder { border-collapse: collapse; }
- table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}
- form, .inline { display: inline; }
- .center { text-align: center; }
- .filename {font-family: monospace;}
- </style>
- <body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
- style="margin-top: 0px;$addstyle" $extra_body_attr>
- END
-     &Apache::lontexconvert::jsMath_reset();
-     if ($env{'environment.texengine'} eq 'jsMath' ||
- 	$env{'form.texengine'}        eq 'jsMath' ) {
- 	$bodytag.=&Apache::lontexconvert::jsMath_header();
-     }
-     my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
-                    $lonhttpdPort.$img.'" alt="'.$function.'" />';
      if ($bodyonly) {
          return $bodytag;
      } elsif ($env{'browser.interface'} eq 'textual') {
  # Accessibility
-         return $bodytag.&Apache::lonmenu::menubuttons($forcereg,'web',
+ 	$bodytag.=&Apache::lonmenu::menubuttons($forcereg,$forcereg);
-                                                       $forcereg).
+ 	if (!$notitle) {
-                '<h1>LON-CAPA: '.$title.'</h1>';
+ 	    $bodytag.='<h1>LON-CAPA: '.$title.'</h1>';
-     } elsif ($env{'environment.remote'} eq 'off') {
+ 	}
- # No Remote
+ 	return $bodytag;
- 	my $roleinfo=(<<ENDROLE);
+     }
- <td bgcolor="$tabbg" align="right">
- <font size="2" face="Arial, Helvetica, sans-serif">
+     my $name = &plainname($env{'user.name'},$env{'user.domain'});
-     $env{'environment.firstname'}
+     if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
-     $env{'environment.middlename'}
+ 	undef($role);
-     $env{'environment.lastname'}
+     } else {
-     $env{'environment.generation'}
+ 	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
-     </font>&nbsp;
+     }
- <br />
- <font size="2" face="Arial, Helvetica, sans-serif">$role</font>&nbsp;
+     my $roleinfo=(<<ENDROLE);
- <br />
+ <td class="LC_title_bar_who">
- <font size="2" face="Arial, Helvetica, sans-serif">$realm</font>&nbsp;
+ <div class="LC_title_bar_name">
+     $name
+     &nbsp;
+ </div>
+ <div class="LC_title_bar_role">
+ $role&nbsp;
+ </div>
+ <div class="LC_title_bar_realm">
+ $realm&nbsp;
+ </div>
  </td>
  ENDROLE
-         my $titleinfo = '<font face="Arial, Helvetica, sans-serif" size="+3" color="'.
- 		$font.'"><b>'.$title.'</b></font>';
-         if ($customtitle) {
-             $titleinfo = $customtitle;
-         }
+     my $titleinfo = '<span class="LC_title_bar_title">'.$title.'</span>';
+     if ($customtitle) {
+         $titleinfo = $customtitle;
+     }
+     #
+     # Extra info if you are the DC
+     my $dc_info = '';
+     if ($env{'user.adv'} && exists($env{'user.role.dc./'.
+                         $env{'course.'.$env{'request.course.id'}.
+                                  '.domain'}.'/'})) {
+         my $cid = $env{'request.course.id'};
+         $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
+         $dc_info =~ s/\s+$//;
+         $dc_info = '('.$dc_info.')';
+     }
+     if ($env{'environment.remote'} eq 'off') {
+         # No Remote
  	if ($env{'request.state'} eq 'construct') {
+ 	    $forcereg=1;
+ 	}
+ 	if (!$customtitle && $env{'request.state'} eq 'construct') {
+ 	    # this is for resources; directories have customtitle, and crumbs
+             # and select recent are created in lonpubdir.pm
  	    my ($uname,$thisdisfn)=
  		($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
  	    my $formaction='/priv/'.$uname.'/'.$thisdisfn;
  	    $formaction=~s/\/+/\//g;
-             unless ($customtitle) {  #this is for resources; directories have customtitle, and crumbs and select recent are created in lonpubdir.pm
-                 my $parentpath = '';
-                 my $lastitem = '';
-                 if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
-                     $parentpath = $1;
-                     $lastitem = $2;
-                 } else {
-                     $lastitem = $thisdisfn;
-                 }
- 	        $titleinfo = &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
-                       '<font face="Arial, Helvetica, sans-serif"><b>Construction Space</b>:</font>&nbsp;'.
-                       '<form name="dirs" method="post" action="'.$formaction
- 		    .'" target="_top"><tt><b>'
- 		    .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<font size=\"+1\">$lastitem</font></b></tt><br />"
- 		    .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
- 		    .'</form>'
- 		    .&Apache::lonmenu::constspaceform();
-             }
+ 	    my $parentpath = '';
- 	    $forcereg=1;
+ 	    my $lastitem = '';
-         }
+ 	    if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
-         my $titletable = '<table bgcolor="'.$pgbg.'" width="100%" border="0" '.
+ 		$parentpath = $1;
-                          'cellspacing="3" cellpadding="3">'.
+ 		$lastitem = $2;
-                          '<tr><td bgcolor="'.$tabbg.'">'.
+ 	    } else {
-                          $titleinfo.'</td>'.$roleinfo.'</tr></table>';
+ 		$lastitem = $thisdisfn;
-         if ($env{'request.state'} eq 'construct') {
+ 	    }
-             if ($notopbar) {
+ 	    $titleinfo =
-                 $bodytag .= $titletable;
+ 		&Apache::loncommon::help_open_menu('','',3,'Authoring')
-             } else {
+ 		.'<b>'.&mt('Construction Space').'</b>:&nbsp;'
-                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg,$titletable);
+ 		.'<form name="dirs" method="post" action="'.$formaction.'"'
-             }
+ 		.' target="_top"><tt><b>'
+ 		.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<font size=\"+1\">$lastitem</font></b></tt><br />"
+ 		.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
+ 		.'</form>'
+ 		.&Apache::lonmenu::constspaceform();
+         }
+         my $titletable;
+ 	if (!$notitle) {
+ 	    $titletable =
+ 		'<table id="LC_title_bar">'.
+                          "<tr><td> $titleinfo $dc_info</td>".$roleinfo.
+ 			 '</tr></table>';
+ 	}
+ 	if ($notopbar) {
+ 	    $bodytag .= $titletable;
  	} else {
-             if ($notopbar) {
+ 	    if ($env{'request.state'} eq 'construct') {
-                 $bodytag .= $titletable;
+                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
+ 							  $titletable);
              } else {
-                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg).
+                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg).
-                         $titletable;
+ 		    $titletable;
              }
          }
          return $bodytag;
- Line 2908  ENDROLE
+ Line 4038  ENDROLE
  #
  # Top frame rendering, Remote is up
  #
-     my $titleinfo = '&nbsp;<font size="5" face="Arial, Helvetica, sans-serif"><b>'.$title.'</b></font>';
-     if ($customtitle) {
+     my $imgsrc = $img;
-         $titleinfo = $customtitle;
+     if ($img =~ /^\/adm/) {
-     }
+         $imgsrc = &lonhttpdurl($img);
-     #
-     # Extra info if you are the DC
-     my $dc_info = '';
-     if ($env{'user.adv'} && exists($env{'user.role.dc./'.
-                         $env{'course.'.$env{'request.course.id'}.
-                                  '.domain'}.'/'})) {
-         my $cid = $env{'request.course.id'};
-         $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
-         $dc_info = '('.$dc_info.')';
      }
+     my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
      # Explicit link to get inline menu
-     my $menu='<br /><font size="2" face="Arial, Helvetica, sans-serif">&nbsp;<a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a></font>';
+     my $menu= ($no_inline_link?''
+ 	       :'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
      #
+     if ($notitle) {
+ 	return $bodytag;
+     }
      return(<<ENDBODY);
  $bodytag
- <table width="100%" cellspacing="0" border="0" cellpadding="0">
+ <table id="LC_title_bar" class="LC_with_remote">
- <tr><td bgcolor="$sidebg">
+ <tr><td class="LC_title_bar_role_logo">$upperleft</td>
- $upperleft</td>
+     <td class="LC_title_bar_domain_logo">$messages&nbsp;</td>
- <td bgcolor="$sidebg" align="right">$messages&nbsp;</td>
  </tr>
- <tr>
+ <tr><td>$titleinfo $dc_info $menu</td>
- <td rowspan="3" bgcolor="$tabbg">
+ $roleinfo
- $titleinfo $dc_info $menu
- </td><td bgcolor="$tabbg" align="right">
- <font size="2" face="Arial, Helvetica, sans-serif">
-     $env{'environment.firstname'}
-     $env{'environment.middlename'}
-     $env{'environment.lastname'}
-     $env{'environment.generation'}
-     </font>&nbsp;
- </td>
  </tr>
- <tr><td bgcolor="$tabbg" align="right">
+ </table>
- <font size="2" face="Arial, Helvetica, sans-serif">$role</font>&nbsp;
- </td></tr>
- <tr>
- <td bgcolor="$tabbg" align="right"><font size="2" face="Arial, Helvetica, sans-serif">$realm</font>&nbsp;</td></tr>
- </table><br />
  ENDBODY
  }
- ###############################################
+ sub make_attr_string {
- ###############################################
+     my ($register,$attr_ref) = @_;
- =pod
+     if ($attr_ref && !ref($attr_ref)) {
+ 	die("addentries Must be a hash ref ".
+ 	    join(':',caller(1))." ".
+ 	    join(':',caller(0))." ");
+     }
+     if ($register) {
+ 	my ($on_load,$on_unload);
+ 	foreach my $key (keys(%{$attr_ref})) {
+ 	    if      (lc($key) eq 'onload') {
+ 		$on_load.=$attr_ref->{$key}.';';
+ 		delete($attr_ref->{$key});
+ 	    } elsif (lc($key) eq 'onunload') {
+ 		$on_unload.=$attr_ref->{$key}.';';
+ 		delete($attr_ref->{$key});
+ 	    }
+ 	}
+ 	$attr_ref->{'onload'}  =
+ 	    &Apache::lonmenu::loadevents().  $on_load;
+ 	$attr_ref->{'onunload'}=
+ 	    &Apache::lonmenu::unloadevents().$on_unload;
+     }
- =back
+ # Accessibility font enhance
+     if ($env{'browser.fontenhance'} eq 'on') {
+ 	my $style;
+ 	foreach my $key (keys(%{$attr_ref})) {
+ 	    if (lc($key) eq 'style') {
+ 		$style.=$attr_ref->{$key}.';';
+ 		delete($attr_ref->{$key});
+ 	    }
+ 	}
+ 	$attr_ref->{'style'}=$style.'; font-size: x-large;';
+     }
- =head1 HTML Helpers
+     if ($env{'browser.blackwhite'} eq 'on') {
+ 	delete($attr_ref->{'font'});
+ 	delete($attr_ref->{'link'});
+ 	delete($attr_ref->{'alink'});
+ 	delete($attr_ref->{'vlink'});
+ 	delete($attr_ref->{'bgcolor'});
+ 	delete($attr_ref->{'background'});
+     }
- =over 4
+     my $attr_string;
+     foreach my $attr (keys(%$attr_ref)) {
+ 	$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" ';
+     }
+     return $attr_string;
+ }
+ ###############################################
+ ###############################################
+ =pod
  =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
+ Inputs: (all optional)
+             domain         -> force to color decorate a page for a specific
+                                domain
+             function       -> force usage of a specific rolish color scheme
+             bgcolor        -> override the default page bgcolor
+ =cut
+ sub standard_css {
+     my ($function,$domain,$bgcolor) = @_;
+     $function  = &get_users_function() if (!$function);
+     my $img    = &designparm($function.'.img',   $domain);
+     my $tabbg  = &designparm($function.'.tabbg', $domain);
+     my $font   = &designparm($function.'.font',  $domain);
+     my $sidebg = &designparm($function.'.sidebg',$domain);
+     my $pgbg_or_bgcolor =
+ 	         $bgcolor ||
+ 	         &designparm($function.'.pgbg',  $domain);
+     my $pgbg   = &designparm($function.'.pgbg',  $domain);
+     my $alink  = &designparm($function.'.alink', $domain);
+     my $vlink  = &designparm($function.'.vlink', $domain);
+     my $link   = &designparm($function.'.link',  $domain);
+     my $sans                 = 'Verdana,Arial,Helvetica,sans-serif';
+     my $mono                 = 'monospace';
+     my $data_table_head      = $tabbg;
+     my $data_table_light     = '#EEEEEE';
+     my $data_table_dark      = '#DDDDDD';
+     my $data_table_darker    = '#CCCCCC';
+     my $data_table_highlight = '#FFFF00';
+     my $mail_new             = '#FFBB77';
+     my $mail_new_hover       = '#DD9955';
+     my $mail_read            = '#BBBB77';
+     my $mail_read_hover      = '#999944';
+     my $mail_replied         = '#AAAA88';
+     my $mail_replied_hover   = '#888855';
+     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';
+     return <<END;
+ h1, h2, h3, th { font-family: $sans }
+ a:focus { color: red; background: yellow }
+ table.thinborder,
+ 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; white-space:pre;}
+ .LC_error {
+   color: red;
+   font-size: larger;
+ }
+ .LC_warning,
+ .LC_diff_removed {
+   color: red;
+ }
+ .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_nav_location {
+   width: 100%;
+   background: $pgbg;
+   border: 2px;
+   border-collapse: separate;
+   padding: 0px;
+ }
+ table#LC_title_bar, table.LC_breadcrumbs,
+ table#LC_title_bar.LC_with_remote {
+   width: 100%;
+   border-color: $pgbg;
+   border-style: solid;
+   border-width: $border;
+   background: $pgbg;
+   font-family: $sans;
+   border-collapse: collapse;
+   padding: 0px;
+ }
+ table.LC_docs_path {
+   width: 100%;
+   border: 0;
+   background: $pgbg;
+   font-family: $sans;
+   border-collapse: collapse;
+   padding: 0px;
+ }
+ table#LC_title_bar td {
+   background: $tabbg;
+ }
+ table#LC_title_bar td.LC_title_bar_who {
+   background: $tabbg;
+   color: $font;
+   font: small $sans;
+   text-align: right;
+ }
+ span.LC_metadata {
+     font-family: $sans;
+ }
+ span.LC_title_bar_title {
+   font: bold x-large $sans;
+ }
+ table#LC_title_bar td.LC_title_bar_domain_logo {
+   background: $sidebg;
+   text-align: right;
+   padding: 0px;
+ }
+ table#LC_title_bar td.LC_title_bar_role_logo {
+   background: $sidebg;
+   padding: 0px;
+ }
+ table#LC_menubuttons_mainmenu {
+   width: 100%;
+   border: 0px;
+   border-spacing: 1px;
+   padding: 0px 1px;
+   margin: 0px;
+   border-collapse: separate;
+ }
+ table#LC_menubuttons img, table#LC_menubuttons_mainmenu img {
+   border: 0px;
+ }
+ table#LC_top_nav td {
+   background: $tabbg;
+   border: 0px;
+   font-size: small;
+ }
+ table#LC_top_nav td a, div#LC_top_nav a {
+   color: $font;
+   font-family: $sans;
+ }
+ table#LC_top_nav td.LC_top_nav_logo {
+   background: $tabbg;
+   text-align: left;
+   white-space: nowrap;
+   width: 31px;
+ }
+ table#LC_top_nav td.LC_top_nav_logo img {
+   border: 0px;
+   vertical-align: bottom;
+ }
+ table#LC_top_nav td.LC_top_nav_exit,
+ table#LC_top_nav td.LC_top_nav_help {
+   width: 2.0em;
+ }
+ table#LC_top_nav td.LC_top_nav_login {
+   width: 4.0em;
+   text-align: center;
+ }
+ table.LC_breadcrumbs td, table.LC_docs_path td  {
+   background: $tabbg;
+   color: $font;
+   font-family: $sans;
+   font-size: smaller;
+ }
+ table.LC_breadcrumbs td.LC_breadcrumbs_component,
+ table.LC_docs_path td.LC_docs_path_component {
+   background: $tabbg;
+   color: $font;
+   font-family: $sans;
+   font-size: larger;
+   text-align: right;
+ }
+ td.LC_table_cell_checkbox {
+   text-align: center;
+ }
+ table#LC_mainmenu td.LC_mainmenu_column {
+     vertical-align: top;
+ }
+ .LC_menubuttons_inline_text {
+   color: $font;
+   font-family: $sans;
+   font-size: smaller;
+ }
+ .LC_menubuttons_link {
+   text-decoration: none;
+ }
+ .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 {
+ }
+ .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;
+ }
+ 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_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.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_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 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;
+   border-collapse: collapse;
+ }
+ table.LC_calendar_pickdate {
+   font-size: xx-small;
+ }
+ table.LC_calendar tr td {
+   border: 1px solid #000000;
+   vertical-align: top;
+ }
+ table.LC_calendar tr td.LC_calendar_day_empty {
+   background-color: $data_table_dark;
+ }
+ table.LC_calendar tr td.LC_calendar_day_current {
+   background-color: $data_table_highlight;
+ }
+ table.LC_mail_list tr.LC_mail_new {
+   background-color: $mail_new;
+ }
+ table.LC_mail_list tr.LC_mail_new:hover {
+   background-color: $mail_new_hover;
+ }
+ table.LC_mail_list tr.LC_mail_read {
+   background-color: $mail_read;
+ }
+ table.LC_mail_list tr.LC_mail_read:hover {
+   background-color: $mail_read_hover;
+ }
+ table.LC_mail_list tr.LC_mail_replied {
+   background-color: $mail_replied;
+ }
+ table.LC_mail_list tr.LC_mail_replied:hover {
+   background-color: $mail_replied_hover;
+ }
+ table.LC_mail_list tr.LC_mail_other {
+   background-color: $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;
+   background: $pgbg;
+   border: 0px;
+   border-spacing: 2px 2px;
+   padding: 0px;
+   margin: 0px;
+   border-collapse: separate;
+ }
+ table#LC_portfolio_actions td.LC_label {
+   background: $tabbg;
+   text-align: right;
+ }
+ table#LC_portfolio_actions td.LC_value {
+   background: $tabbg;
+ }
+ table#LC_cstr_controls {
+   width: 100%;
+   border-collapse: collapse;
+ }
+ table#LC_cstr_controls tr td {
+   border: 4px solid $pgbg;
+   padding: 4px;
+   text-align: center;
+   background: $tabbg;
+ }
+ table#LC_cstr_controls tr th {
+   border: 4px solid $pgbg;
+   background: $table_header;
+   text-align: center;
+   font-family: $sans;
+   font-size: smaller;
+ }
+ table#LC_browser {
+ }
+ table#LC_browser tr th {
+   background: $table_header;
+ }
+ table#LC_browser tr td {
+   padding: 2px;
+ }
+ table#LC_browser tr.LC_browser_file,
+ table#LC_browser tr.LC_browser_file_published {
+   background: #CCFF88;
+ }
+ table#LC_browser tr.LC_browser_file_locked,
+ table#LC_browser tr.LC_browser_file_unpublished {
+   background: #FFAA99;
+ }
+ 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_metamodified {
+   background: #FFFF77;
+ }
+ table#LC_browser tr.LC_browser_folder {
+   background: #CCCCFF;
+ }
+ span.LC_current_location {
+   font-size: x-large;
+   background: $pgbg;
+ }
+ span.LC_parm_menu_item {
+   font-size: larger;
+   font-family: $sans;
+ }
+ span.LC_parm_scope_all {
+   color: red;
+ }
+ span.LC_parm_scope_folder {
+   color: green;
+ }
+ span.LC_parm_scope_resource {
+   color: orange;
+ }
+ span.LC_parm_part {
+   color: blue;
+ }
+ span.LC_parm_folder, span.LC_parm_symb {
+   font-size: x-small;
+   font-family: $mono;
+   color: #AAAAAA;
+ }
+ td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu,
+ td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+   border: 1px solid black;
+   border-collapse: collapse;
+ }
+ table.LC_parm_overview_restrictions td {
+   border-width: 1px 4px 1px 4px;
+   border-style: solid;
+   border-color: $pgbg;
+   text-align: center;
+ }
+ table.LC_parm_overview_restrictions th {
+   background: $tabbg;
+   border-width: 1px 4px 1px 4px;
+   border-style: solid;
+   border-color: $pgbg;
+ }
+ table#LC_helpmenu {
+   border: 0px;
+   height: 55px;
+   border-spacing: 0px;
+ }
+ table#LC_helpmenu fieldset legend {
+   font-size: larger;
+   font-weight: bold;
+ }
+ table#LC_helpmenu_links {
+   width: 100%;
+   border: 1px solid black;
+   background: $pgbg;
+   padding: 0px;
+   border-spacing: 1px;
+ }
+ table#LC_helpmenu_links tr td {
+   padding: 1px;
+   background: $tabbg;
+   text-align: center;
+   font-weight: bold;
+ }
+ table#LC_helpmenu_links a:link, table#LC_helpmenu_links a:visited,
+ table#LC_helpmenu_links a:active {
+   text-decoration: none;
+   color: $font;
+ }
+ table#LC_helpmenu_links a:hover {
+   text-decoration: underline;
+   color: $vlink;
+ }
+ .LC_chrt_popup_exists {
+   border: 1px solid #339933;
+   margin: -1px;
+ }
+ .LC_chrt_popup_up {
+   border: 1px solid yellow;
+   margin: -1px;
+ }
+ .LC_chrt_popup {
+   border: 1px solid #8888FF;
+   background: #CCCCFF;
+ }
+ table.LC_pick_box {
+   border-collapse: separate;
+   background: white;
+   border: 1px solid black;
+   border-spacing: 1px;
+ }
+ table.LC_pick_box td.LC_pick_box_title {
+   background: $tabbg;
+   font-weight: bold;
+   text-align: right;
+   width: 184px;
+   padding: 8px;
+ }
+ table.LC_pick_box td.LC_pick_box_value {
+   text-align: left;
+   padding: 8px;
+ }
+ table.LC_pick_box td.LC_pick_box_select {
+   text-align: left;
+   padding: 8px;
+ }
+ table.LC_pick_box td.LC_pick_box_separator {
+   padding: 0px;
+   height: 1px;
+   background: black;
+ }
+ table.LC_pick_box td.LC_pick_box_submit {
+   text-align: right;
+ }
+ table.LC_pick_box td.LC_evenrow_value {
+   text-align: left;
+   padding: 8px;
+   background-color: $data_table_light;
+ }
+ table.LC_pick_box td.LC_oddrow_value {
+   text-align: left;
+   padding: 8px;
+   background-color: $data_table_light;
+ }
+ 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;
+   border-spacing: 1px;
+ }
+ table.LC_group_priv_box td.LC_pick_box_title {
+   background: $tabbg;
+   font-weight: bold;
+   text-align: right;
+   width: 184px;
+ }
+ table.LC_group_priv_box td.LC_groups_fixed {
+   background: $data_table_light;
+   text-align: center;
+ }
+ table.LC_group_priv_box td.LC_groups_optional {
+   background: $data_table_dark;
+   text-align: center;
+ }
+ table.LC_group_priv_box td.LC_groups_functionality {
+   background: $data_table_darker;
+   text-align: center;
+   font-weight: bold;
+ }
+ table.LC_group_priv td {
+   text-align: left;
+   padding: 0px;
+ }
+ table.LC_notify_front_page {
+   background: white;
+   border: 1px solid black;
+   padding: 8px;
+ }
+ table.LC_notify_front_page td {
+   padding: 8px;
+ }
+ .LC_navbuttons {
+   margin: 2ex 0ex 2ex 0ex;
+ }
+ .LC_topic_bar {
+   font-family: $sans;
+   font-weight: bold;
+   width: 100%;
+   background: $tabbg;
+   vertical-align: middle;
+   margin: 2ex 0ex 2ex 0ex;
+ }
+ .LC_topic_bar span {
+   vertical-align: middle;
+ }
+ .LC_topic_bar img {
+   vertical-align: bottom;
+ }
+ table.LC_course_group_status {
+   margin: 20px;
+ }
+ table.LC_status_selector td {
+   vertical-align: top;
+   text-align: center;
+   padding: 4px;
+ }
+ table.LC_descriptive_input td.LC_description {
+   vertical-align: top;
+   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;
+ }
+ END
+ }
+ =pod
  =item * &headtag()
- Line 2999  Inputs: $title - optional title for the
+ Line 5242  Inputs: $title - optional title for the
          $args - optional arguments
              force_register - if is true call registerurl so the remote is
                               informed
+             redirect       -> array ref of
-             redirect - array ref of seconds before redirect occurs
+- seconds before redirect occurs
-                                     url to redirect to
+- url to redirect to
+- whether the side effect should occur
                             (side effect of setting
                                 $env{'internal.head.redirect'} to the url
                                 redirected too)
- =back
+             domain         -> force to color decorate a page for a specific
+                                domain
+             function       -> force usage of a specific rolish color scheme
+             bgcolor        -> override the default page bgcolor
+             no_auto_mt_title
+                            -> prevent &mt()ing the title arg
  =cut
  sub headtag {
      my ($title,$head_extra,$args) = @_;
+     my $function = $args->{'function'} || &get_users_function();
+     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);
+     $url = '/adm/css/'.&escape($url).'.css';
      my $result =
  	'<head>'.
- 	&Apache::lonxml::fontsettings().
+ 	&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) = @{$args->{'redirect'}};
+ 	my ($time,$url,$inhibit_continue) = @{$args->{'redirect'}};
  	$url = &Apache::lonenc::check_encrypt($url);
- 	$env{'internal.head.redirect'} = $url;
+ 	if (!$inhibit_continue) {
+ 	    $env{'internal.head.redirect'} = $url;
+ 	}
  	$result.=<<ADDMETA
  <meta http-equiv="pragma" content="no-cache" />
- <meta HTTP-EQUIV="Refresh" CONTENT="$time; url=$url" />
+ <meta http-equiv="Refresh" content="$time; url=$url" />
  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>'.$head_extra;
+     $result .= '<title> LON-CAPA '.$title.'</title>'
+ 	.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'
+ 	.$head_extra;
      return $result;
  }
  =pod
- =over 4
+ =item * &font_settings()
+ Returns neccessary <meta> to set the proper encoding
+ Inputs: none
+ =cut
+ sub font_settings {
+     my $headerstring='';
+     if (($env{'browser.os'} eq 'mac') && (!$env{'browser.mathml'})) {
+ 	$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" />';
+     }
+     return $headerstring;
+ }
+ =pod
+ =item * &xml_begin()
+ Returns the needed doctype and <html>
+ Inputs: none
+ =cut
+ sub xml_begin {
+     my $output='';
+     if ($env{'internal.start_page'}==1) {
+ 	&Apache::lonhtmlcommon::init_htmlareafields();
+     }
+     if ($env{'browser.mathml'}) {
+ 	$output='<?xml version="1.0"?>'
+             #.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'."\n"
+ #            .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '
+ #	    .'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [<!ENTITY mathns "http://www.w3.org/1998/Math/MathML">] >'
+ 	    .'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">'
+             .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '
+ 	    .'xmlns="http://www.w3.org/1999/xhtml">';
+     } else {
+ 	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>';
+     }
+     return $output;
+ }
+ =pod
  =item * &endheadtag()
- Line 3048  Returns a uniform </head> for LON-CAPA w
+ Line 5371  Returns a uniform </head> for LON-CAPA w
  Inputs: none
- =back
  =cut
  sub endheadtag {
- Line 3058  sub endheadtag {
+ Line 5379  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
          $head_extra - optional extra HTML to put inside the <head>
- =back
  =cut
- Line 3077  sub head {
+ Line 5395  sub head {
  =pod
- =over 4
  =item * &start_page()
  Returns a complete <html> .. <body> section for LON-CAPA web pages.
- Line 3105  Inputs: $title - optional title for the
+ Line 5421  Inputs: $title - optional title for the
                    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>
- =back
+                                     rather than <body>
+                   no_title       -> if true the title bar won't be shown
+                   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
+                                     '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
  =cut
- Line 3114  sub start_page {
+ Line 5443  sub start_page {
      my ($title,$head_extra,$args) = @_;
      #&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
      my %head_args;
-     foreach my $arg ('redirect','force_register') {
+     foreach my $arg ('redirect','force_register','domain','function',
+ 		     'bgcolor','frameset','no_nav_bar','only_body',
+ 		     'no_auto_mt_title') {
  	if (defined($args->{$arg})) {
  	    $head_args{$arg} = $args->{$arg};
  	}
      }
      $env{'internal.start_page'}++;
-     my $result =
+     my $result;
- 	&Apache::lonxml::xmlbegin().
+     if (! exists($args->{'skip_phases'}{'head'}) ) {
- 	&headtag($title,$head_extra,\%head_args).&endheadtag().
+ 	$result.=
- 	&bodytag($title,
+ 	    &xml_begin().
- 		 $args->{'function'},       $args->{'add_entries'},
+ 	    &headtag($title,$head_extra,\%head_args).&endheadtag();
- 		 $args->{'only_body'},      $args->{'domain'},
+     }
- 		 $args->{'force_register'}, $args->{'body_title'},
- 		 $args->{'no_nav_bar'},     $args->{'bgcolor'});
+     if (! exists($args->{'skip_phases'}{'body'}) ) {
+ 	if ($args->{'frameset'}) {
+ 	    my $attr_string = &make_attr_string($args->{'force_register'},
+ 						$args->{'add_entries'});
+ 	    $result .= "\n<frameset $attr_string>\n";
+ 	} else {
+ 	    $result .=
+ 		&bodytag($title,
+ 			 $args->{'function'},       $args->{'add_entries'},
+ 			 $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);
+ 	}
+     }
      if ($args->{'js_ready'}) {
  	$result = &js_ready($result);
      }
- Line 3138  sub start_page {
+ Line 5485  sub start_page {
      return $result;
  }
- =pod
- =over 4
+ =pod
  =item * &head()
- Line 3151  Inputs:         $args - additional optio
+ Line 5497  Inputs:         $args - additional optio
                                   a javascript writeln
                   html_encode  -> return a string ready for being used in
                                   a html attribute
- =back
+                  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
  sub end_page {
      my ($args) = @_;
-     #&Apache::lonnet::logthis("end_page ".join(':',caller(0)));
      $env{'internal.end_page'}++;
-     my $result = &endbodytag()."\n</html>";
+     my $result;
+     if ($args->{'discussion'}) {
+ 	my ($target,$parser);
+ 	if (ref($args->{'discussion'})) {
+ 	    ($target,$parser) =($args->{'discussion'}{'target'},
+ 				$args->{'discussion'}{'parser'});
+ 	}
+ 	$result .= &Apache::lonxml::xmlend($target,$parser);
+     }
+     if ($args->{'frameset'}) {
+ 	$result .= '</frameset>';
+     } else {
+ 	$result .= &endbodytag($args);
+     }
+     $result .= "\n</html>";
      if ($args->{'js_ready'}) {
  	$result = &js_ready($result);
      }
      if ($args->{'html_encode'}) {
  	$result = &html_encode($result);
      }
      return $result;
  }
- Line 3182  sub js_ready {
+ Line 5551  sub js_ready {
      $result =~ s/[\n\r]/ /xmsg;
      $result =~ s/\\/\\\\/xmsg;
      $result =~ s/'/\\'/xmsg;
-     $result =~ s{</script>}{</scrip'+'t>}xmsg;
+     $result =~ s{</}{<\\/}xmsg;
      return $result;
  }
- Line 3224  sub simple_error_page {
+ Line 5593  sub simple_error_page {
      }
      return $page;
  }
+ {
+     my @row_count;
+     sub start_data_table {
+ 	my ($add_class) = @_;
+ 	my $css_class = (join(' ','LC_data_table',$add_class));
+ 	unshift(@row_count,0);
+ 	return '<table class="'.$css_class.'">'."\n";
+     }
+     sub end_data_table {
+ 	shift(@row_count);
+ 	return '</table>'."\n";;
+     }
+     sub start_data_table_row {
+ 	my ($add_class) = @_;
+ 	$row_count[0]++;
+ 	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";;
+     }
+     sub end_data_table_row {
+ 	return '</tr>'."\n";;
+     }
+     sub start_data_table_empty_row {
+ 	$row_count[0]++;
+ 	return  '<tr class="LC_empty_row" >'."\n";;
+     }
+     sub end_data_table_empty_row {
+ 	return '</tr>'."\n";;
+     }
+     sub start_data_table_header_row {
+ 	return  '<tr class="LC_header_row">'."\n";;
+     }
+     sub end_data_table_header_row {
+ 	return '</tr>'."\n";;
+     }
+ }
+ =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
+ =item * &get_users_function()
  Used by &bodytag to determine the current users primary role.
  Returns either 'student','coordinator','admin', or 'author'.
- Line 3257  sub get_users_function {
+ Line 5727  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.
  Inputs:
  user's domain, user's username, course's domain,
- course's number, optional section/group.
+ course's number, optional section ID.
  Outputs:
  role status: active, previous or future.
- Line 3272  role status: active, previous or future.
+ Line 5742  role status: active, previous or future.
  =cut
  sub check_user_status {
-     my ($udom,$uname,$cdom,$crs,$role,$secgrp) = @_;
+     my ($udom,$uname,$cdom,$crs,$role,$sec) = @_;
      my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname);
      my @uroles = keys %userinfo;
      my $srchstr;
      my $active_chk = 'none';
+     my $now = time;
      if (@uroles > 0) {
-         if (($role eq 'cc') || ($secgrp eq '') || (!defined($secgrp))) {
+         if (($role eq 'cc') || ($sec eq '') || (!defined($sec))) {
              $srchstr = '/'.$cdom.'/'.$crs.'_'.$role;
          } else {
-             $srchstr = '/'.$cdom.'/'.$crs.'/'.$secgrp.'_'.$role;         }
+             $srchstr = '/'.$cdom.'/'.$crs.'/'.$sec.'_'.$role;
-         if (grep/^$srchstr$/,@uroles) {
+         }
+         if (grep/^\Q$srchstr\E$/,@uroles) {
              my $role_end = 0;
              my $role_start = 0;
              $active_chk = 'active';
-             if ($userinfo{$srchstr} =~ m/^($role)_(\d+)/) {
+             if ($userinfo{$srchstr} =~ m/^\Q$role\E_(\d+)/) {
-                 $role_end = $2;
+                 $role_end = $1;
-                 if ($userinfo{$srchstr} =~ m/^($role)_($role_end)_(\d+)$/) {
+                 if ($userinfo{$srchstr} =~ m/^\Q$role\E_\Q$role_end\E_(\d+)$/) {
-                     $role_start = $3;
+                     $role_start = $1;
                  }
              }
              if ($role_start > 0) {
-                 if (time < $role_start) {
+                 if ($now < $role_start) {
                      $active_chk = 'future';
                  }
              }
              if ($role_end > 0) {
-                 if (time > $role_end) {
+                 if ($now > $role_end) {
                      $active_chk = 'previous';
                  }
              }
- Line 3311  sub check_user_status {
+ Line 5783  sub check_user_status {
  =pod
- =item get_sections
+ =item * &get_sections()
  Determines all the sections for a course including
  sections with students and sections containing other roles.
- Incoming parameters: domain, course number, reference to
+ Incoming parameters:
- section hash (keys to be section/group IDs), reference to
- array containing roles for which sections should be gathered
+. domain
- (optional). If the fourth argument is undefined, sections
+. course number
- are gathered for any role.
+. reference to array containing roles for which sections should
+ be gathered (optional).
+. reference to array containing status types for which sections
+ should be gathered (optional).
+ If the third argument is undefined, sections are gathered for any role.
+ If the fourth argument is undefined, sections are gathered for any status.
+ Permissible values are 'active' or 'future' or 'previous'.
- Returns number of sections.
+ Returns section hash (keys are section IDs, values are
+ number of users in each section), subject to the
+ optional roles filter, optional status filter
  =cut
  ###############################################
  sub get_sections {
-     my ($cdom,$cnum,$sectioncount,$possible_roles) = @_;
+     my ($cdom,$cnum,$possible_roles,$possible_status) = @_;
-     if (!($cdom && $cnum)) { return 0; }
+     if (!defined($cdom) || !defined($cnum)) {
-     my $numsections = 0;
+         my $cid =  $env{'request.course.id'};
-     if (!defined($possible_roles) || (grep/^st$/,@$possible_roles)) {
+ 	return if (!defined($cid));
+         $cdom = $env{'course.'.$cid.'.domain'};
+         $cnum = $env{'course.'.$cid.'.num'};
+     }
+     my %sectioncount;
+     my $now = time;
+     if (!defined($possible_roles) || (grep(/^st$/,@$possible_roles))) {
  	my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);
  	my $sec_index = &Apache::loncoursedata::CL_SECTION();
  	my $status_index = &Apache::loncoursedata::CL_STATUS();
- 	while (my ($student,$data) = each %$classlist) {
+         my $start_index = &Apache::loncoursedata::CL_START();
- 	    my ($section,$status) = ($data->[$sec_index],
+         my $end_index = &Apache::loncoursedata::CL_END();
- 				     $data->[$status_index]);
+         my $status;
- 	    unless ($section eq '-1' || $section =~ /^\s*$/) {
+ 	while (my ($student,$data) = each(%$classlist)) {
- 		if (!defined($$sectioncount{$section})) { $numsections++; }
+ 	    my ($section,$stu_status,$start,$end) = ($data->[$sec_index],
- 		$$sectioncount{$section}++;
+ 				                     $data->[$status_index],
+                                                      $data->[$start_index],
+                                                      $data->[$end_index]);
+             if ($stu_status eq 'Active') {
+                 $status = 'active';
+             } elsif ($end < $now) {
+                 $status = 'previous';
+             } elsif ($start > $now) {
+                 $status = 'future';
+             }
+ 	    if ($section ne '-1' && $section !~ /^\s*$/) {
+                 if ((!defined($possible_status)) || (($status ne '') &&
+                     (grep/^\Q$status\E$/,@{$possible_status}))) {
+ 		    $sectioncount{$section}++;
+                 }
  	    }
  	}
      }
- Line 3349  sub get_sections {
+ Line 5853  sub get_sections {
  	if ($user !~ /^(\w{2})/) { next; }
  	my ($role) = ($user =~ /^(\w{2})/);
  	if ($possible_roles && !(grep(/^$role$/,@$possible_roles))) { next; }
- 	my $section;
+ 	my ($section,$status);
  	if ($role eq 'cr' &&
  	    $user =~ m-^$role/[^/]*/[^/]*/[^/]*:[^:]*:[^:]*:(\w+)-) {
  	    $section=$1;
  	}
  	if ($user =~ /^$role:[^:]*:[^:]*:(\w+)/) { $section=$1; }
  	if (!defined($section) || $section eq '-1') { next; }
- 	if (!defined($$sectioncount{$section})) { $numsections++; }
+         my ($end,$start) = ($courseroles{$user} =~ /^([^:]*):([^:]*)$/);
- 	$$sectioncount{$section}++;
+         if ($end == -1 && $start == -1) {
-     }
+             next; #deleted role
-     return $numsections;
- }
- ###############################################
- =pod
- =item coursegroups
- Retrieve information about groups in a course,
- Input:
-. Reference to hash to populate with group information.
-. Optional course domain
-. Optional course number
-. Optional group name
- Course domain and number will be taken from user's
- environment if not supplied. Optional group name will'
- be passed to lonnet::get_coursegroups() as a regexp to
- use in the call to the dump function.
- Output
- Returns number of groups in the course (subject to the
- optional group name filter).
- Side effects:
- Populates the referenced curr_groups hash, with key,
- value pairs. Keys are group names, corresponding values
- are scalars containing group information in XML. This
- can be sent to &get_group_settings() to be parsed.
- =cut
- ###############################################
- sub coursegroups {
-     my ($curr_groups,$cdom,$cnum,$group) = @_;
-     my $numgroups;
-     if (!defined($cdom) || !defined($cnum)) {
-         my $cid =  $env{'request.course.id'};
-         $cdom = $env{'course.'.$cid.'.domain'};
-         $cnum = $env{'course.'.$cid.'.num'};
-     }
-     %{$curr_groups} = &Apache::lonnet::get_coursegroups($cdom,$cnum,$group);
-     my ($tmp) = keys(%{$curr_groups});
-     if ($tmp=~/^error:/) {
-         unless ($tmp eq 'error: 2 tie(GDBM) Failed while attempting dump') {
-             &logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.
-                                                                    $cdom);
          }
-         $numgroups = 0;
+         if (!defined($possible_status)) {
-     } else {
+             $sectioncount{$section}++;
-         $numgroups = keys(%{$curr_groups});
+         } else {
-     }
+             if ((!$end || $end >= $now) && (!$start || $start <= $now)) {
-     return $numgroups;
+                 $status = 'active';
- }
+             } elsif ($end < $now) {
+                 $status = 'future';
- ###############################################
+             } elsif ($start > $now) {
+                 $status = 'previous';
- =pod
- =item get_group_settings
- Uses TokeParser to extract group information from the
- XML used to describe course groups.
- Input:
- Scalar containing XML  - as retrieved from &coursegroups().
- Output:
- Hash containing group information as key=values for (a), and
- hash of hashes for (b)
- Keys (in two categories):
- (a) groupname, creator, creation, modified, startdate,enddate.
- Corresponding values are name of the group, creator of the group
- (username:domain), UNIX time for date group was created, and
- settings were last modified, and default start and end access
- times for group members.
- (b) functions returned in hash of hashes.
- Outer hash key is functions.
- Inner hash keys are chat,discussion,email,files,homepage,roster.
- Corresponding values are either on or off, depending on
- whether this type of functionality is available for the group.
- =cut
- ###############################################
- sub get_group_settings {
-     my ($groupinfo)=@_;
-     my $parser=HTML::TokeParser->new(\$groupinfo);
-     my $token;
-     my $tool = '';
-     my $role = '';
-     my %content=();
-     while ($token=$parser->get_token) {
-         if ($token->[0] eq 'S')  {
-             my $entry=$token->[1];
-             if ($entry eq 'functions' || $entry eq 'autosec') {
-                 %{$content{$entry}} = ();
-                 $tool = $entry;
-             } elsif ($entry eq 'role') {
-                 if ($tool eq 'autosec') {
-                     $role = $token->[2]{id};
-                 }
-             } else {
-                 my $value=$parser->get_text('/'.$entry);
-                 if ($entry eq 'name') {
-                     if ($tool eq 'functions') {
-                         my $function = $token->[2]{id};
-                         $content{$tool}{$function} = $value;
-                     }
-                 } elsif ($entry eq 'groupname') {
-                     $content{$entry}=&Apache::lonnet::unescape($value);
-                 } elsif (($entry eq 'roles') || ($entry eq 'types') ||
-                          ($entry eq 'sectionpick') || ($entry eq 'defpriv')) {
-                     push(@{$content{$entry}},$value);
-                 } elsif ($entry eq 'section') {
-                     if ($tool eq 'autosec'  && $role ne '') {
-                         push(@{$content{$tool}{$role}},$value);
-                     }
-                 } else {
-                     $content{$entry}=$value;
-                 }
              }
-         } elsif ($token->[0] eq 'E') {
+             if (($status ne '') && (grep/^\Q$status\E$/,@{$possible_status})) {
-             if ($token->[1] eq 'functions' || $token->[1] eq 'autosec') {
+                 $sectioncount{$section}++;
-                 $tool = '';
-             } elsif ($token->[1] eq 'role') {
-                 $role = '';
              }
          }
      }
-     return %content;
+     return %sectioncount;
- }
- sub check_group_access {
-     my ($group) = @_;
-     my $access = 1;
-     my $now = time;
-     my ($start,$end) = split(/\./,$env{'user.role.gr/'.$env{'request.course,id'}.'/'.$group});
-     if (($end!=0) && ($end<$now)) { $access = 0; }
-     if (($start!=0) && ($start>$now)) { $access=0; }
-     return $access;
  }
  ###############################################
  =pod
- =item get_course_users
+ =item * &get_course_users()
  Retrieves usernames:domains for users in the specified course
  with specific role(s), and access status.
- Line 3527  previous, future, or all.
+ Line 5900  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.
  =cut
  ###############################################
  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;
      $idx{udom} = &Apache::loncoursedata::CL_SDOM();
      $idx{uname} =  &Apache::loncoursedata::CL_SNAME();
- Line 3558  sub get_course_users {
+ Line 5937  sub get_course_users {
          my $now = time;
          foreach my $student (keys(%{$classlist})) {
              my $match = 0;
+             my $secmatch = 0;
+             my $section = $$classlist{$student}[$idx{section}];
+             my $status = $$classlist{$student}[$idx{status}];
+             if ($section eq '') {
+                 $section = 'none';
+             }
              if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {
- 		unless(grep(/^\Q$$classlist{$student}[$idx{section}]\E$/,
+                 if (grep(/^all$/,@{$sections})) {
- 			    @{$sections})) {
+                     $secmatch = 1;
- 		    next;
+                 } elsif ($$classlist{$student}[$idx{section}] eq '') {
+                     if (grep(/^none$/,@{$sections})) {
+                         $secmatch = 1;
+                     }
+                 } else {
+ 		    if (grep(/^\Q$section\E$/,@{$sections})) {
+ 		        $secmatch = 1;
+                     }
  		}
-             }
+                 if (!$secmatch) {
+                     next;
+                 }
+             }
              if (defined($$types{'active'})) {
                  if ($$classlist{$student}[$idx{status}] eq 'Active') {
                      push(@{$$users{st}{$student}},'active');
- Line 3571  sub get_course_users {
+ Line 5966  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 && defined($userdata)) {
+             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} > 0) && (@{$roles} ne "st")) {
+     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 ($role,$user) = ($person =~ /^([^:]*):([^:]+:[^:]+)/);
+             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});
-                 my ($uname,$udom,$usec) = split(/:/,$user);
+             if ($end == -1 || $start == -1) {
-                 if ($usec ne '' && (ref($sections) eq 'ARRAY') &&
+                 next;
- 		    @{$sections} > 0) {
+             }
- 		    unless(grep(/^\Q$usec\E$/,@{$sections})) {
+             if (($role) && ((grep(/^\Q$role\E$/,@{$roles})) ||
- 			next;
+                 (grep(/^cr$/,@{$roles}) && $role =~ /^cr\//))) {
- 		    }
+                 my ($uname,$udom) = split(/:/,$user);
+                 if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {
+                     if (grep(/^all$/,@{$sections})) {
+                         $secmatch = 1;
+                     } elsif ($usec eq '') {
+                         if (grep(/^none$/,@{$sections})) {
+                             $secmatch = 1;
+                         }
+                     } else {
+                         if (grep(/^\Q$usec\E$/,@{$sections})) {
+                             $secmatch = 1;
+                         }
+                     }
+                     if (!$secmatch) {
+                         next;
+                     }
+                 }
+                 if ($usec eq '') {
+                     $usec = 'none';
                  }
                  if ($uname ne '' && $udom ne '') {
-                     my $status = &check_user_status($udom,$uname,$cdom,$cnum,$role);
+                     if ($hidepriv) {
+                         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) {
-                             @{$$users{$role}{$user}} = $type;
+                             if (!grep(/^\Q$type\E$/,@{$$users{$role}{$user}})) {
+                                 push(@{$$users{$role}{$user}},$type);
+                             }
                              $match = 1;
                          }
                      }
-                     if ($match && defined($userdata) &&
+                     if (($match) && (ref($userdata) eq 'HASH')) {
-                         !exists($$userdata{$uname.':'.$udom})) {
+                         if (!exists($$userdata{$uname.':'.$udom})) {
- 			&get_user_info($udom,$uname,\%idx,$userdata);
+ 			    &get_user_info($udom,$uname,\%idx,$userdata);
+                         }
+                         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 3621  sub get_course_users {
+ Line 6079  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}})) {
+                             push(@{$seclists{$owner}},'none');
+                         }
+                         if (ref($statushash) eq 'HASH') {
+                             $statushash->{$owner}{'ow'}{'none'} = 'Any';
+                         }
  		    }
                  }
              }
          }
+         foreach my $user (keys(%seclists)) {
+             @{$seclists{$user}} = (sort {$a <=> $b} @{$seclists{$user}});
+             $$userdata{$user}[$idx{section}] = join(',',@{$seclists{$user}});
+         }
      }
      return;
  }
- Line 3639  sub get_user_info {
+ Line 6117  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;
  }
  ###############################################
- sub get_posted_cgi {
+ =pod
-     my $r=shift;
-     my $buffer;
+ =item * &get_user_quota()
-     if ($r->header_in('Content-length')) {
- 	$r->read($buffer,$r->header_in('Content-length'),0);
+ Retrieves quota assigned for storage of portfolio files for a user
-     }
-     unless ($buffer=~/^(\-+\w+)\s+Content\-Disposition\:\s*form\-data/si) {
+ Incoming parameters:
- 	my @pairs=split(/&/,$buffer);
+. user's username
- 	my $pair;
+. user's domain
- 	foreach $pair (@pairs) {
- 	    my ($name,$value) = split(/=/,$pair);
+ Returns:
- 	    $value =~ tr/+/ /;
+. Disk quota (in Mb) assigned to student.
- 	    $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+. (Optional) Type of setting: custom or default
- 	    $name  =~ tr/+/ /;
+    (individually assigned or default for user's
- 	    $name  =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+    institutional status).
- 	    &add_to_env("form.$name",$value);
+. (Optional) - User's institutional status (e.g., faculty, staff
- 	}
+    or student - types as defined in localenroll::inst_usertypes
-     } else {
+    for user's domain, which determines default quota for user.
- 	my $contentsep=$1;
+. (Optional) - Default quota which would apply to the user.
- 	my @lines = split (/\n/,$buffer);
- 	my $name='';
+ If a value has been stored in the user's environment,
- 	my $value='';
+ it will return that, otherwise it returns the maximal default
- 	my $fname='';
+ defined for the user's instituional status(es) in the domain.
- 	my $fmime='';
- 	my $i;
+ =cut
- 	for ($i=0;$i<=$#lines;$i++) {
- 	    if ($lines[$i]=~/^$contentsep/) {
+ ###############################################
- 		if ($name) {
- 		    chomp($value);
- 		    if ($fname) {
+ sub get_user_quota {
- 			$env{"form.$name.filename"}=$fname;
+     my ($uname,$udom) = @_;
- 			$env{"form.$name.mimetype"}=$fmime;
+     my ($quota,$quotatype,$settingstatus,$defquota);
- 		    } else {
+     if (!defined($udom)) {
- 			$value=~s/\s+$//s;
+         $udom = $env{'user.domain'};
- 		    }
+     }
- 		    &add_to_env("form.$name",$value);
+     if (!defined($uname)) {
- 		}
+         $uname = $env{'user.name'};
- 		if ($i<$#lines) {
+     }
- 		    $i++;
+     if (($udom eq '' || $uname eq '') ||
- 		    $lines[$i]=~
+         ($udom eq 'public') && ($uname eq 'public')) {
- 		/Content\-Disposition\:\s*form\-data\;\s*name\=\"([^\"]+)\"/i;
+         $quota = 0;
- 		    $name=$1;
+         $quotatype = 'default';
- 		    $value='';
+         $defquota = 0;
- 		    if ($lines[$i]=~/filename\=\"([^\"]+)\"/i) {
+     } else {
- 			$fname=$1;
+         my $inststatus;
- 			if
+         if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) {
-                             ($lines[$i+1]=~/Content\-Type\:\s*([\w\-\/]+)/i) {
+             $quota = $env{'environment.portfolioquota'};
- 				$fmime=$1;
+             $inststatus = $env{'environment.inststatus'};
- 				$i++;
+         } else {
- 			    } else {
+             my %userenv =
- 				$fmime='';
+                 &Apache::lonnet::get('environment',['portfolioquota',
- 			    }
+                                      'inststatus'],$udom,$uname);
- 		    } else {
+             my ($tmp) = keys(%userenv);
- 			$fname='';
+             if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
- 			$fmime='';
+                 $quota = $userenv{'portfolioquota'};
- 		    }
+                 $inststatus = $userenv{'inststatus'};
- 		    $i++;
+             } else {
- 		}
+                 undef(%userenv);
- 	    } else {
+             }
- 		$value.=$lines[$i]."\n";
+         }
- 	    }
+         ($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);
+     my @sections =  (sort {$a <=> $b} keys(%sections_count));
+     my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+     my @groups = sort(keys(%curr_groups));
+     my $allroles = [];
+     my $rolehash;
+     my $accesshash = {
+                      active => 'Currently has access',
+                      future => 'Will have future access',
+                      previous => 'Previously had access',
+                   };
+     if ($needroles) {
+         $rolehash = {'all' => 'all'};
+         my %user_roles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
+ 	if (&Apache::lonnet::error(%user_roles)) {
+ 	    undef(%user_roles);
  	}
+         foreach my $item (keys(%user_roles)) {
+             my ($role)=split(/\:/,$item,2);
+             if ($role eq 'cr') { next; }
+             if ($role =~ /^cr/) {
+                 $$rolehash{$role} = (split('/',$role))[3];
+             } else {
+                 $$rolehash{$role} = &Apache::lonnet::plaintext($role,$type);
+             }
+         }
+         foreach my $key (sort(keys(%{$rolehash}))) {
+             push(@{$allroles},$key);
+         }
+         push (@{$allroles},'st');
+         $$rolehash{'st'} = &Apache::lonnet::plaintext('st',$type);
      }
- #
+     return (\@sections,\@groups,$allroles,$rolehash,$accesshash);
- # Digested POSTed values
+ }
- #
- # Remember the way this was originally done (GET or POST)
+ sub user_picker {
- #
+     my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype) = @_;
-     $env{'request.method'}=$ENV{'REQUEST_METHOD'};
+     my $currdom = $dom;
- #
+     my %curr_selected = (
- # There may also be stuff in the query string
+                         srchin => 'dom',
- # Tell subsequent handlers that this was GET, not POST, so they can access query string.
+                         srchby => 'lastname',
- # Also, unset POSTed content length to cover all tracks.
+                       );
- #
+     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) {
- # This does not work, because M_GET is not defined (if it's defined, it is just 0).
+     var checkok = 1;
- # Commenting out for now ... not sure if harm is done.
+     var srchin;
- #    $r->method_number(M_GET);
+     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";
+         }
+     }
-     $r->method('GET');
+     if (srchtype== 'contains') {
-     $r->headers_in->unset('Content-length');
+         if (srchterm.length < 3) {
+             checkok = 0;
+             msg += "$lt{'thet'}\\n";
+         }
+     }
+     if (srchin == 'instd') {
+         if (srchdomain == '') {
+             checkok = 0;
+             msg += "$lt{'yomc'}\\n";
+         }
+     }
+     if (srchin == 'dom') {
+         if (srchdomain == '') {
+             checkok = 0;
+             msg += "$lt{'ymcd'}\\n";
+         }
+     }
+     if (srchby == 'lastfirst') {
+         if (srchterm.indexOf(",") == -1) {
+             checkok = 0;
+             msg += "$lt{'whus'}\\n";
+         }
+         if (srchterm.indexOf(",") == srchterm.length -1) {
+             checkok = 0;
+             msg += "$lt{'whse'}\\n";
+         }
+     }
+     if (checkok == 0) {
+         alert("$lt{'thfo'}\\n"+msg);
+         return;
+     }
+     if (checkok == 1) {
+         callingForm.submit();
+     }
+ }
+ $newuserscript
+ </script>
+ $new_user_create
+ <table>
+  <tr>
+   <td>$lt{'doma'}:</td>
+   <td>$domform</td>
+   </td>
+  </tr>
+  <tr>
+   <td>$lt{'usr'}:</td>
+   <td>$srchbysel
+       $srchtypesel
+       <input type="text" size="15" name="srchterm" value="$srchterm" />
+       $srchinsel
+   </td>
+  </tr>
+ </table>
+ <br />
+ END_BLOCK
+     return $output;
+ }
+ sub user_rule_check {
+     my ($usershash,$checks,$alerts,$rulematch,$inst_results,$curr_rules,$got_rules) = @_;
+     my $response;
+     if (ref($usershash) eq 'HASH') {
+         foreach my $user (keys(%{$usershash})) {
+             my ($uname,$udom) = split(/:/,$user);
+             next if ($udom eq '' || $uname eq '');
+             my ($id,$newuser);
+             if (ref($usershash->{$user}) eq 'HASH') {
+                 $newuser = $usershash->{$user}->{'newuser'};
+                 $id = $usershash->{$user}->{'id'};
+             }
+             my $inst_response;
+             if (ref($checks) eq 'HASH') {
+                 if (defined($checks->{'username'})) {
+                     ($inst_response,%{$inst_results->{$user}}) =
+                         &Apache::lonnet::get_instuser($udom,$uname);
+                 } elsif (defined($checks->{'id'})) {
+                     ($inst_response,%{$inst_results->{$user}}) =
+                         &Apache::lonnet::get_instuser($udom,undef,$id);
+                 }
+             } else {
+                 ($inst_response,%{$inst_results->{$user}}) =
+                     &Apache::lonnet::get_instuser($udom,$uname);
+                 return;
+             }
+             if (!$got_rules->{$udom}) {
+                 my %domconfig = &Apache::lonnet::get_dom('configuration',
+                                                   ['usercreation'],$udom);
+                 if (ref($domconfig{'usercreation'}) eq 'HASH') {
+                     foreach my $item ('username','id') {
+                         if (ref($domconfig{'usercreation'}{$item.'_rule'}) eq 'ARRAY') {
+                             $$curr_rules{$udom}{$item} =
+                                 $domconfig{'usercreation'}{$item.'_rule'};
+                         }
+                     }
+                 }
+                 $got_rules->{$udom} = 1;
+             }
+             foreach my $item (keys(%{$checks})) {
+                 if (ref($$curr_rules{$udom}) eq 'HASH') {
+                     if (ref($$curr_rules{$udom}{$item}) eq 'ARRAY') {
+                         if (@{$$curr_rules{$udom}{$item}} > 0) {
+                             my %rule_check = &Apache::lonnet::inst_rulecheck($udom,$uname,$id,$item,$$curr_rules{$udom}{$item});
+                             foreach my $rule (@{$$curr_rules{$udom}{$item}}) {
+                                 if ($rule_check{$rule}) {
+                                     $$rulematch{$user}{$item} = $rule;
+                                     if ($inst_response eq 'ok') {
+                                         if (ref($inst_results) eq 'HASH') {
+                                             if (ref($inst_results->{$user}) eq 'HASH') {
+                                                 if (keys(%{$inst_results->{$user}}) == 0) {
+                                                     $$alerts{$item}{$udom}{$uname} = 1;
+                                                 }
+                                             }
+                                         }
+                                     }
+                                     last;
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
+         }
+     }
+     return;
+ }
+ sub user_rule_formats {
+     my ($domain,$domdesc,$curr_rules,$check) = @_;
+     my %text = (
+                  'username' => 'Usernames',
+                  'id'       => 'IDs',
+                );
+     my $output;
+     my ($rules,$ruleorder) = &Apache::lonnet::inst_userrules($domain,$check);
+     if ((ref($rules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) {
+         if (@{$ruleorder} > 0) {
+             $output = '<br />'.&mt("$text{$check} with the following format(s) may <span class=\"LC_cusr_emph\">only</span> be used for verified users at [_1]:",$domdesc).' <ul>';
+             foreach my $rule (@{$ruleorder}) {
+                 if (ref($curr_rules) eq 'ARRAY') {
+                     if (grep(/^\Q$rule\E$/,@{$curr_rules})) {
+                         if (ref($rules->{$rule}) eq 'HASH') {
+                             $output .= '<li>'.$rules->{$rule}{'name'}.': '.
+                                         $rules->{$rule}{'desc'}.'</li>';
+                         }
+                     }
+                 }
+             }
+             $output .= '</ul>';
+         }
+     }
+     return $output;
+ }
+ sub instrule_disallow_msg {
+     my ($checkitem,$domdesc,$count,$mode) = @_;
+     my $response;
+     my %text = (
+                   item   => 'username',
+                   items  => 'usernames',
+                   match  => 'matches',
+                   do     => 'does',
+                   action => 'a username',
+                   one    => 'one',
+                );
+     if ($count > 1) {
+         $text{'item'} = 'usernames';
+         $text{'match'} ='match';
+         $text{'do'} = 'do';
+         $text{'action'} = 'usernames',
+         $text{'one'} = 'ones';
+     }
+     if ($checkitem eq 'id') {
+         $text{'items'} = 'IDs';
+         $text{'item'} = 'ID';
+         $text{'action'} = 'an ID';
+         if ($count > 1) {
+             $text{'item'} = 'IDs';
+             $text{'action'} = 'IDs';
+         }
+     }
+     $response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for <span class=\"LC_cusr_emph\">[_1]</span>, but the $text{'item'} $text{'do'} not exist in the institutional directory.",$domdesc).'<br />';
+     if ($mode eq 'upload') {
+         if ($checkitem eq 'username') {
+             $response .= &mt("You will need to modify your upload file so it will include $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");
+         } elsif ($checkitem eq 'id') {
+             $response .= &mt("Either upload a file which includes $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the ID/Student Number field.");
+         }
+     } else {
+         if ($checkitem eq 'username') {
+             $response .= &mt("You must choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");
+         } elsif ($checkitem eq 'id') {
+             $response .= &mt("You must either choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or leave the ID field blank.");
+         }
+     }
+     return $response;
+ }
+ sub personal_data_fieldtitles {
+     my %fieldtitles = &Apache::lonlocal::texthash (
+                         id => 'Student/Employee ID',
+                         permanentemail => 'E-mail address',
+                         lastname => 'Last Name',
+                         firstname => 'First Name',
+                         middlename => 'Middle Name',
+                         generation => 'Generation',
+                         gen => 'Generation',
+                    );
+     return %fieldtitles;
  }
  =pod
+ =back
+ =head1 HTTP Helpers
+ =over 4
  =item * get_unprocessed_cgi($query,$possible_names)
  Modify the %env hash to contain unprocessed CGI form parameters held in
- Line 3746  will result in $env{'form.uname'} and $e
+ Line 6716  will result in $env{'form.uname'} and $e
  sub get_unprocessed_cgi {
    my ($query,$possible_names)= @_;
    # $Apache::lonxml::debug=1;
-   foreach (split(/&/,$query)) {
+   foreach my $pair (split(/&/,$query)) {
-     my ($name, $value) = split(/=/,$_);
+     my ($name, $value) = split(/=/,$pair);
-     $name = &Apache::lonnet::unescape($name);
+     $name = &unescape($name);
      if (!defined($possible_names) || (grep {$_ eq $name} @$possible_names)) {
        $value =~ tr/+/ /;
        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
- Line 3865  sub get_env_multiple {
+ Line 6835  sub get_env_multiple {
  =pod
  =back
  =head1 CSV Upload/Handling functions
- Line 3964  sub record_sep {
+ Line 6934  sub record_sep {
      if ($env{'form.upfiletype'} eq 'xml') {
      } elsif ($env{'form.upfiletype'} eq 'space') {
          my $i=0;
-         foreach (split(/\s+/,$record)) {
+         foreach my $field (split(/\s+/,$record)) {
-             my $field=$_;
              $field=~s/^(\"|\')//;
              $field=~s/(\"|\')$//;
              $components{&takeleft($i)}=$field;
- Line 3973  sub record_sep {
+ Line 6942  sub record_sep {
          }
      } elsif ($env{'form.upfiletype'} eq 'tab') {
          my $i=0;
-         foreach (split(/\t/,$record)) {
+         foreach my $field (split(/\t/,$record)) {
-             my $field=$_;
              $field=~s/^(\"|\')//;
              $field=~s/(\"|\')$//;
              $components{&takeleft($i)}=$field;
              $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 4019  the file type.
+ Line 7014  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 4067  sub csv_print_samples {
+ Line 7063  sub csv_print_samples {
      my ($r,$records) = @_;
      my $samples = &get_samples($records,3);
-     $r->print(&mt('Samples').'<br /><table border="2"><tr>');
+     $r->print(&mt('Samples').'<br />'.&start_data_table().
-     foreach (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
+               &start_data_table_header_row());
-         $r->print('<th>'.&mt('Column&nbsp;[_1]',($_+1)).'</th>'); }
+     foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
-     $r->print('</tr>');
+         $r->print('<th>'.&mt('Column&nbsp;[_1]',($sample+1)).'</th>'); }
+     $r->print(&end_data_table_header_row());
      foreach my $hash (@$samples) {
- 	$r->print('<tr>');
+ 	$r->print(&start_data_table_row());
- 	foreach (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
+ 	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
  	    $r->print('<td>');
- 	    if (defined($$hash{$_})) { $r->print($$hash{$_}); }
+ 	    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 4105  sub csv_print_select_table {
+ Line 7102  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>'.
-     foreach (@$d) {
+               &end_data_table_header_row()."\n");
- 	my ($value,$display,$defaultcol)=@{ $_ };
+     foreach my $array_ref (@$d) {
- 	$r->print('<tr><td>'.$display.'</td>');
+ 	my ($value,$display,$defaultcol)=@{ $array_ref };
+ 	$r->print(&start_data_table_row().'<tr><td>'.$display.'</td>');
  	$r->print('<td><select name=f'.$i.
  		  ' onchange="javascript:flip(this.form,'.$i.');">');
  	$r->print('<option value="none"></option>');
- 	foreach (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
+ 	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
- 	    $r->print('<option value="'.$_.'"'.
+ 	    $r->print('<option value="'.$sample.'"'.
-                       ($_ eq $defaultcol ? ' selected="selected" ' : '').
+                       ($sample eq $defaultcol ? ' selected="selected" ' : '').
-                       '>Column '.($_+1).'</option>');
+                       '>Column '.($sample+1).'</option>');
  	}
- 	$r->print('</select></td></tr>'."\n");
+ 	$r->print('</select></td>'.&end_data_table_row()."\n");
  	$i++;
      }
+     $r->print(&end_data_table());
      $i--;
      return $i;
  }
- Line 4149  sub csv_samples_select_table {
+ Line 7148  sub csv_samples_select_table {
      my $i=0;
      #
      my $samples = &get_samples($records,3);
-     $r->print('<table border=2><tr><th>'.
+     $r->print(&start_data_table().
-               &mt('Field').'</th><th>'.&mt('Samples').'</th></tr>');
+               &start_data_table_header_row().'<th>'.
+               &mt('Field').'</th><th>'.&mt('Samples').'</th>'.
+               &end_data_table_header_row());
      foreach my $key (sort(keys(%{ $samples->[0] }))) {
- 	$r->print('<tr><td><select name="f'.$i.'"'.
+ 	$r->print(&start_data_table_row().'<td><select name="f'.$i.'"'.
  		  ' onchange="javascript:flip(this.form,'.$i.');">');
  	foreach my $option (@$d) {
  	    my ($value,$display,$defaultcol)=@{ $option };
- Line 4167  sub csv_samples_select_table {
+ Line 7168  sub csv_samples_select_table {
  		$r->print($samples->[$line]{$key}."<br />\n");
  	    }
  	}
- 	$r->print('</td></tr>');
+ 	$r->print('</td>'.&end_data_table_row());
  	$i++;
      }
+     $r->print(&end_data_table());
      $i--;
      return($i);
  }
- Line 4379  sub DrawBarGraph {
+ Line 7381  sub DrawBarGraph {
      $Title  = '' if (! defined($Title));
      $xlabel = '' if (! defined($xlabel));
      $ylabel = '' if (! defined($ylabel));
-     $ValuesHash{$id.'.title'}    = &Apache::lonnet::escape($Title);
+     $ValuesHash{$id.'.title'}    = &escape($Title);
-     $ValuesHash{$id.'.xlabel'}   = &Apache::lonnet::escape($xlabel);
+     $ValuesHash{$id.'.xlabel'}   = &escape($xlabel);
-     $ValuesHash{$id.'.ylabel'}   = &Apache::lonnet::escape($ylabel);
+     $ValuesHash{$id.'.ylabel'}   = &escape($ylabel);
      $ValuesHash{$id.'.y_max_value'} = $Max;
      $ValuesHash{$id.'.NumBars'}  = $NumBars;
      $ValuesHash{$id.'.NumSets'}  = $NumSets;
- Line 4461  sub DrawXYGraph {
+ Line 7463  sub DrawXYGraph {
      $ylabel = '' if (! defined($ylabel));
      my %ValuesHash =
          (
-          $id.'.title'  => &Apache::lonnet::escape($Title),
+          $id.'.title'  => &escape($Title),
-          $id.'.xlabel' => &Apache::lonnet::escape($xlabel),
+          $id.'.xlabel' => &escape($xlabel),
-          $id.'.ylabel' => &Apache::lonnet::escape($ylabel),
+          $id.'.ylabel' => &escape($ylabel),
           $id.'.y_max_value'=> $Max,
           $id.'.labels'     => join(',',@$Xlabels),
           $id.'.PlotType'   => 'XY',
- Line 4558  sub DrawXYYGraph {
+ Line 7560  sub DrawXYYGraph {
      $ylabel = '' if (! defined($ylabel));
      my %ValuesHash =
          (
-          $id.'.title'  => &Apache::lonnet::escape($Title),
+          $id.'.title'  => &escape($Title),
-          $id.'.xlabel' => &Apache::lonnet::escape($xlabel),
+          $id.'.xlabel' => &escape($xlabel),
-          $id.'.ylabel' => &Apache::lonnet::escape($ylabel),
+          $id.'.ylabel' => &escape($ylabel),
           $id.'.labels' => join(',',@$Xlabels),
           $id.'.PlotType' => 'XY',
           $id.'.NumSets' => 2,
- Line 4632  Inputs:
+ Line 7634  Inputs:
  sub chartlink {
      my ($linktext, $sname, $sdomain) = @_;
      my $link = '<a href="/adm/statistics?reportSelected=student_assessment'.
-         '&amp;SelectedStudent='.&Apache::lonnet::escape($sname.':'.$sdomain).
+         '&amp;SelectedStudent='.&escape($sname.':'.$sdomain).
          '&amp;chartoutputmode='.HTML::Entities::encode('html, with all links').
         '">'.$linktext.'</a>';
  }
- Line 4662  a hash ref describing the data to be sto
+ Line 7664  a hash ref describing the data to be sto
      'chartoutputmode' => 'scalar',
      'chartoutputdata' => 'scalar',
      'Section' => 'array',
+     'Group' => 'array',
      'StudentData' => 'array',
      'Maps' => 'array');
  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 4695  sub store_course_settings {
+ Line 7703  sub store_course_settings {
                  if (ref($env{'form.'.$setting})) {
                      $stored_form = join(',',
                                          map {
-                                             &Apache::lonnet::escape($_);
+                                             &escape($_);
                                          } sort(@{$env{'form.'.$setting}}));
                  } else {
                      $stored_form =
-                         &Apache::lonnet::escape($env{'form.'.$setting});
+                         &escape($env{'form.'.$setting});
                  }
                  # Determine if the array contents are the same.
                  if ($stored_form ne $env{$envname}) {
- Line 4721  sub store_course_settings {
+ Line 7729  sub store_course_settings {
  }
  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 4733  sub restore_course_settings {
+ Line 7744  sub restore_course_settings {
              } elsif ($type eq 'array') {
                  $env{'form.'.$setting} = [
                                             map {
-                                                &Apache::lonnet::unescape($_);
+                                                &unescape($_);
                                             } split(',',$env{$envname})
                                             ];
              }
- Line 4741  sub restore_course_settings {
+ Line 7752  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.
+ =cut
  ############################################################
  ############################################################
+ sub build_recipient_list {
+     my ($defmail,$mailing,$defdom,$origmail) = @_;
+     my @recipients;
+     my $otheremails;
+     my %domconfig =
+          &Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
+     if (ref($domconfig{'contacts'}) eq 'HASH') {
+         if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
+             my @contacts = ('adminemail','supportemail');
+             foreach my $item (@contacts) {
+                 if ($domconfig{'contacts'}{$mailing}{$item}) {
+                     my $addr = $domconfig{'contacts'}{$item};
+                     if (!grep(/^\Q$addr\E$/,@recipients)) {
+                         push(@recipients,$addr);
+                     }
+                 }
+                 $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
+             }
+         }
+     } elsif ($origmail ne '') {
+         push(@recipients,$origmail);
+     }
+     if ($defmail ne '') {
+         push(@recipients,$defmail);
+     }
+     if ($otheremails) {
+         my @others;
+         if ($otheremails =~ /,/) {
+             @others = split(/,/,$otheremails);
+         } else {
+             push(@others,$otheremails);
+         }
+         foreach my $addr (@others) {
+             if (!grep(/^\Q$addr\E$/,@recipients)) {
+                 push(@recipients,$addr);
+             }
+         }
+     }
+     my $recipientlist = join(',',@recipients);
+     return $recipientlist;
+ }
- sub propath {
+ ############################################################
-     my ($udom,$uname)=@_;
+ ############################################################
-     $udom=~s/\W//g;
-     $uname=~s/\W//g;
+ sub commit_customrole {
-     my $subdir=$uname.'__';
+     my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
-     $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
+     my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.':'.$three.' in '.$url.
-     my $proname="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
+                          ($start?', '.&mt('starting').' '.localtime($start):'').
-     return $proname;
+                          ($end?', ending '.localtime($end):'').': <b>'.
- }
+               &Apache::lonnet::assigncustomrole(
+                  $udom,$uname,$url,$three,$four,$five,$end,$start).
+                  '</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);
+         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);
+                 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);
+             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);
+ # 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='Syllabus';
+             $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
+         } else {
+             $title='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);
+ }
+ ############################################################
+ ############################################################
+ sub course_type {
+     my ($cid) = @_;
+     if (!defined($cid)) {
+         $cid = $env{'request.course.id'};
+     }
+     if (defined($env{'course.'.$cid.'.type'})) {
+         return $env{'course.'.$cid.'.type'};
+     } else {
+         return 'Course';
+     }
+ }
+ sub group_term {
+     my $crstype = &course_type();
+     my %names = (
+                   'Course' => 'group',
+                   'Group' => 'team',
+                 );
+     return $names{$crstype};
+ }
  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 4770  sub icon {
+ Line 8391  sub icon {
      return &lonhttpdurl($iconname);
  }
- sub lonhttpdurl {
+ sub lonhttpd_port {
-     my ($url)=@_;
      my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
      if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }
+     # IE doesn't like a secure page getting images from a non-secure
+     # port (when logging we haven't parsed the browser type so default
+     # back to secure
+     if ((!exists($env{'browser.type'}) || $env{'browser.type'} eq 'explorer')
+ 	&& $ENV{'SERVER_PORT'} == 443) {
+ 	return 443;
+     }
+     return $lonhttpd_port;
+ }
+ sub lonhttpdurl {
+     my ($url)=@_;
+     my $lonhttpd_port = &lonhttpd_port();
+     if ($lonhttpd_port == 443) {
+ 	return 'https://'.$ENV{'SERVER_NAME'}.$url;
+     }
      return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
  }
- Line 4806  sub escape_double {
+ Line 8444  sub escape_double {
  sub escape_url {
      my ($url)   = @_;
      my @urlslices = split(/\//, $url,-1);
-     my $lastitem = &Apache::lonnet::escape(pop(@urlslices));
+     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);
+ 	$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) = @_;
+     while (my ($key,$value) = each(%$env_data)) {
+ 	$idf->{$prefix.$key} = $value;
+ 	$env{$prefix.$key}   = $value;
+     }
+ }
  =pod
  =back

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

Removed from v.1.329
changed lines
	Added in v.1.636.2.3