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.331 and 1.429

-version 1.331, 2006/04/11 20:00:44
+version 1.429, 2006/07/17 19:47:20
  Line 61  use POSIX qw(strftime mktime);
  use Apache::lonmenu();
  use Apache::lonlocal;
  use HTML::Entities;
+ use Apache::lonhtmlcommon();
+ use Apache::loncoursedata();
+ use Apache::lontexconvert();
+ use LONCAPA;
  my $readit;
- Line 73  my %language;
+ Line 77  my %language;
  my %supported_language;
  my %cprtag;
  my %scprtag;
- my %fe; my %fd;
+ my %fe; my %fd; my %fm;
  my %category_extensions;
  # ---------------------------------------------- Designs
- Line 104  BEGIN {
+ Line 108  BEGIN {
          my $langtabfile = $Apache::lonnet::perlvar{'lonTabDir'}.
                                     '/language.tab';
          if ( open(my $fh,"<$langtabfile") ) {
-             while (<$fh>) {
+             while (my $line = <$fh>) {
-                 next if /^\#/;
+                 next if ($line=~/^\#/);
-                 chomp;
+                 chomp($line);
-                 my ($key,$two,$country,$three,$enc,$val,$sup)=(split(/\t/,$_));
+                 my ($key,$two,$country,$three,$enc,$val,$sup)=(split(/\t/,$line));
                  $language{$key}=$val.' - '.$enc;
                  if ($sup) {
                      $supported_language{$key}=$sup;
- Line 121  BEGIN {
+ Line 125  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 156  BEGIN {
+ Line 160  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 175  BEGIN {
+ Line 179  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 190  BEGIN {
+ Line 194  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 381  sub selectstudent_link {
+ Line 386  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,multflag) {
+     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
          var url = '/adm/pickcourse?';
          var filter;
          if (filter != null) {
- Line 410  sub coursebrowser_javascript {
+ Line 416  sub coursebrowser_javascript {
          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 421  ENDSTDBRW
+ Line 439  ENDSTDBRW
  }
  sub selectcourse_link {
-    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag)=@_;
+    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
      return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'");'."'>".&mt('Select Course')."</a>";
+         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select [_1]',$selecttype)."</a>";
  }
  sub check_uncheck_jscript {
- Line 689  sub helpLatexCheatsheet {
+ Line 707  sub helpLatexCheatsheet {
  }
  sub help_open_menu {
-     my ($color,$topic,$component_help,$function,$faq,$bug,$stayOnPage,$width,$height,$text) = @_;
+     my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) = @_;
      $text = "" if (not defined $text);
      $stayOnPage = 0 if (not defined $stayOnPage);
      if ($env{'browser.interface'} eq 'textual' ||
- Line 703  sub help_open_menu {
+ Line 721  sub help_open_menu {
      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')";
      } else {
          $link = "javascript:helpMenu('display')";
      }
-     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 $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";
-     my $details_link = "/adm/helpmenu?page=body&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";
+     my $details_link = "/adm/helpmenu?page=body&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp";
      my $template;
      if ($text ne "") {
  	$template .=
- Line 770  ENDTEMPLATE
+ Line 788  ENDTEMPLATE
  				       $width,$height).' '.$template;
  	} else {
  	    my $help_text;
- 	    $help_text=&Apache::lonnet::unescape($topic);
+ 	    $help_text=&unescape($topic);
  	    $template='<table><tr><td>'.
  		&help_open_topic($component_help,$help_text,$stayOnPage,
  				 $width,$height).'</td><td>'.$template.
- Line 797  sub help_open_bug {
+ Line 815  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 1149  sub get_domains {
+ Line 1167  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 1204  sub multiple_select_form {
+ Line 1222  sub multiple_select_form {
      my @order = ref($order) ? @$order
                              : sort(keys(%$hash));
      foreach my $key (@order) {
-         $output.='<option value="'.$key.'" ';
+         $output.='<option value="'.&HTML::Entities::encode($key,'"<>&').'" ';
          $output.='selected="selected" ' if ($selected{$key});
          $output.='>'.$hash->{$key}."</option>\n";
      }
- Line 1234  sub select_form {
+ Line 1252  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 1301  sub select_dom_form {
+ Line 1320  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 1326  given $domain.
+ Line 1345  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 1350  sub home_server_option_list {
+ Line 1369  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 1842  sub initialize_keywords {
+ Line 1862  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 1898  sub get_related_words {
+ Line 1918  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 1944  sub plainname {
+ Line 1972  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 2017  sub screenname {
+ Line 2045  sub screenname {
  # ------------------------------------------------------------- Message Wrapper
  sub messagewrapper {
-     my ($link,$username,$domain)=@_;
+     my ($link,$username,$domain,$subject,$text)=@_;
      return
          '<a href="/adm/email?compose=individual&'.
-         'recname='.$username.'&recdom='.$domain.'" '.
+         'recname='.$username.'&recdom='.$domain.
+ 	'&subject='.&escape($subject).'&text='.&escape($text).'" '.
          'title="'.&mt('Send message').'">'.$link.'</a>';
  }
  # --------------------------------------------------------------- Notes Wrapper
- Line 2180  category
+ Line 2209  category
  =cut
  sub filecategorytypes {
-     return @{$category_extensions{lc($_[0])}};
+     my ($cat) = @_;
+     return @{$category_extensions{lc($cat)}};
  }
  =pod
- Line 2195  sub fileembstyle {
+ Line 2225  sub fileembstyle {
      return $fe{lc(shift(@_))};
  }
+ sub filemimetype {
+     return $fm{lc(shift(@_))};
+ }
  sub filecategoryselect {
      my ($name,$value)=@_;
- Line 2251  sub fileextensions {
+ Line 2285  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 2292  sub preferred_languages {
+ Line 2326  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 2352  sub get_previous_attempt {
+ Line 2386  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 2375  sub get_previous_attempt {
+ Line 2409  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 2427  sub relative_to_absolute {
+ Line 2461  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 2516  sub submlink {
+ Line 2550  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 2562  sub pprmlink {
+ Line 2596  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 2592  sub timehash {
+ Line 2626  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 2602  sub maketime {
+ Line 2641  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 2614  sub findallcourses {
+ Line 2659  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 2687  Returns: value of designparamter $which
+ Line 2732  Returns: value of designparamter $which
  =cut
  ##############################################
  sub designparm {
      my ($which,$domain)=@_;
- Line 2701  sub designparm {
+ Line 2747  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 2751  Inputs:
+ Line 2797  Inputs:
  =item * $notopbar, if true, keep the 'what is this' info but remove the
                     navigational links
- =item * $bgcolor, used to override the bg coor on a webpage to a specific value
+ =item * $bgcolor, used to override the bgcolor on a webpage to a specific value
+ =item * $notitle, if true keep the nav controls, but remove the title bar
+ =item * $no_inline_link, if true and in remote mode, don't show the
+          'Switch To Inline Menu' link
  =back
- Line 2764  other decorations will be returned.
+ Line 2815  other decorations will be returned.
  sub bodytag {
      my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
- 	$notopbar,$bgcolor)=@_;
+ 	$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= $bgcolor || &designparm($function.'.pgbg',$domain);
+     my $font =   &designparm($function.'.font',$domain);
-     my $tabbg=&designparm($function.'.tabbg',$domain);
+     my $pgbg   = $bgcolor || &designparm($function.'.pgbg',$domain);
-     my $font=&designparm($function.'.font',$domain);
-     my $link=&designparm($function.'.link',$domain);
+     my %design = ( 'style'   => 'margin-top: 0px',
-     my $alink=&designparm($function.'.alink',$domain);
+ 		   'bgcolor' => $pgbg,
-     my $vlink=&designparm($function.'.vlink',$domain);
+ 		   'text'    => $font,
-     my $sidebg=&designparm($function.'.sidebg',$domain);
+                    'alink'   => &designparm($function.'.alink',$domain),
- # Accessibility font enhance
+ 		   'vlink'   => &designparm($function.'.vlink',$domain),
-     my $addstyle='';
+ 		   'link'    => &designparm($function.'.link',$domain),);
-     if ($env{'browser.fontenhance'} eq 'on') {
+     @$addentries{keys(%design)} = @design{keys(%design)};
- 	$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
- Line 2798  sub bodytag {
+ Line 2857  sub bodytag {
      my $extra_body_attr = &make_attr_string($forcereg,$addentries);
  # 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 }
- table.thinborder { border-collapse: collapse; }
- table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}
- form, .inline { display: inline; }
- .center { text-align: center; }
- .filename {font-family: monospace;}
- </style>
- <body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
- style="margin-top: 0px;$addstyle" $extra_body_attr>
- END
-     $bodytag .= &Apache::lontexconvert::init_math_support();
-     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'}
-     $env{'environment.middlename'}
+     my $roleinfo=(<<ENDROLE);
-     $env{'environment.lastname'}
+ <td class="LC_title_bar_who">
-     $env{'environment.generation'}
+ <div class="LC_title_bar_name">
-     </font>&nbsp;
+     $name
- <br />
+     &nbsp;
- <font size="2" face="Arial, Helvetica, sans-serif">$role</font>&nbsp;
+ </div>
- <br />
+ <div class="LC_title_bar_role">
- <font size="2" face="Arial, Helvetica, sans-serif">$realm</font>&nbsp;
+ $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 2896  ENDROLE
+ Line 2964  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.'" />';
-     }
-     #
-     # Extra info if you are the DC
-     my $dc_info = '';
-     if ($env{'user.adv'} && exists($env{'user.role.dc./'.
-                         $env{'course.'.$env{'request.course.id'}.
-                                  '.domain'}.'/'})) {
-         my $cid = $env{'request.course.id'};
-         $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
-         $dc_info = '('.$dc_info.')';
-     }
      # Explicit link to get inline menu
-     my $menu='<br /><font size="2" face="Arial, Helvetica, sans-serif">&nbsp;<a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a></font>';
+     my $menu= ($no_inline_link?''
+ 	       :'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
      #
+     if ($notitle) {
+ 	return $bodytag;
+     }
      return(<<ENDBODY);
  $bodytag
- <table width="100%" cellspacing="0" border="0" cellpadding="0">
+ <table id="LC_title_bar" class="LC_with_remote">
- <tr><td bgcolor="$sidebg">
+ <tr><td class="LC_title_bar_role_logo">$upperleft</td>
- $upperleft</td>
+     <td class="LC_title_bar_domain_logo">$messages&nbsp;</td>
- <td bgcolor="$sidebg" align="right">$messages&nbsp;</td>
  </tr>
- <tr>
+ <tr><td>$titleinfo $dc_info $menu</td>
- <td rowspan="3" bgcolor="$tabbg">
+ $roleinfo
- $titleinfo $dc_info $menu
- </td><td bgcolor="$tabbg" align="right">
- <font size="2" face="Arial, Helvetica, sans-serif">
-     $env{'environment.firstname'}
-     $env{'environment.middlename'}
-     $env{'environment.lastname'}
-     $env{'environment.generation'}
-     </font>&nbsp;
- </td>
  </tr>
- <tr><td bgcolor="$tabbg" align="right">
+ </table>
- <font size="2" face="Arial, Helvetica, sans-serif">$role</font>&nbsp;
- </td></tr>
- <tr>
- <td bgcolor="$tabbg" align="right"><font size="2" face="Arial, Helvetica, sans-serif">$realm</font>&nbsp;</td></tr>
- </table><br />
  ENDBODY
  }
- Line 2951  sub make_attr_string {
+ Line 2998  sub make_attr_string {
      }
      if ($register) {
- 	$attr_ref->{'onload'}   = &Apache::lonmenu::loadevents().
+ 	my ($on_load,$on_unload);
- 	    $attr_ref->{'onload'};
+ 	foreach my $key (keys(%{$attr_ref})) {
- 	$attr_ref->{'onunload'} = &Apache::lonmenu::unloadevents().
+ 	    if      (lc($key) eq 'onload') {
- 	    $attr_ref->{'onunload'};
+ 		$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}.'" ';
- Line 3001  sub endbodytag {
+ Line 3081  sub endbodytag {
  =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;
+ }
+ 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: right;
+   white-space: nowrap;
+   font-weight: bold;
+ }
+ table#LC_top_nav td.LC_top_nav_logo img {
+   margin-left: 0.2em;
+   vertical-align: bottom;
+ }
+ 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_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 {
+   background-color: $data_table_light;
+   padding: 2px;
+ }
+ table.LC_data_table 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 {
+   background-color: #FFFFFF;
+   font-weight: bold;
+   font-style: italic;
+   text-align: center;
+   padding: 8px;
+ }
+ 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.
- Line 3010  Inputs: $title - optional title for the
+ Line 3605  Inputs: $title - optional title for the
          $args - optional arguments
              force_register - if is true call registerurl so the remote is
                               informed
+             redirect       -> array ref of
-             redirect - array ref of seconds before redirect occurs
+- seconds before redirect occurs
-                                     url to redirect to
+- url to redirect to
+- whether the side effect should occur
                             (side effect of setting
                                 $env{'internal.head.redirect'} to the url
                                 redirected too)
+             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
- Line 3023  Inputs: $title - optional title for the
+ Line 3624  Inputs: $title - optional title for the
  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(),
+ 		   $env{'environment.color.timestamp'},
+ 		   $function,$domain,$bgcolor);
+     $url = '/adm/css/'.&escape($url).'.css';
      my $result =
  	'<head>'.
- 	&Apache::lonxml::fontsettings().
+ 	&font_settings().
  	&Apache::lonhtmlcommon::htmlareaheaders();
      if ($args->{'force_register'}) {
- Line 3033  sub headtag {
+ Line 3644  sub headtag {
      }
      if (ref($args->{'redirect'})) {
- 	my ($time,$url) = @{$args->{'redirect'}};
+ 	my ($time,$url,$inhibit_continue) = @{$args->{'redirect'}};
  	$url = &Apache::lonenc::check_encrypt($url);
- 	$env{'internal.head.redirect'} = $url;
+ 	if (!$inhibit_continue) {
+ 	    $env{'internal.head.redirect'} = $url;
+ 	}
  	$result.=<<ADDMETA
  <meta http-equiv="pragma" content="no-cache" />
- <meta HTTP-EQUIV="Refresh" CONTENT="$time; url=$url" />
+ <meta http-equiv="Refresh" content="$time; url=$url" />
  ADDMETA
      }
      if (!defined($title)) {
  	$title = 'The LearningOnline Network with CAPA';
      }
-     $result .= '<title> LON-CAPA '.&mt($title).'</title>'.$head_extra;
+     $result .= '<title> LON-CAPA '.&mt($title).'</title>'
+ 	.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'
+ 	.$head_extra;
      return $result;
  }
- Line 3053  ADDMETA
+ Line 3668  ADDMETA
  =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.
- Line 3077  Returns a uniform complete <head>..</hea
+ Line 3752  Returns a uniform complete <head>..</hea
  Inputs: $title - optional title for the page
          $head_extra - optional extra HTML to put inside the <head>
  =back
  =cut
- Line 3118  Inputs: $title - optional title for the
+ Line 3794  Inputs: $title - optional title for the
                                      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
- Line 3126  sub start_page {
+ Line 3810  sub start_page {
      my ($title,$head_extra,$args) = @_;
      #&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
      my %head_args;
-     foreach my $arg ('redirect','force_register') {
+     foreach my $arg ('redirect','force_register','domain','function',
+ 		     'bgcolor') {
  	if (defined($args->{$arg})) {
  	    $head_args{$arg} = $args->{$arg};
  	}
      }
      $env{'internal.start_page'}++;
-     my $result =
+     my $result;
- 	&Apache::lonxml::xmlbegin().
+     if (! exists($args->{'skip_phases'}{'head'}) ) {
- 	&headtag($title,$head_extra,\%head_args).&endheadtag();
+ 	$result.=
-     if ($args->{'frameset'}) {
+ 	    &xml_begin().
- 	my $attr_string = &make_attr_string($args->{'force_register'},
+ 	    &headtag($title,$head_extra,\%head_args).&endheadtag();
- 					    $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'});
      }
+     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);
      }
- Line 3173  Inputs:         $args - additional optio
+ Line 3866  Inputs:         $args - additional optio
                                   a html attribute
                   frameset     -> if true will start with a <frameset>
                                   rather than <body>
- =back
  =cut
  sub end_page {
      my ($args) = @_;
-     #&Apache::lonnet::logthis("end_page ".join(':',caller(0)));
      $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 {
- Line 3192  sub end_page {
+ Line 3892  sub end_page {
      if ($args->{'js_ready'}) {
  	$result = &js_ready($result);
      }
      if ($args->{'html_encode'}) {
  	$result = &html_encode($result);
      }
      return $result;
  }
- Line 3211  sub js_ready {
+ Line 3913  sub js_ready {
      $result =~ s/[\n\r]/ /xmsg;
      $result =~ s/\\/\\\\/xmsg;
      $result =~ s/'/\\'/xmsg;
-     $result =~ s{</script>}{</scrip'+'t>}xmsg;
+     $result =~ s{</}{<\\/}xmsg;
      return $result;
  }
- Line 3253  sub simple_error_page {
+ Line 3955  sub simple_error_page {
      }
      return $page;
  }
+ {
+     my $row_count;
+     sub start_data_table {
+ 	my ($add_class) = @_;
+ 	my $css_class = (join(' ','LC_data_table',$add_class));
+ 	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
- =over 4
+ =item * &get_users_function()
- =item get_users_function
  Used by &bodytag to determine the current users primary role.
  Returns either 'student','coordinator','admin', or 'author'.
- Line 3286  sub get_users_function {
+ Line 4031  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 3301  role status: active, previous or future.
+ Line 4046  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 3340  sub check_user_status {
+ Line 4087  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 3378  sub get_sections {
+ Line 4157  sub get_sections {
  	if ($user !~ /^(\w{2})/) { next; }
  	my ($role) = ($user =~ /^(\w{2})/);
  	if ($possible_roles && !(grep(/^$role$/,@$possible_roles))) { next; }
- 	my $section;
+ 	my ($section,$status);
  	if ($role eq 'cr' &&
  	    $user =~ m-^$role/[^/]*/[^/]*/[^/]*:[^:]*:[^:]*:(\w+)-) {
  	    $section=$1;
  	}
  	if ($user =~ /^$role:[^:]*:[^:]*:(\w+)/) { $section=$1; }
  	if (!defined($section) || $section eq '-1') { next; }
- 	if (!defined($$sectioncount{$section})) { $numsections++; }
+         my ($end,$start) = ($courseroles{$user} =~ /^([^:]*):([^:]*)$/);
- 	$$sectioncount{$section}++;
+         if ($end == -1 && $start == -1) {
-     }
+             next; #deleted role
-     return $numsections;
- }
- ###############################################
- =pod
- =item coursegroups
- Retrieve information about groups in a course,
- Input:
-. Reference to hash to populate with group information.
-. Optional course domain
-. Optional course number
-. Optional group name
- Course domain and number will be taken from user's
- environment if not supplied. Optional group name will'
- be passed to lonnet::get_coursegroups() as a regexp to
- use in the call to the dump function.
- Output
- Returns number of groups in the course (subject to the
- optional group name filter).
- Side effects:
- Populates the referenced curr_groups hash, with key,
- value pairs. Keys are group names, corresponding values
- are scalars containing group information in XML. This
- can be sent to &get_group_settings() to be parsed.
- =cut
- ###############################################
- sub coursegroups {
-     my ($curr_groups,$cdom,$cnum,$group) = @_;
-     my $numgroups;
-     if (!defined($cdom) || !defined($cnum)) {
-         my $cid =  $env{'request.course.id'};
-         $cdom = $env{'course.'.$cid.'.domain'};
-         $cnum = $env{'course.'.$cid.'.num'};
-     }
-     %{$curr_groups} = &Apache::lonnet::get_coursegroups($cdom,$cnum,$group);
-     my ($tmp) = keys(%{$curr_groups});
-     if ($tmp=~/^error:/) {
-         unless ($tmp eq 'error: 2 tie(GDBM) Failed while attempting dump') {
-             &logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.
-                                                                    $cdom);
          }
-         $numgroups = 0;
+         if (!defined($possible_status)) {
-     } else {
+             $sectioncount{$section}++;
-         $numgroups = keys(%{$curr_groups});
+         } else {
-     }
+             if ((!$end || $end >= $now) && (!$start || $start <= $now)) {
-     return $numgroups;
+                 $status = 'active';
- }
+             } elsif ($end < $now) {
+                 $status = 'future';
- ###############################################
+             } elsif ($start > $now) {
+                 $status = 'previous';
- =pod
- =item get_group_settings
- Uses TokeParser to extract group information from the
- XML used to describe course groups.
- Input:
- Scalar containing XML  - as retrieved from &coursegroups().
- Output:
- Hash containing group information as key=values for (a), and
- hash of hashes for (b)
- Keys (in two categories):
- (a) groupname, creator, creation, modified, startdate,enddate.
- Corresponding values are name of the group, creator of the group
- (username:domain), UNIX time for date group was created, and
- settings were last modified, and default start and end access
- times for group members.
- (b) functions returned in hash of hashes.
- Outer hash key is functions.
- Inner hash keys are chat,discussion,email,files,homepage,roster.
- Corresponding values are either on or off, depending on
- whether this type of functionality is available for the group.
- =cut
- ###############################################
- sub get_group_settings {
-     my ($groupinfo)=@_;
-     my $parser=HTML::TokeParser->new(\$groupinfo);
-     my $token;
-     my $tool = '';
-     my $role = '';
-     my %content=();
-     while ($token=$parser->get_token) {
-         if ($token->[0] eq 'S')  {
-             my $entry=$token->[1];
-             if ($entry eq 'functions' || $entry eq 'autosec') {
-                 %{$content{$entry}} = ();
-                 $tool = $entry;
-             } elsif ($entry eq 'role') {
-                 if ($tool eq 'autosec') {
-                     $role = $token->[2]{id};
-                 }
-             } else {
-                 my $value=$parser->get_text('/'.$entry);
-                 if ($entry eq 'name') {
-                     if ($tool eq 'functions') {
-                         my $function = $token->[2]{id};
-                         $content{$tool}{$function} = $value;
-                     }
-                 } elsif ($entry eq 'groupname') {
-                     $content{$entry}=&Apache::lonnet::unescape($value);
-                 } elsif (($entry eq 'roles') || ($entry eq 'types') ||
-                          ($entry eq 'sectionpick') || ($entry eq 'defpriv')) {
-                     push(@{$content{$entry}},$value);
-                 } elsif ($entry eq 'section') {
-                     if ($tool eq 'autosec'  && $role ne '') {
-                         push(@{$content{$tool}{$role}},$value);
-                     }
-                 } else {
-                     $content{$entry}=$value;
-                 }
              }
-         } elsif ($token->[0] eq 'E') {
+             if (($status ne '') && (grep/^\Q$status\E$/,@{$possible_status})) {
-             if ($token->[1] eq 'functions' || $token->[1] eq 'autosec') {
+                 $sectioncount{$section}++;
-                 $tool = '';
-             } elsif ($token->[1] eq 'role') {
-                 $role = '';
              }
          }
      }
-     return %content;
+     return %sectioncount;
- }
- sub check_group_access {
-     my ($group) = @_;
-     my $access = 1;
-     my $now = time;
-     my ($start,$end) = split(/\./,$env{'user.role.gr/'.$env{'request.course,id'}.'/'.$group});
-     if (($end!=0) && ($end<$now)) { $access = 0; }
-     if (($start!=0) && ($start>$now)) { $access=0; }
-     return $access;
  }
  ###############################################
  =pod
- =item get_course_users
+ =item * &get_course_users()
  Retrieves usernames:domains for users in the specified course
  with specific role(s), and access status.
- Line 3566  Entries for end, start, section and stat
+ Line 4214  Entries for end, start, section and stat
  of the possibility of multiple values for non-student roles.
  =cut
  ###############################################
  sub get_course_users {
      my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata) = @_;
      my %idx = ();
+     my %seclists;
      $idx{udom} = &Apache::loncoursedata::CL_SDOM();
      $idx{uname} =  &Apache::loncoursedata::CL_SNAME();
- Line 3587  sub get_course_users {
+ Line 4236  sub get_course_users {
          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)) {
- 		unless(grep(/^\Q$$classlist{$student}[$idx{section}]\E$/,
+                 if (grep(/^all$/,@{$sections})) {
- 			    @{$sections})) {
+                     $secmatch = 1;
- 		    next;
+                 } elsif ($$classlist{$student}[$idx{section}] eq '') {
+                     if (grep(/^none$/,@{$sections})) {
+                         $secmatch = 1;
+                     }
+                 } else {
+ 		    if (grep(/^\Q$section\E$/,@{$sections})) {
+ 		        $secmatch = 1;
+                     }
  		}
-             }
+                 if (!$secmatch) {
+                     next;
+                 }
+             }
+             push(@{$seclists{$student}},$section);
              if (defined($$types{'active'})) {
                  if ($$classlist{$student}[$idx{status}] eq 'Active') {
                      push(@{$$users{st}{$student}},'active');
- Line 3611  sub get_course_users {
+ Line 4276  sub get_course_users {
                      $match = 1;
                  }
              }
-             if ($match && defined($userdata)) {
+             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);
          foreach my $person (@coursepersonnel) {
              my $match = 0;
-             my ($role,$user) = ($person =~ /^([^:]*):([^:]+:[^:]+)/);
+             my $secmatch = 0;
+             my ($role,$user,$usec) = ($person =~ /^([^:]*):([^:]+:[^:]+):([^:]*)/);
              $user =~ s/:$//;
              if (($role) && (grep(/^\Q$role\E$/,@{$roles}))) {
-                 my ($uname,$udom,$usec) = split(/:/,$user);
+                 my ($uname,$udom) = split(/:/,$user);
-                 if ($usec ne '' && (ref($sections) eq 'ARRAY') &&
+                 if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {
- 		    @{$sections} > 0) {
+                     if (grep(/^all$/,@{$sections})) {
- 		    unless(grep(/^\Q$usec\E$/,@{$sections})) {
+                         $secmatch = 1;
- 			next;
+                     } 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);
+                     my $status = &check_user_status($udom,$uname,$cdom,$cnum,$role,
+                                                     $usec);
                      foreach my $type (keys(%{$types})) {
                          if ($status eq $type) {
-                             @{$$users{$role}{$user}} = $type;
+                             if (!grep(/^\Q$type\E$/,@{$$users{$role}{$user}})) {
+                                 push(@{$$users{$role}{$user}},$type);
+                             }
                              $match = 1;
                          }
                      }
-                     if ($match && defined($userdata) &&
+                     if (($match) && (ref($userdata) eq 'HASH')) {
-                         !exists($$userdata{$uname.':'.$udom})) {
+                         if (!exists($$userdata{$uname.':'.$udom})) {
- 			&get_user_info($udom,$uname,\%idx,$userdata);
+ 			    &get_user_info($udom,$uname,\%idx,$userdata);
+                         }
+                         if (!grep(/^\Q$usec\E$/,@{$seclists{$uname.':'.$udom}})) {
+                             push(@{$seclists{$uname.':'.$udom}},$usec);
+                         }
                      }
                  }
              }
- Line 3654  sub get_course_users {
+ Line 4340  sub get_course_users {
                      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;
  }
- Line 3671  sub get_user_info {
+ Line 4364  sub get_user_info {
      return;
  }
- ###############################################
+ sub get_secgrprole_info {
+     my ($cdom,$cnum,$needroles,$type)  = @_;
- sub get_posted_cgi {
+     my %sections_count = &get_sections($cdom,$cnum);
-     my $r=shift;
+     my @sections =  (sort {$a <=> $b} keys(%sections_count));
+     my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
-     my $buffer;
+     my @groups = sort(keys(%curr_groups));
-     if ($r->header_in('Content-length')) {
+     my $allroles = [];
- 	$r->read($buffer,$r->header_in('Content-length'),0);
+     my $rolehash;
-     }
+     my $accesshash = {
-     unless ($buffer=~/^(\-+\w+)\s+Content\-Disposition\:\s*form\-data/si) {
+                      active => 'Currently has access',
- 	my @pairs=split(/&/,$buffer);
+                      future => 'Will have future access',
- 	my $pair;
+                      previous => 'Previously had access',
- 	foreach $pair (@pairs) {
+                   };
- 	    my ($name,$value) = split(/=/,$pair);
+     if ($needroles) {
- 	    $value =~ tr/+/ /;
+         $rolehash = {'all' => 'all'};
- 	    $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+         my %user_roles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
- 	    $name  =~ tr/+/ /;
+ 	if (&Apache::lonnet::error(%user_roles)) {
- 	    $name  =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+ 	    undef(%user_roles);
- 	    &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);
      }
- #
+     return (\@sections,\@groups,$allroles,$rolehash,$accesshash);
- # Digested POSTed values
- #
- # Remember the way this was originally done (GET or POST)
- #
-     $env{'request.method'}=$ENV{'REQUEST_METHOD'};
- #
- # There may also be stuff in the query string
- # Tell subsequent handlers that this was GET, not POST, so they can access query string.
- # Also, unset POSTed content length to cover all tracks.
- #
- # This does not work, because M_GET is not defined (if it's defined, it is just 0).
- # Commenting out for now ... not sure if harm is done.
- #    $r->method_number(M_GET);
-     $r->method('GET');
-     $r->headers_in->unset('Content-length');
  }
  =pod
- Line 3775  will result in $env{'form.uname'} and $e
+ Line 4419  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 3993  sub record_sep {
+ Line 4637  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 4002  sub record_sep {
+ Line 4645  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 4097  sub csv_print_samples {
+ Line 4739  sub csv_print_samples {
      my $samples = &get_samples($records,3);
      $r->print(&mt('Samples').'<br /><table border="2"><tr>');
-     foreach (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
+     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 (@$samples) {
  	$r->print('<tr>');
- 	foreach (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
+ 	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
  	    $r->print('<td>');
- 	    if (defined($$hash{$_})) { $r->print($$hash{$_}); }
+ 	    if (defined($$hash{$sample})) { $r->print($$hash{$sample}); }
  	    $r->print('</td>');
  	}
  	$r->print('</tr>');
- Line 4137  sub csv_print_select_table {
+ Line 4779  sub csv_print_select_table {
  	     '<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(%{ $samples->[0] }))) {
+ 	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
- 	    $r->print('<option value="'.$_.'"'.
+ 	    $r->print('<option value="'.$sample.'"'.
-                       ($_ eq $defaultcol ? ' selected="selected" ' : '').
+                       ($sample eq $defaultcol ? ' selected="selected" ' : '').
-                       '>Column '.($_+1).'</option>');
+                       '>Column '.($sample+1).'</option>');
  	}
  	$r->print('</select></td></tr>'."\n");
  	$i++;
- Line 4408  sub DrawBarGraph {
+ Line 5050  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 4490  sub DrawXYGraph {
+ Line 5132  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 4587  sub DrawXYYGraph {
+ Line 5229  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 4661  Inputs:
+ Line 5303  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 4691  a hash ref describing the data to be sto
+ Line 5333  a hash ref describing the data to be sto
      'chartoutputmode' => 'scalar',
      'chartoutputdata' => 'scalar',
      'Section' => 'array',
+     'Group' => 'array',
      'StudentData' => 'array',
      'Maps' => 'array');
- Line 4724  sub store_course_settings {
+ Line 5367  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 4762  sub restore_course_settings {
+ Line 5405  sub restore_course_settings {
              } elsif ($type eq 'array') {
                  $env{'form.'.$setting} = [
                                             map {
-                                                &Apache::lonnet::unescape($_);
+                                                &unescape($_);
                                             } split(',',$env{$envname})
                                             ];
              }
- Line 4773  sub restore_course_settings {
+ Line 5416  sub restore_course_settings {
  ############################################################
  ############################################################
- sub propath {
+ sub course_type {
-     my ($udom,$uname)=@_;
+     my ($cid) = @_;
-     $udom=~s/\W//g;
+     if (!defined($cid)) {
-     $uname=~s/\W//g;
+         $cid = $env{'request.course.id'};
-     my $subdir=$uname.'__';
+     }
-     $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
+     if (defined($env{'course.'.$cid.'.type'})) {
-     my $proname="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
+         return $env{'course.'.$cid.'.type'};
-     return $proname;
+     } else {
- }
+         return 'Course';
+     }
+ }
+ sub group_term {
+     my $crstype = &course_type();
+     my %names = (
+                   'Course' => 'group',
+                   'Group' => 'team',
+                 );
+     return $names{$crstype};
+ }
  sub icon {
      my ($file)=@_;
- Line 4835  sub escape_double {
+ Line 5489  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.331
changed lines
	Added in v.1.429