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.221 and 1.489

-version 1.221, 2004/10/21 09:53:44
+version 1.489, 2006/12/08 20:09:29
  Line 55  redundancy from other modules and increa
  package Apache::loncommon;
  use strict;
- use Apache::lonnet();
+ use Apache::lonnet;
  use GDBM_File;
  use POSIX qw(strftime mktime);
- use Apache::Constants qw(:common :http :methods);
- use Apache::lonmsg();
  use Apache::lonmenu();
  use Apache::lonlocal;
  use HTML::Entities;
+ use Apache::lonhtmlcommon();
+ use Apache::loncoursedata();
+ use Apache::lontexconvert();
+ use Apache::lonclonecourse();
+ use LONCAPA qw(:DEFAULT :match);
  my $readit;
- Line 75  my %language;
+ Line 78  my %language;
  my %supported_language;
  my %cprtag;
  my %scprtag;
- my %fe; my %fd;
+ my %fe; my %fd; my %fm;
  my %category_extensions;
  # ---------------------------------------------- Designs
- Line 106  BEGIN {
+ Line 109  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 123  BEGIN {
+ Line 126  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);
- Line 153  BEGIN {
+ Line 156  BEGIN {
      my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
      opendir(DIR,$designdir);
      while ($filename=readdir(DIR)) {
- 	my ($domain)=($filename=~/^(\w+)\./);
+ 	if ($filename!~/\.tab$/) { next; }
-     {
+ 	my ($domain)=($filename=~/^($match_domain)\./);
-         my $designfile = $designdir.'/'.$filename;
+ 	{
-         if ( open (my $fh,"<$designfile") ) {
+ 	    my $designfile = $designdir.'/'.$filename;
-             while (<$fh>) {
+ 	    if ( open (my $fh,"<$designfile") ) {
-                 next if /^\#/;
+ 		while (my $line = <$fh>) {
-                 chomp;
+ 		    next if ($line =~ /^\#/);
-                 my ($key,$val)=(split(/\=/,$_));
+ 		    chomp($line);
-                 if ($val) { $designhash{$domain.'.'.$key}=$val; }
+ 		    my ($key,$val)=(split(/\=/,$line));
-             }
+ 		    if ($val) { $designhash{$domain.'.'.$key}=$val; }
-             close($fh);
+ 		}
-         }
+ 		close($fh);
-     }
+ 	    }
+ 	}
      }
      closedir(DIR);
- Line 176  BEGIN {
+ Line 180  BEGIN {
          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 191  BEGIN {
+ Line 195  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 252  of the element the selection from the se
+ Line 257  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 281  sub browser_and_searcher_javascript {
+ Line 286  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 302  sub browser_and_searcher_javascript {
+ Line 307  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 312  END
+ Line 317  END
  }
  sub lastresurl {
-     if ($ENV{'environment.lastresurl'}) {
+     if ($env{'environment.lastresurl'}) {
- 	return $ENV{'environment.lastresurl'}
+ 	return $env{'environment.lastresurl'}
      } else {
  	return '/res';
      }
- Line 330  sub storeresurl {
+ Line 335  sub storeresurl {
  sub studentbrowser_javascript {
     unless (
-             (($ENV{'request.course.id'}) &&
+             (($env{'request.course.id'}) &&
-              (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})))
+              (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
-          || ($ENV{'request.role'}=~/^(au|dc|su)/)
+ 	      || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+ 					  '/'.$env{'request.course.sec'})
+ 	      ))
+          || ($env{'request.role'}=~/^(au|dc|su)/)
            ) { return ''; }
     return (<<'ENDSTDBRW');
  <script type="text/javascript" language="Javascript" >
- Line 361  ENDSTDBRW
+ Line 369  ENDSTDBRW
  sub selectstudent_link {
     my ($form,$unameele,$udomele)=@_;
-    if ($ENV{'request.course.id'}) {
+    if ($env{'request.course.id'}) {
-        unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+        if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+ 	   && !&Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+ 					'/'.$env{'request.course.sec'})) {
  	   return '';
         }
         return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
          '","'.$udomele.'");'."'>".&mt('Select User')."</a>";
     }
-    if ($ENV{'request.role'}=~/^(au|dc|su)/) {
+    if ($env{'request.role'}=~/^(au|dc|su)/) {
         return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
          '","'.$udomele.'",1);'."'>".&mt('Select User')."</a>";
     }
- Line 376  sub selectstudent_link {
+ Line 386  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');
+    my $output = '
  <script type="text/javascript" language="Javascript" >
-     var stdeditbrowser;
+     var stdeditbrowser;'."\n";
-     function opencrsbrowser(formname,uname,udom,desc) {
+    $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 397  sub coursebrowser_javascript {
+ Line 415  sub coursebrowser_javascript {
          url += 'form=' + formname + '&cnumelement='+uname+
  	                            '&cdomelement='+udom+
                                      '&cnameelement='+desc;
+         if (extra_element !=null && extra_element != '') {
+             if (formname == 'rolechoice') {
+                 url += '&roleelement='+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 = 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)=@_;
+    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
      return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-         '","'.$udomele.'","'.$desc.'");'."'>".&mt('Select Course')."</a>";
+         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select [_1]',$selecttype)."</a>";
  }
+ sub check_uncheck_jscript {
+     my $jscript = <<"ENDSCRT";
+ function checkAll(field) {
+     if (field.length > 0) {
+         for (i = 0; i < field.length; i++) {
+             field[i].checked = true ;
+         }
+     } else {
+         field.checked = true
+     }
+ }
+ function uncheckAll(field) {
+     if (field.length > 0) {
+         for (i = 0; i < field.length; i++) {
+             field[i].checked = false ;
+         }     } else {
+         field.checked = false ;
+     }
+ }
+ ENDSCRT
+     return $jscript;
+ }
  =pod
  =item * linked_select_forms(...)
- Line 542  END
+ Line 673  END
      $result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed()\">\n";
      foreach my $value (sort(keys(%$hashref))) {
          $result.="    <option value=\"$value\" ";
-         $result.=" selected=\"true\" " if ($value eq $firstdefault);
+         $result.=" selected=\"selected\" " if ($value eq $firstdefault);
          $result.=">".&mt($hashref->{$value}->{'text'})."</option>\n";
      }
      $result .= "</select>\n";
- Line 552  END
+ Line 683  END
      my $seconddefault = $hashref->{$firstdefault}->{'default'};
      foreach my $value (sort(keys(%select2))) {
          $result.="    <option value=\"$value\" ";
-         $result.=" selected=\"true\" " if ($value eq $seconddefault);
+         $result.=" selected=\"selected\" " if ($value eq $seconddefault);
          $result.=">".&mt($select2{$value})."</option>\n";
      }
      $result .= "</select>\n";
- Line 588  sub help_open_topic {
+ Line 719  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' ) {
+ 	$env{'environment.remote'} eq 'off' ) {
  	$stayOnPage=1;
      }
      $width = 350 if (not defined $width);
- Line 616  sub help_open_topic {
+ Line 747  sub help_open_topic {
      {
  	$template .=
    "<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 650  sub helpLatexCheatsheet {
+ Line 781  sub helpLatexCheatsheet {
  	.'</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) {
+     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";
-          $link = "javascript:helpMenu('open')";
+     my $output .= <<"ENDOUTPUT";
-     } else {
+ <script type="text/javascript">
-         $link = "javascript:helpMenu('display')";
+ banner_link = '$banner_link';
-     }
+ </script>
-     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";
+ ENDOUTPUT
-     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";
+     return $output;
-     my $template;
-     if ($text ne "") {
- 	$template .=
-   "<table bgcolor='#773311' cellspacing='1' cellpadding='1' border='0'><tr>".
-   "<td bgcolor='#886622'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
-     }
-     my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");
-     $template .= <<"ENDTEMPLATE";
-  <script type="text/javascript">
- //<!-- BEGIN LON-CAPA Internal
- function helpMenu(caller) {
-     if (caller == 'open') {
-         newWindow =  window.open("","helpmenu","HEIGHT=$height,WIDTH=$width,resize=yes,scrollbars=yes" )
-         caller = newWindow.document
-     } else {
-         caller = this.document
-     }
-     caller.write("<html><head><title>LON-CAPA Help Menu</title><meta http-equiv='pragma' content='no-cache'></head>")
-     caller.write("<frameset rows='105,*' border='0'><frame name='bannerframe'  src='$banner_link'><frame name='bodyframe' src='$details_link'></frameset>")
-     caller.write("</html>")
-     caller.close()
-     if (caller == newWindow.document) {
-         caller.focus()
-     }
  }
- // END LON-CAPA Internal -->
-  </script>
+ # now just updates the help link and generates a blue icon
-  <a href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help Menu)" /></a>
+ sub help_open_menu {
- ENDTEMPLATE
+     my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text)
+ 	= @_;
+     $stayOnPage = 0 if (not defined $stayOnPage);
+     if ($env{'browser.interface'} eq 'textual' ||
+ 	$env{'environment.remote'} eq 'off' ) {
+ 	$stayOnPage=1;
+     }
+     my $output;
      if ($component_help) {
  	if (!$text) {
- 	    $template=&help_open_topic($component_help,undef,$stayOnPage,
+ 	    $output=&help_open_topic($component_help,undef,$stayOnPage,
- 				       $width,$height).' '.$template;
+ 				       $width,$height);
  	} else {
  	    my $help_text;
- 	    $help_text=&Apache::lonnet::unescape($topic);
+ 	    $help_text=&unescape($topic);
- 	    $template='<table><tr><td>'.
+ 	    $output='<table><tr><td>'.
  		&help_open_topic($component_help,$help_text,$stayOnPage,
- 				 $width,$height).'</td><td>'.$template.
+ 				 $width,$height).'</td></tr></table>';
- 				 '</td></tr></table>';
  	}
      }
-     if ($text ne '') { $template.='</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 $stayOnPage =
+ 	($env{'browser.interface'}  eq 'textual' ||
+ 	 $env{'environment.remote'} eq 'off' );
+     my $link=  ($stayOnPage) ? "javascript:helpMenu('display')"
+ 	                     : "javascript:helpMenu('open')";
+     my $banner_link = &update_help_link(undef,undef,undef,undef,$stayOnPage);
+     my $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 $start_page =
+         &Apache::loncommon::start_page('Help Menu', undef,
+ 				       {'frameset'    => 1,
+ 					'js_ready'    => 1,
+ 					'add_entries' => {
+ 					    'border' => '0',
+ 					    'rows'   => "105,*",},});
+     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') {
+         var newWindow = null;
+         try {
+             newWindow =  window.open($nothing,"helpmenu","HEIGHT=$height,WIDTH=$width,resizable=yes,scrollbars=yes" )
+         }
+         catch(error) {
+             writeHelp(caller);
+             return;
+         }
+         if (newWindow) {
+             caller = newWindow;
+         }
+     }
+     writeHelp(caller);
+     return;
+ }
+ function writeHelp(caller) {
+     caller.document.writeln('$start_page<frame name="bannerframe"  src="'+banner_link+'" /><frame name="bodyframe" src="$details_link" /> $end_page')
+     caller.document.close()
+     caller.focus()
+ }
+ // ]]>
+ // END LON-CAPA Internal -->
+ </script>
+ ENDTEMPLATE
      return $template;
  }
  sub help_open_bug {
      my ($topic, $text, $stayOnPage, $width, $height) = @_;
-     unless ($ENV{'user.adv'}) { return ''; }
+     unless ($env{'user.adv'}) { return ''; }
      unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; }
      $text = "" if (not defined $text);
      $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($ENV{'browser.interface'} eq 'textual' ||
+     if ($env{'browser.interface'} eq 'textual' ||
- 	$ENV{'environment.remote'} eq 'off' ) {
+ 	$env{'environment.remote'} eq 'off' ) {
  	$stayOnPage=1;
      }
      $width = 600 if (not defined $width);
- Line 737  sub help_open_bug {
+ Line 930  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 752  sub help_open_bug {
+ Line 945  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 768  ENDTEMPLATE
+ Line 961  ENDTEMPLATE
  sub help_open_faq {
      my ($topic, $text, $stayOnPage, $width, $height) = @_;
-     unless ($ENV{'user.adv'}) { return ''; }
+     unless ($env{'user.adv'}) { return ''; }
      unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; }
      $text = "" if (not defined $text);
      $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($ENV{'browser.interface'} eq 'textual' ||
+     if ($env{'browser.interface'} eq 'textual' ||
- 	$ENV{'environment.remote'} eq 'off' ) {
+ 	$env{'environment.remote'} eq 'off' ) {
  	$stayOnPage=1;
      }
      $width = 350 if (not defined $width);
- Line 797  sub help_open_faq {
+ Line 990  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 816  ENDTEMPLATE
+ Line 1009  ENDTEMPLATE
  =pod
+ =item * change_content_javascript():
+ This and the next function allow you to create small sections of an
+ otherwise static HTML page that you can update on the fly with
+ Javascript, even in Netscape 4.
+ The Javascript fragment returned by this function (no E<lt>scriptE<gt> tag)
+ must be written to the HTML page once. It will prove the Javascript
+ function "change(name, content)". Calling the change function with the
+ name of the section
+ you want to update, matching the name passed to C<changable_area>, and
+ the new content you want to put in there, will put the content into
+ that area.
+ B<Note>: Netscape 4 only reserves enough space for the changable area
+ to contain room for the original contents. You need to "make space"
+ for whatever changes you wish to make, and be B<sure> to check your
+ code in Netscape 4. This feature in Netscape 4 is B<not> powerful;
+ it's adequate for updating a one-line status display, but little more.
+ This script will set the space to 100% width, so you only need to
+ worry about height in Netscape 4.
+ Modern browsers are much less limiting, and if you can commit to the
+ user not using Netscape 4, this feature may be used freely with
+ pretty much any HTML.
+ =cut
+ sub change_content_javascript {
+     # If we're on Netscape 4, we need to use Layer-based code
+     if ($env{'browser.type'} eq 'netscape' &&
+ 	$env{'browser.version'} =~ /^4\./) {
+ 	return (<<NETSCAPE4);
+ 	function change(name, content) {
+ 	    doc = document.layers[name+"___escape"].layers[0].document;
+ 	    doc.open();
+ 	    doc.write(content);
+ 	    doc.close();
+ 	}
+ NETSCAPE4
+     } else {
+ 	# Otherwise, we need to use semi-standards-compliant code
+ 	# (technically, "innerHTML" isn't standard but the equivalent
+ 	# is really scary, and every useful browser supports it
+ 	return (<<DOMBASED);
+ 	function change(name, content) {
+ 	    element = document.getElementById(name);
+ 	    element.innerHTML = content;
+ 	}
+ DOMBASED
+     }
+ }
+ =pod
+ =item * changable_area($name, $origContent):
+ This provides a "changable area" that can be modified on the fly via
+ the Javascript code provided in C<change_content_javascript>. $name is
+ the name you will use to reference the area later; do not repeat the
+ same name on a given HTML page more then once. $origContent is what
+ the area will originally contain, which can be left blank.
+ =cut
+ sub changable_area {
+     my ($name, $origContent) = @_;
+     if ($env{'browser.type'} eq 'netscape' &&
+ 	$env{'browser.version'} =~ /^4\./) {
+ 	# If this is netscape 4, we need to use the Layer tag
+ 	return "<ilayer width='100%' id='${name}___escape' overflow='none'><layer width='100%' id='$name' overflow='none'>$origContent</layer></ilayer>";
+     } else {
+ 	return "<span id='$name'>$origContent</span>";
+     }
+ }
+ =pod
+ =back
+ =head1 Excel and CSV file utility routines
+ =over 4
+ =cut
+ ###############################################################
+ ###############################################################
+ =pod
  =item * csv_translate($text)
  Translate $text to allow it to be output as a 'comma separated values'
- Line 832  sub csv_translate {
+ Line 1117  sub csv_translate {
      return $text;
  }
  ###############################################################
  ###############################################################
- Line 856  Currently supported formats:
+ Line 1140  Currently supported formats:
  =item h3
+ =item h4
+ =item i
  =item date
  =back
- Line 878  sub define_excel_formats {
+ Line 1166  sub define_excel_formats {
      $format->{'h1'}   = $workbook->add_format(bold=>1, size=>18);
      $format->{'h2'}   = $workbook->add_format(bold=>1, size=>16);
      $format->{'h3'}   = $workbook->add_format(bold=>1, size=>14);
+     $format->{'h4'}   = $workbook->add_format(bold=>1, size=>12);
+     $format->{'i'}    = $workbook->add_format(italic=>1);
      $format->{'date'} = $workbook->add_format(num_format=>
                                              'mm/dd/yyyy hh:mm:ss');
      return $format;
- Line 888  sub define_excel_formats {
+ Line 1178  sub define_excel_formats {
  =pod
- =item * change_content_javascript():
+ =item * create_workbook
- This and the next function allow you to create small sections of an
+ Create an Excel worksheet.  If it fails, output message on the
- otherwise static HTML page that you can update on the fly with
+ request object and return undefs.
- Javascript, even in Netscape 4.
- The Javascript fragment returned by this function (no E<lt>scriptE<gt> tag)
+ Inputs: Apache request object
- must be written to the HTML page once. It will prove the Javascript
- function "change(name, content)". Calling the change function with the
- name of the section
- you want to update, matching the name passed to C<changable_area>, and
- the new content you want to put in there, will put the content into
- that area.
- B<Note>: Netscape 4 only reserves enough space for the changable area
- to contain room for the original contents. You need to "make space"
- for whatever changes you wish to make, and be B<sure> to check your
- code in Netscape 4. This feature in Netscape 4 is B<not> powerful;
- it's adequate for updating a one-line status display, but little more.
- This script will set the space to 100% width, so you only need to
- worry about height in Netscape 4.
- Modern browsers are much less limiting, and if you can commit to the
+ Returns (undef) on failure,
- user not using Netscape 4, this feature may be used freely with
+     Excel worksheet object, scalar with filename, and formats
- pretty much any HTML.
+     from &Apache::loncommon::define_excel_formats on success
  =cut
- sub change_content_javascript {
+ ###############################################################
-     # If we're on Netscape 4, we need to use Layer-based code
+ ###############################################################
-     if ($ENV{'browser.type'} eq 'netscape' &&
+ sub create_workbook {
- 	$ENV{'browser.version'} =~ /^4\./) {
+     my ($r) = @_;
- 	return (<<NETSCAPE4);
+         #
- 	function change(name, content) {
+     # Create the excel spreadsheet
- 	    doc = document.layers[name+"___escape"].layers[0].document;
+     my $filename = '/prtspool/'.
- 	    doc.open();
+         $env{'user.name'}.'_'.$env{'user.domain'}.'_'.
- 	    doc.write(content);
+         time.'_'.rand(1000000000).'.xls';
- 	    doc.close();
+     my $workbook  = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
- 	}
+     if (! defined($workbook)) {
- NETSCAPE4
+         $r->log_error("Error creating excel spreadsheet $filename: $!");
-     } else {
+         $r->print('<p>'.&mt("Unable to create new Excel file.  ".
- 	# Otherwise, we need to use semi-standards-compliant code
+                             "This error has been logged.  ".
- 	# (technically, "innerHTML" isn't standard but the equivalent
+                             "Please alert your LON-CAPA administrator").
- 	# is really scary, and every useful browser supports it
+                   '</p>');
- 	return (<<DOMBASED);
+         return (undef);
- 	function change(name, content) {
- 	    element = document.getElementById(name);
- 	    element.innerHTML = content;
- 	}
- DOMBASED
      }
+     #
+     $workbook->set_tempdir('/home/httpd/perl/tmp');
+     #
+     my $format = &Apache::loncommon::define_excel_formats($workbook);
+     return ($workbook,$filename,$format);
  }
+ ###############################################################
+ ###############################################################
  =pod
- =item * changable_area($name, $origContent):
+ =item * create_text_file
- This provides a "changable area" that can be modified on the fly via
+ Create a file to write to and eventually make available to the usre.
- the Javascript code provided in C<change_content_javascript>. $name is
+ If file creation fails, outputs an error message on the request object and
- the name you will use to reference the area later; do not repeat the
+ return undefs.
- same name on a given HTML page more then once. $origContent is what
- the area will originally contain, which can be left blank.
- =cut
+ Inputs: Apache request object, and file suffix
- sub changable_area {
+ Returns (undef) on failure,
-     my ($name, $origContent) = @_;
+     Filehandle and filename on success.
-     if ($ENV{'browser.type'} eq 'netscape' &&
+ =cut
- 	$ENV{'browser.version'} =~ /^4\./) {
- 	# If this is netscape 4, we need to use the Layer tag
+ ###############################################################
- 	return "<ilayer width='100%' id='${name}___escape' overflow='none'><layer width='100%' id='$name' overflow='none'>$origContent</layer></ilayer>";
+ ###############################################################
-     } else {
+ sub create_text_file {
- 	return "<span id='$name'>$origContent</span>";
+     my ($r,$suffix) = @_;
+     if (! defined($suffix)) { $suffix = 'txt'; };
+     my $fh;
+     my $filename = '/prtspool/'.
+         $env{'user.name'}.'_'.$env{'user.domain'}.'_'.
+         time.'_'.rand(1000000000).'.'.$suffix;
+     $fh = Apache::File->new('>/home/httpd'.$filename);
+     if (! defined($fh)) {
+         $r->log_error("Couldn't open $filename for output $!");
+         $r->print("Problems occured in creating the output file.  ".
+                   "This error has been logged.  ".
+                   "Please alert your LON-CAPA administrator.");
      }
+     return ($fh,$filename)
  }
- =pod
+ =pod
  =back
- Line 993  sub get_domains {
+ Line 1282  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)) {
+     foreach my $dom (sort(values(%Apache::lonnet::hostdom))) {
- 	push (@domains,$_) unless $seen{$_}++;
+ 	push(@domains,$dom) unless $seen{$dom}++;
      }
      return @domains;
  }
- Line 1008  sub domain_select {
+ Line 1297  sub domain_select {
      } &get_domains;
      if ($multiple) {
  	$domains{''}=&mt('Any domain');
- 	return &multiple_select_form($name,$value,4,%domains);
+ 	return &multiple_select_form($name,$value,4,\%domains);
      } else {
  	return &select_form($name,$value,%domains);
      }
  }
+ #-------------------------------------------
+ =pod
+ =item * multiple_select_form($name,$value,$size,$hash,$order)
+ Returns a string containing a <select> element int multiple mode
+ Args:
+   $name - name of the <select> element
+   $value - sclara or array ref of values that should already be selected
+   $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
+ =cut
+ #-------------------------------------------
  sub multiple_select_form {
-     my ($name,$value,$size,%hash)=@_;
+     my ($name,$value,$size,$hash,$order)=@_;
      my %selected = map { $_ => 1 } ref($value)?@{$value}:($value);
      my $output='';
      if (! defined($size)) {
          $size = 4;
-         if (scalar(keys(%hash))<4) {
+         if (scalar(keys(%$hash))<4) {
-             $size = scalar(keys(%hash));
+             $size = scalar(keys(%$hash));
          }
      }
      $output.="\n<select name='$name' size='$size' multiple='1'>";
-     foreach (sort(keys(%hash))) {
+     my @order = ref($order) ? @$order
-         $output.='<option value="'.$_.'" ';
+                             : sort(keys(%$hash));
-         $output.='selected ' if ($selected{$_});
+     foreach my $key (@order) {
-         $output.='>'.$hash{$_}."</option>\n";
+         $output.='<option value="'.&HTML::Entities::encode($key,'"<>&').'" ';
+         $output.='selected="selected" ' if ($selected{$key});
+         $output.='>'.$hash->{$key}."</option>\n";
      }
      $output.="</select>\n";
      return $output;
- Line 1056  sub select_form {
+ Line 1367  sub select_form {
      } else {
  	@keys=sort(keys(%hash));
      }
-     foreach (@keys) {
+     foreach my $key (@keys) {
-         $selectform.="<option value=\"$_\" ".
+         $selectform.=
-             ($_ eq $def ? '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 1095  sub select_level_form {
+ Line 1425  sub select_level_form {
      my $selectform = "<select name=\"$name\" size=\"1\">\n";
      for (my $i=0; $i<=18; $i++) {
          $selectform.="<option value=\"$i\" ".
-             ($i==$deflevel ? 'selected' : '').
+             ($i==$deflevel ? 'selected="selected" ' : '').
                  ">".&gradeleveldescription($i)."</option>\n";
      }
      $selectform.="</select>";
- Line 1123  sub select_dom_form {
+ Line 1453  sub select_dom_form {
      my @domains = get_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' : '').
+             ($dom eq $defdom ? 'selected="selected" ' : '').
-                 ">$_</option>\n";
+                 ">$dom</option>\n";
      }
      $selectdomain.="</select>";
      return $selectdomain;
- Line 1148  given $domain.
+ Line 1478  given $domain.
  sub get_library_servers {
      my $domain = shift;
      my %library_servers;
-     foreach (keys(%Apache::lonnet::libserv)) {
+     foreach my $hostid (keys(%Apache::lonnet::libserv)) {
-         if ($Apache::lonnet::hostdom{$_} eq $domain) {
+         if ($Apache::lonnet::hostdom{$hostid} eq $domain) {
-             $library_servers{$_} = $Apache::lonnet::hostname{$_};
+             $library_servers{$hostid} = $Apache::lonnet::hostname{$hostid};
          }
      }
      return %library_servers;
- Line 1172  sub home_server_option_list {
+ Line 1502  sub home_server_option_list {
      my $domain = shift;
      my %servers = &get_library_servers($domain);
      my $result = '';
-     foreach (sort keys(%servers)) {
+     foreach my $hostid (sort(keys(%servers))) {
          $result.=
-             '<option value="'.$_.'">'.$_.' '.$servers{$_}."</option>\n";
+             '<option value="'.$hostid.'">'.
+ 	    $hostid.' '.$servers{$hostid}."</option>\n";
      }
      return $result;
  }
- Line 1224  Outputs:
+ Line 1555  Outputs:
  ###############################################################
  ###############################################################
  sub decode_user_agent {
+     my ($r)=@_;
      my @browsertype=split(/\&/,$Apache::lonnet::perlvar{"lonBrowsDet"});
      my %mathcap=split(/\&/,$$Apache::lonnet::perlvar{"lonMathML"});
      my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
+     if (!$httpbrowser && $r) { $httpbrowser=$r->header_in('User-Agent'); }
      my $clientbrowser='unknown';
      my $clientversion='0';
      my $clientmathml='';
- Line 1422  sub authform_nochange{
+ Line 1755  sub authform_nochange{
                kerb_def_dom => 'MSU.EDU',
                @_,
            );
-     my $result = &mt('[_1] Do not change login data',
+     my $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'});".'" />');
+             "javascript:changed_radio('nochange',$in{'formname'});".'" />').
+ 	    '</label>';
      return $result;
  }
- Line 1457  sub authform_kerberos{
+ Line 1791  sub authform_kerberos{
      my $jscall = "javascript:changed_radio('krb',$in{'formname'});";
      my $result .= &mt
          ('[_1] Kerberos authenticated with domain [_2] '.
-          '[_3] Version 4 [_4] Version 5',
+          '[_3] Version 4 [_4] Version 5 [_5]',
-          '<input type="radio" name="login" value="krb" '.
+          '<label><input type="radio" name="login" value="krb" '.
               'onclick="'.$jscall.'" onchange="'.$jscall.'"'.$krbcheck.' />',
-          '<input type="text" size="10" name="krbarg" '.
+          '</label><input type="text" size="10" name="krbarg" '.
               'value="'.$krbarg.'" '.
               'onchange="'.$jscall.'" />',
-          '<input type="radio" name="krbver" value="4" '.$check4.' />',
+          '<label><input type="radio" name="krbver" value="4" '.$check4.' />',
-          '<input type="radio" name="krbver" value="5" '.$check5.' />');
+          '</label><label><input type="radio" name="krbver" value="5" '.$check5.' />',
+ 	 '</label>');
      return $result;
  }
- Line 1489  sub authform_internal{
+ Line 1824  sub authform_internal{
      my $jscall = "javascript:changed_radio('int',$args{'formname'});";
      my $result.=&mt
          ('[_1] Internally authenticated (with initial password [_2])',
-          '<input type="radio" name="login" value="int" '.$intcheck.
+          '<label><input type="radio" name="login" value="int" '.$intcheck.
               ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-          '<input type="text" size="10" name="intarg" '.$intarg.
+          '</label><input type="text" size="10" name="intarg" '.$intarg.
               ' onchange="'.$jscall.'" />');
      return $result;
  }
- Line 1516  sub authform_local{
+ Line 1851  sub authform_local{
      my $jscall = "javascript:changed_radio('loc',$in{'formname'});";
      my $result.=&mt('[_1] Local Authentication with argument [_2]',
-                     '<input type="radio" name="login" value="loc" '.$loccheck.
+                     '<label><input type="radio" name="login" value="loc" '.$loccheck.
                          ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-                     '<input type="text" size="10" name="locarg" '.$locarg.
+                     '</label><input type="text" size="10" name="locarg" '.$locarg.
                          ' onchange="'.$jscall.'" />');
      return $result;
  }
- Line 1532  sub authform_filesystem{
+ Line 1867  sub authform_filesystem{
      my $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
      my $result.= &mt
          ('[_1] Filesystem Authenticated (with initial password [_2])',
-          '<input type="radio" name="login" value="fsys" '.
+          '<label><input type="radio" name="login" value="fsys" '.
           'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
-          '<input type="text" size="10" name="fsysarg" value="" '.
+          '</label><input type="text" size="10" name="fsysarg" value="" '.
                    'onchange="'.$jscall.'" />');
      return $result;
  }
- Line 1660  sub initialize_keywords {
+ Line 1995  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 1716  sub get_related_words {
+ Line 2051  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 1741  sub get_related_words {
+ Line 2084  sub get_related_words {
  =over 4
- =item * plainname($uname,$udom)
+ =item * plainname($uname,$udom,$first)
  Takes a users logon name and returns it as a string in
  "first middle last generation" form
+ if $first is set to 'lastname' then it returns it as
+ 'lastname generation, firstname middlename' if their is a lastname
  =cut
  ###############################################################
  sub plainname {
-     my ($uname,$udom)=@_;
+     my ($uname,$udom,$first)=@_;
-     my %names=&Apache::lonnet::get('environment',
+     my %names=&getnames($uname,$udom);
-                     ['firstname','middlename','lastname','generation'],
+     my $name=&Apache::lonnet::format_name($names{'firstname'},
- 					 $udom,$uname);
+ 					  $names{'middlename'},
-     my $name=$names{'firstname'}.' '.$names{'middlename'}.' '.
+ 					  $names{'lastname'},
- 	$names{'lastname'}.' '.$names{'generation'};
+ 					  $names{'generation'},$first);
+     $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 1781  if the user does not
+ Line 2128  if the user does not
  sub nickname {
      my ($uname,$udom)=@_;
-     my %names;
+     my %names=&getnames($uname,$udom);
-     if ($uname eq $ENV{'user.name'} &&
- 	$udom eq $ENV{'user.domain'}) {
- 	%names=('nickname'   => $ENV{'environment.nickname'}  ,
- 		'firstname'  => $ENV{'environment.firstname'} ,
- 		'middlename' => $ENV{'environment.middlename'},
- 		'lastname'   => $ENV{'environment.lastname'}  ,
- 		'generation' => $ENV{'environment.generation'});
-     } else {
- 	%names=&Apache::lonnet::get('environment',
- 				    ['nickname','firstname','middlename',
- 				     'lastname','generation'],$udom,$uname);
-     }
      my $name=$names{'nickname'};
      if ($name) {
         $name='&quot;'.$name.'&quot;';
- Line 1806  sub nickname {
+ Line 2141  sub nickname {
      return $name;
  }
+ sub getnames {
+     my ($uname,$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) {
+ 	return %{$names};
+     } else {
+ 	my %loadnames=&Apache::lonnet::get('environment',
+                     ['firstname','middlename','lastname','generation','nickname'],
+ 					 $udom,$uname);
+ 	&Apache::lonnet::do_cache_new('namescache',$id,\%loadnames);
+ 	return %loadnames;
+     }
+ }
+ 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;
+     }
+ }
  # ------------------------------------------------------------------ Screenname
- Line 1819  Gets a users screenname and returns it a
+ Line 2192  Gets a users screenname and returns it a
  sub screenname {
      my ($uname,$udom)=@_;
-     if ($uname eq $ENV{'user.name'} &&
+     if ($uname eq $env{'user.name'} &&
- 	$udom eq $ENV{'user.domain'}) {return $ENV{'environment.screenname'};}
+ 	$udom eq $env{'user.domain'}) {return $env{'environment.screenname'};}
      my %names=&Apache::lonnet::get('environment',['screenname'],$udom,$uname);
      return $names{'screenname'};
  }
- Line 1829  sub screenname {
+ Line 2202  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 1846  sub noteswrapper {
+ Line 2220  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 1862  sub syllabuswrapper {
+ Line 2239  sub syllabuswrapper {
  }
  sub track_student_link {
-     my ($linktext,$sname,$sdom,$target) = @_;
+     my ($linktext,$sname,$sdom,$target,$start) = @_;
-     my $link ="/adm/trackstudent";
+     my $link ="/adm/trackstudent?";
      my $title = 'View recent activity';
      if (defined($sname) && $sname !~ /^\s*$/ &&
          defined($sdom)  && $sdom  !~ /^\s*$/) {
-         $link .= "?selected_student=$sname:$sdom";
+         $link .= "selected_student=$sname:$sdom";
          $title .= ' of this student';
      }
      if (defined($target) && $target !~ /^\s*$/) {
          $target = qq{target="$target"};
      } else {
          $target = '';
      }
-     return qq{<a href="$link" title="$title" $target>$linktext</a>};
+     if ($start) { $link.='&amp;start='.$start; }
+     return qq{<a href="$link" title="$title" $target>$linktext</a>}.
+ 	&help_open_topic('View_recent_activity');
  }
  =pod
  =back
- Line 1993  category
+ Line 2371  category
  =cut
  sub filecategorytypes {
-     return @{$category_extensions{lc($_[0])}};
+     my ($cat) = @_;
+     return @{$category_extensions{lc($cat)}};
  }
  =pod
- Line 2008  sub fileembstyle {
+ Line 2387  sub fileembstyle {
      return $fe{lc(shift(@_))};
  }
+ sub filemimetype {
+     return $fm{lc(shift(@_))};
+ }
  sub filecategoryselect {
      my ($name,$value)=@_;
- Line 2064  sub fileextensions {
+ Line 2447  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'}) {
+     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 2078  sub display_languages {
+ Line 2461  sub display_languages {
  sub preferred_languages {
      my @languages=();
-     if ($ENV{'course.'.$ENV{'request.course.id'}.'.languages'}) {
+     if ($env{'course.'.$env{'request.course.id'}.'.languages'}) {
  	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,
- 	         $ENV{'course.'.$ENV{'request.course.id'}.'.languages'}));
+ 	         $env{'course.'.$env{'request.course.id'}.'.languages'}));
      }
-     if ($ENV{'environment.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];
      if ($browser) {
  	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$browser));
      }
-     if ($Apache::lonnet::domain_lang_def{$ENV{'user.domain'}}) {
+     if ($Apache::lonnet::domain_lang_def{$env{'user.domain'}}) {
  	@languages=(@languages,
- 		$Apache::lonnet::domain_lang_def{$ENV{'user.domain'}});
+ 		$Apache::lonnet::domain_lang_def{$env{'user.domain'}});
      }
-     if ($Apache::lonnet::domain_lang_def{$ENV{'request.role.domain'}}) {
+     if ($Apache::lonnet::domain_lang_def{$env{'request.role.domain'}}) {
  	@languages=(@languages,
- 		$Apache::lonnet::domain_lang_def{$ENV{'request.role.domain'}});
+ 		$Apache::lonnet::domain_lang_def{$env{'request.role.domain'}});
      }
      if ($Apache::lonnet::domain_lang_def{
  	                          $Apache::lonnet::perlvar{'lonDefDomain'}}) {
- Line 2105  sub preferred_languages {
+ Line 2489  sub preferred_languages {
      }
  # 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]);
  	}
      }
      return @genlanguages;
- Line 2165  sub get_previous_attempt {
+ Line 2549  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.='<table border="0" width="100%"><tr bgcolor="#e6ffff"><td>History</td>';
-       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);
- Line 2188  sub get_previous_attempt {
+ Line 2572  sub get_previous_attempt {
        if ($getattempt eq '') {
  	for ($version=1;$version<=$returnhash{'version'};$version++) {
  	  $prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Transaction '.$version.'</td>';
- 	    foreach (sort(keys %lasthash)) {
+ 	    foreach my $key (sort(keys(%lasthash))) {
  	       my $value;
- 	       if ($_ =~ /timestamp/) {
+ 	       if ($key =~ /timestamp/) {
- 		  $value=scalar(localtime($returnhash{$version.':'.$_}));
+ 		  $value=scalar(localtime($returnhash{$version.':'.$key}));
  	       } else {
- 		  $value=$returnhash{$version.':'.$_};
+ 		  $value=$returnhash{$version.':'.$key};
  	       }
- 	       $prevattempts.='<td>'.&Apache::lonnet::unescape($value).'&nbsp;</td>';
+ 	       $prevattempts.='<td>'.&unescape($value).'&nbsp;</td>';
  	    }
  	 }
        }
        $prevattempts.='</tr><tr bgcolor="#ffffe6"><td>Current</td>';
-       foreach (sort(keys %lasthash)) {
+       foreach my $key (sort(keys(%lasthash))) {
  	my $value;
- 	if ($_ =~ /timestamp/) {
+ 	if ($key =~ /timestamp/) {
- 	  $value=scalar(localtime($lasthash{$_}));
+ 	  $value=scalar(localtime($lasthash{$key}));
  	} else {
- 	  $value=$lasthash{$_};
+ 	  $value=$lasthash{$key};
  	}
- 	$value=&Apache::lonnet::unescape($value);
+ 	$value=&unescape($value);
- 	if ($_ =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
+ 	if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
  	$prevattempts.='<td>'.$value.'&nbsp;</td>';
        }
        $prevattempts.='</tr></table></td></tr></table>';
- Line 2240  sub relative_to_absolute {
+ Line 2624  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 2274  sub get_student_view {
+ Line 2658  sub get_student_view {
    if (defined($moreenv)) {
        %form=(%form,%{$moreenv});
    }
-   if ($target eq 'tex') {$form{'grade_target'} = 'tex';}
+   if (defined($target)) { $form{'grade_target'} = $target; }
    $feedurl=&Apache::lonnet::clutter($feedurl);
    my $userview=&Apache::lonnet::ssi_body($feedurl,%form);
    $userview=~s/\<body[^\>]*\>//gi;
- Line 2314  sub get_student_answers {
+ Line 2698  sub get_student_answers {
  =item * &submlink()
- Inputs: $text $uname $udom $symb
+ Inputs: $text $uname $udom $symb $target
  Returns: A link to grades.pm such as to see the SUBM view of a student
- Line 2322  Returns: A link to grades.pm such as to
+ Line 2706  Returns: A link to grades.pm such as to
  ###############################################
  sub submlink {
-     my ($text,$uname,$udom,$symb)=@_;
+     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=&symbread(); }
+     if (!$symb) { $symb=&Apache::lonnet::symbread(); }
-     return '<a href="/adm/grades?symb='.$symb.'&student='.$uname.
+     $symb=&escape($symb);
- 	'&userdom='.$udom.'&command=submission">'.$text.'</a>';
+     if ($target) { $target="target=\"$target\""; }
+     return '<a href="/adm/grades?&command=submission&'.
+ 	'symb='.$symb.'&student='.$uname.
+ 	'&userdom='.$udom.'" '.$target.'>'.$text.'</a>';
+ }
+ ##############################################
+ =pod
+ =item * &pgrdlink()
+ Inputs: $text $uname $udom $symb $target
+ Returns: A link to grades.pm such as to see the PGRD view of a student
+ =cut
+ ###############################################
+ sub pgrdlink {
+     my $link=&submlink(@_);
+     $link=~s/(&command=submission)/$1&showgrading=yes/;
+     return $link;
+ }
+ ##############################################
+ =pod
+ =item * &pprmlink()
+ Inputs: $text $uname $udom $symb $target
+ Returns: A link to parmset.pm such as to see the PPRM view of a
+ student and a specific resource
+ =cut
+ ###############################################
+ sub pprmlink {
+     my ($text,$uname,$udom,$symb,$target)=@_;
+     if (!($uname && $udom)) {
+ 	(my $cursymb, my $courseid,$udom,$uname)=
+ 	    &Apache::lonnet::whichuser($symb);
+ 	if (!$symb) { $symb=$cursymb; }
+     }
+     if (!$symb) { $symb=&Apache::lonnet::symbread(); }
+     $symb=&escape($symb);
+     if ($target) { $target="target=\"$target\""; }
+     return '<a href="/adm/parmset?&command=set&'.
+ 	'symb='.$symb.'&uname='.$uname.
+ 	'&udom='.$udom.'" '.$target.'>'.$text.'</a>';
  }
  ##############################################
- Line 2356  sub timehash {
+ Line 2789  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 2366  sub maketime {
+ Line 2804  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) = @_;
+     # Retrieve active course roles - course coordinator, instructor, exam proctor, ta, student or custom role.
+     my %live_courses = &findallcourses(undef,$uname,$udom);
+     # Retrieve blocking times and identity of blocker for active courses
+     # of specified user, unless user has 'evb' privilege.
+     my $startblock = 0;
+     my $endblock = 0;
+     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;
+         foreach my $sec (keys(%{$live_courses{$course}})) {
+             my $checkrole = 'cm./'.$cdom.'/'.$cnum;
+             if ($sec ne 'none') {
+                 $checkrole .= '/'.$sec;
+             }
+             if ((defined($uname) && ($uname ne $env{'user.name'})) ||
+                  (defined($udom) && ($udom ne $env{'user.domain'}))) {
+                 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 {
+                 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\./$cdom/$cnum}));
+         next if ($no_userblock);
+         $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 > $1) ) {
+                         $startblock = $1;
+                     }
+                     if ( ($endblock == 0) || ($endblock < $2) ) {
+                         $endblock = $2;
+                     }
+                 }
+             }
+         }
+     }
+     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 = &aboutmewrapper(&plainname($uname,$udom),$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();
+ }
  ###############################################
  =pod
- Line 2407  sub determinedomain {
+ Line 3056  sub determinedomain {
     if (! $domain) {
          # Determine domain if we have not been given one
          $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
-         if ($ENV{'user.domain'}) { $domain=$ENV{'user.domain'}; }
+         if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
-         if ($ENV{'request.role.domain'}) {
+         if ($env{'request.role.domain'}) {
-             $domain=$ENV{'request.role.domain'};
+             $domain=$env{'request.role.domain'};
          }
      }
      return $domain;
- Line 2451  Returns: value of designparamter $which
+ Line 3100  Returns: value of designparamter $which
  =cut
  ##############################################
  sub designparm {
      my ($which,$domain)=@_;
-     if ($ENV{'browser.blackwhite'} eq 'on') {
+     if ($env{'browser.blackwhite'} eq 'on') {
  	if ($which=~/\.(font|alink|vlink|link)$/) {
  	    return '#000000';
  	}
- Line 2465  sub designparm {
+ Line 3115  sub designparm {
  	    return '#CCCCCC';
  	}
      }
-     if ($ENV{'environment.color.'.$which}) {
+     if (exists($env{'environment.color.'.$which})) {
- 	return $ENV{'environment.color.'.$which};
+ 	return $env{'environment.color.'.$which};
      }
      $domain=&determinedomain($domain);
-     if ($designhash{$domain.'.'.$which}) {
+     if (exists($designhash{$domain.'.'.$which})) {
  	return $designhash{$domain.'.'.$which};
      } else {
          return $designhash{'default.'.$which};
- Line 2508  Inputs:
+ Line 3158  Inputs:
  =item * $forcereg, if page should register as content page (relevant for
              text interface only)
+ =item * $customtitle, alternate text to use instead of $title
+                       in the title box that appears, this text
+                       is not auto translated like the $title is
+ =item * $notopbar, if true, keep the 'what is this' info but remove the
+                    navigational links
+ =item * $bgcolor, used to override the bgcolor on a webpage to a specific value
+ =item * $notitle, if true keep the nav controls, but remove the title bar
+ =item * $no_inline_link, if true and in remote mode, don't show the
+          'Switch To Inline Menu' link
+ =item * $args, optional argument valid values are
+             no_auto_mt_title -> prevents &mt()ing the title arg
  =back
  Returns: A uniform header for LON-CAPA web pages.
- Line 2518  other decorations will be returned.
+ Line 3185  other decorations will be returned.
  =cut
  sub bodytag {
-     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg)=@_;
+     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
-     $title=&mt($title);
+ 	$notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
+     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=&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),
-     unless ($addentries) { $addentries=''; }
+ 		   'link'    => &designparm($function.'.link',$domain),);
-     my $addstyle='';
+     @design{keys(%$addentries)} = @$addentries{keys(%$addentries)};
-     if ($ENV{'browser.fontenhance'} eq 'on') {
- 	$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).':'.$rdom;
+     }
  # realm
-     if ($ENV{'request.course.id'}) {
+     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'};
      if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
+     my $extra_body_attr = &make_attr_string($forcereg,\%design);
  # construct main body tag
-     my $bodytag = <<END;
+     my $bodytag = "<body $extra_body_attr>".
- <style>
+ 	&Apache::lontexconvert::init_math_support();
- h1, h2, h3, th { font-family: Arial, Helvetica, sans-serif }
- a:focus { color: red; background: yellow }
+     if ($bodyonly
- </style>
+ 	|| ($env{'request.state'} eq 'construct'
- <body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
+ 	    && $env{'environment.remote'} ne 'off' )) {
- style="margin-top: 0px;$addstyle" $addentries>
- END
-     my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
-                    $lonhttpdPort.$img.'" alt="'.$function.'" />';
-     if ($bodyonly) {
          return $bodytag;
-     } elsif ($ENV{'browser.interface'} eq 'textual') {
+     } elsif ($env{'browser.interface'} eq 'textual') {
  # Accessibility
-         return $bodytag.&Apache::lonmenu::menubuttons($forcereg,'web',
-                                                       $forcereg).
+ 	$bodytag.=&Apache::lonmenu::menubuttons($forcereg,$forcereg);
-                '<h1>LON-CAPA: '.$title.'</h1>';
+ 	if (!$notitle) {
-     } elsif ($ENV{'environment.remote'} eq 'off') {
+ 	    $bodytag.='<h1>LON-CAPA: '.$title.'</h1>';
- # No Remote
+ 	}
- 	my $roleinfo=(<<ENDROLE);
+ 	return $bodytag;
- <td bgcolor="$tabbg" align="right">
+     }
- <p>
- <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">
- </p>
+     $name
+     &nbsp;
+ </div>
+ <div class="LC_title_bar_role">
+ $role&nbsp;
+ </div>
+ <div class="LC_title_bar_realm">
+ $realm&nbsp;
+ </div>
  </td>
  ENDROLE
-         return $bodytag.&Apache::lonmenu::menubuttons($forcereg,'web',
-                                                       $forcereg).
+     my $titleinfo = '<span class="LC_title_bar_title">'.$title.'</span>';
-       '<table bgcolor="'.$pgbg.'" width="100%" border="0" cellspacing="3" cellpadding="3"><tr><td rowspan="3" bgcolor="'.$tabbg.'"><font face="Arial, Helvetica, sans-serif" size="+3" color="'.$font.'"><b>'.$title.
+     if ($customtitle) {
- '</b></font></td>'.$roleinfo.'</tr></table>';
+         $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;
+ 	    my $parentpath = '';
+ 	    my $lastitem = '';
+ 	    if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
+ 		$parentpath = $1;
+ 		$lastitem = $2;
+ 	    } else {
+ 		$lastitem = $thisdisfn;
+ 	    }
+ 	    $titleinfo =
+ 		&Apache::loncommon::help_open_menu('','',3,'Authoring').
+ 		'<b>Construction Space</b>:&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 $titletable;
+ 	if (!$notitle) {
+ 	    $titletable =
+ 		'<table id="LC_title_bar">'.
+                          "<tr><td> $titleinfo $dc_info</td>".$roleinfo.
+ 			 '</tr></table>';
+ 	}
+ 	if ($notopbar) {
+ 	    $bodytag .= $titletable;
+ 	} else {
+ 	    if ($env{'request.state'} eq 'construct') {
+                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
+ 							  $titletable);
+             } else {
+                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg).
+ 		    $titletable;
+             }
+         }
+         return $bodytag;
      }
  #
  # Top frame rendering, Remote is up
  #
+     my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
+         $lonhttpdPort.$img.'" alt="'.$function.'" />';
+     # Explicit link to get inline menu
+     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
- &nbsp;<font size="5" face="Arial, Helvetica, sans-serif"><b>$title</b></font>
- <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) = @_;
+     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;
+     }
+ # Accessibility font enhance
+     if ($env{'browser.fontenhance'} eq 'on') {
+ 	my $style;
+ 	foreach my $key (keys(%{$attr_ref})) {
+ 	    if (lc($key) eq 'style') {
+ 		$style.=$attr_ref->{$key}.';';
+ 		delete($attr_ref->{$key});
+ 	    }
+ 	}
+ 	$attr_ref->{'style'}=$style.'; font-size: x-large;';
+     }
+     if ($env{'browser.blackwhite'} eq 'on') {
+ 	delete($attr_ref->{'font'});
+ 	delete($attr_ref->{'link'});
+ 	delete($attr_ref->{'alink'});
+ 	delete($attr_ref->{'vlink'});
+ 	delete($attr_ref->{'bgcolor'});
+ 	delete($attr_ref->{'background'});
+     }
+     my $attr_string;
+     foreach my $attr (keys(%$attr_ref)) {
+ 	$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" ';
+     }
+     return $attr_string;
+ }
+ ###############################################
  ###############################################
  =pod
- =item get_users_function
+ =back
+ =head1 HTML Helpers
+ =over 4
+ =item * &endbodytag()
+ Returns a uniform footer for LON-CAPA web pages.
+ Inputs: none
+ =back
+ =cut
+ sub endbodytag {
+     my $endbodytag='</body>';
+     $endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag;
+     if ( exists( $env{'internal.head.redirect'} ) ) {
+ 	$endbodytag=
+ 	    "<br /><a href=\"$env{'internal.head.redirect'}\">".
+ 	    &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
+ =back
+ =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                 = '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') ? '0px 2px 0px 2px'
+ 	                                              : '0px 3px 0px 4px';
+     return <<END;
+ h1, h2, h3, th { font-family: $sans }
+ a:focus { color: red; background: yellow }
+ table.thinborder { border-collapse: collapse; }
+ table.thinborder tr th {  border-style: solid; border-width: 1px; background: $tabbg;}
+ table.thinborder tr td { border-style: solid; border-width: 1px}
+ form, .inline { display: inline; }
+ .center { text-align: center; }
+ .LC_filename {font-family: $mono;}
+ .LC_error {
+   color: red;
+   font-size: larger;
+ }
+ .LC_warning,
+ .LC_diff_removed {
+   color: red;
+ }
+ .LC_success,
+ .LC_diff_added {
+   color: green;
+ }
+ .LC_icon {
+   border: 0px;
+ }
+ table.LC_pastsubmission {
+   border: 1px solid black;
+   margin: 2px;
+ }
+ table#LC_top_nav, table#LC_menubuttons {
+   width: 100%;
+   background: $pgbg;
+   border: 2px;
+   border-collapse: separate;
+   padding: 0px;
+ }
+ table#LC_title_bar, table.LC_breadcrumbs, table#LC_nav_location,
+ 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 {
+   background: $pgbg;
+   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;
+ }
+ .LC_menubuttons_inline_text {
+   color: $font;
+   font-family: $sans;
+   font-size: smaller;
+ }
+ td.LC_menubuttons_text {
+   color: $font;
+   font-family: $sans;
+ }
+ td.LC_menubuttons_img {
+   background: $tabbg;
+ }
+ .LC_current_location {
+   font-family: $sans;
+   background: $tabbg;
+ }
+ .LC_new_mail {
+   font-family: $sans;
+   font-weight: bold;
+ }
+ table.LC_aboutme_port {
+   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;
+ }
+ .LC_data_table_dense {
+   font-size: small;
+ }
+ table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th {
+   font-weight: bold;
+   background-color: $data_table_head;
+   font-size: smaller;
+ }
+ table.LC_data_table tr 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.LC_empty_row td,
+ table.LC_whatsnew tr.LC_empty_row td {
+   background-color: #FFFFFF;
+   font-weight: bold;
+   font-style: italic;
+   text-align: center;
+   padding: 8px;
+ }
+ table.LC_whatsnew tr.LC_empty_row td {
+   padding: 4ex
+ }
+ table.LC_whatsnew {
+ }
+ table.LC_whatsnew tr th,
+ table.LC_whatsnew tr.LC_info_row td {
+   background-color: #CCC;
+   font-weight: bold;
+   font-size: small;
+   text-align: right;
+ }
+ table.LC_whatsnew tr td {
+   background-color: #FFF;
+   font-size: small;
+   text-align: right;
+ }
+ table.LC_whatsnew tr td.LC_first_item {
+   text-align: left;
+ }
+ table.LC_whatsnew 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_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 {
+   width: 100%;
+   border-collapse: separate;
+   background: white;
+   border: 1px solid black;
+   border-spacing: 1px;
+ }
+ table.LC_pick_box td.LC_pick_box_title {
+   background: $tabbg;
+   font-weight: bold;
+   text-align: right;
+   width: 184px;
+   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_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;
+ }
+ table.LC_feedback_link {
+     background: $feedback_link_bg;
+ }
+ span.LC_feedback_link {
+     background: $feedback_link_bg;
+     font-size: larger;
+ }
+ END
+ }
+ =pod
+ =over 4
+ =item * &headtag()
+ Returns a uniform footer for LON-CAPA web pages.
+ Inputs: $title - optional title for the head
+         $head_extra - optional extra HTML to put inside the <head>
+         $args - optional arguments
+             force_register - if is true call registerurl so the remote is
+                              informed
+             redirect       -> array ref of
+- seconds before redirect occurs
+- url to redirect to
+- whether the side effect should occur
+                            (side effect of setting
+                                $env{'internal.head.redirect'} to the url
+                                redirected too)
+             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
+ =back
+ =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>'.
+ 	&font_settings();
+     if (!$args->{'frameset'}) {
+ 	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
+     }
+     if ($args->{'force_register'}) {
+ 	$result .= &Apache::lonmenu::registerurl(1);
+     }
+     if (!$args->{'no_nav_bar'}
+ 	&& !$args->{'only_body'}
+ 	&& !$args->{'frameset'}) {
+ 	$result .= &help_menu_js();
+     }
+     if (ref($args->{'redirect'})) {
+ 	my ($time,$url,$inhibit_continue) = @{$args->{'redirect'}};
+ 	$url = &Apache::lonenc::check_encrypt($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" />
+ ADDMETA
+     }
+     if (!defined($title)) {
+ 	$title = 'The LearningOnline Network with CAPA';
+     }
+     if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
+     $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
+ =back
+ =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
+ =over 4
+ =item * &xml_begin()
+ Returns the needed doctype and <html>
+ Inputs: none
+ =back
+ =cut
+ sub xml_begin {
+     my $output='';
+     &Apache::lonhtmlcommon::init_htmlareafields();
+     if ($env{'browser.mathml'}) {
+ 	$output='<?xml version="1.0"?>'
+             #.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'."\n"
+ #            .'<!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
+ =over 4
+ =item * &endheadtag()
+ Returns a uniform </head> for LON-CAPA web pages.
+ Inputs: none
+ =back
+ =cut
+ sub endheadtag {
+     return '</head>';
+ }
+ =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
+ sub head {
+     my ($title,$head_extra,$args) = @_;
+     return &headtag($title,$head_extra,$args).&endheadtag();
+ }
+ =pod
+ =over 4
+ =item * &start_page()
+ Returns a complete <html> .. <body> section for LON-CAPA web pages.
+ Inputs: $title - optional title for the page
+         $head_extra - optional extra HTML to incude inside the <head>
+         $args - additional optional args supported are:
+                   only_body      -> is true will set &bodytag() onlybodytag
+                                     arg on
+                   no_nav_bar     -> is true will set &bodytag() notopbar arg on
+                   add_entries    -> additional attributes to add to the  <body>
+                   domain         -> force to color decorate a page for a
+                                     specific domain
+                   function       -> force usage of a specific rolish color
+                                     scheme
+                   redirect       -> see &headtag()
+                   bgcolor        -> override the default page bg color
+                   js_ready       -> return a string ready for being used in
+                                     a javascript writeln
+                   html_encode    -> return a string ready for being used in
+                                     a html attribute
+                   force_register -> if is true will turn on the &bodytag()
+                                     $forcereg arg
+                   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>
+                                     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
+ =back
+ =cut
+ 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','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;
+     if (! exists($args->{'skip_phases'}{'head'}) ) {
+ 	$result.=
+ 	    &xml_begin().
+ 	    &headtag($title,$head_extra,\%head_args).&endheadtag();
+     }
+     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);
+     }
+     if ($args->{'html_encode'}) {
+ 	$result = &html_encode($result);
+     }
+     return $result;
+ }
+ =pod
+ =over 4
+ =item * &head()
+ Returns a complete </body></html> section for LON-CAPA web pages.
+ Inputs:         $args - additional optional args supported are:
+                  js_ready     -> return a string ready for being used in
+                                  a javascript writeln
+                  html_encode  -> return a string ready for being used in
+                                  a html attribute
+                  frameset     -> if true will start with a <frameset>
+                                  rather than <body>
+ =cut
+ sub end_page {
+     my ($args) = @_;
+     $env{'internal.end_page'}++;
+     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();
+     }
+     $result .= "\n</html>";
+     if ($args->{'js_ready'}) {
+ 	$result = &js_ready($result);
+     }
+     if ($args->{'html_encode'}) {
+ 	$result = &html_encode($result);
+     }
+     return $result;
+ }
+ sub html_encode {
+     my ($result) = @_;
+     $result = &HTML::Entities::encode($result,'<>&"');
+     return $result;
+ }
+ sub js_ready {
+     my ($result) = @_;
+     $result =~ s/[\n\r]/ /xmsg;
+     $result =~ s/\\/\\\\/xmsg;
+     $result =~ s/'/\\'/xmsg;
+     $result =~ s{</}{<\\/}xmsg;
+     return $result;
+ }
+ sub validate_page {
+     if (  exists($env{'internal.start_page'})
+ 	  &&     $env{'internal.start_page'} > 1) {
+ 	&Apache::lonnet::logthis('start_page called multiple times '.
+ 				 $env{'internal.start_page'}.' '.
+ 				 $ENV{'request.filename'});
+     }
+     if (  exists($env{'internal.end_page'})
+ 	  &&     $env{'internal.end_page'} > 1) {
+ 	&Apache::lonnet::logthis('end_page called multiple times '.
+ 				 $env{'internal.end_page'}.' '.
+ 				 $env{'request.filename'});
+     }
+     if (     exists($env{'internal.start_page'})
+ 	&& ! exists($env{'internal.end_page'})) {
+ 	&Apache::lonnet::logthis('start_page called without end_page '.
+ 				 $env{'request.filename'});
+     }
+     if (   ! exists($env{'internal.start_page'})
+ 	&&   exists($env{'internal.end_page'})) {
+ 	&Apache::lonnet::logthis('end_page called without start_page'.
+ 				 $env{'request.filename'});
+     }
+ }
+ sub simple_error_page {
+     my ($r,$title,$msg) = @_;
+     my $page =
+ 	&Apache::loncommon::start_page($title).
+ 	&mt($msg).
+ 	&Apache::loncommon::end_page();
+     if (ref($r)) {
+ 	$r->print($page);
+ 	return;
+     }
+     return $page;
+ }
+ {
+     my $row_count;
+     sub start_data_table {
+ 	my ($add_class) = @_;
+ 	my $css_class = (join(' ','LC_data_table',$add_class));
+ 	undef($row_count);
+ 	return '<table class="'.$css_class.'">'."\n";
+     }
+     sub end_data_table {
+ 	undef($row_count);
+ 	return '</table>'."\n";;
+     }
+     sub start_data_table_row {
+ 	my ($add_class) = @_;
+ 	$row_count++;
+ 	my $css_class = ($row_count % 2)?'':'LC_even_row';
+ 	$css_class = (join(' ',$css_class,$add_class));
+ 	return  '<tr class="'.$css_class.'">'."\n";;
+     }
+     sub continue_data_table_row {
+ 	my ($add_class) = @_;
+ 	my $css_class = ($row_count % 2)?'':'LC_even_row';
+ 	$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++;
+ 	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 * &get_users_function()
  Used by &bodytag to determine the current users primary role.
  Returns either 'student','coordinator','admin', or 'author'.
- Line 2636  Returns either 'student','coordinator','
+ Line 4489  Returns either 'student','coordinator','
  ###############################################
  sub get_users_function {
      my $function = 'student';
-     if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
+     if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
          $function='coordinator';
      }
-     if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
+     if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
          $function='admin';
      }
-     if (($ENV{'request.role'}=~/^(au|ca)/) ||
+     if (($env{'request.role'}=~/^(au|ca)/) ||
          ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
          $function='author';
      }
- Line 2651  sub get_users_function {
+ Line 4504  sub get_users_function {
  ###############################################
- sub get_posted_cgi {
+ =pod
-     my $r=shift;
-     my $buffer;
+ =item * &check_user_status
-     $r->read($buffer,$r->header_in('Content-length'),0);
+ Determines current status of supplied role for a
-     unless ($buffer=~/^(\-+\w+)\s+Content\-Disposition\:\s*form\-data/si) {
+ specific user. Roles can be active, previous or future.
- 	my @pairs=split(/&/,$buffer);
- 	my $pair;
+ Inputs:
- 	foreach $pair (@pairs) {
+ user's domain, user's username, course's domain,
- 	    my ($name,$value) = split(/=/,$pair);
+ course's number, optional section ID.
- 	    $value =~ tr/+/ /;
- 	    $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+ Outputs:
- 	    $name  =~ tr/+/ /;
+ role status: active, previous or future.
- 	    $name  =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
- 	    &add_to_env("form.$name",$value);
+ =cut
- 	}
-     } else {
+ sub check_user_status {
- 	my $contentsep=$1;
+     my ($udom,$uname,$cdom,$crs,$role,$sec) = @_;
- 	my @lines = split (/\n/,$buffer);
+     my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname);
- 	my $name='';
+     my @uroles = keys %userinfo;
- 	my $value='';
+     my $srchstr;
- 	my $fname='';
+     my $active_chk = 'none';
- 	my $fmime='';
+     my $now = time;
- 	my $i;
+     if (@uroles > 0) {
- 	for ($i=0;$i<=$#lines;$i++) {
+         if (($role eq 'cc') || ($sec eq '') || (!defined($sec))) {
- 	    if ($lines[$i]=~/^$contentsep/) {
+             $srchstr = '/'.$cdom.'/'.$crs.'_'.$role;
- 		if ($name) {
+         } else {
- 		    chomp($value);
+             $srchstr = '/'.$cdom.'/'.$crs.'/'.$sec.'_'.$role;
- 		    if ($fname) {
+         }
- 			$ENV{"form.$name.filename"}=$fname;
+         if (grep/^\Q$srchstr\E$/,@uroles) {
- 			$ENV{"form.$name.mimetype"}=$fmime;
+             my $role_end = 0;
- 		    } else {
+             my $role_start = 0;
- 			$value=~s/\s+$//s;
+             $active_chk = 'active';
- 		    }
+             if ($userinfo{$srchstr} =~ m/^\Q$role\E_(\d+)/) {
- 		    &add_to_env("form.$name",$value);
+                 $role_end = $1;
+                 if ($userinfo{$srchstr} =~ m/^\Q$role\E_\Q$role_end\E_(\d+)$/) {
+                     $role_start = $1;
+                 }
+             }
+             if ($role_start > 0) {
+                 if ($now < $role_start) {
+                     $active_chk = 'future';
+                 }
+             }
+             if ($role_end > 0) {
+                 if ($now > $role_end) {
+                     $active_chk = 'previous';
+                 }
+             }
+         }
+     }
+     return $active_chk;
+ }
+ ###############################################
+ =pod
+ =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 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 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,$possible_roles,$possible_status) = @_;
+     if (!defined($cdom) || !defined($cnum)) {
+         my $cid =  $env{'request.course.id'};
+ 	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();
+         my $start_index = &Apache::loncoursedata::CL_START();
+         my $end_index = &Apache::loncoursedata::CL_END();
+         my $status;
+ 	while (my ($student,$data) = each(%$classlist)) {
+ 	    my ($section,$stu_status,$start,$end) = ($data->[$sec_index],
+ 				                     $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}++;
+                 }
+ 	    }
+ 	}
+     }
+     my %courseroles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
+     foreach my $user (sort(keys(%courseroles))) {
+ 	if ($user !~ /^(\w{2})/) { next; }
+ 	my ($role) = ($user =~ /^(\w{2})/);
+ 	if ($possible_roles && !(grep(/^$role$/,@$possible_roles))) { next; }
+ 	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; }
+         my ($end,$start) = ($courseroles{$user} =~ /^([^:]*):([^:]*)$/);
+         if ($end == -1 && $start == -1) {
+             next; #deleted role
+         }
+         if (!defined($possible_status)) {
+             $sectioncount{$section}++;
+         } else {
+             if ((!$end || $end >= $now) && (!$start || $start <= $now)) {
+                 $status = 'active';
+             } elsif ($end < $now) {
+                 $status = 'future';
+             } elsif ($start > $now) {
+                 $status = 'previous';
+             }
+             if (($status ne '') && (grep/^\Q$status\E$/,@{$possible_status})) {
+                 $sectioncount{$section}++;
+             }
+         }
+     }
+     return %sectioncount;
+ }
+ ###############################################
+ =pod
+ =item * &get_course_users()
+ Retrieves usernames:domains for users in the specified course
+ with specific role(s), and access status.
+ Incoming parameters:
+. course domain
+. course number
+. access status: users must have - either active,
+ previous, future, or all.
+. reference to array of permissible roles
+. 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.
+ 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.
+ 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 %idx = ();
+     my %seclists;
+     $idx{udom} = &Apache::loncoursedata::CL_SDOM();
+     $idx{uname} =  &Apache::loncoursedata::CL_SNAME();
+     $idx{end} = &Apache::loncoursedata::CL_END();
+     $idx{start} = &Apache::loncoursedata::CL_START();
+     $idx{id} = &Apache::loncoursedata::CL_ID();
+     $idx{section} = &Apache::loncoursedata::CL_SECTION();
+     $idx{fullname} = &Apache::loncoursedata::CL_FULLNAME();
+     $idx{status} = &Apache::loncoursedata::CL_STATUS();
+     if (grep(/^st$/,@{$roles})) {
+         my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist($cdom,$cnum);
+         my $now = time;
+         foreach my $student (keys(%{$classlist})) {
+             my $match = 0;
+             my $secmatch = 0;
+             my $section = $$classlist{$student}[$idx{section}];
+             if ($section eq '') {
+                 $section = 'none';
+             }
+             if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {
+                 if (grep(/^all$/,@{$sections})) {
+                     $secmatch = 1;
+                 } elsif ($$classlist{$student}[$idx{section}] eq '') {
+                     if (grep(/^none$/,@{$sections})) {
+                         $secmatch = 1;
+                     }
+                 } else {
+ 		    if (grep(/^\Q$section\E$/,@{$sections})) {
+ 		        $secmatch = 1;
+                     }
  		}
- 		if ($i<$#lines) {
+                 if (!$secmatch) {
- 		    $i++;
+                     next;
- 		    $lines[$i]=~
+                 }
- 		/Content\-Disposition\:\s*form\-data\;\s*name\=\"([^\"]+)\"/i;
+             }
- 		    $name=$1;
+             push(@{$seclists{$student}},$section);
- 		    $value='';
+             if (defined($$types{'active'})) {
- 		    if ($lines[$i]=~/filename\=\"([^\"]+)\"/i) {
+                 if ($$classlist{$student}[$idx{status}] eq 'Active') {
- 			$fname=$1;
+                     push(@{$$users{st}{$student}},'active');
- 			if
+                     $match = 1;
-                             ($lines[$i+1]=~/Content\-Type\:\s*([\w\-\/]+)/i) {
+                 }
- 				$fmime=$1;
+             }
- 				$i++;
+             if (defined($$types{'previous'})) {
- 			    } else {
+                 if ($$classlist{$student}[$idx{end}] <= $now) {
- 				$fmime='';
+                     push(@{$$users{st}{$student}},'previous');
- 			    }
+                     $match = 1;
- 		    } else {
+                 }
- 			$fname='';
+             }
- 			$fmime='';
+             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 '')) {
+                     push(@{$$users{st}{$student}},'future');
+                     $match = 1;
+                 }
+             }
+             if ($match && ref($userdata) eq 'HASH') {
+                 $$userdata{$student} = $$classlist{$student};
+             }
+         }
+     }
+     if ((@{$roles} > 1) || ((@{$roles} == 1) && ($$roles[0] ne "st"))) {
+         my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
+         my $now = time;
+         foreach my $person (sort(keys(%coursepersonnel))) {
+             my $match = 0;
+             my $secmatch = 0;
+             my $status;
+             my ($role,$user,$usec) = ($person =~ /^([^:]*):([^:]+:[^:]+):([^:]*)/);
+             $user =~ s/:$//;
+             my ($end,$start) = split(/:/,$coursepersonnel{$person});
+             if ($end == -1 || $start == -1) {
+                 next;
+             }
+             if (($role) && ((grep(/^\Q$role\E$/,@{$roles})) ||
+                 (grep(/^cr$/,@{$roles}) && $role =~ /^cr\//))) {
+                 my ($uname,$udom) = split(/:/,$user);
+                 if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {
+                     if (grep(/^all$/,@{$sections})) {
+                         $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 '') {
+                     if ($end < $now) {
+                         $status = 'previous';
+                     } elsif ($start > $now) {
+                         $status = 'future';
+                     } else {
+                         $status = 'active';
+                     }
+                     foreach my $type (keys(%{$types})) {
+                         if ($status eq $type) {
+                             if (!grep(/^\Q$type\E$/,@{$$users{$role}{$user}})) {
+                                 push(@{$$users{$role}{$user}},$type);
+                             }
+                             $match = 1;
+                         }
+                     }
+                     if (($match) && (ref($userdata) eq 'HASH')) {
+                         if (!exists($$userdata{$uname.':'.$udom})) {
+ 			    &get_user_info($udom,$uname,\%idx,$userdata);
+                         }
+                         if (!grep(/^\Q$usec\E$/,@{$seclists{$uname.':'.$udom}})) {
+                             push(@{$seclists{$uname.':'.$udom}},$usec);
+                         }
+                     }
+                 }
+             }
+         }
+         if (grep(/^ow$/,@{$roles})) {
+             if ((defined($cdom)) && (defined($cnum))) {
+                 my %csettings = &Apache::lonnet::get('environment',['internal.courseowner'],$cdom,$cnum);
+                 if ( defined($csettings{'internal.courseowner'}) ) {
+                     my $owner = $csettings{'internal.courseowner'};
+                     if ($owner !~ /^[^:]+:[^:]+$/) {
+                         $owner = $owner.':'.$cdom;
+                     }
+                     @{$$users{'ow'}{$owner}} = 'any';
+                     if (defined($userdata) &&
+ 			!exists($$userdata{$owner.':'.$cdom})) {
+ 			&get_user_info($cdom,$owner,\%idx,$userdata);
+                         if (!grep(/^none$/,@{$seclists{$owner.':'.$cdom}})) {
+                             push(@{$seclists{$owner.':'.$cdom}},'none');
+                         }
  		    }
- 		    $i++;
+                 }
- 		}
+             }
- 	    } else {
+         }
- 		$value.=$lines[$i]."\n";
+         foreach my $user (keys(%seclists)) {
- 	    }
+             @{$seclists{$user}} = (sort {$a <=> $b} @{$seclists{$user}});
+             $$userdata{$user}[$idx{section}] = join(',',@{$seclists{$user}});
+         }
+     }
+     return;
+ }
+ sub get_user_info {
+     my ($udom,$uname,$idx,$userdata) = @_;
+     $$userdata{$uname.':'.$udom}[$$idx{fullname}] =
+ 	&plainname($uname,$udom,'lastname');
+     $$userdata{$uname.':'.$udom}[$$idx{uname}] = $uname;
+     $$userdata{$uname.':'.$udom}[$$idx{udom}] = $udom;
+     return;
+ }
+ ###############################################
+ =pod
+ =item * &get_user_quota()
+ Retrieves quota assigned for storage of portfolio files for a user
+ Incoming parameters:
+. user's username
+. user's domain
+ Returns:
+. Disk quota (in Mb) assigned to student.
+ If a value has been stored in the user's environment,
+ it will return that, otherwise it returns the default
+ for users in the domain.
+ =cut
+ ###############################################
+ sub get_user_quota {
+     my ($uname,$udom) = @_;
+     my $quota;
+     if (!defined($udom)) {
+         $udom = $env{'user.domain'};
+     }
+     if (!defined($uname)) {
+         $uname = $env{'user.name'};
+     }
+     if (($udom eq '' || $uname eq '') ||
+         ($udom eq 'public') && ($uname eq 'public')) {
+         $quota = 0;
+     } else {
+         if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) {
+             $quota = $env{'environment.portfolioquota'};
+         } else {
+             my %userenv = &Apache::lonnet::dump('environment',$udom,$uname);
+             my ($tmp) = keys(%userenv);
+             if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
+                 $quota = $userenv{'portfolioquota'};
+             } else {
+                 undef(%userenv);
+             }
+         }
+         if ($quota eq '') {
+             $quota = &default_quota($udom);
+         }
+     }
+     return $quota;
+ }
+ ###############################################
+ =pod
+ =item * &default_quota()
+ Retrieves default quota assigned for storage of user portfolio files
+ Incoming parameters:
+. domain
+ Returns:
+. Default disk quota (in Mb) for user portfolios in the domain.
+ 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).
+ =cut
+ ###############################################
+ sub default_quota {
+     my ($udom) = @_;
+     my %defaults = &Apache::lonnet::get_dom('configuration',
+                                             ['portfolioquota'],$udom);
+     if ($defaults{'portfolioquota'} ne '') {
+         return $defaults{'portfolioquota'};
+     } else {
+         return '20';
+     }
+ }
+ 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);
      }
-     $ENV{'request.method'}=$ENV{'REQUEST_METHOD'};
+     return (\@sections,\@groups,$allroles,$rolehash,$accesshash);
-     $r->method_number(M_GET);
-     $r->method('GET');
-     $r->headers_in->unset('Content-length');
  }
  =pod
  =item * get_unprocessed_cgi($query,$possible_names)
- Modify the %ENV hash to contain unprocessed CGI form parameters held in
+ Modify the %env hash to contain unprocessed CGI form parameters held in
  $query.  The parameters listed in $possible_names (an array reference),
- will be set in $ENV{'form.name'} if they do not already exist.
+ will be set in $env{'form.name'} if they do not already exist.
  Typically called with $ENV{'QUERY_STRING'} as the first parameter.
  $possible_names is an ref to an array of form element names.  As an example:
  get_unprocessed_cgi($ENV{'QUERY_STRING'},['uname','udom']);
- will result in $ENV{'form.uname'} and $ENV{'form.udom'} being set.
+ will result in $env{'form.uname'} and $env{'form.udom'} being set.
  =cut
  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;
-       &Apache::lonxml::debug("Seting :$name: to :$value:");
+       unless (defined($env{'form.'.$name})) { &add_to_env('form.'.$name,$value) };
-       unless (defined($ENV{'form.'.$name})) { &add_to_env('form.'.$name,$value) };
      }
    }
  }
- Line 2759  returns cache-controlling header code
+ Line 5019  returns cache-controlling header code
  =cut
  sub cacheheader {
-     unless ($ENV{'request.method'} eq 'GET') { return ''; }
+     unless ($env{'request.method'} eq 'GET') { return ''; }
      my $date=strftime("%a, %d %b %Y %H:%M:%S GMT",gmtime);
      my $output .='<meta HTTP-EQUIV="Expires" CONTENT="'.$date.'" />
                  <meta HTTP-EQUIV="Cache-control" CONTENT="no-cache" />
- Line 2778  specifies header code to not have cache
+ Line 5038  specifies header code to not have cache
  sub no_cache {
      my ($r) = @_;
      if ($ENV{'REQUEST_METHOD'} ne 'GET' &&
- 	$ENV{'request.method'} ne 'GET') { return ''; }
+ 	$env{'request.method'} ne 'GET') { return ''; }
      my $date=strftime("%a, %d %b %Y %H:%M:%S GMT",gmtime(time));
      $r->no_cache(1);
      $r->header_out("Expires" => $date);
- Line 2787  sub no_cache {
+ Line 5047  sub no_cache {
  sub content_type {
      my ($r,$type,$charset) = @_;
+     if ($r) {
+ 	#  Note that printout.pl calls this with undef for $r.
+ 	&no_cache($r);
+     }
+     if ($env{'browser.mathml'} && $type eq 'text/html') { $type='text/xml'; }
      unless ($charset) {
  	$charset=&Apache::lonlocal::current_encoding;
      }
- Line 2802  sub content_type {
+ Line 5067  sub content_type {
  =item * add_to_env($name,$value)
- adds $name to the %ENV hash with value
+ adds $name to the %env hash with value
  $value, if $name already exists, the entry is converted to an array
  reference and $value is added to the array.
- Line 2810  reference and $value is added to the arr
+ Line 5075  reference and $value is added to the arr
  sub add_to_env {
    my ($name,$value)=@_;
-   if (defined($ENV{$name})) {
+   if (defined($env{$name})) {
-     if (ref($ENV{$name})) {
+     if (ref($env{$name})) {
        #already have multiple values
-       push(@{ $ENV{$name} },$value);
+       push(@{ $env{$name} },$value);
      } else {
        #first time seeing multiple values, convert hash entry to an arrayref
-       my $first=$ENV{$name};
+       my $first=$env{$name};
-       undef($ENV{$name});
+       undef($env{$name});
-       push(@{ $ENV{$name} },$first,$value);
+       push(@{ $env{$name} },$first,$value);
      }
    } else {
-     $ENV{$name}=$value;
+     $env{$name}=$value;
    }
  }
- Line 2829  sub add_to_env {
+ Line 5094  sub add_to_env {
  =item * get_env_multiple($name)
- gets $name from the %ENV hash, it seemlessly handles the cases where multiple
+ gets $name from the %env hash, it seemlessly handles the cases where multiple
  values may be defined and end up as an array ref.
  returns an array of values
- Line 2839  returns an array of values
+ Line 5104  returns an array of values
  sub get_env_multiple {
      my ($name) = @_;
      my @values;
-     if (defined($ENV{$name})) {
+     if (defined($env{$name})) {
          # exists is it an array
-         if (ref($ENV{$name})) {
+         if (ref($env{$name})) {
-             @values=@{ $ENV{$name} };
+             @values=@{ $env{$name} };
          } else {
-             $values[0]=$ENV{$name};
+             $values[0]=$env{$name};
          }
      }
      return(@values);
- Line 2853  sub get_env_multiple {
+ Line 5118  sub get_env_multiple {
  =pod
  =back
  =head1 CSV Upload/Handling functions
- Line 2862  sub get_env_multiple {
+ Line 5127  sub get_env_multiple {
  =item * upfile_store($r)
  Store uploaded file, $r should be the HTTP Request object,
- needs $ENV{'form.upfile'}
+ needs $env{'form.upfile'}
  returns $datatoken to be put into hidden field
  =cut
  sub upfile_store {
      my $r=shift;
-     $ENV{'form.upfile'}=~s/\r/\n/gs;
+     $env{'form.upfile'}=~s/\r/\n/gs;
-     $ENV{'form.upfile'}=~s/\f/\n/gs;
+     $env{'form.upfile'}=~s/\f/\n/gs;
-     $ENV{'form.upfile'}=~s/\n+/\n/gs;
+     $env{'form.upfile'}=~s/\n+/\n/gs;
-     $ENV{'form.upfile'}=~s/\n+$//gs;
+     $env{'form.upfile'}=~s/\n+$//gs;
-     my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}.
+     my $datatoken=$env{'user.name'}.'_'.$env{'user.domain'}.
- 	'_enroll_'.$ENV{'request.course.id'}.'_'.time.'_'.$$;
+ 	'_enroll_'.$env{'request.course.id'}.'_'.time.'_'.$$;
      {
          my $datafile = $r->dir_config('lonDaemons').
                             '/tmp/'.$datatoken.'.tmp';
          if ( open(my $fh,">$datafile") ) {
-             print $fh $ENV{'form.upfile'};
+             print $fh $env{'form.upfile'};
              close($fh);
          }
      }
- Line 2892  sub upfile_store {
+ Line 5157  sub upfile_store {
  =item * load_tmp_file($r)
  Load uploaded file from tmp, $r should be the HTTP Request object,
- needs $ENV{'form.datatoken'},
+ needs $env{'form.datatoken'},
- sets $ENV{'form.upfile'} to the contents of the file
+ sets $env{'form.upfile'} to the contents of the file
  =cut
- Line 2902  sub load_tmp_file {
+ Line 5167  sub load_tmp_file {
      my @studentdata=();
      {
          my $studentfile = $r->dir_config('lonDaemons').
-                               '/tmp/'.$ENV{'form.datatoken'}.'.tmp';
+                               '/tmp/'.$env{'form.datatoken'}.'.tmp';
          if ( open(my $fh,"<$studentfile") ) {
              @studentdata=<$fh>;
              close($fh);
          }
      }
-     $ENV{'form.upfile'}=join('',@studentdata);
+     $env{'form.upfile'}=join('',@studentdata);
  }
  =pod
- Line 2917  sub load_tmp_file {
+ Line 5182  sub load_tmp_file {
  Separate uploaded file into records
  returns array of records,
- needs $ENV{'form.upfile'} and $ENV{'form.upfiletype'}
+ needs $env{'form.upfile'} and $env{'form.upfiletype'}
  =cut
  sub upfile_record_sep {
-     if ($ENV{'form.upfiletype'} eq 'xml') {
+     if ($env{'form.upfiletype'} eq 'xml') {
      } else {
- 	return split(/\n/,$ENV{'form.upfile'});
+ 	my @records;
+ 	foreach my $line (split(/\n/,$env{'form.upfile'})) {
+ 	    if ($line=~/^\s*$/) { next; }
+ 	    push(@records,$line);
+ 	}
+ 	return @records;
      }
  }
- Line 2932  sub upfile_record_sep {
+ Line 5202  sub upfile_record_sep {
  =item * record_sep($record)
- Separate a record into fields $record should be an item from the upfile_record_sep(), needs $ENV{'form.upfiletype'}
+ Separate a record into fields $record should be an item from the upfile_record_sep(), needs $env{'form.upfiletype'}
  =cut
+ sub takeleft {
+     my $index=shift;
+     return substr('0000'.$index,-4,4);
+ }
  sub record_sep {
      my $record=shift;
      my %components=();
-     if ($ENV{'form.upfiletype'} eq 'xml') {
+     if ($env{'form.upfiletype'} eq 'xml') {
-     } elsif ($ENV{'form.upfiletype'} eq 'space') {
+     } 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{$i}=$field;
+             $components{&takeleft($i)}=$field;
              $i++;
          }
-     } elsif ($ENV{'form.upfiletype'} eq 'tab') {
+     } 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{$i}=$field;
+             $components{&takeleft($i)}=$field;
              $i++;
          }
      } else {
-         my @allfields=split(/\,/,$record);
+         my @allfields;
+         if ($env{'form.upfiletype'} eq 'semisv') {
+             @allfields=split(/;/,$record);
+         } else {
+             @allfields=split(/\,/,$record);
+         }
          my $i=0;
          my $j;
          for ($j=0;$j<=$#allfields;$j++) {
- Line 2973  sub record_sep {
+ Line 5251  sub record_sep {
                  $field=~s/^\s*$delimiter//;
                  $field=~s/$delimiter\s*$//;
              }
-             $components{$i}=$field;
+             $components{&takeleft($i)}=$field;
  	    $i++;
          }
      }
- Line 2997  the file type.
+ Line 5275  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 3010  sub upfile_select_html {
+ Line 5289  sub upfile_select_html {
      return $Str;
  }
+ sub get_samples {
+     my ($records,$toget) = @_;
+     my @samples=({});
+     my $got=0;
+     foreach my $rec (@$records) {
+ 	my %temp = &record_sep($rec);
+ 	if (! grep(/\S/, values(%temp))) { next; }
+ 	if (%temp) {
+ 	    $samples[$got]=\%temp;
+ 	    $got++;
+ 	    if ($got == $toget) { last; }
+ 	}
+     }
+     return \@samples;
+ }
  ######################################################
  ######################################################
- Line 3027  Apache Request ref, $records is an array
+ Line 5322  Apache Request ref, $records is an array
  ######################################################
  sub csv_print_samples {
      my ($r,$records) = @_;
-     my (%sone,%stwo,%sthree);
+     my $samples = &get_samples($records,3);
-     %sone=&record_sep($$records[0]);
-     if (defined($$records[1])) {%stwo=&record_sep($$records[1]);}
-     if (defined($$records[2])) {%sthree=&record_sep($$records[2]);}
-     #
      $r->print(&mt('Samples').'<br /><table border="2"><tr>');
-     foreach (sort({$a <=> $b} keys(%sone))) {
+     foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
-         $r->print('<th>'.&mt('Column&nbsp;[_1]',($_+1)).'</th>'); }
+         $r->print('<th>'.&mt('Column&nbsp;[_1]',($sample+1)).'</th>'); }
      $r->print('</tr>');
-     foreach my $hash (\%sone,\%stwo,\%sthree) {
+     foreach my $hash (@$samples) {
  	$r->print('<tr>');
- 	foreach (sort({$a <=> $b} keys(%sone))) {
+ 	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>');
- Line 3067  $d is an array of 2 element arrays (inte
+ Line 5359  $d is an array of 2 element arrays (inte
  ######################################################
  sub csv_print_select_table {
      my ($r,$records,$d) = @_;
-     my $i=0;my %sone;
+     my $i=0;
-     %sone=&record_sep($$records[0]);
+     my $samples = &get_samples($records,1);
      $r->print(&mt('Associate columns with student attributes.')."\n".
  	     '<table border="2"><tr>'.
                '<th>'.&mt('Attribute').'</th>'.
                '<th>'.&mt('Column').'</th></tr>'."\n");
-     foreach (@$d) {
+     foreach my $array_ref (@$d) {
- 	my ($value,$display,$defaultcol)=@{ $_ };
+ 	my ($value,$display,$defaultcol)=@{ $array_ref };
  	$r->print('<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(%sone))) {
+ 	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
- 	    $r->print('<option value="'.$_.'"'.
+ 	    $r->print('<option value="'.$sample.'"'.
-                       ($_ eq $defaultcol ? ' selected ' : '').
+                       ($sample eq $defaultcol ? ' selected="selected" ' : '').
-                       '>Column '.($_+1).'</option>');
+                       '>Column '.($sample+1).'</option>');
  	}
  	$r->print('</select></td></tr>'."\n");
  	$i++;
- Line 3111  $d is an array of 2 element arrays (inte
+ Line 5403  $d is an array of 2 element arrays (inte
  ######################################################
  sub csv_samples_select_table {
      my ($r,$records,$d) = @_;
-     my %sone; my %stwo; my %sthree;
      my $i=0;
      #
+     my $samples = &get_samples($records,3);
      $r->print('<table border=2><tr><th>'.
                &mt('Field').'</th><th>'.&mt('Samples').'</th></tr>');
-     %sone=&record_sep($$records[0]);
-     if (defined($$records[1])) {%stwo=&record_sep($$records[1]);}
+     foreach my $key (sort(keys(%{ $samples->[0] }))) {
-     if (defined($$records[2])) {%sthree=&record_sep($$records[2]);}
-     #
-     foreach (sort keys %sone) {
  	$r->print('<tr><td><select name="f'.$i.'"'.
  		  ' onchange="javascript:flip(this.form,'.$i.');">');
- 	foreach (@$d) {
+ 	foreach my $option (@$d) {
- 	    my ($value,$display,$defaultcol)=@{ $_ };
+ 	    my ($value,$display,$defaultcol)=@{ $option };
  	    $r->print('<option value="'.$value.'"'.
-                       ($i eq $defaultcol ? ' selected ':'').'>'.
+                       ($i eq $defaultcol ? ' selected="selected" ':'').'>'.
                        $display.'</option>');
  	}
  	$r->print('</select></td><td>');
- 	if (defined($sone{$_})) { $r->print($sone{$_}."</br>\n"); }
+ 	foreach my $line (0..2) {
- 	if (defined($stwo{$_})) { $r->print($stwo{$_}."</br>\n"); }
+ 	    if (defined($samples->[$line]{$key})) {
- 	if (defined($sthree{$_})) { $r->print($sthree{$_}."</br>\n"); }
+ 		$r->print($samples->[$line]{$key}."<br />\n");
+ 	    }
+ 	}
  	$r->print('</td></tr>');
  	$i++;
      }
- Line 3221  the routine &Apache::lonnet::transfer_pr
+ Line 5512  the routine &Apache::lonnet::transfer_pr
  my $uniq=0;
  sub get_cgi_id {
      $uniq=($uniq+1)%100000;
-     return (time.'_'.$uniq);
+     return (time.'_'.$$.'_'.$uniq);
  }
  ############################################################
- Line 3257  they are plotted.  If undefined, default
+ Line 5548  they are plotted.  If undefined, default
  =item @Values: An array of array references.  Each array reference holds data
  to be plotted in a stacked bar chart.
+ =item If the final element of @Values is a hash reference the key/value
+ pairs will be added to the graph definition.
  =back
  Returns:
- Line 3277  sub DrawBarGraph {
+ Line 5571  sub DrawBarGraph {
                    '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66',
                    ];
      }
+     my $extra_settings = {};
+     if (ref($Values[-1]) eq 'HASH') {
+         $extra_settings = pop(@Values);
+     }
      #
      my $identifier = &get_cgi_id();
      my $id = 'cgi.'.$identifier;
      if (! @Values || ref($Values[0]) ne 'ARRAY') {
          return '';
      }
+     #
+     my @Labels;
+     if (defined($labels)) {
+         @Labels = @$labels;
+     } else {
+         for (my $i=0;$i<@{$Values[0]};$i++) {
+             push (@Labels,$i+1);
+         }
+     }
+     #
      my $NumBars = scalar(@{$Values[0]});
+     if ($NumBars < scalar(@Labels)) { $NumBars = scalar(@Labels); }
      my %ValuesHash;
      my $NumSets=1;
      foreach my $array (@Values) {
- Line 3293  sub DrawBarGraph {
+ Line 5602  sub DrawBarGraph {
      }
      #
      my ($height,$width,$xskip,$bar_width) = (200,120,1,15);
-     if ($NumBars < 5) {
+     if ($NumBars < 3) {
-         $width = 120+$NumBars*25;
+         $width = 120+$NumBars*32;
          $xskip = 1;
-         $bar_width = 25;
+         $bar_width = 30;
+     } elsif ($NumBars < 5) {
+         $width = 120+$NumBars*20;
+         $xskip = 1;
+         $bar_width = 20;
      } elsif ($NumBars < 10) {
          $width = 120+$NumBars*15;
          $xskip = 1;
- Line 3315  sub DrawBarGraph {
+ Line 5628  sub DrawBarGraph {
          $bar_width = 4;
      }
      #
-     my @Labels;
-     if (defined($labels)) {
-         @Labels = @$labels;
-     } else {
-         for (my $i=0;$i<@{$Values[0]};$i++) {
-             push (@Labels,$i+1);
-         }
-     }
-     #
      $Max = 1 if ($Max < 1);
      if ( int($Max) < $Max ) {
          $Max++;
- Line 3332  sub DrawBarGraph {
+ Line 5636  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 3346  sub DrawBarGraph {
+ Line 5650  sub DrawBarGraph {
      $ValuesHash{$id.'.bar_width'} = $bar_width;
      $ValuesHash{$id.'.labels'} = join(',',@Labels);
      #
+     # Deal with other parameters
+     while (my ($key,$value) = each(%$extra_settings)) {
+         $ValuesHash{$id.'.'.$key} = $value;
+     }
+     #
      &Apache::lonnet::appenv(%ValuesHash);
      return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
  }
- Line 3409  sub DrawXYGraph {
+ Line 5718  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 3506  sub DrawXYYGraph {
+ Line 5815  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 3580  Inputs:
+ Line 5889  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 3610  a hash ref describing the data to be sto
+ Line 5919  a hash ref describing the data to be sto
      'chartoutputmode' => 'scalar',
      'chartoutputdata' => 'scalar',
      'Section' => 'array',
+     'Group' => 'array',
      'StudentData' => 'array',
      'Maps' => 'array');
- Line 3622  Returns: both routines return nothing
+ Line 5932  Returns: both routines return nothing
  sub store_course_settings {
      # save to the environment
      # appenv the same items, just to be safe
-     my $courseid = $ENV{'request.course.id'};
+     my $courseid = $env{'request.course.id'};
-     my $coursedom = $ENV{'course.'.$courseid.'.domain'};
+     my $udom  = $env{'user.domain'};
+     my $uname = $env{'user.name'};
      my ($prefix,$Settings) = @_;
      my %SaveHash;
      my %AppHash;
      while (my ($setting,$type) = each(%$Settings)) {
-         my $basename = 'internal.'.$prefix.'.'.$setting;
+         my $basename = join('.','internal',$courseid,$prefix,$setting);
-         my $envname = 'course.'.$courseid.'.'.$basename;
+         my $envname = 'environment.'.$basename;
-         if (exists($ENV{'form.'.$setting})) {
+         if (exists($env{'form.'.$setting})) {
              # Save this value away
              if ($type eq 'scalar' &&
-                 (! exists($ENV{$envname}) ||
+                 (! exists($env{$envname}) ||
-                  $ENV{$envname} ne $ENV{'form.'.$setting})) {
+                  $env{$envname} ne $env{'form.'.$setting})) {
-                 $SaveHash{$basename} = $ENV{'form.'.$setting};
+                 $SaveHash{$basename} = $env{'form.'.$setting};
-                 $AppHash{$envname}   = $ENV{'form.'.$setting};
+                 $AppHash{$envname}   = $env{'form.'.$setting};
              } elsif ($type eq 'array') {
                  my $stored_form;
-                 if (ref($ENV{'form.'.$setting})) {
+                 if (ref($env{'form.'.$setting})) {
                      $stored_form = join(',',
                                          map {
-                                             &Apache::lonnet::escape($_);
+                                             &escape($_);
-                                         } sort(@{$ENV{'form.'.$setting}}));
+                                         } 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}) {
+                 if ($stored_form ne $env{$envname}) {
                      $SaveHash{$basename} = $stored_form;
                      $AppHash{$envname}   = $stored_form;
                  }
- Line 3657  sub store_course_settings {
+ Line 5968  sub store_course_settings {
          }
      }
      my $put_result = &Apache::lonnet::put('environment',\%SaveHash,
-                                           $coursedom,
+                                           $udom,$uname);
-                                           $ENV{'course.'.$courseid.'.num'});
      if ($put_result !~ /^(ok|delayed)/) {
          &Apache::lonnet::logthis('unable to save form parameters, '.
                                   'got error:'.$put_result);
- Line 3669  sub store_course_settings {
+ Line 5979  sub store_course_settings {
  }
  sub restore_course_settings {
-     my $courseid = $ENV{'request.course.id'};
+     my $courseid = $env{'request.course.id'};
      my ($prefix,$Settings) = @_;
      while (my ($setting,$type) = each(%$Settings)) {
-         next if (exists($ENV{'form.'.$setting}));
+         next if (exists($env{'form.'.$setting}));
-         my $envname = 'course.'.$courseid.'.internal.'.$prefix.
+         my $envname = 'environment.internal.'.$courseid.'.'.$prefix.
              '.'.$setting;
-         if (exists($ENV{$envname})) {
+         if (exists($env{$envname})) {
              if ($type eq 'scalar') {
-                 $ENV{'form.'.$setting} = $ENV{$envname};
+                 $env{'form.'.$setting} = $env{$envname};
              } elsif ($type eq 'array') {
-                 $ENV{'form.'.$setting} = [
+                 $env{'form.'.$setting} = [
                                             map {
-                                                &Apache::lonnet::unescape($_);
+                                                &unescape($_);
-                                            } split(',',$ENV{$envname})
+                                            } split(',',$env{$envname})
                                             ];
              }
          }
- Line 3692  sub restore_course_settings {
+ Line 6002  sub restore_course_settings {
  ############################################################
  ############################################################
- sub propath {
+ sub commit_customrole {
-     my ($udom,$uname)=@_;
+     my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
-     $udom=~s/\W//g;
+     my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url.
-     $uname=~s/\W//g;
+                          ($start?', '.&mt('starting').' '.localtime($start):'').
-     my $subdir=$uname.'__';
+                          ($end?', ending '.localtime($end):'').': <b>'.
-     $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
+               &Apache::lonnet::assigncustomrole(
-     my $proname="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
+                  $udom,$uname,$url,$three,$four,$five,$end,$start).
-     return $proname;
+                  '</b><br />';
- }
+     return $output;
+ }
+ sub commit_standardrole {
+     my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
+     my $output;
+     my $logmsg;
+     if ($three eq 'st') {
+         my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec);
+         if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
+             $output = "Error: $result\n";
+         } else {
+             $output = &mt('Assigning').' '.$three.' in '.$url.
+                ($start?', '.&mt('starting').' '.localtime($start):'').
+                ($end?', '.&mt('ending').' '.localtime($end):'').
+                ': <b>'.$result.'</b><br />'.
+                &mt('Add to classlist').': <b>ok</b><br />';
+         }
+     } else {
+         $output = &mt('Assigning').' '.$three.' in '.$url.
+                ($start?', '.&mt('starting').' '.localtime($start):'').
+                ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
+                &Apache::lonnet::assignrole(
+                    $udom,$uname,$url,$three,$end,$start).
+                    '</b><br />';
+     }
+     return $output;
+ }
+ sub commit_studentrole {
+     my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
+     my $linefeed =  '<br />'."\n";
+     my $result;
+     if (defined($one) && defined($two)) {
+         my $cid=$one.'_'.$two;
+         my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid);
+         my $secchange = 0;
+         my $expire_role_result;
+         my $modify_section_result;
+         unless ($oldsec eq '-1') {
+             unless ($sec eq $oldsec) {
+                 $secchange = 1;
+                 my $uurl='/'.$cid;
+                 $uurl=~s/\_/\//g;
+                 if ($oldsec) {
+                     $uurl.='/'.$oldsec;
+                 }
+                 $expire_role_result = &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',time);
+                 $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) {
+                     $$logmsg .= "Section for $uname switched from old section: $oldsec to new section: $sec".$linefeed;
+                 } elsif ($oldsec eq '-1') {
+                     $$logmsg .= "New student role for $uname in section $sec in course $cid".$linefeed;
+                 } else {
+                     $$logmsg .= "Student $uname assigned to unchanged section $sec in course $cid".$linefeed;
+                 }
+             } else {
+                 $$logmsg .= "Error when attempting section change for $uname from old section $oldsec to new section: $sec in course $cid -error: $modify_section_result".$linefeed;
+             }
+             $result = $modify_section_result;
+         } elsif ($secchange == 1) {
+             $$logmsg .= "Error when attempting to expire role for $uname in old section $oldsec in course $cid -error: $expire_role_result".$linefeed;
+         }
+     } else {
+         $$logmsg .= "Incomplete course id defined.  Addition of user $uname from domain $udom to course $one\_$two, section $sec not completed.$linefeed";
+         $result = "error: incomplete course id\n";
+     }
+     return $result;
+ }
+ ############################################################
+ ############################################################
+ sub construct_course {
+     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_;
+     my $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]<br />',$crstype,$$courseid);
+ #
+ # Check if created correctly
+ #
+     ($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid);
+     my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
+     $outcome .= &mt('Created on').': '.$crsuhome.'<br>';
+ #
+ # Are we cloning?
+ #
+     my $cloneid='';
+     if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
+ 	$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
+         my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid);
+ 	my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
+ 	if ($clonehome eq 'no_host') {
+ 	    $outcome .=
+     '<br /><font color="red">'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.'</font>';
+ 	} else {
+ 	    $outcome .=
+     '<br /><font color="green">'.&mt('Cloning [_1] from [_2]',$crstype,$clonehome).'</font>';
+ 	    my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
+ # Copy all files
+ 	    &Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid);
+ # Restore URL
+ 	    $cenv{'url'}=$oldcenv{'url'};
+ # Restore title
+ 	    $cenv{'description'}=$oldcenv{'description'};
+ # restore grading mode
+ 	    if (defined($oldcenv{'grading'})) {
+ 		$cenv{'grading'}=$oldcenv{'grading'};
+ 	    }
+ # Mark as cloned
+ 	    $cenv{'clonedfrom'}=$cloneid;
+ 	    delete($cenv{'default_enrollment_start_date'});
+ 	    delete($cenv{'default_enrollment_end_date'});
+ 	}
+     }
+ #
+ # Set environment (will override cloned, if existing)
+ #
+     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'
+         );
+         $outcome .= '<font color="red">'.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').<br /><ul>'."\n";
+         foreach (@badclasses) {
+             $outcome .= "<li>$_</li>\n";
+         }
+         $outcome .= "</ul><br /><br /></font>\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 '') {
+             $outcome .= '<font color="red" size="+1">'.
+                       &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student').'</font></p>';
+         }
+     }
+     if (($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 .= ('<br />'.&mt('Setting environment').': '.
+           &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).'<br>');
+ #
+ # 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).'<br>';
+    }
+ #
+ # 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').'<br />';
+     }
+     return $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)=@_;
- Line 3715  sub icon {
+ Line 6409  sub icon {
  		$curfext.".gif";
  	}
      }
-     return $iconname;
+     return &lonhttpdurl($iconname);
  }
  sub lonhttpdurl {
- Line 3732  sub connection_aborted {
+ Line 6426  sub connection_aborted {
      return $c->aborted();
  }
- #
  #    Escapes strings that may have embedded 's that will be put into
- #    javascript strings as 'strings'.
+ #    strings as 'strings'.
- #    The assumptions are:
+ sub escape_single {
- #       There has been no effort to escape ' with \'
- #       Any \'s in the string are intended to be there as part of the URL
- #        and must also be escaped.
- # Parameters:
- #     input     - The string to escape.
- # Returns:
- #     The escaped string (' replaced by \' and \ replaced by \\).
- #
- sub javascript_escape {
      my ($input) = @_;
+     $input =~ s/\\/\\\\/g;	# Escape the \'s..(must be first)>
-     #  I imagine a regexp wizard could combine the two expressions below.
-     #  If you do you might want to comment the result.
-     $input =~ s/\\/\\\\/g;	# Escape the /'s..(must be first)>
      $input =~ s/\'/\\\'/g;	# Esacpe the 's....
+     return $input;
+ }
+ #  Same as escape_single, but escape's "'s  This
+ #  can be used for  "strings"
+ sub escape_double {
+     my ($input) = @_;
+     $input =~ s/\\/\\\\/g;	# Escape the /'s..(must be first)>
+     $input =~ s/\"/\\\"/g;	# Esacpe the "s....
      return $input;
  }
+ #   Escapes the last element of a full URL.
+ sub escape_url {
+     my ($url)   = @_;
+     my @urlslices = split(/\//, $url,-1);
+     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

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

Removed from v.1.221
changed lines
	Added in v.1.489