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.278 and 1.454

-version 1.278, 2005/10/04 18:49:32
+version 1.454, 2006/09/13 19:42:06
  Line 58  use strict;
  use Apache::lonnet;
  use GDBM_File;
  use POSIX qw(strftime mktime);
- use Apache::Constants qw(:common :http :methods);
  use Apache::lonmenu();
  use Apache::lonlocal;
  use HTML::Entities;
+ use Apache::lonhtmlcommon();
+ use Apache::loncoursedata();
+ use Apache::lontexconvert();
+ use Apache::lonclonecourse();
+ use LONCAPA;
  my $readit;
- Line 74  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 105  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 122  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 157  BEGIN {
+ Line 161  BEGIN {
  	{
  	    my $designfile = $designdir.'/'.$filename;
  	    if ( open (my $fh,"<$designfile") ) {
- 		while (<$fh>) {
+ 		while (my $line = <$fh>) {
- 		    next if /^\#/;
+ 		    next if ($line =~ /^\#/);
- 		    chomp;
+ 		    chomp($line);
- 		    my ($key,$val)=(split(/\=/,$_));
+ 		    my ($key,$val)=(split(/\=/,$line));
  		    if ($val) { $designhash{$domain.'.'.$key}=$val; }
  		}
  		close($fh);
- 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 331  sub storeresurl {
+ Line 336  sub storeresurl {
  sub studentbrowser_javascript {
     unless (
              (($env{'request.course.id'}) &&
-              (&Apache::lonnet::allowed('srm',$env{'request.course.id'})))
+              (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+ 	      || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+ 					  '/'.$env{'request.course.sec'})
+ 	      ))
           || ($env{'request.role'}=~/^(au|dc|su)/)
            ) { return ''; }
     return (<<'ENDSTDBRW');
- Line 362  ENDSTDBRW
+ Line 370  ENDSTDBRW
  sub selectstudent_link {
     my ($form,$unameele,$udomele)=@_;
     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.
- Line 377  sub selectstudent_link {
+ Line 387  sub selectstudent_link {
  sub coursebrowser_javascript {
      my ($domainfilter)=@_;
+     my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
     return (<<ENDSTDBRW);
  <script type="text/javascript" language="Javascript" >
      var stdeditbrowser;
-     function opencrsbrowser(formname,uname,udom,desc,extra_element) {
+     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
          var url = '/adm/pickcourse?';
          var filter;
          if (filter != null) {
- Line 403  sub coursebrowser_javascript {
+ Line 414  sub coursebrowser_javascript {
                  url += '&domainfilter='+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';
- Line 414  ENDSTDBRW
+ Line 440  ENDSTDBRW
  }
  sub selectcourse_link {
-    my ($form,$unameele,$udomele,$desc,$extra_element)=@_;
+    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
      return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-         '","'.$udomele.'","'.$desc.'","'.$extra_element.'");'."'>".&mt('Select Course')."</a>";
+         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select [_1]',$selecttype)."</a>";
  }
  sub check_uncheck_jscript {
- Line 647  sub help_open_topic {
+ Line 673  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 681  sub helpLatexCheatsheet {
+ Line 707  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) {
-          $link = "javascript:helpMenu('open')";
+     my $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";
-     } else {
+     my $output .= <<"ENDOUTPUT";
-         $link = "javascript:helpMenu('display')";
+ <script type="text/javascript">
+ banner_link = '$banner_link';
+ </script>
+ ENDOUTPUT
+     return $output;
+ }
+ # now just updates the help link and generates a blue icon
+ sub help_open_menu {
+     my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text)
+ 	= @_;
+     $stayOnPage = 0 if (not defined $stayOnPage);
+     if ($env{'browser.interface'} eq 'textual' ||
+ 	$env{'environment.remote'} eq 'off' ) {
+ 	$stayOnPage=1;
      }
-     my $banner_link = "/adm/helpmenu?page=banner&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";
+     my $output;
-     my $details_link = "/adm/helpmenu?page=body&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";
+     if ($component_help) {
-     my $template;
+ 	if (!$text) {
-     if ($text ne "") {
+ 	    $output=&help_open_topic($component_help,undef,$stayOnPage,
- 	$template .=
+ 				       $width,$height);
-   "<table bgcolor='#CC3300' cellspacing='1' cellpadding='1' border='0'><tr>".
+ 	} else {
-   "<td bgcolor='#CC6600'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+ 	    my $help_text;
+ 	    $help_text=&unescape($topic);
+ 	    $output='<table><tr><td>'.
+ 		&help_open_topic($component_help,$help_text,$stayOnPage,
+ 				 $width,$height).'</td></tr></table>';
+ 	}
      }
+     my $banner_link = &update_help_link($topic,$component_help,$faq,$bug,$stayOnPage);
+     return $output.$banner_link;
+ }
+ sub top_nav_help {
+     my ($text) = @_;
+     $text = &mt($text);
+     my $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 $html=&Apache::lonxml::xmlbegin();
+     my $start_page =
-     my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");
+         &Apache::loncommon::start_page('Help Menu', undef,
-     $template .= <<"ENDTEMPLATE";
+ 				       {'frameset'    => 1,
-  <script type="text/javascript">
+ 					'js_ready'    => 1,
+ 					'add_entries' => {
+ 					    'border' => '0',
+ 					    'rows'   => "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') {
- Line 738  function helpMenu(target) {
+ Line 829  function helpMenu(target) {
      return;
  }
  function writeHelp(caller) {
-     caller.document.writeln('$html<head><title>LON-CAPA Help Menu</title><meta http-equiv="pragma" content="no-cache"></head>')
+     caller.document.writeln('$start_page<frame name="bannerframe"  src="'+banner_link+'" /><frame name="bodyframe" src="$details_link" /> $end_page')
-     caller.document.writeln("<frameset rows='105,*' border='0'><frame name='bannerframe'  src='$banner_link'><frame name='bodyframe' src='$details_link'></frameset>")
-     caller.document.writeln("</html>")
      caller.document.close()
      caller.focus()
  }
  // ]]>
  // END LON-CAPA Internal -->
-  </script>
+ </script>
-  <a href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help Menu)" /></a>
  ENDTEMPLATE
-     if ($component_help) {
- 	if (!$text) {
- 	    $template=&help_open_topic($component_help,undef,$stayOnPage,
- 				       $width,$height).' '.$template;
- 	} else {
- 	    my $help_text;
- 	    $help_text=&Apache::lonnet::unescape($topic);
- 	    $template='<table><tr><td>'.
- 		&help_open_topic($component_help,$help_text,$stayOnPage,
- 				 $width,$height).'</td><td>'.$template.
- 				 '</td></tr></table>';
- 	}
-     }
-     if ($text ne '') { $template.='</td></tr></table>' };
      return $template;
  }
- Line 782  sub help_open_bug {
+ Line 856  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 797  sub help_open_bug {
+ Line 871  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 842  sub help_open_faq {
+ Line 916  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 1134  sub get_domains {
+ Line 1208  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 1149  sub domain_select {
+ Line 1223  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="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 1197  sub select_form {
+ Line 1293  sub select_form {
      } else {
  	@keys=sort(keys(%hash));
      }
-     foreach (@keys) {
+     foreach my $key (@keys) {
-         $selectform.="<option value=\"$_\" ".
+         $selectform.=
-             ($_ eq $def ? 'selected="selected" ' : '').
+ 	    '<option value="'.&HTML::Entities::encode($key,'"<>&').'" '.
-                 ">".&mt($hash{$_})."</option>\n";
+             ($key eq $def ? 'selected="selected" ' : '').
+                 ">".&mt($hash{$key})."</option>\n";
      }
      $selectform.="</select>";
      return $selectform;
- Line 1264  sub select_dom_form {
+ Line 1361  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="selected" ' : '').
+             ($dom eq $defdom ? 'selected="selected" ' : '').
-                 ">$_</option>\n";
+                 ">$dom</option>\n";
      }
      $selectdomain.="</select>";
      return $selectdomain;
- Line 1289  given $domain.
+ Line 1386  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 1313  sub home_server_option_list {
+ Line 1410  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 1565  sub authform_nochange{
+ Line 1663  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 1600  sub authform_kerberos{
+ Line 1699  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 1632  sub authform_internal{
+ Line 1732  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 1659  sub authform_local{
+ Line 1759  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 1675  sub authform_filesystem{
+ Line 1775  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 1803  sub initialize_keywords {
+ Line 1903  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 1859  sub get_related_words {
+ Line 1959  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 1893  if $first is set to 'lastname' then it r
+ Line 2001  if $first is set to 'lastname' then it r
  =cut
  ###############################################################
  sub plainname {
      my ($uname,$udom,$first)=@_;
-     my %names=&Apache::lonnet::get('environment',
+     my %names=&getnames($uname,$udom);
-                     ['firstname','middlename','lastname','generation'],
- 					 $udom,$uname);
      my $name=&Apache::lonnet::format_name($names{'firstname'},
  					  $names{'middlename'},
  					  $names{'lastname'},
- Line 1906  sub plainname {
+ Line 2013  sub plainname {
      $name=~s/^\s+//;
      $name=~s/\s+$//;
      $name=~s/\s+/ /g;
-     if ($name !~ /\S/) { $name=$uname.'@'.$udom; }
+     if ($name !~ /\S/) { $name=$uname.':'.$udom; }
      return $name;
  }
- Line 1929  if the user does not
+ Line 2036  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 1954  sub nickname {
+ Line 2049  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;
+     }
+ }
  # ------------------------------------------------------------------ Screenname
- Line 1977  sub screenname {
+ Line 2089  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 1994  sub noteswrapper {
+ Line 2107  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 2024  sub track_student_link {
+ Line 2140  sub track_student_link {
          $target = '';
      }
      if ($start) { $link.='&amp;start='.$start; }
-     return qq{<a href="$link" title="$title" $target>$linktext</a>};
+     return qq{<a href="$link" title="$title" $target>$linktext</a>}.
+ 	&help_open_topic('View_recent_activity');
  }
  =pod
- Line 2140  category
+ Line 2258  category
  =cut
  sub filecategorytypes {
-     return @{$category_extensions{lc($_[0])}};
+     my ($cat) = @_;
+     return @{$category_extensions{lc($cat)}};
  }
  =pod
- Line 2155  sub fileembstyle {
+ Line 2274  sub fileembstyle {
      return $fe{lc(shift(@_))};
  }
+ sub filemimetype {
+     return $fm{lc(shift(@_))};
+ }
  sub filecategoryselect {
      my ($name,$value)=@_;
- Line 2211  sub fileextensions {
+ Line 2334  sub fileextensions {
  sub display_languages {
      my %languages=();
-     foreach (&preferred_languages()) {
+     foreach my $lang (&preferred_languages()) {
- 	$languages{$_}=1;
+ 	$languages{$lang}=1;
      }
      &get_unprocessed_cgi($ENV{'QUERY_STRING'},['displaylanguage']);
      if ($env{'form.displaylanguage'}) {
- 	foreach (split(/\s*(\,|\;|\:)\s*/,$env{'form.displaylanguage'})) {
+ 	foreach my $lang (split(/\s*(\,|\;|\:)\s*/,$env{'form.displaylanguage'})) {
- 	    $languages{$_}=1;
+ 	    $languages{$lang}=1;
          }
      }
      return %languages;
- Line 2252  sub preferred_languages {
+ Line 2375  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 2312  sub get_previous_attempt {
+ Line 2435  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 2335  sub get_previous_attempt {
+ Line 2458  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 2387  sub relative_to_absolute {
+ Line 2510  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 2476  sub submlink {
+ Line 2599  sub submlink {
  	if (!$symb) { $symb=$cursymb; }
      }
      if (!$symb) { $symb=&Apache::lonnet::symbread(); }
-     $symb=&Apache::lonnet::escape($symb);
+     $symb=&escape($symb);
      if ($target) { $target="target=\"$target\""; }
      return '<a href="/adm/grades?&command=submission&'.
  	'symb='.$symb.'&student='.$uname.
- Line 2509  sub pgrdlink {
+ Line 2632  sub pgrdlink {
  Inputs: $text $uname $udom $symb $target
  Returns: A link to parmset.pm such as to see the PPRM view of a
- student andn resource
+ student and a specific resource
  =cut
- Line 2522  sub pprmlink {
+ Line 2645  sub pprmlink {
  	if (!$symb) { $symb=$cursymb; }
      }
      if (!$symb) { $symb=&Apache::lonnet::symbread(); }
-     $symb=&Apache::lonnet::escape($symb);
+     $symb=&escape($symb);
      if ($target) { $target="target=\"$target\""; }
      return '<a href="/adm/parmset?&command=set&'.
  	'symb='.$symb.'&uname='.$uname.
- Line 2552  sub timehash {
+ Line 2675  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 2562  sub maketime {
+ Line 2690  sub maketime {
  #########################################
  sub findallcourses {
-     my %courses=();
+     my ($roles) = @_;
+     my %roles;
+     if (ref($roles)) { %roles = map { $_ => 1 } @{$roles}; }
+     my %courses;
      my $now=time;
-     foreach (keys %env) {
+     foreach my $key (keys(%env)) {
- 	if ($_=~/^user\.role\.\w+\.\/(\w+)\/(\w+)/) {
+ 	if ( $key=~m{^user\.role\.(\w+)\./(\w+)/(\w+)} ) {
- 	    my ($starttime,$endtime)=$env{$_};
+ 	    my ($role,$domain,$id) = ($1,$2,$3);
+ 	    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; }
- Line 2574  sub findallcourses {
+ Line 2708  sub findallcourses {
              if ($endtime) {
                  if ($now>$endtime) { $active=0; }
              }
-             if ($active) { $courses{$1.'_'.$2}=1; }
+             if ($active) { $courses{$domain.'_'.$id}=1; }
          }
      }
-     return keys %courses;
+     return keys(%courses);
  }
  ###############################################
- Line 2647  Returns: value of designparamter $which
+ Line 2781  Returns: value of designparamter $which
  =cut
  ##############################################
  sub designparm {
      my ($which,$domain)=@_;
- Line 2661  sub designparm {
+ Line 2796  sub designparm {
  	    return '#CCCCCC';
  	}
      }
-     if ($env{'environment.color.'.$which}) {
+     if (exists($env{'environment.color.'.$which})) {
  	return $env{'environment.color.'.$which};
      }
      $domain=&determinedomain($domain);
-     if ($designhash{$domain.'.'.$which}) {
+     if (exists($designhash{$domain.'.'.$which})) {
  	return $designhash{$domain.'.'.$which};
      } else {
          return $designhash{'default.'.$which};
- Line 2704  Inputs:
+ Line 2839  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
  =back
  Returns: A uniform header for LON-CAPA web pages.
- Line 2714  other decorations will be returned.
+ Line 2863  other decorations will be returned.
  =cut
  sub bodytag {
-     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,$notopbar)=@_;
+     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
+ 	$notopbar,$bgcolor,$notitle,$no_inline_link)=@_;
      $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-^/(\w+)/(\w+)$-);
+         $realm = &plainname($rname,$rdom).':'.$rdom;
+     }
  # realm
      if ($env{'request.course.id'}) {
- 	$realm=
+         if ($env{'request.role'} !~ /^cr/) {
-          $env{'course.'.$env{'request.course.id'}.'.description'};
+             $role = &Apache::lonnet::plaintext($role,&course_type());
+         }
+ 	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
+     } else {
+         $role = &Apache::lonnet::plaintext($role);
      }
-     unless ($realm) { $realm='&nbsp;'; }
+     if (!$realm) { $realm='&nbsp;'; }
  # Set messages
      my $messages=&domainlogo($domain);
  # Port for miniserver
      my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
      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 type="text/css">
+ 	&Apache::lontexconvert::init_math_support();
- h1, h2, h3, th { font-family: Arial, Helvetica, sans-serif }
- a:focus { color: red; background: yellow }
- </style>
- <body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
- style="margin-top: 0px;$addstyle" $addentries>
- END
-     &Apache::lontexconvert::jsMath_reset();
-     if ($env{'environment.texengine'} eq 'jsMath') {
- 	$bodytag.=&Apache::lontexconvert::jsMath_header();
-     }
-     my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
+     if ($bodyonly
-                    $lonhttpdPort.$img.'" alt="'.$function.'" />';
+ 	|| ($env{'request.state'} eq 'construct'
-     if ($bodyonly) {
+ 	    && $env{'environment.remote'} ne 'off' )) {
          return $bodytag;
      } elsif ($env{'browser.interface'} eq 'textual') {
  # Accessibility
-         return $bodytag.&Apache::lonmenu::menubuttons($forcereg,'web',
+ 	$bodytag.=&Apache::lonmenu::menubuttons($forcereg,$forcereg);
-                                                       $forcereg).
+ 	if (!$notitle) {
-                '<h1>LON-CAPA: '.$title.'</h1>';
+ 	    $bodytag.='<h1>LON-CAPA: '.$title.'</h1>';
-     } elsif ($env{'environment.remote'} eq 'off') {
+ 	}
- # No Remote
+ 	return $bodytag;
- 	my $roleinfo=(<<ENDROLE);
+     }
- <td bgcolor="$tabbg" align="right">
- <font size="2" face="Arial, Helvetica, sans-serif">
+     my $name = &plainname($env{'user.name'},$env{'user.domain'});
-     $env{'environment.firstname'}
+     if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
-     $env{'environment.middlename'}
+ 	undef($role);
-     $env{'environment.lastname'}
+     } else {
-     $env{'environment.generation'}
+ 	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
-     </font>&nbsp;
+     }
- <br />
- <font size="2" face="Arial, Helvetica, sans-serif">$role</font>&nbsp;
+     my $roleinfo=(<<ENDROLE);
- <br />
+ <td class="LC_title_bar_who">
- <font size="2" face="Arial, Helvetica, sans-serif">$realm</font>&nbsp;
+ <div class="LC_title_bar_name">
+     $name
+     &nbsp;
+ </div>
+ <div class="LC_title_bar_role">
+ $role&nbsp;
+ </div>
+ <div class="LC_title_bar_realm">
+ $realm&nbsp;
+ </div>
  </td>
  ENDROLE
-         my $titleinfo = '<font face="Arial, Helvetica, sans-serif" size="+3" color="'.
- 		$font.'"><b>'.$title.'</b></font>';
-         if ($customtitle) {
-             $titleinfo = $customtitle;
-         }
+     my $titleinfo = '<span class="LC_title_bar_title">'.$title.'</span>';
+     if ($customtitle) {
+         $titleinfo = $customtitle;
+     }
+     #
+     # Extra info if you are the DC
+     my $dc_info = '';
+     if ($env{'user.adv'} && exists($env{'user.role.dc./'.
+                         $env{'course.'.$env{'request.course.id'}.
+                                  '.domain'}.'/'})) {
+         my $cid = $env{'request.course.id'};
+         $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
+         $dc_info =~ s/\s+$//;
+         $dc_info = '('.$dc_info.')';
+     }
+     if ($env{'environment.remote'} eq 'off') {
+         # No Remote
  	if ($env{'request.state'} eq 'construct') {
+ 	    $forcereg=1;
+ 	}
+ 	if (!$customtitle && $env{'request.state'} eq 'construct') {
+ 	    # this is for resources; directories have customtitle, and crumbs
+             # and select recent are created in lonpubdir.pm
  	    my ($uname,$thisdisfn)=
  		($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
  	    my $formaction='/priv/'.$uname.'/'.$thisdisfn;
  	    $formaction=~s/\/+/\//g;
-             unless ($customtitle) {  #this is for resources; directories have customtitle, and crumbs and select recent are created in lonpubdir.pm
-                 my $parentpath = '';
-                 my $lastitem = '';
-                 if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
-                     $parentpath = $1;
-                     $lastitem = $2;
-                 } else {
-                     $lastitem = $thisdisfn;
-                 }
- 	        $titleinfo = &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
-                       '<font face="Arial, Helvetica, sans-serif"><b>Construction Space</b>:</font>&nbsp;'.
-                       '<form name="dirs" method="post" action="'.$formaction
- 		    .'" target="_top"><tt><b>'
- 		    .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<font size=\"+1\">$lastitem</font></b></tt><br />"
- 		    .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
- 		    .'</form>'
- 		    .&Apache::lonmenu::constspaceform();
-             }
+ 	    my $parentpath = '';
- 	    $forcereg=1;
+ 	    my $lastitem = '';
-         }
+ 	    if ($thisdisfn =~ m-(.+/)([^/]*)$-) {
-         my $titletable = '<table bgcolor="'.$pgbg.'" width="100%" border="0" '.
+ 		$parentpath = $1;
-                          'cellspacing="3" cellpadding="3">'.
+ 		$lastitem = $2;
-                          '<tr><td bgcolor="'.$tabbg.'">'.
+ 	    } else {
-                          $titleinfo.'</td>'.$roleinfo.'</tr></table>';
+ 		$lastitem = $thisdisfn;
-         if ($env{'request.state'} eq 'construct') {
+ 	    }
-             if ($notopbar) {
+ 	    $titleinfo =
-                 $bodytag .= $titletable;
+ 		&Apache::loncommon::help_open_menu('','',3,'Authoring').
-             } else {
+ 		'<b>Construction Space</b>:&nbsp;'.
-                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg,$titletable);
+ 		'<form name="dirs" method="post" action="'.$formaction
-             }
+ 		.'" target="_top"><tt><b>'
+ 		.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."<font size=\"+1\">$lastitem</font></b></tt><br />"
+ 		.&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
+ 		.'</form>'
+ 		.&Apache::lonmenu::constspaceform();
+         }
+         my $titletable;
+ 	if (!$notitle) {
+ 	    $titletable =
+ 		'<table id="LC_title_bar">'.
+                          "<tr><td> $titleinfo $dc_info</td>".$roleinfo.
+ 			 '</tr></table>';
+ 	}
+ 	if ($notopbar) {
+ 	    $bodytag .= $titletable;
  	} else {
-             if ($notopbar) {
+ 	    if ($env{'request.state'} eq 'construct') {
-                 $bodytag .= $titletable;
+                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
+ 							  $titletable);
              } else {
-                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,'web',$forcereg).
+                 $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg).
-                         $titletable;
+ 		    $titletable;
              }
          }
          return $bodytag;
- Line 2841  ENDROLE
+ Line 3019  ENDROLE
  #
  # Top frame rendering, Remote is up
  #
-     my $titleinfo = '&nbsp;<font size="5" face="Arial, Helvetica, sans-serif"><b>'.$title.'</b></font>';
-     if ($customtitle) {
+     my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
-         $titleinfo = $customtitle;
+         $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>');
      #
-     # Extra info if you are the DC
+     if ($notitle) {
-     my $dc_info = '';
+ 	return $bodytag;
-     if ($env{'user.adv'} && exists($env{'user.role.dc./'.
-                         $env{'course.'.$env{'request.course.id'}.
-                                  '.domain'}.'/'})) {
-         my $cid = $env{'request.course.id'};
-         $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
-         $dc_info = '('.$dc_info.')';
      }
-     #
      return(<<ENDBODY);
  $bodytag
- <table width="100%" cellspacing="0" border="0" cellpadding="0">
+ <table id="LC_title_bar" class="LC_with_remote">
- <tr><td bgcolor="$sidebg">
+ <tr><td class="LC_title_bar_role_logo">$upperleft</td>
- $upperleft</td>
+     <td class="LC_title_bar_domain_logo">$messages&nbsp;</td>
- <td bgcolor="$sidebg" align="right">$messages&nbsp;</td>
  </tr>
- <tr>
+ <tr><td>$titleinfo $dc_info $menu</td>
- <td rowspan="3" bgcolor="$tabbg">
+ $roleinfo
- $titleinfo $dc_info
- </td><td bgcolor="$tabbg" align="right">
- <font size="2" face="Arial, Helvetica, sans-serif">
-     $env{'environment.firstname'}
-     $env{'environment.middlename'}
-     $env{'environment.lastname'}
-     $env{'environment.generation'}
-     </font>&nbsp;
- </td>
  </tr>
- <tr><td bgcolor="$tabbg" align="right">
+ </table>
- <font size="2" face="Arial, Helvetica, sans-serif">$role</font>&nbsp;
- </td></tr>
- <tr>
- <td bgcolor="$tabbg" align="right"><font size="2" face="Arial, Helvetica, sans-serif">$realm</font>&nbsp;</td></tr>
- </table><br />
  ENDBODY
  }
+ sub make_attr_string {
+     my ($register,$attr_ref) = @_;
+     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;
+ }
  ###############################################
  ###############################################
- Line 2891  ENDBODY
+ Line 3106  ENDBODY
  =back
- =head1 HTTP Helpers
+ =head1 HTML Helpers
  =over 4
- Line 2899  ENDBODY
+ Line 3114  ENDBODY
  Returns a uniform footer for LON-CAPA web pages.
- Inputs:
+ Inputs: none
- =over 4
  =back
- Returns: A uniform footer for LON-CAPA web pages.
  =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      = '#DDD';
+     my $data_table_darker    = '#CCC';
+     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 $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 {
+   color: red;
+ }
+ .LC_success {
+   color: green;
+ }
+ .LC_icon {
+   border: 0px;
+ }
+ 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_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 {
+ }
+ 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_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 {
+   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;
+ }
+ 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
+ =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'},
+ 		   #time(),
+ 		   $Apache::lonnet::perlvar{'lonVersion'},
+ 		   $env{'environment.color.timestamp'},
+ 		   $function,$domain,$bgcolor);
+     $url = '/adm/css/'.&escape($url).'.css';
+     my $result =
+ 	'<head>'.
+ 	&font_settings().
+ 	&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';
+     }
+     $result .= '<title> LON-CAPA '.&mt($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
+ =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') {
+ 	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'});
+ 	}
+     }
+     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 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
+ =item * &get_users_function()
  Used by &bodytag to determine the current users primary role.
  Returns either 'student','coordinator','admin', or 'author'.
- Line 2946  sub get_users_function {
+ Line 4135  sub get_users_function {
  =pod
- =item check_user_status
+ =item * &check_user_status
  Determines current status of supplied role for a
  specific user. Roles can be active, previous or future.
  Inputs:
  user's domain, user's username, course's domain,
- course's number, optional section/group.
+ course's number, optional section ID.
  Outputs:
  role status: active, previous or future.
- Line 2961  role status: active, previous or future.
+ Line 4150  role status: active, previous or future.
  =cut
  sub check_user_status {
-     my ($udom,$uname,$cdom,$crs,$role,$secgrp) = @_;
+     my ($udom,$uname,$cdom,$crs,$role,$sec) = @_;
      my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname);
      my @uroles = keys %userinfo;
      my $srchstr;
      my $active_chk = 'none';
+     my $now = time;
      if (@uroles > 0) {
-         if (($role eq 'cc') || ($secgrp eq '') || (!defined($secgrp))) {
+         if (($role eq 'cc') || ($sec eq '') || (!defined($sec))) {
              $srchstr = '/'.$cdom.'/'.$crs.'_'.$role;
          } else {
-             $srchstr = '/'.$cdom.'/'.$crs.'/'.$secgrp.'_'.$role;         }
+             $srchstr = '/'.$cdom.'/'.$crs.'/'.$sec.'_'.$role;
-         if (grep/^$srchstr$/,@uroles) {
+         }
+         if (grep/^\Q$srchstr\E$/,@uroles) {
              my $role_end = 0;
              my $role_start = 0;
              $active_chk = 'active';
-             if ($userinfo{$srchstr} =~ m/^($role)_(\d+)/) {
+             if ($userinfo{$srchstr} =~ m/^\Q$role\E_(\d+)/) {
-                 $role_end = $2;
+                 $role_end = $1;
-                 if ($userinfo{$srchstr} =~ m/^($role)_($role_end)_(\d+)$/) {
+                 if ($userinfo{$srchstr} =~ m/^\Q$role\E_\Q$role_end\E_(\d+)$/) {
-                     $role_start = $3;
+                     $role_start = $1;
                  }
              }
              if ($role_start > 0) {
-                 if (time < $role_start) {
+                 if ($now < $role_start) {
                      $active_chk = 'future';
                  }
              }
              if ($role_end > 0) {
-                 if (time > $role_end) {
+                 if ($now > $role_end) {
                      $active_chk = 'previous';
                  }
              }
- Line 3000  sub check_user_status {
+ Line 4191  sub check_user_status {
  =pod
- =item get_sections
+ =item * &get_sections()
  Determines all the sections for a course including
  sections with students and sections containing other roles.
- Incoming parameters: domain, course number, reference to
+ Incoming parameters:
- section hash (keys to be section/group IDs), reference to
- array containing roles for which sections should be gathered
+. domain
- (optional). If the fourth argument is undefined, sections
+. course number
- are gathered for any role.
+. reference to array containing roles for which sections should
+ be gathered (optional).
+. reference to array containing status types for which sections
+ should be gathered (optional).
+ If the third argument is undefined, sections are gathered for any role.
+ If the fourth argument is undefined, sections are gathered for any status.
+ Permissible values are 'active' or 'future' or 'previous'.
- Returns number of sections.
+ Returns section hash (keys are section IDs, values are
+ number of users in each section), subject to the
+ optional roles filter, optional status filter
  =cut
  ###############################################
  sub get_sections {
-     my ($cdom,$cnum,$sectioncount,$possible_roles) = @_;
+     my ($cdom,$cnum,$possible_roles,$possible_status) = @_;
-     if (!($cdom && $cnum)) { return 0; }
+     if (!defined($cdom) || !defined($cnum)) {
-     my $numsections = 0;
+         my $cid =  $env{'request.course.id'};
+ 	return if (!defined($cid));
-     if (!defined($possible_roles) || (grep/^st$/,@$possible_roles)) {
+         $cdom = $env{'course.'.$cid.'.domain'};
+         $cnum = $env{'course.'.$cid.'.num'};
+     }
+     my %sectioncount;
+     my $now = time;
+     if (!defined($possible_roles) || (grep(/^st$/,@$possible_roles))) {
  	my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);
  	my $sec_index = &Apache::loncoursedata::CL_SECTION();
  	my $status_index = &Apache::loncoursedata::CL_STATUS();
- 	while (my ($student,$data) = each %$classlist) {
+         my $start_index = &Apache::loncoursedata::CL_START();
- 	    my ($section,$status) = ($data->[$sec_index],
+         my $end_index = &Apache::loncoursedata::CL_END();
- 				     $data->[$status_index]);
+         my $status;
- 	    unless ($section eq '-1' || $section =~ /^\s*$/) {
+ 	while (my ($student,$data) = each(%$classlist)) {
- 		if (!defined($$sectioncount{$section})) { $numsections++; }
+ 	    my ($section,$stu_status,$start,$end) = ($data->[$sec_index],
- 		$$sectioncount{$section}++;
+ 				                     $data->[$status_index],
+                                                      $data->[$start_index],
+                                                      $data->[$end_index]);
+             if ($stu_status eq 'Active') {
+                 $status = 'active';
+             } elsif ($end < $now) {
+                 $status = 'previous';
+             } elsif ($start > $now) {
+                 $status = 'future';
+             }
+ 	    if ($section ne '-1' && $section !~ /^\s*$/) {
+                 if ((!defined($possible_status)) || (($status ne '') &&
+                     (grep/^\Q$status\E$/,@{$possible_status}))) {
+ 		    $sectioncount{$section}++;
+                 }
  	    }
  	}
      }
- Line 3038  sub get_sections {
+ Line 4261  sub get_sections {
  	if ($user !~ /^(\w{2})/) { next; }
  	my ($role) = ($user =~ /^(\w{2})/);
  	if ($possible_roles && !(grep(/^$role$/,@$possible_roles))) { next; }
- 	my $section;
+ 	my ($section,$status);
  	if ($role eq 'cr' &&
  	    $user =~ m-^$role/[^/]*/[^/]*/[^/]*:[^:]*:[^:]*:(\w+)-) {
  	    $section=$1;
  	}
  	if ($user =~ /^$role:[^:]*:[^:]*:(\w+)/) { $section=$1; }
  	if (!defined($section) || $section eq '-1') { next; }
- 	if (!defined($$sectioncount{$section})) { $numsections++; }
+         my ($end,$start) = ($courseroles{$user} =~ /^([^:]*):([^:]*)$/);
- 	$$sectioncount{$section}++;
+         if ($end == -1 && $start == -1) {
+             next; #deleted role
+         }
+         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 $numsections;
+     return %sectioncount;
  }
  ###############################################
  =pod
- =item get_course_users
+ =item * &get_course_users()
  Retrieves usernames:domains for users in the specified course
  with specific role(s), and access status.
- Line 3066  Incoming parameters:
+ Line 4305  Incoming parameters:
 . access status: users must have - either active,
  previous, future, or all.
 . reference to array of permissible roles
-. reference to results object (hash of hashes).
+. 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,$users) = @_;
+     my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata) = @_;
-     if (grep/^st$/,@{$roles}) {
+     my %idx = ();
-         my $statusidx = &Apache::loncoursedata::CL_STATUS();
+     my %seclists;
-         my $startidx = &Apache::loncoursedata::CL_START();
-         my $endidx = &Apache::loncoursedata::CL_END();
+     $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 (!$secmatch) {
+                     next;
+                 }
+             }
+             push(@{$seclists{$student}},$section);
              if (defined($$types{'active'})) {
-                 if ($$classlist{$student}[$statusidx] eq 'Active') {
+                 if ($$classlist{$student}[$idx{status}] eq 'Active') {
                      push(@{$$users{st}{$student}},'active');
+                     $match = 1;
                  }
              }
              if (defined($$types{'previous'})) {
-                 if ($$classlist{$student}[$endidx] <= $now) {
+                 if ($$classlist{$student}[$idx{end}] <= $now) {
                      push(@{$$users{st}{$student}},'previous');
+                     $match = 1;
                  }
              }
              if (defined($$types{'future'})) {
-                 if (($$classlist{$student}[$startidx] > $now) && ($$classlist{$student}[$endidx] > $now) || ($$classlist{$student}[$endidx] == 0) || ($$classlist{$student}[$endidx] eq '')) {
+                 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} > 0) && (@{$roles} ne "st")) {
+     if ((@{$roles} > 1) || ((@{$roles} == 1) && ($$roles[0] ne "st"))) {
-         my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$cdom,$cnum);
+         my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
-         foreach my $person (@coursepersonnel) {
+         my $now = time;
-             my ($role,$user) = ($person =~ /^([^:]*):([^:]+:[^:]+)/);
+         foreach my $person (sort(keys(%coursepersonnel))) {
+             my $match = 0;
+             my $secmatch = 0;
+             my $status;
+             my ($role,$user,$usec) = ($person =~ /^([^:]*):([^:]+:[^:]+):([^:]*)/);
              $user =~ s/:$//;
-             if (($role) && (grep(/^$role$/,@{$roles}))) {
+             my ($end,$start) = split(/:/,$coursepersonnel{$person});
+             if ($end == -1 || $start == -1) {
+                 next;
+             }
+             if (($role) && ((grep(/^\Q$role\E$/,@{$roles})) ||
+                 (grep(/^cr$/,@{$roles}) && $role =~ /^cr\//))) {
                  my ($uname,$udom) = split(/:/,$user);
+                 if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {
+                     if (grep(/^all$/,@{$sections})) {
+                         $secmatch = 1;
+                     } elsif ($usec eq '') {
+                         if (grep(/^none$/,@{$sections})) {
+                             $secmatch = 1;
+                         }
+                     } else {
+                         if (grep(/^\Q$usec\E$/,@{$sections})) {
+                             $secmatch = 1;
+                         }
+                     }
+                     if (!$secmatch) {
+                         next;
+                     }
+                 }
+                 if ($usec eq '') {
+                     $usec = 'none';
+                 }
                  if ($uname ne '' && $udom ne '') {
-                     my $status = &check_user_status($udom,$uname,$cdom,$cnum,$role);
+                     if ($end < $now) {
+                         $status = 'previous';
+                     } elsif ($start > $now) {
+                         $status = 'future';
+                     } else {
+                         $status = 'active';
+                     }
                      foreach my $type (keys(%{$types})) {
                          if ($status eq $type) {
-                             $$users{$role}{$user} = $type;
+                             if (!grep(/^\Q$type\E$/,@{$$users{$role}{$user}})) {
+                                 push(@{$$users{$role}{$user}},$type);
+                             }
+                             $match = 1;
+                         }
+                     }
+                     if (($match) && (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');
+                         }
+ 		    }
+                 }
+             }
+         }
+         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;
+ }
+ sub get_secgrprole_info {
- ###############################################
+     my ($cdom,$cnum,$needroles,$type)  = @_;
+     my %sections_count = &get_sections($cdom,$cnum);
- sub get_posted_cgi {
+     my @sections =  (sort {$a <=> $b} keys(%sections_count));
-     my $r=shift;
+     my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+     my @groups = sort(keys(%curr_groups));
-     my $buffer;
+     my $allroles = [];
-     if ($r->header_in('Content-length')) {
+     my $rolehash;
- 	$r->read($buffer,$r->header_in('Content-length'),0);
+     my $accesshash = {
-     }
+                      active => 'Currently has access',
-     unless ($buffer=~/^(\-+\w+)\s+Content\-Disposition\:\s*form\-data/si) {
+                      future => 'Will have future access',
- 	my @pairs=split(/&/,$buffer);
+                      previous => 'Previously had access',
- 	my $pair;
+                   };
- 	foreach $pair (@pairs) {
+     if ($needroles) {
- 	    my ($name,$value) = split(/=/,$pair);
+         $rolehash = {'all' => 'all'};
- 	    $value =~ tr/+/ /;
+         my %user_roles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
- 	    $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+ 	if (&Apache::lonnet::error(%user_roles)) {
- 	    $name  =~ tr/+/ /;
+ 	    undef(%user_roles);
- 	    $name  =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
- 	    &add_to_env("form.$name",$value);
- 	}
-     } else {
- 	my $contentsep=$1;
- 	my @lines = split (/\n/,$buffer);
- 	my $name='';
- 	my $value='';
- 	my $fname='';
- 	my $fmime='';
- 	my $i;
- 	for ($i=0;$i<=$#lines;$i++) {
- 	    if ($lines[$i]=~/^$contentsep/) {
- 		if ($name) {
- 		    chomp($value);
- 		    if ($fname) {
- 			$env{"form.$name.filename"}=$fname;
- 			$env{"form.$name.mimetype"}=$fmime;
- 		    } else {
- 			$value=~s/\s+$//s;
- 		    }
- 		    &add_to_env("form.$name",$value);
- 		}
- 		if ($i<$#lines) {
- 		    $i++;
- 		    $lines[$i]=~
- 		/Content\-Disposition\:\s*form\-data\;\s*name\=\"([^\"]+)\"/i;
- 		    $name=$1;
- 		    $value='';
- 		    if ($lines[$i]=~/filename\=\"([^\"]+)\"/i) {
- 			$fname=$1;
- 			if
-                             ($lines[$i+1]=~/Content\-Type\:\s*([\w\-\/]+)/i) {
- 				$fmime=$1;
- 				$i++;
- 			    } else {
- 				$fmime='';
- 			    }
- 		    } else {
- 			$fname='';
- 			$fmime='';
- 		    }
- 		    $i++;
- 		}
- 	    } else {
- 		$value.=$lines[$i]."\n";
- 	    }
  	}
+         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
- Line 3214  will result in $env{'form.uname'} and $e
+ Line 4538  will result in $env{'form.uname'} and $e
  sub get_unprocessed_cgi {
    my ($query,$possible_names)= @_;
    # $Apache::lonxml::debug=1;
-   foreach (split(/&/,$query)) {
+   foreach my $pair (split(/&/,$query)) {
-     my ($name, $value) = split(/=/,$_);
+     my ($name, $value) = split(/=/,$pair);
-     $name = &Apache::lonnet::unescape($name);
+     $name = &unescape($name);
      if (!defined($possible_names) || (grep {$_ eq $name} @$possible_names)) {
        $value =~ tr/+/ /;
        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
- Line 3262  sub no_cache {
+ Line 4586  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 3428  sub record_sep {
+ Line 4756  sub record_sep {
      if ($env{'form.upfiletype'} eq 'xml') {
      } elsif ($env{'form.upfiletype'} eq 'space') {
          my $i=0;
-         foreach (split(/\s+/,$record)) {
+         foreach my $field (split(/\s+/,$record)) {
-             my $field=$_;
              $field=~s/^(\"|\')//;
              $field=~s/(\"|\')$//;
              $components{&takeleft($i)}=$field;
- Line 3437  sub record_sep {
+ Line 4764  sub record_sep {
          }
      } elsif ($env{'form.upfiletype'} eq 'tab') {
          my $i=0;
-         foreach (split(/\t/,$record)) {
+         foreach my $field (split(/\t/,$record)) {
-             my $field=$_;
              $field=~s/^(\"|\')//;
              $field=~s/(\"|\')$//;
              $components{&takeleft($i)}=$field;
- Line 3496  sub upfile_select_html {
+ Line 4822  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 3513  Apache Request ref, $records is an array
+ Line 4855  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 3553  $d is an array of 2 element arrays (inte
+ Line 4892  $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="selected" ' : '').
+                       ($sample eq $defaultcol ? ' selected="selected" ' : '').
-                       '>Column '.($_+1).'</option>');
+                       '>Column '.($sample+1).'</option>');
  	}
  	$r->print('</select></td></tr>'."\n");
  	$i++;
- Line 3597  $d is an array of 2 element arrays (inte
+ Line 4936  $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="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 3707  the routine &Apache::lonnet::transfer_pr
+ Line 5045  the routine &Apache::lonnet::transfer_pr
  my $uniq=0;
  sub get_cgi_id {
      $uniq=($uniq+1)%100000;
-     return (time.'_'.$uniq);
+     return (time.'_'.$$.'_'.$uniq);
  }
  ############################################################
- Line 3831  sub DrawBarGraph {
+ Line 5169  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 3913  sub DrawXYGraph {
+ Line 5251  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 4010  sub DrawXYYGraph {
+ Line 5348  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 4084  Inputs:
+ Line 5422  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 4114  a hash ref describing the data to be sto
+ Line 5452  a hash ref describing the data to be sto
      'chartoutputmode' => 'scalar',
      'chartoutputdata' => 'scalar',
      'Section' => 'array',
+     'Group' => 'array',
      'StudentData' => 'array',
      'Maps' => 'array');
- Line 4127  sub store_course_settings {
+ Line 5466  sub store_course_settings {
      # save to the environment
      # appenv the same items, just to be safe
      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})) {
              # Save this value away
              if ($type eq 'scalar' &&
- Line 4146  sub store_course_settings {
+ Line 5486  sub store_course_settings {
                  if (ref($env{'form.'.$setting})) {
                      $stored_form = join(',',
                                          map {
-                                             &Apache::lonnet::escape($_);
+                                             &escape($_);
                                          } sort(@{$env{'form.'.$setting}}));
                  } else {
                      $stored_form =
-                         &Apache::lonnet::escape($env{'form.'.$setting});
+                         &escape($env{'form.'.$setting});
                  }
                  # Determine if the array contents are the same.
                  if ($stored_form ne $env{$envname}) {
- Line 4161  sub store_course_settings {
+ Line 5501  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 4177  sub restore_course_settings {
+ Line 5516  sub restore_course_settings {
      my ($prefix,$Settings) = @_;
      while (my ($setting,$type) = each(%$Settings)) {
          next if (exists($env{'form.'.$setting}));
-         my $envname = 'course.'.$courseid.'.internal.'.$prefix.
+         my $envname = 'environment.internal.'.$courseid.'.'.$prefix.
              '.'.$setting;
          if (exists($env{$envname})) {
              if ($type eq 'scalar') {
- Line 4185  sub restore_course_settings {
+ Line 5524  sub restore_course_settings {
              } elsif ($type eq 'array') {
                  $env{'form.'.$setting} = [
                                             map {
-                                                &Apache::lonnet::unescape($_);
+                                                &unescape($_);
                                             } split(',',$env{$envname})
                                             ];
              }
- Line 4196  sub restore_course_settings {
+ Line 5535  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)=($$courseid=~/^\/(\w+)\/(\w+)$/);
+     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)=($cloneid=~/^\/(\w+)\/(\w+)$/);
+ 	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'}) {
+ 	$args->{'keyauth'}=~s/[^\w\@]//g;
+ 	if ($args->{'keyauth'}) {
+ 	    $cenv{'keyauth'}=$args->{'keyauth'};
+ 	}
+     }
+     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 4229  sub lonhttpdurl {
+ Line 5950  sub lonhttpdurl {
      return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
  }
+ sub absolute_url {
+     my ($host_name) = @_;
+     my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://');
+     if ($host_name eq '') {
+ 	$host_name = $ENV{'SERVER_NAME'};
+     }
+     return $protocol.$host_name;
+ }
  sub connection_aborted {
      my ($r)=@_;
      $r->print(" ");$r->rflush();
- Line 4258  sub escape_double {
+ Line 5988  sub escape_double {
  sub escape_url {
      my ($url)   = @_;
      my @urlslices = split(/\//, $url,-1);
-     my $lastitem = &Apache::lonnet::escape(pop(@urlslices));
+     my $lastitem = &escape(pop(@urlslices));
      return join('/',@urlslices).'/'.$lastitem;
  }
  =pod

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

Removed from v.1.278
changed lines
	Added in v.1.454