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.365 and 1.521

-version 1.365, 2006/05/09 14:38:09
+version 1.521, 2007/04/11 02:42:00
  Line 59  use Apache::lonnet;
  use GDBM_File;
  use POSIX qw(strftime mktime);
  use Apache::lonmenu();
+ use Apache::lonenc();
  use Apache::lonlocal;
  use HTML::Entities;
  use Apache::lonhtmlcommon();
  use Apache::loncoursedata();
  use Apache::lontexconvert();
+ use Apache::lonclonecourse();
+ use LONCAPA qw(:DEFAULT :match);
+ # ---------------------------------------------- Designs
+ use vars qw(%defaultdesign);
  my $readit;
  ##
  ## Global Variables
  ##
- Line 79  my %scprtag;
+ Line 86  my %scprtag;
  my %fe; my %fd; my %fm;
  my %category_extensions;
- # ---------------------------------------------- Designs
- my %designhash;
  # ---------------------------------------------- Thesaurus variables
  #
  # %Keywords:
- Line 148  BEGIN {
+ Line 151  BEGIN {
          }
      }
- # -------------------------------------------------------------- domain designs
+ # -------------------------------------------------------------- default domain designs
-     my $filename;
      my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
-     opendir(DIR,$designdir);
+     my $designfile = $designdir.'/default.tab';
-     while ($filename=readdir(DIR)) {
+     if ( open (my $fh,"<$designfile") ) {
- 	if ($filename!~/\.tab$/) { next; }
+         while (my $line = <$fh>) {
- 	my ($domain)=($filename=~/^(\w+)\./);
+             next if ($line =~ /^\#/);
- 	{
+             chomp($line);
- 	    my $designfile = $designdir.'/'.$filename;
+             my ($key,$val)=(split(/\=/,$line));
- 	    if ( open (my $fh,"<$designfile") ) {
+             if ($val) { $defaultdesign{$key}=$val; }
- 		while (my $line = <$fh>) {
+         }
- 		    next if ($line =~ /^\#/);
+         close($fh);
- 		    chomp($line);
- 		    my ($key,$val)=(split(/\=/,$line));
- 		    if ($val) { $designhash{$domain.'.'.$key}=$val; }
- 		}
- 		close($fh);
- 	    }
- 	}
      }
-     closedir(DIR);
  # ------------------------------------------------------------- file categories
      {
- Line 255  of the element the selection from the se
+ Line 246  of the element the selection from the se
  sub browser_and_searcher_javascript {
      my ($mode)=@_;
      if (!defined($mode)) { $mode='edit'; }
-     my $resurl=&lastresurl();
+     my $resurl=&escape_single(&lastresurl());
      return <<END;
  // <!-- BEGIN LON-CAPA Internal
      var editbrowser = null;
- Line 284  sub browser_and_searcher_javascript {
+ Line 275  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 305  sub browser_and_searcher_javascript {
+ Line 296  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 384  sub selectstudent_link {
+ Line 375  sub selectstudent_link {
  }
  sub coursebrowser_javascript {
-     my ($domainfilter)=@_;
+     my ($domainfilter,$sec_element,$formname)=@_;
-    return (<<ENDSTDBRW);
+     my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
+    my $output = '
  <script type="text/javascript" language="Javascript" >
-     var stdeditbrowser;
+     var stdeditbrowser;'."\n";
-     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag) {
+    $output .= <<"ENDSTDBRW";
+     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
          var url = '/adm/pickcourse?';
-         var filter;
+         var domainfilter = '';
-         if (filter != null) {
+         var formid = getFormIdByName(formname);
-            if (filter != '') {
+         if (formid > -1) {
-                url += 'filter='+filter+'&';
+             var domid = getIndexByName(formid,udom);
- 	   }
+             if (domid > -1) {
+                 if (document.forms[formid].elements[domid].type == 'select-one') {
+                     domainfilter=document.forms[formid].elements[domid].options[document.forms[formid].elements[domid].selectedIndex].value;
+                 }
+                 if (document.forms[formid].elements[domid].type == 'hidden') {
+                     domainfilter=document.forms[formid].elements[domid].value;
+                 }
+             }
          }
-         var domainfilter='$domainfilter';
          if (domainfilter != null) {
             if (domainfilter != '') {
                 url += 'domainfilter='+domainfilter+'&';
- Line 405  sub coursebrowser_javascript {
+ Line 404  sub coursebrowser_javascript {
          url += 'form=' + formname + '&cnumelement='+uname+
  	                            '&cdomelement='+udom+
                                      '&cnameelement='+desc;
-         if (extra_element !=null && extra_element != '' && formname == 'rolechoice') {
+         if (extra_element !=null && extra_element != '') {
-             url += '&roleelement='+extra_element;
+             if (formname == 'rolechoice') {
-             if (domainfilter == null || domainfilter == '') {
+                 url += '&roleelement='+extra_element;
-                 url += '&domainfilter='+extra_element;
+                 if (domainfilter == null || domainfilter == '') {
+                     url += '&domainfilter='+extra_element;
+                 }
              }
+             else {
+                 if (formname == 'portform') {
+                     url += '&setroles='+extra_element;
+                 }
+             }
          }
          if (multflag !=null && multflag != '') {
              url += '&multiple='+multflag;
          }
+         if (crstype == 'Course/Group') {
+             if (formname == 'cu') {
+                 crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
+                 if (crstype == "") {
+                     alert("$crs_or_grp_alert");
+                     return;
+                 }
+             }
+         }
+         if (crstype !=null && crstype != '') {
+             url += '&type='+crstype;
+         }
          var title = 'Course_Browser';
          var options = 'scrollbars=1,resizable=1,menubar=0';
          options += ',width=700,height=600';
          stdeditbrowser = open(url,title,options,'1');
          stdeditbrowser.focus();
      }
- </script>
+     function getFormIdByName(formname) {
+         for (var i=0;i<document.forms.length;i++) {
+             if (document.forms[i].name == formname) {
+                 return i;
+             }
+         }
+         return -1;
+     }
+     function getIndexByName(formid,item) {
+         for (var i=0;i<document.forms[formid].elements.length;i++) {
+             if (document.forms[formid].elements[i].name == item) {
+                 return i;
+             }
+         }
+         return -1;
+     }
  ENDSTDBRW
+     if ($sec_element ne '') {
+         $output .= &setsec_javascript($sec_element,$formname);
+     }
+     $output .= '
+ </script>';
+     return $output;
+ }
+ sub setsec_javascript {
+     my ($sec_element,$formname) = @_;
+     my $setsections = qq|
+ function setSect(sectionlist) {
+     var sectionsArray = sectionlist.split(",");
+     var numSections = sectionsArray.length;
+     document.$formname.$sec_element.length = 0;
+     if (numSections == 0) {
+         document.$formname.$sec_element.multiple=false;
+         document.$formname.$sec_element.size=1;
+         document.$formname.$sec_element.options[0] = new Option('No existing sections','',false,false)
+     } else {
+         if (numSections == 1) {
+             document.$formname.$sec_element.multiple=false;
+             document.$formname.$sec_element.size=1;
+             document.$formname.$sec_element.options[0] = new Option('Select','',true,true);
+             document.$formname.$sec_element.options[1] = new Option('No section','',false,false)
+             document.$formname.$sec_element.options[2] = new Option(sectionsArray[0],sectionsArray[0],false,false);
+         } else {
+             for (var i=0; i<numSections; i++) {
+                 document.$formname.$sec_element.options[i] = new Option(sectionsArray[i],sectionsArray[i],false,false)
+             }
+             document.$formname.$sec_element.multiple=true
+             if (numSections < 3) {
+                 document.$formname.$sec_element.size=numSections;
+             } else {
+                 document.$formname.$sec_element.size=3;
+             }
+             document.$formname.$sec_element.options[0].selected = false
+         }
+     }
+ }
+ |;
+     return $setsections;
  }
  sub selectcourse_link {
-    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag)=@_;
+    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
-     return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
+    return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'");'."'>".&mt('Select Course')."</a>";
+         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>";
  }
  sub check_uncheck_jscript {
- Line 658  sub help_open_topic {
+ Line 736  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 692  sub helpLatexCheatsheet {
+ Line 770  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 my $datum (\$color,\$function,\$topic,\$component_help,\$faq,
+     foreach my $datum (\$topic,\$component_help,\$faq,\$bug,\$origurl) {
- 		       \$bug,\$origurl) {
+         $$datum = &escape($$datum);
-         $$datum = &Apache::lonnet::escape($$datum);
+     }
-     }
-     if (!$stayOnPage) {
+     my $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";
-          $link = "javascript:helpMenu('open')";
+     my $output .= <<"ENDOUTPUT";
-     } else {
+ <script type="text/javascript">
-         $link = "javascript:helpMenu('display')";
+ banner_link = '$banner_link';
-     }
+ </script>
-     my $banner_link = "/adm/helpmenu?page=banner&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";
+ ENDOUTPUT
-     my $details_link = "/adm/helpmenu?page=body&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";
+     return $output;
-     my $template;
+ }
-     if ($text ne "") {
- 	$template .=
+ # now just updates the help link and generates a blue icon
-   "<table bgcolor='#CC3300' cellspacing='1' cellpadding='1' border='0'><tr>".
+ sub help_open_menu {
-   "<td bgcolor='#CC6600'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+     my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text)
+ 	= @_;
+     $stayOnPage = 0 if (not defined $stayOnPage);
+     if ($env{'browser.interface'} eq 'textual' ||
+ 	$env{'environment.remote'} eq 'off' ) {
+ 	$stayOnPage=1;
+     }
+     my $output;
+     if ($component_help) {
+ 	if (!$text) {
+ 	    $output=&help_open_topic($component_help,undef,$stayOnPage,
+ 				       $width,$height);
+ 	} else {
+ 	    my $help_text;
+ 	    $help_text=&unescape($topic);
+ 	    $output='<table><tr><td>'.
+ 		&help_open_topic($component_help,$help_text,$stayOnPage,
+ 				 $width,$height).'</td></tr></table>';
+ 	}
      }
+     my $banner_link = &update_help_link($topic,$component_help,$faq,$bug,$stayOnPage);
+     return $output.$banner_link;
+ }
+ sub top_nav_help {
+     my ($text) = @_;
+     $text = &mt($text);
+     my $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 $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");
      my $start_page =
          &Apache::loncommon::start_page('Help Menu', undef,
  				       {'frameset'    => 1,
- Line 737  sub help_open_menu {
+ Line 868  sub help_open_menu {
          &Apache::loncommon::end_page({'frameset' => 1,
  				      'js_ready' => 1,});
-     $template .= <<"ENDTEMPLATE";
+     my $template .= <<"ENDTEMPLATE";
-  <script type="text/javascript">
+ <script type="text/javascript">
  // <!-- BEGIN LON-CAPA Internal
  // <![CDATA[
+ var banner_link = '';
  function helpMenu(target) {
      var caller = this;
      if (target == 'open') {
- Line 760  function helpMenu(target) {
+ Line 892  function helpMenu(target) {
      return;
  }
  function writeHelp(caller) {
-     caller.document.writeln('$start_page<frame name="bannerframe"  src="$banner_link" /><frame name="bodyframe" src="$details_link" /> $end_page')
+     caller.document.writeln('$start_page<frame name="bannerframe"  src="'+banner_link+'" /><frame name="bodyframe" src="$details_link" /> $end_page')
      caller.document.close()
      caller.focus()
  }
  // ]]>
  // END LON-CAPA Internal -->
-  </script>
+ </script>
-  <a href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help Menu)" /></a>
  ENDTEMPLATE
-     if ($component_help) {
- 	if (!$text) {
- 	    $template=&help_open_topic($component_help,undef,$stayOnPage,
- 				       $width,$height).' '.$template;
- 	} else {
- 	    my $help_text;
- 	    $help_text=&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 802  sub help_open_bug {
+ Line 919  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 817  sub help_open_bug {
+ Line 934  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 862  sub help_open_faq {
+ Line 979  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 1136  sub create_text_file {
+ Line 1253  sub create_text_file {
  ##        Home server <option> list generating code          ##
  ###############################################################
- =pod
- =head1 Home Server option list generating code
- =over 4
- =item * get_domains()
- Returns an array containing each of the domains listed in the hosts.tab
- file.
- =cut
- #-------------------------------------------
- sub get_domains {
-     # The code below was stolen from "The Perl Cookbook", p 102, 1st ed.
-     my @domains;
-     my %seen;
-     foreach my $dom (sort(values(%Apache::lonnet::hostdom))) {
- 	push(@domains,$dom) unless $seen{$dom}++;
-     }
-     return @domains;
- }
  # ------------------------------------------
  sub domain_select {
      my ($name,$value,$multiple)=@_;
      my %domains=map {
- 	$_ => $_.' '.$Apache::lonnet::domaindescription{$_}
+ 	$_ => $_.' '. &Apache::lonnet::domain($_,'description')
-     } &get_domains;
+     } &Apache::lonnet::all_domains();
      if ($multiple) {
  	$domains{''}=&mt('Any domain');
  	return &multiple_select_form($name,$value,4,\%domains);
- Line 1179  sub domain_select {
+ Line 1272  sub domain_select {
  =pod
+ =head1 Routines for form select boxes
+ =over 4
+ =cut
  =item * multiple_select_form($name,$value,$size,$hash,$order)
  Returns a string containing a <select> element int multiple mode
- Line 1186  Returns a string containing a <select> e
+ Line 1285  Returns a string containing a <select> e
  Args:
    $name - name of the <select> element
-   $value - sclara or array ref of values that should already be selected
+   $value - scalar or array ref of values that should already be selected
    $size - number of rows long the select element is
    $hash - the elements should be 'option' => 'shown text'
            (shown text should already have been &mt())
-   $order - (optional) array ref of the order to show the elments in
+   $order - (optional) array ref of the order to show the elements in
  =cut
- Line 1206  sub multiple_select_form {
+ Line 1305  sub multiple_select_form {
          }
      }
      $output.="\n<select name='$name' size='$size' multiple='1'>";
-     my @order = ref($order) ? @$order
+     my @order;
-                             : sort(keys(%$hash));
+     if (ref($order) eq 'ARRAY')  {
+         @order = @{$order};
+     } else {
+         @order = sort(keys(%$hash));
+     }
+     if (exists($$hash{'select_form_order'})) {
+         @order = @{$$hash{'select_form_order'}};
+     }
      foreach my $key (@order) {
          $output.='<option value="'.&HTML::Entities::encode($key,'"<>&').'" ';
          $output.='selected="selected" ' if ($selected{$key});
- Line 1249  sub select_form {
+ Line 1356  sub select_form {
      return $selectform;
  }
+ # For display filters
+ sub display_filter {
+     if (!$env{'form.show'}) { $env{'form.show'}=10; }
+     if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }
+     return '<nobr><label>'.&mt('Records [_1]',
+ 			       &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
+ 							   (&mt('all'),10,20,50,100,1000,10000))).
+ 	   '</label></nobr> <nobr>'.
+            &mt('Filter [_1]',
+ 	   &select_form($env{'form.displayfilter'},
+ 			'displayfilter',
+ 			('currentfolder' => 'Current folder/page',
+ 			 'containing' => 'Containing phrase',
+ 			 'none' => 'None'))).
+ 			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></nobr>';
+ }
  sub gradeleveldescription {
      my $gradelevel=shift;
      my %gradelevels=(0 => 'Not specified',
- Line 1304  selected");
+ Line 1429  selected");
  #-------------------------------------------
  sub select_dom_form {
      my ($defdom,$name,$includeempty) = @_;
-     my @domains = get_domains();
+     my @domains = sort(&Apache::lonnet::all_domains());
      if ($includeempty) { @domains=('',@domains); }
      my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
      foreach my $dom (@domains) {
- Line 1320  sub select_dom_form {
+ Line 1445  sub select_dom_form {
  =pod
- =item * get_library_servers($domain)
- Returns a hash which contains keys like '103l3' and values like
- 'kirk.lite.msu.edu'.  All of the keys will be for machines in the
- given $domain.
- =cut
- #-------------------------------------------
- sub get_library_servers {
-     my $domain = shift;
-     my %library_servers;
-     foreach my $hostid (keys(%Apache::lonnet::libserv)) {
-         if ($Apache::lonnet::hostdom{$hostid} eq $domain) {
-             $library_servers{$hostid} = $Apache::lonnet::hostname{$hostid};
-         }
-     }
-     return %library_servers;
- }
- #-------------------------------------------
- =pod
  =item * home_server_option_list($domain)
  returns a string which contains an <option> list to be used in a
- Line 1354  returns a string which contains an <opti
+ Line 1455  returns a string which contains an <opti
  #-------------------------------------------
  sub home_server_option_list {
      my $domain = shift;
-     my %servers = &get_library_servers($domain);
+     my %servers = &Apache::lonnet::get_servers($domain,'library');
      my $result = '';
      foreach my $hostid (sort(keys(%servers))) {
          $result.=
- Line 1366  sub home_server_option_list {
+ Line 1467  sub home_server_option_list {
  =pod
- =back
  =cut
  ###############################################################
- Line 1756  If target_domain is not found in domain.
+ Line 1855  If target_domain is not found in domain.
  #-------------------------------------------
  sub get_auth_defaults {
      my $domain=shift;
-     return ($Apache::lonnet::domain_auth_def{$domain},$Apache::lonnet::domain_auth_arg_def{$domain});
+     return (&Apache::lonnet::domain($domain,'auth_def'),
+ 	    &Apache::lonnet::domain($domain,'auth_arg_def'));
  }
  ###############################################################
  ##   End Get Authentication Defaults for Domain              ##
- Line 1905  sub get_related_words {
+ Line 2006  sub get_related_words {
          return ();
      }
      my @Words=();
+     my $count=0;
      if (exists($thesaurus_db{$keyword})) {
  	# The first element is the number of times
  	# the word appears.  We do not need it now.
- 	(undef,@Words) = (split(/:/,$thesaurus_db{$keyword}));
+ 	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 1989  sub nickname {
+ Line 2098  sub nickname {
  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) {
- Line 2002  sub getnames {
+ Line 2114  sub getnames {
      }
  }
+ sub getemails {
+     my ($uname,$udom)=@_;
+     if ($udom eq 'public' && $uname eq 'public') {
+ 	return;
+     }
+     if (!$udom) { $udom=$env{'user.domain'}; }
+     if (!$uname) { $uname=$env{'user.name'}; }
+     my $id=$uname.':'.$udom;
+     my ($names,$cached)=&Apache::lonnet::is_cached_new('emailscache',$id);
+     if ($cached) {
+ 	return %{$names};
+     } else {
+ 	my %loadnames=&Apache::lonnet::get('environment',
+                     			   ['notification','critnotification',
+ 					    'permanentemail'],
+ 					   $udom,$uname);
+ 	&Apache::lonnet::do_cache_new('emailscache',$id,\%loadnames);
+ 	return %loadnames;
+     }
+ }
  # ------------------------------------------------------------------ Screenname
  =pod
- Line 2024  sub screenname {
+ Line 2157  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 2041  sub noteswrapper {
+ Line 2175  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 2071  sub track_student_link {
+ Line 2208  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');
+ }
+ # ===================================================== Display a student photo
+ sub student_image_tag {
+     my ($domain,$user)=@_;
+     my $imgsrc=&Apache::lonnet::studentphoto($domain,$user,'jpg');
+     if (($imgsrc) && ($imgsrc ne '/adm/lonKaputt/lonlogo_broken.gif')) {
+ 	return '<img src="'.$imgsrc.'" align="right" />';
+     } else {
+ 	return '';
+     }
  }
  =pod
- Line 2282  sub preferred_languages {
+ Line 2434  sub preferred_languages {
  	         $env{'course.'.$env{'request.course.id'}.'.languages'}));
      }
      if ($env{'environment.languages'}) {
- 	@languages=split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'});
+ 	@languages=(@languages,
+ 		    split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}));
      }
      my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0];
      if ($browser) {
  	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$browser));
      }
-     if ($Apache::lonnet::domain_lang_def{$env{'user.domain'}}) {
+     if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) {
  	@languages=(@languages,
- 		$Apache::lonnet::domain_lang_def{$env{'user.domain'}});
+ 		    &Apache::lonnet::domain($env{'user.domain'},
+ 					    'lang_def'));
      }
-     if ($Apache::lonnet::domain_lang_def{$env{'request.role.domain'}}) {
+     if (&Apache::lonnet::domain($env{'request.role.domain'},'lang_def')) {
  	@languages=(@languages,
- 		$Apache::lonnet::domain_lang_def{$env{'request.role.domain'}});
+ 		    &Apache::lonnet::domain($env{'request.role.domain'},
+ 					    'lang_def'));
      }
-     if ($Apache::lonnet::domain_lang_def{
+     if (&Apache::lonnet::domain($Apache::lonnet::perlvar{'lonDefDomain'},
- 	                          $Apache::lonnet::perlvar{'lonDefDomain'}}) {
+ 				'lang_def')) {
  	@languages=(@languages,
- 		$Apache::lonnet::domain_lang_def{
+ 		    &Apache::lonnet::domain($Apache::lonnet::perlvar{'lonDefDomain'},
-                                   $Apache::lonnet::perlvar{'lonDefDomain'}});
+ 					    'lang_def'));
      }
  # turn "en-ca" into "en-ca,en"
      my @genlanguages;
- Line 2394  sub get_previous_attempt {
+ Line 2549  sub get_previous_attempt {
  	       } else {
  		  $value=$returnhash{$version.':'.$key};
  	       }
- 	       $prevattempts.='<td>'.&Apache::lonnet::unescape($value).'&nbsp;</td>';
+ 	       $prevattempts.='<td>'.&unescape($value).'&nbsp;</td>';
  	    }
  	 }
        }
- Line 2406  sub get_previous_attempt {
+ Line 2561  sub get_previous_attempt {
  	} else {
  	  $value=$lasthash{$key};
  	}
- 	$value=&Apache::lonnet::unescape($value);
+ 	$value=&unescape($value);
  	if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
  	$prevattempts.='<td>'.$value.'&nbsp;</td>';
        }
- Line 2505  sub get_student_answers {
+ Line 2660  sub get_student_answers {
    }
    $moreenv{'grade_target'}='answer';
    %moreenv=(%form,%moreenv);
-   my $userview=&Apache::lonnet::ssi('/res/'.$feedurl,%moreenv);
+   $feedurl = &Apache::lonnet::clutter($feedurl);
+   &Apache::lonenc::check_encrypt(\$feedurl);
+   my $userview=&Apache::lonnet::ssi($feedurl,%moreenv);
    return $userview;
  }
- Line 2524  sub submlink {
+ Line 2681  sub submlink {
      my ($text,$uname,$udom,$symb,$target)=@_;
      if (!($uname && $udom)) {
  	(my $cursymb, my $courseid,$udom,$uname)=
- 	    &Apache::lonxml::whichuser($symb);
+ 	    &Apache::lonnet::whichuser($symb);
  	if (!$symb) { $symb=$cursymb; }
      }
      if (!$symb) { $symb=&Apache::lonnet::symbread(); }
-     $symb=&Apache::lonnet::escape($symb);
+     $symb=&escape($symb);
      if ($target) { $target="target=\"$target\""; }
      return '<a href="/adm/grades?&command=submission&'.
  	'symb='.$symb.'&student='.$uname.
- Line 2570  sub pprmlink {
+ Line 2727  sub pprmlink {
      my ($text,$uname,$udom,$symb,$target)=@_;
      if (!($uname && $udom)) {
  	(my $cursymb, my $courseid,$udom,$uname)=
- 	    &Apache::lonxml::whichuser($symb);
+ 	    &Apache::lonnet::whichuser($symb);
  	if (!$symb) { $symb=$cursymb; }
      }
      if (!$symb) { $symb=&Apache::lonnet::symbread(); }
-     $symb=&Apache::lonnet::escape($symb);
+     $symb=&escape($symb);
      if ($target) { $target="target=\"$target\""; }
      return '<a href="/adm/parmset?&command=set&'.
  	'symb='.$symb.'&uname='.$uname.
- Line 2604  sub timehash {
+ Line 2761  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 2614  sub maketime {
+ Line 2776  sub maketime {
  #########################################
  sub findallcourses {
-     my ($roles) = @_;
+     my ($roles,$uname,$udom) = @_;
      my %roles;
      if (ref($roles)) { %roles = map { $_ => 1 } @{$roles}; }
      my %courses;
      my $now=time;
-     foreach my $key (keys(%env)) {
+     if (!defined($uname)) {
- 	if ( $key=~m{^user\.role\.(\w+)\./(\w+)/(\w+)} ) {
+         $uname = $env{'user.name'};
- 	    my ($role,$domain,$id) = ($1,$2,$3);
+     }
- 	    next if ($role eq 'ca' || $role eq 'aa');
+     if (!defined($udom)) {
- 	    next if (%roles && !exists($roles{$role}));
+         $udom = $env{'user.domain'};
- 	    my ($starttime,$endtime)=split(/\./,$env{$key});
+     }
-             my $active=1;
+     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-             if ($starttime) {
+         my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname);
- 		if ($now<$starttime) { $active=0; }
+         if (!%roles) {
+             %roles = (
+                        cc => 1,
+                        in => 1,
+                        ep => 1,
+                        ta => 1,
+                        cr => 1,
+                        st => 1,
+              );
+         }
+         foreach my $entry (keys(%roleshash)) {
+             my ($trole,$tend,$tstart) = split(/_/,$roleshash{$entry});
+             if ($trole =~ /^cr/) {
+                 next if (!exists($roles{$trole}) && !exists($roles{'cr'}));
+             } else {
+                 next if (!exists($roles{$trole}));
+             }
+             if ($tend) {
+                 next if ($tend < $now);
              }
-             if ($endtime) {
+             if ($tstart) {
-                 if ($now>$endtime) { $active=0; }
+                 next if ($tstart > $now);
+             }
+             my ($cdom,$cnum,$sec,$cnumpart,$secpart,$role,$realsec);
+             (undef,$cdom,$cnumpart,$secpart) = split(/\//,$entry);
+             if ($secpart eq '') {
+                 ($cnum,$role) = split(/_/,$cnumpart);
+                 $sec = 'none';
+                 $realsec = '';
+             } else {
+                 $cnum = $cnumpart;
+                 ($sec,$role) = split(/_/,$secpart);
+                 $realsec = $sec;
+             }
+             $courses{$cdom.'_'.$cnum}{$sec} = $trole.'/'.$cdom.'/'.$cnum.'/'.$realsec;
+         }
+     } else {
+         foreach my $key (keys(%env)) {
+ 	    if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_courseid)/?(\w*)$} ||
+                  $key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_courseid)/?(\w*)$}) {
+ 	        my ($role,$cdom,$cnum,$sec) = ($1,$2,$3,$4);
+ 	        next if ($role eq 'ca' || $role eq 'aa');
+ 	        next if (%roles && !exists($roles{$role}));
+ 	        my ($starttime,$endtime)=split(/\./,$env{$key});
+                 my $active=1;
+                 if ($starttime) {
+ 		    if ($now<$starttime) { $active=0; }
+                 }
+                 if ($endtime) {
+                     if ($now>$endtime) { $active=0; }
+                 }
+                 if ($active) {
+                     if ($sec eq '') {
+                         $sec = 'none';
+                     }
+                     $courses{$cdom.'_'.$cnum}{$sec} =
+                                      $role.'/'.$cdom.'/'.$cnum.'/'.$sec;
+                 }
              }
-             if ($active) { $courses{$domain.'_'.$id}=1; }
          }
      }
-     return keys(%courses);
+     return %courses;
  }
  ###############################################
+ sub blockcheck {
+     my ($setters,$activity,$uname,$udom) = @_;
+     if (!defined($udom)) {
+         $udom = $env{'user.domain'};
+     }
+     if (!defined($uname)) {
+         $uname = $env{'user.name'};
+     }
+     # If uname and udom are for a course, check for blocks in the course.
+     if (&Apache::lonnet::is_course($udom,$uname)) {
+         my %records = &Apache::lonnet::dump('comm_block',$udom,$uname);
+         my ($startblock,$endblock)=&get_blocks($setters,$activity,$udom,$uname);
+         return ($startblock,$endblock);
+     }
+     my $startblock = 0;
+     my $endblock = 0;
+     my %live_courses = &findallcourses(undef,$uname,$udom);
+     # If uname is for a user, and activity is course-specific, i.e.,
+     # boards, chat or groups, check for blocking in current course only.
+     if (($activity eq 'boards' || $activity eq 'chat' ||
+          $activity eq 'groups') && ($env{'request.course.id'})) {
+         foreach my $key (keys(%live_courses)) {
+             if ($key ne $env{'request.course.id'}) {
+                 delete($live_courses{$key});
+             }
+         }
+     }
+     my $otheruser = 0;
+     my %own_courses;
+     if ((($uname ne $env{'user.name'})) || ($udom ne $env{'user.domain'})) {
+         # Resource belongs to user other than current user.
+         $otheruser = 1;
+         # Gather courses for current user
+         %own_courses =
+             &findallcourses(undef,$env{'user.name'},$env{'user.domain'});
+     }
+     # Gather active course roles - course coordinator, instructor,
+     # exam proctor, ta, student, or custom role.
+     foreach my $course (keys(%live_courses)) {
+         my ($cdom,$cnum);
+         if ((defined($env{'course.'.$course.'.domain'})) && (defined($env{'course.'.$course.'.num'}))) {
+             $cdom = $env{'course.'.$course.'.domain'};
+             $cnum = $env{'course.'.$course.'.num'};
+         } else {
+             ($cdom,$cnum) = split(/_/,$course);
+         }
+         my $no_ownblock = 0;
+         my $no_userblock = 0;
+         if ($otheruser) {
+             # Check if current user has 'evb' priv for this
+             if (defined($own_courses{$course})) {
+                 foreach my $sec (keys(%{$own_courses{$course}})) {
+                     my $checkrole = 'cm./'.$cdom.'/'.$cnum;
+                     if ($sec ne 'none') {
+                         $checkrole .= '/'.$sec;
+                     }
+                     if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) {
+                         $no_ownblock = 1;
+                         last;
+                     }
+                 }
+             }
+             # if they have 'evb' priv and are currently not playing student
+             next if (($no_ownblock) &&
+                  ($env{'request.role'} !~ m{^st\./$cdom/$cnum}));
+         }
+         foreach my $sec (keys(%{$live_courses{$course}})) {
+             my $checkrole = 'cm./'.$cdom.'/'.$cnum;
+             if ($sec ne 'none') {
+                 $checkrole .= '/'.$sec;
+             }
+             if ($otheruser) {
+                 # Resource belongs to user other than current user.
+                 # Assemble privs for that user, and check for 'evb' priv.
+                 my ($trole,$tdom,$tnum,$tsec);
+                 my $entry = $live_courses{$course}{$sec};
+                 if ($entry =~ /^cr/) {
+                     ($trole,$tdom,$tnum,$tsec) =
+                       ($entry =~ m|^(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)/?(\w*)$|);
+                 } else {
+                     ($trole,$tdom,$tnum,$tsec) = split(/\//,$entry);
+                 }
+                 my ($spec,$area,$trest,%allroles,%userroles);
+                 $area = '/'.$tdom.'/'.$tnum;
+                 $trest = $tnum;
+                 if ($tsec ne '') {
+                     $area .= '/'.$tsec;
+                     $trest .= '/'.$tsec;
+                 }
+                 $spec = $trole.'.'.$area;
+                 if ($trole =~ /^cr/) {
+                     &Apache::lonnet::custom_roleprivs(\%allroles,$trole,
+                                                       $tdom,$spec,$trest,$area);
+                 } else {
+                     &Apache::lonnet::standard_roleprivs(\%allroles,$trole,
+                                                        $tdom,$spec,$trest,$area);
+                 }
+                 my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles);
+                 if ($userroles{'user.priv.'.$checkrole} =~ /evb\&([^\:]*)/) {
+                     if ($1) {
+                         $no_userblock = 1;
+                         last;
+                     }
+                 }
+             } else {
+                 # Resource belongs to current user
+                 # Check for 'evb' priv via lonnet::allowed().
+                 if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) {
+                     $no_ownblock = 1;
+                     last;
+                 }
+             }
+         }
+         # if they have the evb priv and are currently not playing student
+         next if (($no_ownblock) &&
+                  ($env{'request.role'} !~ m{^st\./\Q$cdom\E/\Q$cnum\E}));
+         next if ($no_userblock);
+         # Retrieve blocking times and identity of blocker for course
+         # of specified user, unless user has 'evb' privilege.
+         my ($start,$end)=&get_blocks($setters,$activity,$cdom,$cnum);
+         if (($start != 0) &&
+             (($startblock == 0) || ($startblock > $start))) {
+             $startblock = $start;
+         }
+         if (($end != 0)  &&
+             (($endblock == 0) || ($endblock < $end))) {
+             $endblock = $end;
+         }
+     }
+     return ($startblock,$endblock);
+ }
+ sub get_blocks {
+     my ($setters,$activity,$cdom,$cnum) = @_;
+     my $startblock = 0;
+     my $endblock = 0;
+     my $course = $cdom.'_'.$cnum;
+     $setters->{$course} = {};
+     $setters->{$course}{'staff'} = [];
+     $setters->{$course}{'times'} = [];
+     my %records = &Apache::lonnet::dump('comm_block',$cdom,$cnum);
+     foreach my $record (keys(%records)) {
+         my ($start,$end) = ($record =~ m/^(\d+)____(\d+)$/);
+         if ($start <= time && $end >= time) {
+             my ($staff_name,$staff_dom,$title,$blocks) =
+                 &parse_block_record($records{$record});
+             if ($blocks->{$activity} eq 'on') {
+                 push(@{$$setters{$course}{'staff'}},[$staff_name,$staff_dom]);
+                 push(@{$$setters{$course}{'times'}}, [$start,$end]);
+                 if ( ($startblock == 0) || ($startblock > $start) ) {
+                     $startblock = $start;
+                 }
+                 if ( ($endblock == 0) || ($endblock < $end) ) {
+                     $endblock = $end;
+                 }
+             }
+         }
+     }
+     return ($startblock,$endblock);
+ }
+ sub parse_block_record {
+     my ($record) = @_;
+     my ($setuname,$setudom,$title,$blocks);
+     if (ref($record) eq 'HASH') {
+         ($setuname,$setudom) = split(/:/,$record->{'setter'});
+         $title = &unescape($record->{'event'});
+         $blocks = $record->{'blocks'};
+     } else {
+         my @data = split(/:/,$record,3);
+         if (scalar(@data) eq 2) {
+             $title = $data[1];
+             ($setuname,$setudom) = split(/@/,$data[0]);
+         } else {
+             ($setuname,$setudom,$title) = @data;
+         }
+         $blocks = { 'com' => 'on' };
+     }
+     return ($setuname,$setudom,$title,$blocks);
+ }
+ sub build_block_table {
+     my ($startblock,$endblock,$setters) = @_;
+     my %lt = &Apache::lonlocal::texthash(
+         'cacb' => 'Currently active communication blocks',
+         'cour' => 'Course',
+         'dura' => 'Duration',
+         'blse' => 'Block set by'
+     );
+     my $output;
+     $output = '<br />'.$lt{'cacb'}.':<br />';
+     $output .= &start_data_table();
+     $output .= '
+ <tr>
+  <th>'.$lt{'cour'}.'</th>
+  <th>'.$lt{'dura'}.'</th>
+  <th>'.$lt{'blse'}.'</th>
+ </tr>
+ ';
+     foreach my $course (keys(%{$setters})) {
+         my %courseinfo=&Apache::lonnet::coursedescription($course);
+         for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
+             my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
+             my $fullname = &plainname($uname,$udom);
+             if (defined($env{'user.name'}) && defined($env{'user.domain'})
+                 && $env{'user.name'} ne 'public'
+                 && $env{'user.domain'} ne 'public') {
+                 $fullname = &aboutmewrapper($fullname,$uname,$udom);
+             }
+             my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
+             $openblock = &Apache::lonlocal::locallocaltime($openblock);
+             $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
+             $output .= &Apache::loncommon::start_data_table_row().
+                        '<td>'.$courseinfo{'description'}.'</td>'.
+                        '<td>'.$openblock.' to '.$closeblock.'</td>'.
+                        '<td>'.$fullname.'</td>'.
+                         &Apache::loncommon::end_data_table_row();
+         }
+     }
+     $output .= &end_data_table();
+ }
+ sub blocking_status {
+     my ($activity,$uname,$udom) = @_;
+     my %setters;
+     my ($blocked,$output,$ownitem,$is_course);
+     my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
+     if ($startblock && $endblock) {
+         $blocked = 1;
+         if (wantarray) {
+             my $category;
+             if ($activity eq 'boards') {
+                 $category = 'Discussion posts in this course';
+             } elsif ($activity eq 'blogs') {
+                 $category = 'Blogs';
+             } elsif ($activity eq 'port') {
+                 if (defined($uname) && defined($udom)) {
+                     if ($uname eq $env{'user.name'} &&
+                         $udom eq $env{'user.domain'}) {
+                         $ownitem = 1;
+                     }
+                 }
+                 $is_course = &Apache::lonnet::is_course($udom,$uname);
+                 if ($ownitem) {
+                     $category = 'Your portfolio files';
+                 } elsif ($is_course) {
+                     my $coursedesc;
+                     foreach my $course (keys(%setters)) {
+                         my %courseinfo =
+                              &Apache::lonnet::coursedescription($course);
+                         $coursedesc = $courseinfo{'description'};
+                     }
+                     $category = "Group files in the course '$coursedesc'";
+                 } else {
+                     $category = 'Portfolio files belonging to ';
+                     if ($env{'user.name'} eq 'public' &&
+                         $env{'user.domain'} eq 'public') {
+                         $category .= &plainname($uname,$udom);
+                     } else {
+                         $category .= &aboutmewrapper(&plainname($uname,$udom),$uname,$udom);
+                     }
+                 }
+             } elsif ($activity eq 'groups') {
+                 $category = 'Groups in this course';
+             }
+             my $showstart = &Apache::lonlocal::locallocaltime($startblock);
+             my $showend = &Apache::lonlocal::locallocaltime($endblock);
+             $output = '<br />'.&mt('[_1] will be inaccessible between [_2] and [_3] because communication is being blocked.',$category,$showstart,$showend).'<br />';
+             if (!($activity eq 'port' && !($ownitem) && !($is_course))) {
+                 $output .= &build_block_table($startblock,$endblock,\%setters);
+             }
+         }
+     }
+     if (wantarray) {
+         return ($blocked,$output);
+     } else {
+         return $blocked;
+     }
+ }
  ###############################################
  =pod
- Line 2669  sub determinedomain {
+ Line 3176  sub determinedomain {
      return $domain;
  }
  ###############################################
+ sub devalidate_domconfig_cache {
+     my ($udom)=@_;
+     &Apache::lonnet::devalidate_cache_new('domainconfig',$udom);
+ }
+ # ---------------------- Get domain configuration for a domain
+ sub get_domainconf {
+     my ($udom) = @_;
+     my $cachetime=1800;
+     my ($result,$cached)=&Apache::lonnet::is_cached_new('domainconfig',$udom);
+     if (defined($cached)) { return %{$result}; }
+     my %domconfig = &Apache::lonnet::get_dom('configuration',
+ 					     ['login','rolecolors'],$udom);
+     my %designhash;
+     if (keys(%domconfig) > 0) {
+         if (ref($domconfig{'login'}) eq 'HASH') {
+             foreach my $key (keys(%{$domconfig{'login'}})) {
+                 $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+             }
+         }
+         if (ref($domconfig{'rolecolors'}) eq 'HASH') {
+             foreach my $role (keys(%{$domconfig{'rolecolors'}})) {
+                 if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') {
+                     foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) {
+                         $designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item};
+                     }
+                 }
+             }
+         }
+     } else {
+         my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
+         my $designfile =  $designdir.'/'.$udom.'.tab';
+         if (-e $designfile) {
+             if ( open (my $fh,"<$designfile") ) {
+                 while (my $line = <$fh>) {
+                     next if ($line =~ /^\#/);
+                     chomp($line);
+                     my ($key,$val)=(split(/\=/,$line));
+                     if ($val) { $designhash{$udom.'.'.$key}=$val; }
+                 }
+                 close($fh);
+             }
+         }
+         if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') {
+             $designhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif";
+         }
+     }
+     &Apache::lonnet::do_cache_new('domainconfig',$udom,\%designhash,
+ 				  $cachetime);
+     return %designhash;
+ }
  =pod
  =item * &domainlogo()
- Line 2682  If the domain logo does not exist, a des
+ Line 3243  If the domain logo does not exist, a des
  ###############################################
  sub domainlogo {
      my $domain = &determinedomain(shift);
-      # See if there is a logo
+     my %designhash = &get_domainconf($domain);
-     if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') {
+     # See if there is a logo
- 	my $logo=&lonhttpdurl("/adm/lonDomLogos/$domain.gif");
+     if ($designhash{$domain.'.login.domlogo'} ne '') {
-         return '<img src="'.$logo.'" alt="'.$domain.'" />';
+         my $imgsrc = $designhash{$domain.'.login.domlogo'};
-     } elsif(exists($Apache::lonnet::domaindescription{$domain})) {
+         if ($imgsrc =~ /^\/(adm|res)/) {
-         return $Apache::lonnet::domaindescription{$domain};
+             $imgsrc = &lonhttpdurl($imgsrc);
+         }
+         return '<img src="'.$imgsrc.'" alt="'.$domain.'" />';
+     } elsif (defined(&Apache::lonnet::domain($domain,'description'))) {
+         return &Apache::lonnet::domain($domain,'description');
      } else {
          return '';
      }
- Line 2705  Returns: value of designparamter $which
+ Line 3270  Returns: value of designparamter $which
  =cut
  ##############################################
  sub designparm {
      my ($which,$domain)=@_;
- Line 2719  sub designparm {
+ Line 3285  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}) {
+     my %domdesign = &get_domainconf($domain);
- 	return $designhash{$domain.'.'.$which};
+     my $output;
+     if ($domdesign{$domain.'.'.$which} ne '') {
+ 	$output = $domdesign{$domain.'.'.$which};
      } else {
-         return $designhash{'default.'.$which};
+         $output = $defaultdesign{$which};
+     }
+     if (($which =~ /^(student|coordinator|author|admin)\.img$/) ||
+         ($which =~ /login\.(img|logo|domlogo)/)) {
+         if ($output =~ /^\/(adm|res)\//) {
+             $output = &lonhttpdurl($output);
+         }
      }
+     return $output;
  }
  ###############################################
- Line 2776  Inputs:
+ Line 3351  Inputs:
  =item * $no_inline_link, if true and in remote mode, don't show the
           'Switch To Inline Menu' link
+ =item * $args, optional argument valid values are
+             no_auto_mt_title -> prevents &mt()ing the title arg
  =back
- Line 2788  other decorations will be returned.
+ Line 3365  other decorations will be returned.
  sub bodytag {
      my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
- 	$notopbar,$bgcolor,$notitle,$no_inline_link)=@_;
+ 	$notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_;
-     $title=&mt($title);
+     if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
      $function = &get_users_function() if (!$function);
      my $img =    &designparm($function.'.img',$domain);
- Line 2803  sub bodytag {
+ Line 3380  sub bodytag {
                     'alink'   => &designparm($function.'.alink',$domain),
  		   'vlink'   => &designparm($function.'.vlink',$domain),
  		   'link'    => &designparm($function.'.link',$domain),);
-     @$addentries{keys(%design)} = @design{keys(%design)};
+     @design{keys(%$addentries)} = @$addentries{keys(%$addentries)};
   # role and realm
-     my ($role,$realm) =
+     my ($role,$realm) = split(/\./,$env{'request.role'},2);
- 	&Apache::lonnet::plaintext((split(/\./,$env{'request.role'}))[0]);
+     if ($role  eq 'ca') {
+         my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$});
+         $realm = &plainname($rname,$rdom);
+     }
  # realm
      if ($env{'request.course.id'}) {
+         if ($env{'request.role'} !~ /^cr/) {
+             $role = &Apache::lonnet::plaintext($role,&course_type());
+         }
  	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
+     } else {
+         $role = &Apache::lonnet::plaintext($role);
      }
      if (!$realm) { $realm='&nbsp;'; }
  # Set messages
      my $messages=&domainlogo($domain);
- Line 2819  sub bodytag {
+ Line 3405  sub bodytag {
      my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
      if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
-     my $extra_body_attr = &make_attr_string($forcereg,$addentries);
+     my $extra_body_attr = &make_attr_string($forcereg,\%design);
  # construct main body tag
      my $bodytag = "<body $extra_body_attr>".
- Line 2839  sub bodytag {
+ Line 3425  sub bodytag {
  	return $bodytag;
      }
+     my $name = &plainname($env{'user.name'},$env{'user.domain'});
+     if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+ 	undef($role);
+     } else {
+ 	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
+     }
      my $roleinfo=(<<ENDROLE);
  <td class="LC_title_bar_who">
  <div class="LC_title_bar_name">
-     $env{'environment.firstname'}
+     $name
-     $env{'environment.middlename'}
-     $env{'environment.lastname'}
-     $env{'environment.generation'}
      &nbsp;
  </div>
  <div class="LC_title_bar_role">
- Line 2871  ENDROLE
+ Line 3459  ENDROLE
                                   '.domain'}.'/'})) {
          my $cid = $env{'request.course.id'};
          $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
+         $dc_info =~ s/\s+$//;
          $dc_info = '('.$dc_info.')';
      }
- Line 2897  ENDROLE
+ Line 3486  ENDROLE
  		$lastitem = $thisdisfn;
  	    }
  	    $titleinfo =
- 		&Apache::loncommon::help_open_menu('','','','',3,'Authoring').
+ 		&Apache::loncommon::help_open_menu('','',3,'Authoring').
  		'<b>Construction Space</b>:&nbsp;'.
  		'<form name="dirs" method="post" action="'.$formaction
  		.'" target="_top"><tt><b>'
- Line 2932  ENDROLE
+ Line 3521  ENDROLE
  # Top frame rendering, Remote is up
  #
-     my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
+     my $imgsrc = $img;
-         $lonhttpdPort.$img.'" alt="'.$function.'" />';
+     if ($img =~ /^\/adm/) {
+         $imgsrc = 'http://'.$ENV{'HTTP_HOST'}.':'.$lonhttpdPort.$img;
+     }
+     my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
      # Explicit link to get inline menu
      my $menu= ($no_inline_link?''
- Line 2945  ENDROLE
+ Line 3537  ENDROLE
      return(<<ENDBODY);
  $bodytag
  <table id="LC_title_bar" class="LC_with_remote">
- <tr><td>$upperleft</td>
+ <tr><td class="LC_title_bar_role_logo">$upperleft</td>
      <td class="LC_title_bar_domain_logo">$messages&nbsp;</td>
  </tr>
  <tr><td>$titleinfo $dc_info $menu</td>
  $roleinfo
+ </tr>
  </table>
  ENDBODY
  }
- Line 3068  sub standard_css {
+ Line 3661  sub standard_css {
      my $tabbg  = &designparm($function.'.tabbg', $domain);
      my $font   = &designparm($function.'.font',  $domain);
      my $sidebg = &designparm($function.'.sidebg',$domain);
-     my $pgbg   = $bgcolor ||
+     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_dark      = '#DDDDDD';
+     my $data_table_darker    = '#CCCCCC';
      my $data_table_highlight = '#FFFF00';
      my $mail_new             = '#FFBB77';
      my $mail_new_hover       = '#DD9955';
- Line 3087  sub standard_css {
+ Line 3684  sub standard_css {
      my $mail_replied_hover   = '#888855';
      my $mail_other           = '#99BBBB';
      my $mail_other_hover     = '#669999';
+     my $table_header         = '#DDDDDD';
+     my $feedback_link_bg     = '#BBBBBB';
+     my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'
+ 	                                              : '0px 3px 0px 4px';
      return <<END;
  h1, h2, h3, th { font-family: $sans }
  a:focus { color: red; background: yellow }
- table.thinborder { border-collapse: collapse; }
+ table.thinborder,
- table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}
+ table.LC_optres_prior {
+   border-collapse: collapse;
+ }
+ table.thinborder tr th {
+   border-style: solid;
+   border-width: 1px;
+   background: $tabbg;
+ }
+ table.thinborder tr td,
+ table.LC_optres_prior tr td {
+   border-style: solid;
+   border-width: 1px
+ }
  form, .inline { display: inline; }
  .center { text-align: center; }
- .filename {font-family: monospace;}
+ .LC_filename {font-family: $mono;}
  .LC_error {
    color: red;
    font-size: larger;
  }
- .LC_success {
+ .LC_warning,
+ .LC_diff_removed {
+   color: red;
+ }
+ .LC_success,
+ .LC_diff_added {
    color: green;
  }
+ .LC_icon {
+   border: 0px;
+ }
- table#LC_top_nav, table#LC_menubuttons, table#LC_nav_location, table#LC_breadcrumbs {
+ table.LC_pastsubmission {
+   border: 1px solid black;
+   margin: 2px;
+ }
+ table#LC_top_nav, table#LC_menubuttons {
    width: 100%;
    background: $pgbg;
-   border: 0px;
+   border: 2px;
-   border-spacing: 2px 1px;
-   padding: 0px;
-   margin: 0px;
    border-collapse: separate;
+   padding: 0px;
  }
- table#LC_title_bar {
+ table#LC_title_bar, table.LC_breadcrumbs, table#LC_nav_location,
+ table#LC_title_bar.LC_with_remote {
    width: 100%;
-   border: 0;
+   border-color: $pgbg;
-   border-spacing: 0px 1px;
+   border-style: solid;
+   border-width: $border;
    background: $pgbg;
    font-family: $sans;
    border-collapse: collapse;
+   padding: 0px;
  }
- table#LC_title_bar.LC_with_remote {
+ table.LC_docs_path {
    width: 100%;
    border: 0;
-   border-spacing: 0;
    background: $pgbg;
    font-family: $sans;
    border-collapse: collapse;
+   padding: 0px;
  }
  table#LC_title_bar td {
-   padding: 3px;
    background: $tabbg;
  }
  table#LC_title_bar td.LC_title_bar_who {
    background: $tabbg;
    color: $font;
-   font: medium $sans;
+   font: small $sans;
    text-align: right;
  }
+ span.LC_metadata {
+     font-family: $sans;
+ }
  span.LC_title_bar_title {
-   font: bold xx-large $sans;
+   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;
+   padding: 0px 1px;
    margin: 0px;
    border-collapse: separate;
  }
- Line 3160  table#LC_menubuttons img, table#LC_menub
+ Line 3800  table#LC_menubuttons img, table#LC_menub
  }
  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;
- Line 3167  table#LC_top_nav td a, div#LC_top_nav a
+ Line 3809  table#LC_top_nav td a, div#LC_top_nav a
  }
  table#LC_top_nav td.LC_top_nav_logo {
    background: $tabbg;
-   text-align: right;
+   text-align: left;
+   white-space: nowrap;
+   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_breadcrumbs td {
+ 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_breadcrumb_component {
+ 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;
  }
+ .LC_menu_category {
+   color: $font;
+   font-family: $sans;
+   font-size: larger;
+   font-weight: bold;
+ }
  td.LC_menubuttons_text {
    color: $font;
    font-family: $sans;
- Line 3204  td.LC_menubuttons_img {
+ Line 3872  td.LC_menubuttons_img {
    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: seperate;
+   border-collapse: separate;
+   border-spacing: 1px;
+ }
+ .LC_data_table_dense {
+   font-size: small;
+ }
+ table.LC_nested_outer {
+   border: 1px solid #000000;
+   border-collapse: separate;
+   border-spacing: 0px;
+   width: 100%;
+ }
+ table.LC_nested {
+   border: 0px;
+   border-collapse: separate;
+   border-spacing: 0px;
+   width: 100%;
  }
  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_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_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_empty td {
+ 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_nested tr.LC_empty_row td {
    background-color: #FFFFFF;
+   font-weight: bold;
+   font-style: italic;
+   text-align: center;
+   padding: 8px;
+ }
+ table.LC_nested tr.LC_empty_row td {
+   padding: 4ex
+ }
+ table.LC_nested_outer tr th {
+   font-weight: bold;
+   background-color: $data_table_head;
+   font-size: smaller;
+   border-bottom: 1px solid #000000;
+ }
+ table.LC_nested_outer tr td.LC_subheader {
+   background-color: $data_table_head;
+   font-weight: bold;
+   font-size: small;
+   border-bottom: 1px solid #000000;
+   text-align: right;
+ }
+ table.LC_nested tr.LC_info_row td {
+   background-color: #CCC;
+   font-weight: bold;
+   font-size: small;
+   text-align: center;
+ }
+ table.LC_nested tr.LC_info_row td.LC_left_item {
+   text-align: left;
+ }
+ table.LC_nested td {
+   background-color: #FFF;
+   font-size: small;
+ }
+ table.LC_nested_outer tr th.LC_right_item,
+ table.LC_nested tr.LC_info_row td.LC_right_item,
+ table.LC_nested tr.LC_odd_row td.LC_right_item,
+ table.LC_nested tr td.LC_right_item {
+   text-align: right;
+ }
+ table.LC_nested tr.LC_odd_row td {
+   background-color: #EEE;
+ }
+ table.LC_createuser {
+ }
+ table.LC_createuser tr.LC_section_row td {
+   font-size: smaller;
+ }
+ table.LC_createuser tr.LC_info_row td  {
+   background-color: #CCC;
+   font-weight: bold;
+   text-align: center;
  }
  table.LC_calendar {
- Line 3264  table.LC_mail_list tr.LC_mail_other {
+ Line 4017  table.LC_mail_list tr.LC_mail_other {
  table.LC_mail_list tr.LC_mail_other:hover {
    background-color: $mail_other_hover;
  }
+ table.LC_mail_list tr.LC_mail_even {
+ }
+ table.LC_mail_list tr.LC_mail_odd {
+ }
+ table#LC_portfolio_actions {
+   width: auto;
+   background: $pgbg;
+   border: 0px;
+   border-spacing: 2px 2px;
+   padding: 0px;
+   margin: 0px;
+   border-collapse: separate;
+ }
+ table#LC_portfolio_actions td.LC_label {
+   background: $tabbg;
+   text-align: right;
+ }
+ table#LC_portfolio_actions td.LC_value {
+   background: $tabbg;
+ }
+ table#LC_cstr_controls {
+   width: 100%;
+   border-collapse: collapse;
+ }
+ table#LC_cstr_controls tr td {
+   border: 4px solid $pgbg;
+   padding: 4px;
+   text-align: center;
+   background: $tabbg;
+ }
+ table#LC_cstr_controls tr th {
+   border: 4px solid $pgbg;
+   background: $table_header;
+   text-align: center;
+   font-family: $sans;
+   font-size: smaller;
+ }
+ table#LC_browser {
+ }
+ table#LC_browser tr th {
+   background: $table_header;
+ }
+ table#LC_browser tr td {
+   padding: 2px;
+ }
+ table#LC_browser tr.LC_browser_file,
+ table#LC_browser tr.LC_browser_file_published {
+   background: #CCFF88;
+ }
+ table#LC_browser tr.LC_browser_file_locked,
+ table#LC_browser tr.LC_browser_file_unpublished {
+   background: #FFAA99;
+ }
+ table#LC_browser tr.LC_browser_file_obsolete {
+   background: #AAAAAA;
+ }
+ table#LC_browser tr.LC_browser_file_modified,
+ table#LC_browser tr.LC_browser_file_metamodified {
+   background: #FFFF77;
+ }
+ table#LC_browser tr.LC_browser_folder {
+   background: #CCCCFF;
+ }
+ span.LC_current_location {
+   font-size: x-large;
+   background: $pgbg;
+ }
+ span.LC_parm_menu_item {
+   font-size: larger;
+   font-family: $sans;
+ }
+ span.LC_parm_scope_all {
+   color: red;
+ }
+ span.LC_parm_scope_folder {
+   color: green;
+ }
+ span.LC_parm_scope_resource {
+   color: orange;
+ }
+ span.LC_parm_part {
+   color: blue;
+ }
+ span.LC_parm_folder, span.LC_parm_symb {
+   font-size: x-small;
+   font-family: $mono;
+   color: #AAAAAA;
+ }
+ td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu,
+ td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+   border: 1px solid black;
+   border-collapse: collapse;
+ }
+ table.LC_parm_overview_restrictions td {
+   border-width: 1px 4px 1px 4px;
+   border-style: solid;
+   border-color: $pgbg;
+   text-align: center;
+ }
+ table.LC_parm_overview_restrictions th {
+   background: $tabbg;
+   border-width: 1px 4px 1px 4px;
+   border-style: solid;
+   border-color: $pgbg;
+ }
+ table#LC_helpmenu {
+   border: 0px;
+   height: 55px;
+   border-spacing: 0px;
+ }
+ table#LC_helpmenu fieldset legend {
+   font-size: larger;
+   font-weight: bold;
+ }
+ table#LC_helpmenu_links {
+   width: 100%;
+   border: 1px solid black;
+   background: $pgbg;
+   padding: 0px;
+   border-spacing: 1px;
+ }
+ table#LC_helpmenu_links tr td {
+   padding: 1px;
+   background: $tabbg;
+   text-align: center;
+   font-weight: bold;
+ }
+ table#LC_helpmenu_links a:link, table#LC_helpmenu_links a:visited,
+ table#LC_helpmenu_links a:active {
+   text-decoration: none;
+   color: $font;
+ }
+ table#LC_helpmenu_links a:hover {
+   text-decoration: underline;
+   color: $vlink;
+ }
+ .LC_chrt_popup_exists {
+   border: 1px solid #339933;
+   margin: -1px;
+ }
+ .LC_chrt_popup_up {
+   border: 1px solid yellow;
+   margin: -1px;
+ }
+ .LC_chrt_popup {
+   border: 1px solid #8888FF;
+   background: #CCCCFF;
+ }
+ table.LC_pick_box {
+   width: 100%;
+   border-collapse: separate;
+   background: white;
+   border: 1px solid black;
+   border-spacing: 1px;
+ }
+ table.LC_pick_box td.LC_pick_box_title {
+   background: $tabbg;
+   font-weight: bold;
+   text-align: right;
+   width: 184px;
+   padding: 8px;
+ }
+ table.LC_pick_box td.LC_pick_box_separator {
+   padding: 0px;
+   height: 1px;
+   background: black;
+ }
+ table.LC_pick_box td.LC_pick_box_submit {
+   text-align: right;
+ }
+ table.LC_group_priv_box {
+   background: white;
+   border: 1px solid black;
+   border-spacing: 1px;
+ }
+ table.LC_group_priv_box td.LC_pick_box_title {
+   background: $tabbg;
+   font-weight: bold;
+   text-align: right;
+   width: 184px;
+ }
+ table.LC_group_priv_box td.LC_groups_fixed {
+   background: $data_table_light;
+   text-align: center;
+ }
+ table.LC_group_priv_box td.LC_groups_optional {
+   background: $data_table_dark;
+   text-align: center;
+ }
+ table.LC_group_priv_box td.LC_groups_functionality {
+   background: $data_table_darker;
+   text-align: center;
+   font-weight: bold;
+ }
+ table.LC_group_priv td {
+   text-align: left;
+   padding: 0px;
+ }
+ table.LC_notify_front_page {
+   background: white;
+   border: 1px solid black;
+   padding: 8px;
+ }
+ table.LC_notify_front_page td {
+   padding: 8px;
+ }
+ .LC_navbuttons {
+   margin: 2ex 0ex 2ex 0ex;
+ }
+ .LC_topic_bar {
+   font-family: $sans;
+   font-weight: bold;
+   width: 100%;
+   background: $tabbg;
+   vertical-align: middle;
+   margin: 2ex 0ex 2ex 0ex;
+ }
+ .LC_topic_bar span {
+   vertical-align: middle;
+ }
+ .LC_topic_bar img {
+   vertical-align: bottom;
+ }
+ table.LC_course_group_status {
+   margin: 20px;
+ }
+ table.LC_status_selector td {
+   vertical-align: top;
+   text-align: center;
+   padding: 4px;
+ }
+ table.LC_descriptive_input td.LC_description {
+   vertical-align: top;
+   text-align: right;
+   font-weight: bold;
+ }
+ table.LC_feedback_link {
+     background: $feedback_link_bg;
+ }
+ span.LC_feedback_link {
+     background: $feedback_link_bg;
+     font-size: larger;
+ }
+ table.LC_prior_tries {
+     border-width: 1px;
+     border-style: solid;
+     border-color: gray;
+     border-collapse: collapse;
+ }
+ table.LC_prior_tries th,
+ table.LC_prior_tries td {
+     border-width: 1px;
+     border-style: solid;
+     border-color: gray;
+     padding: 3px;
+ }
+ table.LC_prior_tries tr.LC_correct {
+     font-weight: bold;
+     background: #aaffaa;
+ }
+ span.LC_prior_numerical {
+     font-family: monospace;
+     white-space: pre;
+ }
+ span.LC_nobreak {
+     white-space: nowrap;
+ }
  END
  }
- Line 3280  Inputs: $title - optional title for the
+ Line 4316  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 seconds before redirect occurs
+             redirect       -> array ref of
-                                     url to redirect to
+- 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)
- Line 3289  Inputs: $title - optional title for the
+ Line 4327  Inputs: $title - optional title for the
                                 domain
              function       -> force usage of a specific rolish color scheme
              bgcolor        -> override the default page bgcolor
+             no_auto_mt_title
+                            -> prevent &mt()ing the title arg
  =back
- Line 3301  sub headtag {
+ Line 4341  sub headtag {
      my $domain   = $args->{'domain'}   || &determinedomain();
      my $bgcolor  = $args->{'bgcolor'}  || &designparm($function.'.pgbg',$domain);
      my $url = join(':',$env{'user.name'},$env{'user.domain'},
+ 		   $Apache::lonnet::perlvar{'lonVersion'},
+ 		   #time(),
  		   $env{'environment.color.timestamp'},
  		   $function,$domain,$bgcolor);
-     $url = '/adm/css/'.&Apache::lonnet::escape($url).'.css';
+     $url = '/adm/css/'.&escape($url).'.css';
      my $result =
  	'<head>'.
- 	'<link rel="stylesheet" type="text/css" href="'.$url.'" />'.
+ 	&font_settings();
- 	&font_settings().
- 	&Apache::lonhtmlcommon::htmlareaheaders();
+     if (!$args->{'frameset'}) {
+ 	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
+     }
      if ($args->{'force_register'}) {
  	$result .= &Apache::lonmenu::registerurl(1);
      }
+     if (!$args->{'no_nav_bar'}
+ 	&& !$args->{'only_body'}
+ 	&& !$args->{'frameset'}) {
+ 	$result .= &help_menu_js();
+     }
      if (ref($args->{'redirect'})) {
- 	my ($time,$url) = @{$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" />
- Line 3328  ADDMETA
+ Line 4378  ADDMETA
      if (!defined($title)) {
  	$title = 'The LearningOnline Network with CAPA';
      }
+     if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
-     $result .= '<title> LON-CAPA '.&mt($title).'</title>'.$head_extra;
+     $result .= '<title> LON-CAPA '.$title.'</title>'
+ 	.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'
+ 	.$head_extra;
      return $result;
  }
- Line 3421  Returns a uniform complete <head>..</hea
+ Line 4473  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 3470  Inputs: $title - optional title for the
+ Line 4523  Inputs: $title - optional title for the
                    no_inline_link -> if true and in remote mode, don't show the
                                      'Switch To Inline Menu' link
+                   no_auto_mt_title -> prevent &mt()ing the title arg
  =back
  =cut
- Line 3479  sub start_page {
+ Line 4534  sub start_page {
      #&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
      my %head_args;
      foreach my $arg ('redirect','force_register','domain','function',
- 		     'bgcolor') {
+ 		     'bgcolor','frameset','no_nav_bar','only_body',
+ 		     'no_auto_mt_title') {
  	if (defined($args->{$arg})) {
  	    $head_args{$arg} = $args->{$arg};
  	}
- Line 3505  sub start_page {
+ Line 4561  sub start_page {
  			 $args->{'only_body'},      $args->{'domain'},
  			 $args->{'force_register'}, $args->{'body_title'},
  			 $args->{'no_nav_bar'},     $args->{'bgcolor'},
- 			 $args->{'no_title'},       $args->{'no_inline_link'});
+ 			 $args->{'no_title'},       $args->{'no_inline_link'},
+ 			 $args);
  	}
      }
- Line 3534  Inputs:         $args - additional optio
+ Line 4591  Inputs:         $args - additional optio
                                   a html attribute
                   frameset     -> if true will start with a <frameset>
                                   rather than <body>
- =back
+                  dicsussion   -> if true will get discussion from
+                                   lonxml::xmlend
+                                  (you can pass the target and parser arguments
+                                   through optional 'target' and 'parser' args
+                                   to this routine)
  =cut
  sub end_page {
      my ($args) = @_;
-     #&Apache::lonnet::logthis("end_page ".join(':',caller(0)));
      $env{'internal.end_page'}++;
      my $result;
      if ($args->{'discussion'}) {
- Line 3583  sub js_ready {
+ Line 4643  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 3629  sub simple_error_page {
+ Line 4689  sub simple_error_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="LC_data_table">';
+ 	return '<table class="'.$css_class.'">'."\n";
      }
      sub end_data_table {
  	undef($row_count);
- 	return '</table>';
+ 	return '</table>'."\n";;
      }
      sub start_data_table_row {
+ 	my ($add_class) = @_;
  	$row_count++;
- 	return  '<tr '.(($row_count % 2)?'':'class="LC_even_row"').'>';
+ 	my $css_class = ($row_count % 2)?'':'LC_even_row';
+ 	$css_class = (join(' ',$css_class,$add_class));
+ 	return  '<tr class="'.$css_class.'">'."\n";;
+     }
+     sub continue_data_table_row {
+ 	my ($add_class) = @_;
+ 	my $css_class = ($row_count % 2)?'':'LC_even_row';
+ 	$css_class = (join(' ',$css_class,$add_class));
+ 	return  '<tr class="'.$css_class.'">'."\n";;
      }
      sub end_data_table_row {
- 	return '</tr>';
+ 	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";;
      }
  }
- Line 3652  sub simple_error_page {
+ Line 4741  sub simple_error_page {
  =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 3681  sub get_users_function {
+ Line 4768  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 3696  role status: active, previous or future.
+ Line 4783  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 3735  sub check_user_status {
+ Line 4824  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));
+         $cdom = $env{'course.'.$cid.'.domain'};
+         $cnum = $env{'course.'.$cid.'.num'};
+     }
+     my %sectioncount;
+     my $now = time;
-     if (!defined($possible_roles) || (grep/^st$/,@$possible_roles)) {
+     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 3773  sub get_sections {
+ Line 4894  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;
+         }
- }
+         if (!defined($possible_status)) {
+             $sectioncount{$section}++;
- ###############################################
+         } else {
+             if ((!$end || $end >= $now) && (!$start || $start <= $now)) {
- =pod
+                 $status = 'active';
+             } elsif ($end < $now) {
- =item coursegroups
+                 $status = 'future';
+             } elsif ($start > $now) {
- Retrieve information about groups in a course,
+                 $status = 'previous';
- 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 ($cdom,$cnum,$group) = @_;
-     if (!defined($cdom) || !defined($cnum)) {
-         my $cid =  $env{'request.course.id'};
- 	return if (!defined($cid));
-         $cdom = $env{'course.'.$cid.'.domain'};
-         $cnum = $env{'course.'.$cid.'.num'};
-     }
-     my %curr_groups = &Apache::lonnet::get_coursegroups($cdom,$cnum,$group);
-     my ($tmp) = keys(%curr_groups);
-     if ($tmp=~/^(con_lost|no_such_host|error: [^2] )/) {
- 	undef(%curr_groups);
- 	&logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.$cdom);
-     } elsif ($tmp=~/^error: 2 /) {
- 	undef(%curr_groups);
-     }
-     return %curr_groups;
- }
- ###############################################
- =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 3960  Entries for end, start, section and stat
+ Line 4951  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 3981  sub get_course_users {
+ Line 4973  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 4005  sub get_course_users {
+ Line 5013  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);
+         my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
-         foreach my $person (@coursepersonnel) {
+         my $now = time;
+         foreach my $person (sort(keys(%coursepersonnel))) {
              my $match = 0;
-             my ($role,$user) = ($person =~ /^([^:]*):([^:]+:[^:]+)/);
+             my $secmatch = 0;
+             my $status;
+             my ($role,$user,$usec) = ($person =~ /^([^:]*):([^:]+:[^:]+):([^:]*)/);
              $user =~ s/:$//;
-             if (($role) && (grep(/^\Q$role\E$/,@{$roles}))) {
+             my ($end,$start) = split(/:/,$coursepersonnel{$person});
-                 my ($uname,$udom,$usec) = split(/:/,$user);
+             if ($end == -1 || $start == -1) {
-                 if ($usec ne '' && (ref($sections) eq 'ARRAY') &&
+                 next;
- 		    @{$sections} > 0) {
+             }
- 		    unless(grep(/^\Q$usec\E$/,@{$sections})) {
+             if (($role) && ((grep(/^\Q$role\E$/,@{$roles})) ||
- 			next;
+                 (grep(/^cr$/,@{$roles}) && $role =~ /^cr\//))) {
- 		    }
+                 my ($uname,$udom) = split(/:/,$user);
+                 if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {
+                     if (grep(/^all$/,@{$sections})) {
+                         $secmatch = 1;
+                     } elsif ($usec eq '') {
+                         if (grep(/^none$/,@{$sections})) {
+                             $secmatch = 1;
+                         }
+                     } else {
+                         if (grep(/^\Q$usec\E$/,@{$sections})) {
+                             $secmatch = 1;
+                         }
+                     }
+                     if (!$secmatch) {
+                         next;
+                     }
+                 }
+                 if ($usec eq '') {
+                     $usec = 'none';
                  }
                  if ($uname ne '' && $udom ne '') {
-                     my $status = &check_user_status($udom,$uname,$cdom,$cnum,$role);
+                     if ($end > 0 && $end < $now) {
+                         $status = 'previous';
+                     } elsif ($start > $now) {
+                         $status = 'future';
+                     } else {
+                         $status = 'active';
+                     }
                      foreach my $type (keys(%{$types})) {
                          if ($status eq $type) {
-                             @{$$users{$role}{$user}} = $type;
+                             if (!grep(/^\Q$type\E$/,@{$$users{$role}{$user}})) {
+                                 push(@{$$users{$role}{$user}},$type);
+                             }
                              $match = 1;
                          }
                      }
-                     if ($match && defined($userdata) &&
+                     if (($match) && (ref($userdata) eq 'HASH')) {
-                         !exists($$userdata{$uname.':'.$udom})) {
+                         if (!exists($$userdata{$uname.':'.$udom})) {
- 			&get_user_info($udom,$uname,\%idx,$userdata);
+ 			    &get_user_info($udom,$uname,\%idx,$userdata);
+                         }
+                         if (!grep(/^\Q$usec\E$/,@{$seclists{$uname.':'.$udom}})) {
+                             push(@{$seclists{$uname.':'.$udom}},$usec);
+                         }
                      }
                  }
              }
- Line 4044  sub get_course_users {
+ Line 5085  sub get_course_users {
                  my %csettings = &Apache::lonnet::get('environment',['internal.courseowner'],$cdom,$cnum);
                  if ( defined($csettings{'internal.courseowner'}) ) {
                      my $owner = $csettings{'internal.courseowner'};
-                     @{$$users{'ow'}{$owner.':'.$cdom}} = 'any';
+                     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;
  }
- Line 4065  sub get_user_info {
+ Line 5116  sub get_user_info {
      return;
  }
+ ###############################################
+ =pod
+ =item * &get_user_quota()
+ Retrieves quota assigned for storage of portfolio files for a user
+ Incoming parameters:
+. user's username
+. user's domain
+ Returns:
+. Disk quota (in Mb) assigned to student.
+ If a value has been stored in the user's environment,
+ it will return that, otherwise it returns the default
+ for users in the domain.
+ =cut
+ ###############################################
+ sub get_user_quota {
+     my ($uname,$udom) = @_;
+     my $quota;
+     if (!defined($udom)) {
+         $udom = $env{'user.domain'};
+     }
+     if (!defined($uname)) {
+         $uname = $env{'user.name'};
+     }
+     if (($udom eq '' || $uname eq '') ||
+         ($udom eq 'public') && ($uname eq 'public')) {
+         $quota = 0;
+     } else {
+         if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) {
+             $quota = $env{'environment.portfolioquota'};
+         } else {
+             my %userenv = &Apache::lonnet::dump('environment',$udom,$uname);
+             my ($tmp) = keys(%userenv);
+             if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
+                 $quota = $userenv{'portfolioquota'};
+             } else {
+                 undef(%userenv);
+             }
+         }
+         if ($quota eq '') {
+             $quota = &default_quota($udom);
+         }
+     }
+     return $quota;
+ }
+ ###############################################
+ =pod
+ =item * &default_quota()
+ Retrieves default quota assigned for storage of user portfolio files
+ Incoming parameters:
+. domain
+ Returns:
+. Default disk quota (in Mb) for user portfolios in the domain.
+ If a value has been stored in the domain's configuration db,
+ it will return that, otherwise it returns 20 (for backwards
+ compatibility with domains which have not set up a configuration
+ db file; the original statically defined portfolio quota was 20 Mb).
+ =cut
+ ###############################################
+ sub default_quota {
+     my ($udom) = @_;
+     my %defaults = &Apache::lonnet::get_dom('configuration',
+                                             ['portfolioquota'],$udom);
+     if ($defaults{'portfolioquota'} ne '') {
+         return $defaults{'portfolioquota'};
+     } else {
+         return '20';
+     }
+ }
+ sub get_secgrprole_info {
+     my ($cdom,$cnum,$needroles,$type)  = @_;
+     my %sections_count = &get_sections($cdom,$cnum);
+     my @sections =  (sort {$a <=> $b} keys(%sections_count));
+     my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+     my @groups = sort(keys(%curr_groups));
+     my $allroles = [];
+     my $rolehash;
+     my $accesshash = {
+                      active => 'Currently has access',
+                      future => 'Will have future access',
+                      previous => 'Previously had access',
+                   };
+     if ($needroles) {
+         $rolehash = {'all' => 'all'};
+         my %user_roles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
+ 	if (&Apache::lonnet::error(%user_roles)) {
+ 	    undef(%user_roles);
+ 	}
+         foreach my $item (keys(%user_roles)) {
+             my ($role)=split(/\:/,$item,2);
+             if ($role eq 'cr') { next; }
+             if ($role =~ /^cr/) {
+                 $$rolehash{$role} = (split('/',$role))[3];
+             } else {
+                 $$rolehash{$role} = &Apache::lonnet::plaintext($role,$type);
+             }
+         }
+         foreach my $key (sort(keys(%{$rolehash}))) {
+             push(@{$allroles},$key);
+         }
+         push (@{$allroles},'st');
+         $$rolehash{'st'} = &Apache::lonnet::plaintext('st',$type);
+     }
+     return (\@sections,\@groups,$allroles,$rolehash,$accesshash);
+ }
  =pod
  =item * get_unprocessed_cgi($query,$possible_names)
- Line 4085  sub get_unprocessed_cgi {
+ Line 5263  sub get_unprocessed_cgi {
    # $Apache::lonxml::debug=1;
    foreach my $pair (split(/&/,$query)) {
      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 4202  sub get_env_multiple {
+ Line 5380  sub get_env_multiple {
  =pod
  =back
  =head1 CSV Upload/Handling functions
- Line 4316  sub record_sep {
+ Line 5494  sub record_sep {
              $i++;
          }
      } else {
-         my @allfields=split(/\,/,$record);
+         my @allfields;
+         if ($env{'form.upfiletype'} eq 'semisv') {
+             @allfields=split(/;/,$record,-1);
+         } else {
+             @allfields=split(/\,/,$record,-1);
+         }
          my $i=0;
          my $j;
          for ($j=0;$j<=$#allfields;$j++) {
- Line 4354  the file type.
+ Line 5537  the file type.
  sub upfile_select_html {
      my %Types = (
                   csv   => &mt('CSV (comma separated values, spreadsheet)'),
+                  semisv => &mt('Semicolon separated values'),
                   space => &mt('Space separated'),
                   tab   => &mt('Tabulator separated'),
  #                 xml   => &mt('HTML/XML'),
- Line 4714  sub DrawBarGraph {
+ Line 5898  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 4796  sub DrawXYGraph {
+ Line 5980  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 4893  sub DrawXYYGraph {
+ Line 6077  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 4967  Inputs:
+ Line 6151  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 4997  a hash ref describing the data to be sto
+ Line 6181  a hash ref describing the data to be sto
      'chartoutputmode' => 'scalar',
      'chartoutputdata' => 'scalar',
      'Section' => 'array',
+     'Group' => 'array',
      'StudentData' => 'array',
      'Maps' => 'array');
- Line 5007  Returns: both routines return nothing
+ Line 6192  Returns: both routines return nothing
  #######################################################
  #######################################################
  sub store_course_settings {
+     return &store_settings($env{'request.course.id'},@_);
+ }
+ sub store_settings {
      # save to the environment
      # appenv the same items, just to be safe
-     my $courseid = $env{'request.course.id'};
      my $udom  = $env{'user.domain'};
      my $uname = $env{'user.name'};
-     my ($prefix,$Settings) = @_;
+     my ($context,$prefix,$Settings) = @_;
      my %SaveHash;
      my %AppHash;
      while (my ($setting,$type) = each(%$Settings)) {
-         my $basename = join('.','internal',$courseid,$prefix,$setting);
+         my $basename = join('.','internal',$context,$prefix,$setting);
          my $envname = 'environment.'.$basename;
          if (exists($env{'form.'.$setting})) {
              # Save this value away
- Line 5030  sub store_course_settings {
+ Line 6218  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 5056  sub store_course_settings {
+ Line 6244  sub store_course_settings {
  }
  sub restore_course_settings {
-     my $courseid = $env{'request.course.id'};
+     return &restore_settings($env{'request.course.id'},@_);
-     my ($prefix,$Settings) = @_;
+ }
+ sub restore_settings {
+     my ($context,$prefix,$Settings) = @_;
      while (my ($setting,$type) = each(%$Settings)) {
          next if (exists($env{'form.'.$setting}));
-         my $envname = 'environment.internal.'.$courseid.'.'.$prefix.
+         my $envname = 'environment.internal.'.$context.'.'.$prefix.
              '.'.$setting;
          if (exists($env{$envname})) {
              if ($type eq 'scalar') {
- Line 5068  sub restore_course_settings {
+ Line 6259  sub restore_course_settings {
              } elsif ($type eq 'array') {
                  $env{'form.'.$setting} = [
                                             map {
-                                                &Apache::lonnet::unescape($_);
+                                                &unescape($_);
                                             } split(',',$env{$envname})
                                             ];
              }
- Line 5079  sub restore_course_settings {
+ Line 6270  sub restore_course_settings {
  ############################################################
  ############################################################
- sub propath {
+ sub commit_customrole {
-     my ($udom,$uname)=@_;
+     my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
-     $udom=~s/\W//g;
+     my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url.
-     $uname=~s/\W//g;
+                          ($start?', '.&mt('starting').' '.localtime($start):'').
-     my $subdir=$uname.'__';
+                          ($end?', ending '.localtime($end):'').': <b>'.
-     $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
+               &Apache::lonnet::assigncustomrole(
-     my $proname="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
+                  $udom,$uname,$url,$three,$four,$five,$end,$start).
-     return $proname;
+                  '</b><br />';
- }
+     return $output;
+ }
+ sub commit_standardrole {
+     my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
+     my $output;
+     my $logmsg;
+     if ($three eq 'st') {
+         my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec);
+         if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
+             $output = "Error: $result\n";
+         } else {
+             $output = &mt('Assigning').' '.$three.' in '.$url.
+                ($start?', '.&mt('starting').' '.localtime($start):'').
+                ($end?', '.&mt('ending').' '.localtime($end):'').
+                ': <b>'.$result.'</b><br />'.
+                &mt('Add to classlist').': <b>ok</b><br />';
+         }
+     } else {
+         $output = &mt('Assigning').' '.$three.' in '.$url.
+                ($start?', '.&mt('starting').' '.localtime($start):'').
+                ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
+                &Apache::lonnet::assignrole(
+                    $udom,$uname,$url,$three,$end,$start).
+                    '</b><br />';
+     }
+     return $output;
+ }
+ sub commit_studentrole {
+     my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
+     my $linefeed =  '<br />'."\n";
+     my $result;
+     if (defined($one) && defined($two)) {
+         my $cid=$one.'_'.$two;
+         my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid);
+         my $secchange = 0;
+         my $expire_role_result;
+         my $modify_section_result;
+         unless ($oldsec eq '-1') {
+             unless ($sec eq $oldsec) {
+                 $secchange = 1;
+                 my $uurl='/'.$cid;
+                 $uurl=~s/\_/\//g;
+                 if ($oldsec) {
+                     $uurl.='/'.$oldsec;
+                 }
+                 $expire_role_result = &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',time);
+                 $result = $expire_role_result;
+             }
+         }
+         if (($expire_role_result eq 'ok') || ($secchange == 0)) {
+             $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid);
+             if ($modify_section_result =~ /^ok/) {
+                 if ($secchange == 1) {
+                     $$logmsg .= "Section for $uname switched from old section: $oldsec to new section: $sec".$linefeed;
+                 } elsif ($oldsec eq '-1') {
+                     $$logmsg .= "New student role for $uname in section $sec in course $cid".$linefeed;
+                 } else {
+                     $$logmsg .= "Student $uname assigned to unchanged section $sec in course $cid".$linefeed;
+                 }
+             } else {
+                 $$logmsg .= "Error when attempting section change for $uname from old section $oldsec to new section: $sec in course $cid -error: $modify_section_result".$linefeed;
+             }
+             $result = $modify_section_result;
+         } elsif ($secchange == 1) {
+             $$logmsg .= "Error when attempting to expire role for $uname in old section $oldsec in course $cid -error: $expire_role_result".$linefeed;
+         }
+     } else {
+         $$logmsg .= "Incomplete course id defined.  Addition of user $uname from domain $udom to course $one\_$two, section $sec not completed.$linefeed";
+         $result = "error: incomplete course id\n";
+     }
+     return $result;
+ }
+ ############################################################
+ ############################################################
+ sub construct_course {
+     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_;
+     my $outcome;
+ #
+ # Open course
+ #
+     my $crstype = lc($args->{'crstype'});
+     my %cenv=();
+     $$courseid=&Apache::lonnet::createcourse($args->{'course_domain'},
+                                              $args->{'cdescr'},
+                                              $args->{'curl'},
+                                              $args->{'course_home'},
+                                              $args->{'nonstandard'},
+                                              $args->{'crscode'},
+                                              $args->{'ccuname'}.':'.
+                                              $args->{'ccdomain'},
+                                              $args->{'crstype'});
+     # Note: The testing routines depend on this being output; see
+     # Utils::Course. This needs to at least be output as a comment
+     # if anyone ever decides to not show this, and Utils::Course::new
+     # will need to be suitably modified.
+     $outcome .= &mt('New LON-CAPA [_1] ID: [_2]<br />',$crstype,$$courseid);
+ #
+ # Check if created correctly
+ #
+     ($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid);
+     my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
+     $outcome .= &mt('Created on').': '.$crsuhome.'<br>';
+ #
+ # Are we cloning?
+ #
+     my $cloneid='';
+     if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
+ 	$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
+         my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid);
+ 	my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
+ 	if ($clonehome eq 'no_host') {
+ 	    $outcome .=
+     '<br /><font color="red">'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.'</font>';
+ 	} else {
+ 	    $outcome .=
+     '<br /><font color="green">'.&mt('Cloning [_1] from [_2]',$crstype,$clonehome).'</font>';
+ 	    my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
+ # Copy all files
+ 	    &Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid);
+ # Restore URL
+ 	    $cenv{'url'}=$oldcenv{'url'};
+ # Restore title
+ 	    $cenv{'description'}=$oldcenv{'description'};
+ # restore grading mode
+ 	    if (defined($oldcenv{'grading'})) {
+ 		$cenv{'grading'}=$oldcenv{'grading'};
+ 	    }
+ # Mark as cloned
+ 	    $cenv{'clonedfrom'}=$cloneid;
+ 	    delete($cenv{'default_enrollment_start_date'});
+ 	    delete($cenv{'default_enrollment_end_date'});
+ 	}
+     }
+ #
+ # Set environment (will override cloned, if existing)
+ #
+     my @sections = ();
+     my @xlists = ();
+     if ($args->{'crstype'}) {
+         $cenv{'type'}=$args->{'crstype'};
+     }
+     if ($args->{'crsid'}) {
+         $cenv{'courseid'}=$args->{'crsid'};
+     }
+     if ($args->{'crscode'}) {
+         $cenv{'internal.coursecode'}=$args->{'crscode'};
+     }
+     if ($args->{'crsquota'} ne '') {
+         $cenv{'internal.coursequota'}=$args->{'crsquota'};
+     } else {
+         $cenv{'internal.coursequota'}=$args->{'crsquota'} = 20;
+     }
+     if ($args->{'ccuname'}) {
+         $cenv{'internal.courseowner'} = $args->{'ccuname'}.
+                                         ':'.$args->{'ccdomain'};
+     } else {
+         $cenv{'internal.courseowner'} = $args->{'curruser'};
+     }
+     my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner.
+     if ($args->{'crssections'}) {
+         $cenv{'internal.sectionnums'} = '';
+         if ($args->{'crssections'} =~ m/,/) {
+             @sections = split/,/,$args->{'crssections'};
+         } else {
+             $sections[0] = $args->{'crssections'};
+         }
+         if (@sections > 0) {
+             foreach my $item (@sections) {
+                 my ($sec,$gp) = split/:/,$item;
+                 my $class = $args->{'crscode'}.$sec;
+                 my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'});
+                 $cenv{'internal.sectionnums'} .= $item.',';
+                 unless ($addcheck eq 'ok') {
+                     push @badclasses, $class;
+                 }
+             }
+             $cenv{'internal.sectionnums'} =~ s/,$//;
+         }
+     }
+ # do not hide course coordinator from staff listing,
+ # even if privileged
+     $cenv{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
+ # add crosslistings
+     if ($args->{'crsxlist'}) {
+         $cenv{'internal.crosslistings'}='';
+         if ($args->{'crsxlist'} =~ m/,/) {
+             @xlists = split/,/,$args->{'crsxlist'};
+         } else {
+             $xlists[0] = $args->{'crsxlist'};
+         }
+         if (@xlists > 0) {
+             foreach my $item (@xlists) {
+                 my ($xl,$gp) = split/:/,$item;
+                 my $addcheck =  &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$xl,$cenv{'internal.courseowner'});
+                 $cenv{'internal.crosslistings'} .= $item.',';
+                 unless ($addcheck eq 'ok') {
+                     push @badclasses, $xl;
+                 }
+             }
+             $cenv{'internal.crosslistings'} =~ s/,$//;
+         }
+     }
+     if ($args->{'autoadds'}) {
+         $cenv{'internal.autoadds'}=$args->{'autoadds'};
+     }
+     if ($args->{'autodrops'}) {
+         $cenv{'internal.autodrops'}=$args->{'autodrops'};
+     }
+ # check for notification of enrollment changes
+     my @notified = ();
+     if ($args->{'notify_owner'}) {
+         if ($args->{'ccuname'} ne '') {
+             push(@notified,$args->{'ccuname'}.':'.$args->{'ccdomain'});
+         }
+     }
+     if ($args->{'notify_dc'}) {
+         if ($uname ne '') {
+             push(@notified,$uname.'@'.$udom);
+         }
+     }
+     if (@notified > 0) {
+         my $notifylist;
+         if (@notified > 1) {
+             $notifylist = join(',',@notified);
+         } else {
+             $notifylist = $notified[0];
+         }
+         $cenv{'internal.notifylist'} = $notifylist;
+     }
+     if (@badclasses > 0) {
+         my %lt=&Apache::lonlocal::texthash(
+                 'tclb' => 'The courses listed below were included as sections or crosslistings affiliated with your new LON-CAPA course.  However, if automated course roster updates are enabled for this class, these particular sections/crosslistings will not contribute towards enrollment, because the user identified as the course owner for this LON-CAPA course',
+                 'dnhr' => 'does not have rights to access enrollment in these classes',
+                 'adby' => 'as determined by the policies of your institution on access to official classlists'
+         );
+         $outcome .= '<font color="red">'.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').<br /><ul>'."\n";
+         foreach (@badclasses) {
+             $outcome .= "<li>$_</li>\n";
+         }
+         $outcome .= "</ul><br /><br /></font>\n";
+     }
+     if ($args->{'no_end_date'}) {
+         $args->{'endaccess'} = 0;
+     }
+     $cenv{'internal.autostart'}=$args->{'enrollstart'};
+     $cenv{'internal.autoend'}=$args->{'enrollend'};
+     $cenv{'default_enrollment_start_date'}=$args->{'startaccess'};
+     $cenv{'default_enrollment_end_date'}=$args->{'endaccess'};
+     if ($args->{'showphotos'}) {
+       $cenv{'internal.showphotos'}=$args->{'showphotos'};
+     }
+     $cenv{'internal.authtype'} = $args->{'authtype'};
+     $cenv{'internal.autharg'} = $args->{'autharg'};
+     if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) {
+         if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'}  eq '') {
+             $outcome .= '<font color="red" size="+1">'.
+                       &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student').'</font></p>';
+         }
+     }
+     if (($args->{'ccdomain'}) && ($args->{'ccuname'})) {
+        if ($args->{'setpolicy'}) {
+            $cenv{'policy.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
+        }
+        if ($args->{'setcontent'}) {
+            $cenv{'question.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
+        }
+     }
+     if ($args->{'reshome'}) {
+ 	$cenv{'reshome'}=$args->{'reshome'}.'/';
+ 	$cenv{'reshome'}=~s/\/+$/\//;
+     }
+ #
+ # course has keyed access
+ #
+     if ($args->{'setkeys'}) {
+        $cenv{'keyaccess'}='yes';
+     }
+ # if specified, key authority is not course, but user
+ # only active if keyaccess is yes
+     if ($args->{'keyauth'}) {
+ 	my ($user,$domain) = split(':',$args->{'keyauth'});
+ 	$user = &LONCAPA::clean_username($user);
+ 	$domain = &LONCAPA::clean_username($domain);
+ 	if ($user ne '' && $domain ne '') {
+ 	    $cenv{'keyauth'}=$user.':'.$domain;
+ 	}
+     }
+     if ($args->{'disresdis'}) {
+         $cenv{'pch.roles.denied'}='st';
+     }
+     if ($args->{'disablechat'}) {
+         $cenv{'plc.roles.denied'}='st';
+     }
+     # Record we've not yet viewed the Course Initialization Helper for this
+     # course
+     $cenv{'course.helper.not.run'} = 1;
+     #
+     # Use new Randomseed
+     #
+     $cenv{'rndseed'}=&Apache::lonnet::latest_rnd_algorithm_id();;
+     $cenv{'receiptalg'}=&Apache::lonnet::latest_receipt_algorithm_id();;
+     #
+     # The encryption code and receipt prefix for this course
+     #
+     $cenv{'internal.encseed'}=$Apache::lonnet::perlvar{'lonReceipt'}.$$.time.int(rand(9999));
+     $cenv{'internal.encpref'}=100+int(9*rand(99));
+     #
+     # By default, use standard grading
+     if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; }
+     $outcome .= ('<br />'.&mt('Setting environment').': '.
+           &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).'<br>');
+ #
+ # Open all assignments
+ #
+     if ($args->{'openall'}) {
+        my $storeunder=$$crsudom.'_'.$$crsunum.'.0.opendate';
+        my %storecontent = ($storeunder         => time,
+                            $storeunder.'.type' => 'date_start');
+        $outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput
+                  ('resourcedata',\%storecontent,$$crsudom,$$crsunum).'<br>';
+    }
+ #
+ # Set first page
+ #
+     unless (($args->{'nonstandard'}) || ($args->{'firstres'} eq 'blank')
+ 	    || ($cloneid)) {
+ 	use LONCAPA::map;
+ 	$outcome .= &mt('Setting first resource').': ';
+ 	my $map = '/uploaded/'.$$crsudom.'/'.$$crsunum.'/default.sequence';
+         my ($errtext,$fatal)=&LONCAPA::map::mapread($map);
+         $outcome .= ($fatal?$errtext:'read ok').' - ';
+         my $title; my $url;
+         if ($args->{'firstres'} eq 'syl') {
+ 	    $title='Syllabus';
+             $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
+         } else {
+             $title='Navigate Contents';
+             $url='/adm/navmaps';
+         }
+         $LONCAPA::map::resources[1]=$title.':'.$url.':false:start:res';
+ 	(my $outtext,$errtext) = &LONCAPA::map::storemap($map,1);
+ 	if ($errtext) { $fatal=2; }
+         $outcome .= ($fatal?$errtext:'write ok').'<br />';
+     }
+     return $outcome;
+ }
+ ############################################################
+ ############################################################
+ sub course_type {
+     my ($cid) = @_;
+     if (!defined($cid)) {
+         $cid = $env{'request.course.id'};
+     }
+     if (defined($env{'course.'.$cid.'.type'})) {
+         return $env{'course.'.$cid.'.type'};
+     } else {
+         return 'Course';
+     }
+ }
+ sub group_term {
+     my $crstype = &course_type();
+     my %names = (
+                   'Course' => 'group',
+                   'Group' => 'team',
+                 );
+     return $names{$crstype};
+ }
  sub icon {
      my ($file)=@_;
-     my $curfext = (split(/\./,$file))[-1];
+     my $curfext = lc((split(/\./,$file))[-1]);
      my $iconname=$Apache::lonnet::perlvar{'lonIconsURL'}.'/unknown.gif';
      my $embstyle = &Apache::loncommon::fileembstyle($curfext);
      if (!(!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn')) {
- Line 5141  sub escape_double {
+ Line 6716  sub escape_double {
  sub escape_url {
      my ($url)   = @_;
      my @urlslices = split(/\//, $url,-1);
-     my $lastitem = &Apache::lonnet::escape(pop(@urlslices));
+     my $lastitem = &escape(pop(@urlslices));
      return join('/',@urlslices).'/'.$lastitem;
  }
+ # -------------------------------------------------------- Initliaze user login
+ sub init_user_environment {
+     my ($r, $username, $domain, $authhost, $form, $args) = @_;
+     my $lonids=$Apache::lonnet::perlvar{'lonIDsDir'};
+     my $public=($username eq 'public' && $domain eq 'public');
+ # See if old ID present, if so, remove
+     my ($filename,$cookie,$userroles);
+     my $now=time;
+     if ($public) {
+ 	my $max_public=100;
+ 	my $oldest;
+ 	my $oldest_time=0;
+ 	for(my $next=1;$next<=$max_public;$next++) {
+ 	    if (-e $lonids."/publicuser_$next.id") {
+ 		my $mtime=(stat($lonids."/publicuser_$next.id"))[9];
+ 		if ($mtime<$oldest_time || !$oldest_time) {
+ 		    $oldest_time=$mtime;
+ 		    $oldest=$next;
+ 		}
+ 	    } else {
+ 		$cookie="publicuser_$next";
+ 		last;
+ 	    }
+ 	}
+ 	if (!$cookie) { $cookie="publicuser_$oldest"; }
+     } else {
+ 	# if this isn't a robot, kill any existing non-robot sessions
+ 	if (!$args->{'robot'}) {
+ 	    opendir(DIR,$lonids);
+ 	    while ($filename=readdir(DIR)) {
+ 		if ($filename=~/^$username\_\d+\_$domain\_$authhost\.id$/) {
+ 		    unlink($lonids.'/'.$filename);
+ 		}
+ 	    }
+ 	    closedir(DIR);
+ 	}
+ # Give them a new cookie
+ 	my $id = ($args->{'robot'} ? 'robot'.$args->{'robot'}
+ 		                   : $now);
+ 	$cookie="$username\_$id\_$domain\_$authhost";
+ # Initialize roles
+ 	$userroles=&Apache::lonnet::rolesinit($domain,$username,$authhost);
+     }
+ # ------------------------------------ Check browser type and MathML capability
+     my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml,
+         $clientunicode,$clientos) = &decode_user_agent($r);
+ # -------------------------------------- Any accessibility options to remember?
+     if (($form->{'interface'}) && ($form->{'remember'} eq 'true')) {
+ 	foreach my $option ('imagesuppress','appletsuppress',
+ 			    'embedsuppress','fontenhance','blackwhite') {
+ 	    if ($form->{$option} eq 'true') {
+ 		&Apache::lonnet::put('environment',{$option => 'on'},
+ 				     $domain,$username);
+ 	    } else {
+ 		&Apache::lonnet::del('environment',[$option],
+ 				     $domain,$username);
+ 	    }
+ 	}
+     }
+ # ------------------------------------------------------------- Get environment
+     my %userenv = &Apache::lonnet::dump('environment',$domain,$username);
+     my ($tmp) = keys(%userenv);
+     if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
+ 	# default remote control to off
+ 	if ($userenv{'remote'} ne 'on') { $userenv{'remote'} = 'off'; }
+     } else {
+ 	undef(%userenv);
+     }
+     if (($userenv{'interface'}) && (!$form->{'interface'})) {
+ 	$form->{'interface'}=$userenv{'interface'};
+     }
+     $env{'environment.remote'}=$userenv{'remote'};
+     if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; }
+ # --------------- Do not trust query string to be put directly into environment
+     foreach my $option ('imagesuppress','appletsuppress',
+ 			'embedsuppress','fontenhance','blackwhite',
+ 			'interface','localpath','localres') {
+ 	$form->{$option}=~s/[\n\r\=]//gs;
+     }
+ # --------------------------------------------------------- Write first profile
+     {
+ 	my %initial_env =
+ 	    ("user.name"          => $username,
+ 	     "user.domain"        => $domain,
+ 	     "user.home"          => $authhost,
+ 	     "browser.type"       => $clientbrowser,
+ 	     "browser.version"    => $clientversion,
+ 	     "browser.mathml"     => $clientmathml,
+ 	     "browser.unicode"    => $clientunicode,
+ 	     "browser.os"         => $clientos,
+ 	     "server.domain"      => $Apache::lonnet::perlvar{'lonDefDomain'},
+ 	     "request.course.fn"  => '',
+ 	     "request.course.uri" => '',
+ 	     "request.course.sec" => '',
+ 	     "request.role"       => 'cm',
+ 	     "request.role.adv"   => $env{'user.adv'},
+ 	     "request.host"       => $ENV{'REMOTE_ADDR'},);
+         if ($form->{'localpath'}) {
+ 	    $initial_env{"browser.localpath"}  = $form->{'localpath'};
+ 	    $initial_env{"browser.localres"}   = $form->{'localres'};
+         }
+ 	if ($public) {
+ 	    $initial_env{"environment.remote"} = "off";
+ 	}
+ 	if ($form->{'interface'}) {
+ 	    $form->{'interface'}=~s/\W//gs;
+ 	    $initial_env{"browser.interface"} = $form->{'interface'};
+ 	    $env{'browser.interface'}=$form->{'interface'};
+ 	    foreach my $option ('imagesuppress','appletsuppress',
+ 				'embedsuppress','fontenhance','blackwhite') {
+ 		if (($form->{$option} eq 'true') ||
+ 		    ($userenv{$option} eq 'on')) {
+ 		    $initial_env{"browser.$option"} = "on";
+ 		}
+ 	    }
+ 	}
+ 	$env{'user.environment'} = "$lonids/$cookie.id";
+ 	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
+ 		 &GDBM_WRCREAT(),0640)) {
+ 	    &_add_to_env(\%disk_env,\%initial_env);
+ 	    &_add_to_env(\%disk_env,\%userenv,'environment.');
+ 	    &_add_to_env(\%disk_env,$userroles);
+ 	    if (ref($args->{'extra_env'})) {
+ 		&_add_to_env(\%disk_env,$args->{'extra_env'});
+ 	    }
+ 	    untie(%disk_env);
+ 	} else {
+ 	    &Apache::lonnet::logthis("<font color=\"blue\">WARNING: ".
+ 			   'Could not create environment storage in lonauth: '.$!.'</font>');
+ 	    return 'error: '.$!;
+ 	}
+     }
+     $env{'request.role'}='cm';
+     $env{'request.role.adv'}=$env{'user.adv'};
+     $env{'browser.type'}=$clientbrowser;
+     return $cookie;
+ }
+ sub _add_to_env {
+     my ($idf,$env_data,$prefix) = @_;
+     while (my ($key,$value) = each(%$env_data)) {
+ 	$idf->{$prefix.$key} = $value;
+ 	$env{$prefix.$key}   = $value;
+     }
+ }
  =pod
  =back

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

Removed from v.1.365
changed lines
	Added in v.1.521