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.454 and 1.564.2.5

-version 1.454, 2006/09/13 19:42:06
+version 1.564.2.5, 2007/09/04 23:58:06
  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;
+ use LONCAPA qw(:DEFAULT :match);
+ # ---------------------------------------------- Designs
+ use vars qw(%defaultdesign);
  my $readit;
  ##
  ## Global Variables
  ##
- Line 81  my %scprtag;
+ Line 86  my %scprtag;
  my %fe; my %fd; my %fm;
  my %category_extensions;
- # ---------------------------------------------- Designs
- my %designhash;
  # ---------------------------------------------- Thesaurus variables
  #
  # %Keywords:
- Line 150  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 345  sub studentbrowser_javascript {
+ Line 334  sub studentbrowser_javascript {
     return (<<'ENDSTDBRW');
  <script type="text/javascript" language="Javascript" >
      var stdeditbrowser;
-     function openstdbrowser(formname,uname,udom,roleflag) {
+     function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
          var url = '/adm/pickstudent?';
          var filter;
-         eval('filter=document.'+formname+'.'+uname+'.value;');
+ 	if (!ignorefilter) {
+ 	    eval('filter=document.'+formname+'.'+uname+'.value;');
+ 	}
          if (filter != null) {
             if (filter != '') {
                 url += 'filter='+filter+'&';
- Line 376  sub selectstudent_link {
+ Line 367  sub selectstudent_link {
  	   return '';
         }
         return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
-         '","'.$udomele.'");'."'>".&mt('Select User')."</a>";
+         '","'.$udomele.'","","1");'."'>".&mt('Select User')."</a>";
     }
     if ($env{'request.role'}=~/^(au|dc|su)/) {
         return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
- Line 386  sub selectstudent_link {
+ Line 377  sub selectstudent_link {
  }
  sub coursebrowser_javascript {
-     my ($domainfilter)=@_;
+     my ($domainfilter,$sec_element,$formname)=@_;
      my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
-    return (<<ENDSTDBRW);
+    my $output = '
- <script type="text/javascript" language="Javascript" >
+ <script type="text/javascript">
-     var stdeditbrowser;
+     var stdeditbrowser;'."\n";
+    $output .= <<"ENDSTDBRW";
      function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
          var url = '/adm/pickcourse?';
-         var filter;
+         var domainfilter = '';
-         if (filter != null) {
+         var formid = getFormIdByName(formname);
-            if (filter != '') {
+         if (formid > -1) {
-                url += 'filter='+filter+'&';
+             var domid = getIndexByName(formid,udom);
- 	   }
+             if (domid > -1) {
+                 if (document.forms[formid].elements[domid].type == 'select-one') {
+                     domainfilter=document.forms[formid].elements[domid].options[document.forms[formid].elements[domid].selectedIndex].value;
+                 }
+                 if (document.forms[formid].elements[domid].type == 'hidden') {
+                     domainfilter=document.forms[formid].elements[domid].value;
+                 }
+             }
          }
-         var domainfilter='$domainfilter';
          if (domainfilter != null) {
             if (domainfilter != '') {
                 url += 'domainfilter='+domainfilter+'&';
- Line 408  sub coursebrowser_javascript {
+ Line 406  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;
- Line 435  sub coursebrowser_javascript {
+ Line 440  sub coursebrowser_javascript {
          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,$selecttype)=@_;
-     return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
+    return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select [_1]',$selecttype)."</a>";
+         '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>";
  }
  sub check_uncheck_jscript {
- Line 461  function uncheckAll(field) {
+ Line 526  function uncheckAll(field) {
      if (field.length > 0) {
          for (i = 0; i < field.length; i++) {
              field[i].checked = false ;
-         }     } else {
+         }
+     } else {
          field.checked = false ;
      }
  }
- Line 645  sub help_open_topic {
+ Line 711  sub help_open_topic {
      my ($topic, $text, $stayOnPage, $width, $height) = @_;
      $text = "" if (not defined $text);
      $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual' ||
+     if ($env{'browser.interface'} eq 'textual') {
- 	$env{'environment.remote'} eq 'off' ) {
  	$stayOnPage=1;
      }
      $width = 350 if (not defined $width);
- Line 738  ENDOUTPUT
+ Line 803  ENDOUTPUT
  # now just updates the help link and generates a blue icon
  sub help_open_menu {
      my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text)
  	= @_;
      $stayOnPage = 0 if (not defined $stayOnPage);
-     if ($env{'browser.interface'} eq 'textual' ||
+     # formerly only used pop-up help (stayOnPage = 0)
- 	$env{'environment.remote'} eq 'off' ) {
+     # if environment.remote is on (using remote control UI)
- 	$stayOnPage=1;
+     # if ($env{'browser.interface'} eq 'textual' ||
+     #	$env{'environment.remote'} eq 'off' ) {
+     #   $stayOnPage=1;
+     #}
+     # Now making pop-up help the default even with remote control
+     if ($env{'browser.interface'} eq 'textual') {
+         $stayOnPage=1;
      }
      my $output;
      if ($component_help) {
- Line 1015  sub changable_area {
+ Line 1085  sub changable_area {
  =pod
  =back
  =head1 Excel and CSV file utility routines
  =over 4
- Line 1149  sub create_workbook {
+ Line 1219  sub create_workbook {
  =item * create_text_file
- Create a file to write to and eventually make available to the usre.
+ Create a file to write to and eventually make available to the user.
  If file creation fails, outputs an error message on the request object and
  return undefs.
- Line 1190  sub create_text_file {
+ Line 1260  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');
+ 	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
  	return &multiple_select_form($name,$value,4,\%domains);
      } else {
+ 	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
  	return &select_form($name,$value,%domains);
      }
  }
- Line 1233  sub domain_select {
+ Line 1281  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 1240  Returns a string containing a <select> e
+ Line 1294  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 1260  sub multiple_select_form {
+ Line 1314  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 1303  sub select_form {
+ Line 1365  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 1344  sub select_level_form {
+ Line 1424  sub select_level_form {
  =pod
- =item * select_dom_form($defdom,$name,$includeempty)
+ =item * select_dom_form($defdom,$name,$includeempty,$showdomdesc)
  Returns a string containing a <select name='$name' size='1'> form to
  allow a user to select the domain to preform an operation in.
- Line 1353  See loncreateuser.pm for an example invo
+ Line 1433  See loncreateuser.pm for an example invo
  If the $includeempty flag is set, it also includes an empty choice ("no domain
  selected");
+ If the $showdomdesc flag is set, the domain name is followed by the domain description.
  =cut
  #-------------------------------------------
  sub select_dom_form {
-     my ($defdom,$name,$includeempty) = @_;
+     my ($defdom,$name,$includeempty,$showdomdesc) = @_;
-     my @domains = get_domains();
+     my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
      if ($includeempty) { @domains=('',@domains); }
      my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
      foreach my $dom (@domains) {
          $selectdomain.="<option value=\"$dom\" ".
-             ($dom eq $defdom ? 'selected="selected" ' : '').
+             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
-                 ">$dom</option>\n";
+         if ($showdomdesc) {
+             if ($dom ne '') {
+                 my $domdesc = &Apache::lonnet::domain($dom,'description');
+                 if ($domdesc ne '') {
+                     $selectdomain .= ' ('.$domdesc.')';
+                 }
+             }
+         }
+         $selectdomain .= "</option>\n";
      }
      $selectdomain.="</select>";
      return $selectdomain;
- Line 1374  sub select_dom_form {
+ Line 1464  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 1408  returns a string which contains an <opti
+ Line 1474  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 1420  sub home_server_option_list {
+ Line 1486  sub home_server_option_list {
  =pod
  =back
  =cut
- Line 1810  If target_domain is not found in domain.
+ Line 1876  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 2005  if $first is set to 'lastname' then it r
+ Line 2073  if $first is set to 'lastname' then it r
  ###############################################################
  sub plainname {
      my ($uname,$udom,$first)=@_;
+     return if (!defined($uname) || !defined($udom));
      my %names=&getnames($uname,$udom);
      my $name=&Apache::lonnet::format_name($names{'firstname'},
  					  $names{'middlename'},
- Line 2036  if the user does not
+ Line 2105  if the user does not
  sub nickname {
      my ($uname,$udom)=@_;
+     return if (!defined($uname) || !defined($udom));
      my %names=&getnames($uname,$udom);
      my $name=$names{'nickname'};
      if ($name) {
- Line 2051  sub nickname {
+ Line 2121  sub nickname {
  sub getnames {
      my ($uname,$udom)=@_;
+     return if (!defined($uname) || !defined($udom));
      if ($udom eq 'public' && $uname eq 'public') {
  	return ('lastname' => &mt('Public'));
      }
- Line 2067  sub getnames {
+ Line 2138  sub getnames {
      }
  }
+ # -------------------------------------------------------------------- getemails
+ =pod
+ =item * getemails($uname,$udom)
+ Gets a user's email information and returns it as a hash with keys:
+ notification, critnotification, permanentemail
+ For notification and critnotification, values are comma-separated lists
+ of e-mail address(es); for permanentemail, value is a single e-mail address.
+ =cut
+ sub getemails {
+     my ($uname,$udom)=@_;
+     if ($udom eq 'public' && $uname eq 'public') {
+ 	return;
+     }
+     if (!$udom) { $udom=$env{'user.domain'}; }
+     if (!$uname) { $uname=$env{'user.name'}; }
+     my $id=$uname.':'.$udom;
+     my ($names,$cached)=&Apache::lonnet::is_cached_new('emailscache',$id);
+     if ($cached) {
+ 	return %{$names};
+     } else {
+ 	my %loadnames=&Apache::lonnet::get('environment',
+                     			   ['notification','critnotification',
+ 					    'permanentemail'],
+ 					   $udom,$uname);
+ 	&Apache::lonnet::do_cache_new('emailscache',$id,\%loadnames);
+ 	return %loadnames;
+     }
+ }
+ sub flush_email_cache {
+     my ($uname,$udom)=@_;
+     if (!$udom)  { $udom =$env{'user.domain'}; }
+     if (!$uname) { $uname=$env{'user.name'};   }
+     return if ($udom eq 'public' && $uname eq 'public');
+     my $id=$uname.':'.$udom;
+     &Apache::lonnet::devalidate_cache_new('emailscache',$id);
+ }
  # ------------------------------------------------------------------ Screenname
  =pod
- Line 2140  sub track_student_link {
+ Line 2254  sub track_student_link {
          $target = '';
      }
      if ($start) { $link.='&amp;start='.$start; }
+     $title = &mt($title);
+     $linktext = &mt($linktext);
      return qq{<a href="$link" title="$title" $target>$linktext</a>}.
  	&help_open_topic('View_recent_activity');
  }
+ # ===================================================== Display a student photo
+ sub student_image_tag {
+     my ($domain,$user)=@_;
+     my $imgsrc=&Apache::lonnet::studentphoto($domain,$user,'jpg');
+     if (($imgsrc) && ($imgsrc ne '/adm/lonKaputt/lonlogo_broken.gif')) {
+ 	return '<img src="'.$imgsrc.'" align="right" />';
+     } else {
+ 	return '';
+     }
+ }
  =pod
  =back
- Line 2353  sub preferred_languages {
+ Line 2481  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 2576  sub get_student_answers {
+ Line 2707  sub get_student_answers {
    }
    $moreenv{'grade_target'}='answer';
    %moreenv=(%form,%moreenv);
-   my $userview=&Apache::lonnet::ssi('/res/'.$feedurl,%moreenv);
+   $feedurl = &Apache::lonnet::clutter($feedurl);
+   my $userview=&Apache::lonnet::ssi($feedurl,%moreenv);
    return $userview;
  }
- Line 2595  sub submlink {
+ Line 2727  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(); }
- Line 2641  sub pprmlink {
+ Line 2773  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(); }
- Line 2690  sub maketime {
+ Line 2822  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 ($endtime) {
+             if ($tend) {
-                 if ($now>$endtime) { $active=0; }
+                 next if ($tend < $now);
+             }
+             if ($tstart) {
+                 next if ($tstart > $now);
+             }
+             my ($cdom,$cnum,$sec,$cnumpart,$secpart,$role,$realsec);
+             (undef,$cdom,$cnumpart,$secpart) = split(/\//,$entry);
+             if ($secpart eq '') {
+                 ($cnum,$role) = split(/_/,$cnumpart);
+                 $sec = 'none';
+                 $realsec = '';
+             } else {
+                 $cnum = $cnumpart;
+                 ($sec,$role) = split(/_/,$secpart);
+                 $realsec = $sec;
+             }
+             $courses{$cdom.'_'.$cnum}{$sec} = $trole.'/'.$cdom.'/'.$cnum.'/'.$realsec;
+         }
+     } else {
+         foreach my $key (keys(%env)) {
+ 	    if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_courseid)/?(\w*)$} ||
+                  $key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_courseid)/?(\w*)$}) {
+ 	        my ($role,$cdom,$cnum,$sec) = ($1,$2,$3,$4);
+ 	        next if ($role eq 'ca' || $role eq 'aa');
+ 	        next if (%roles && !exists($roles{$role}));
+ 	        my ($starttime,$endtime)=split(/\./,$env{$key});
+                 my $active=1;
+                 if ($starttime) {
+ 		    if ($now<$starttime) { $active=0; }
+                 }
+                 if ($endtime) {
+                     if ($now>$endtime) { $active=0; }
+                 }
+                 if ($active) {
+                     if ($sec eq '') {
+                         $sec = 'none';
+                     }
+                     $courses{$cdom.'_'.$cnum}{$sec} =
+                                      $role.'/'.$cdom.'/'.$cnum.'/'.$sec;
+                 }
              }
-             if ($active) { $courses{$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 && $activity ne 'com') {
+             # Check if current user has 'evb' priv for this
+             if (defined($own_courses{$course})) {
+                 foreach my $sec (keys(%{$own_courses{$course}})) {
+                     my $checkrole = 'cm./'.$cdom.'/'.$cnum;
+                     if ($sec ne 'none') {
+                         $checkrole .= '/'.$sec;
+                     }
+                     if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) {
+                         $no_ownblock = 1;
+                         last;
+                     }
+                 }
+             }
+             # if they have 'evb' priv and are currently not playing student
+             next if (($no_ownblock) &&
+                  ($env{'request.role'} !~ m{^st\./$cdom/$cnum}));
+         }
+         foreach my $sec (keys(%{$live_courses{$course}})) {
+             my $checkrole = 'cm./'.$cdom.'/'.$cnum;
+             if ($sec ne 'none') {
+                 $checkrole .= '/'.$sec;
+             }
+             if ($otheruser) {
+                 # Resource belongs to user other than current user.
+                 # Assemble privs for that user, and check for 'evb' priv.
+                 my ($trole,$tdom,$tnum,$tsec);
+                 my $entry = $live_courses{$course}{$sec};
+                 if ($entry =~ /^cr/) {
+                     ($trole,$tdom,$tnum,$tsec) =
+                       ($entry =~ m|^(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)/?(\w*)$|);
+                 } else {
+                     ($trole,$tdom,$tnum,$tsec) = split(/\//,$entry);
+                 }
+                 my ($spec,$area,$trest,%allroles,%userroles);
+                 $area = '/'.$tdom.'/'.$tnum;
+                 $trest = $tnum;
+                 if ($tsec ne '') {
+                     $area .= '/'.$tsec;
+                     $trest .= '/'.$tsec;
+                 }
+                 $spec = $trole.'.'.$area;
+                 if ($trole =~ /^cr/) {
+                     &Apache::lonnet::custom_roleprivs(\%allroles,$trole,
+                                                       $tdom,$spec,$trest,$area);
+                 } else {
+                     &Apache::lonnet::standard_roleprivs(\%allroles,$trole,
+                                                        $tdom,$spec,$trest,$area);
+                 }
+                 my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles);
+                 if ($userroles{'user.priv.'.$checkrole} =~ /evb\&([^\:]*)/) {
+                     if ($1) {
+                         $no_userblock = 1;
+                         last;
+                     }
+                 }
+             } else {
+                 # Resource belongs to current user
+                 # Check for 'evb' priv via lonnet::allowed().
+                 if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) {
+                     $no_ownblock = 1;
+                     last;
+                 }
+             }
+         }
+         # if they have the evb priv and are currently not playing student
+         next if (($no_ownblock) &&
+                  ($env{'request.role'} !~ m{^st\./\Q$cdom\E/\Q$cnum\E}));
+         next if ($no_userblock);
+         # Retrieve blocking times and identity of blocker for course
+         # of specified user, unless user has 'evb' privilege.
+         my ($start,$end)=&get_blocks($setters,$activity,$cdom,$cnum);
+         if (($start != 0) &&
+             (($startblock == 0) || ($startblock > $start))) {
+             $startblock = $start;
+         }
+         if (($end != 0)  &&
+             (($endblock == 0) || ($endblock < $end))) {
+             $endblock = $end;
+         }
+     }
+     return ($startblock,$endblock);
+ }
+ sub get_blocks {
+     my ($setters,$activity,$cdom,$cnum) = @_;
+     my $startblock = 0;
+     my $endblock = 0;
+     my $course = $cdom.'_'.$cnum;
+     $setters->{$course} = {};
+     $setters->{$course}{'staff'} = [];
+     $setters->{$course}{'times'} = [];
+     my %records = &Apache::lonnet::dump('comm_block',$cdom,$cnum);
+     foreach my $record (keys(%records)) {
+         my ($start,$end) = ($record =~ m/^(\d+)____(\d+)$/);
+         if ($start <= time && $end >= time) {
+             my ($staff_name,$staff_dom,$title,$blocks) =
+                 &parse_block_record($records{$record});
+             if ($blocks->{$activity} eq 'on') {
+                 push(@{$$setters{$course}{'staff'}},[$staff_name,$staff_dom]);
+                 push(@{$$setters{$course}{'times'}}, [$start,$end]);
+                 if ( ($startblock == 0) || ($startblock > $start) ) {
+                     $startblock = $start;
+                 }
+                 if ( ($endblock == 0) || ($endblock < $end) ) {
+                     $endblock = $end;
+                 }
+             }
+         }
+     }
+     return ($startblock,$endblock);
+ }
+ sub parse_block_record {
+     my ($record) = @_;
+     my ($setuname,$setudom,$title,$blocks);
+     if (ref($record) eq 'HASH') {
+         ($setuname,$setudom) = split(/:/,$record->{'setter'});
+         $title = &unescape($record->{'event'});
+         $blocks = $record->{'blocks'};
+     } else {
+         my @data = split(/:/,$record,3);
+         if (scalar(@data) eq 2) {
+             $title = $data[1];
+             ($setuname,$setudom) = split(/@/,$data[0]);
+         } else {
+             ($setuname,$setudom,$title) = @data;
+         }
+         $blocks = { 'com' => 'on' };
+     }
+     return ($setuname,$setudom,$title,$blocks);
+ }
+ sub build_block_table {
+     my ($startblock,$endblock,$setters) = @_;
+     my %lt = &Apache::lonlocal::texthash(
+         'cacb' => 'Currently active communication blocks',
+         'cour' => 'Course',
+         'dura' => 'Duration',
+         'blse' => 'Block set by'
+     );
+     my $output;
+     $output = '<br />'.$lt{'cacb'}.':<br />';
+     $output .= &start_data_table();
+     $output .= '
+ <tr>
+  <th>'.$lt{'cour'}.'</th>
+  <th>'.$lt{'dura'}.'</th>
+  <th>'.$lt{'blse'}.'</th>
+ </tr>
+ ';
+     foreach my $course (keys(%{$setters})) {
+         my %courseinfo=&Apache::lonnet::coursedescription($course);
+         for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
+             my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
+             my $fullname = &plainname($uname,$udom);
+             if (defined($env{'user.name'}) && defined($env{'user.domain'})
+                 && $env{'user.name'} ne 'public'
+                 && $env{'user.domain'} ne 'public') {
+                 $fullname = &aboutmewrapper($fullname,$uname,$udom);
+             }
+             my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
+             $openblock = &Apache::lonlocal::locallocaltime($openblock);
+             $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
+             $output .= &Apache::loncommon::start_data_table_row().
+                        '<td>'.$courseinfo{'description'}.'</td>'.
+                        '<td>'.$openblock.' to '.$closeblock.'</td>'.
+                        '<td>'.$fullname.'</td>'.
+                         &Apache::loncommon::end_data_table_row();
+         }
+     }
+     $output .= &end_data_table();
+ }
+ sub blocking_status {
+     my ($activity,$uname,$udom) = @_;
+     my %setters;
+     my ($blocked,$output,$ownitem,$is_course);
+     my ($startblock,$endblock)=&blockcheck(\%setters,$activity,$uname,$udom);
+     if ($startblock && $endblock) {
+         $blocked = 1;
+         if (wantarray) {
+             my $category;
+             if ($activity eq 'boards') {
+                 $category = 'Discussion posts in this course';
+             } elsif ($activity eq 'blogs') {
+                 $category = 'Blogs';
+             } elsif ($activity eq 'port') {
+                 if (defined($uname) && defined($udom)) {
+                     if ($uname eq $env{'user.name'} &&
+                         $udom eq $env{'user.domain'}) {
+                         $ownitem = 1;
+                     }
+                 }
+                 $is_course = &Apache::lonnet::is_course($udom,$uname);
+                 if ($ownitem) {
+                     $category = 'Your portfolio files';
+                 } elsif ($is_course) {
+                     my $coursedesc;
+                     foreach my $course (keys(%setters)) {
+                         my %courseinfo =
+                              &Apache::lonnet::coursedescription($course);
+                         $coursedesc = $courseinfo{'description'};
+                     }
+                     $category = "Group files in the course '$coursedesc'";
+                 } else {
+                     $category = 'Portfolio files belonging to ';
+                     if ($env{'user.name'} eq 'public' &&
+                         $env{'user.domain'} eq 'public') {
+                         $category .= &plainname($uname,$udom);
+                     } else {
+                         $category .= &aboutmewrapper(&plainname($uname,$udom),$uname,$udom);
+                     }
+                 }
+             } elsif ($activity eq 'groups') {
+                 $category = 'Groups in this course';
+             }
+             my $showstart = &Apache::lonlocal::locallocaltime($startblock);
+             my $showend = &Apache::lonlocal::locallocaltime($endblock);
+             $output = '<br />'.&mt('[_1] will be inaccessible between [_2] and [_3] because communication is being blocked.',$category,$showstart,$showend).'<br />';
+             if (!($activity eq 'port' && !($ownitem) && !($is_course))) {
+                 $output .= &build_block_table($startblock,$endblock,\%setters);
+             }
+         }
+     }
+     if (wantarray) {
+         return ($blocked,$output);
+     } else {
+         return $blocked;
+     }
+ }
  ###############################################
  =pod
- Line 2734  Returns: Determines which domain should
+ Line 3211  Returns: Determines which domain should
  ###############################################
  sub determinedomain {
      my $domain=shift;
-    if (! $domain) {
+     if (! $domain) {
          # Determine domain if we have not been given one
          $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
          if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
- Line 2745  sub determinedomain {
+ Line 3222  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 2758  If the domain logo does not exist, a des
+ Line 3289  If the domain logo does not exist, a des
  ###############################################
  sub domainlogo {
      my $domain = &determinedomain(shift);
-      # See if there is a logo
+     my %designhash = &get_domainconf($domain);
-     if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') {
+     # See if there is a logo
- 	my $logo=&lonhttpdurl("/adm/lonDomLogos/$domain.gif");
+     if ($designhash{$domain.'.login.domlogo'} ne '') {
-         return '<img src="'.$logo.'" alt="'.$domain.'" />';
+         my $imgsrc = $designhash{$domain.'.login.domlogo'};
-     } elsif(exists($Apache::lonnet::domaindescription{$domain})) {
+         if ($imgsrc =~ m{^/(adm|res)/}) {
-         return $Apache::lonnet::domaindescription{$domain};
+ 	    if ($imgsrc =~ m{^/res/}) {
+ 		my $local_name = &Apache::lonnet::filelocation('',$imgsrc);
+ 		&Apache::lonnet::repcopy($local_name);
+ 	    }
+ 	   $imgsrc = &lonhttpdurl($imgsrc);
+         }
+         return '<img src="'.$imgsrc.'" alt="'.$domain.'" />';
+     } elsif (defined(&Apache::lonnet::domain($domain,'description'))) {
+         return &Apache::lonnet::domain($domain,'description');
      } else {
          return '';
      }
- Line 2800  sub designparm {
+ Line 3339  sub designparm {
  	return $env{'environment.color.'.$which};
      }
      $domain=&determinedomain($domain);
-     if (exists($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 =~ m{^/(adm|res)/}) {
+ 	    if ($output =~ m{^/res/}) {
+ 		my $local_name = &Apache::lonnet::filelocation('',$output);
+ 		&Apache::lonnet::repcopy($local_name);
+ 	    }
+             $output = &lonhttpdurl($output);
+         }
      }
+     return $output;
  }
  ###############################################
- Line 2814  sub designparm {
+ Line 3366  sub designparm {
  =back
- =head1 HTTP Helpers
+ =head1 HTML Helpers
  =over 4
- Line 2853  Inputs:
+ Line 3405  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
+             inherit_jsmath -> when creating popup window in a page,
+                               should it have jsmath forced on by the
+                               current page
  =back
  Returns: A uniform header for LON-CAPA web pages.
- Line 2864  other decorations will be returned.
+ Line 3422  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 2884  sub bodytag {
+ Line 3442  sub bodytag {
   # role and realm
      my ($role,$realm) = split(/\./,$env{'request.role'},2);
      if ($role  eq 'ca') {
-         my ($rdom,$rname) = ($realm =~ m-^/(\w+)/(\w+)$-);
+         my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$});
-         $realm = &plainname($rname,$rdom).':'.$rdom;
+         $realm = &plainname($rname,$rdom);
      }
  # realm
      if ($env{'request.course.id'}) {
- Line 2900  sub bodytag {
+ Line 3458  sub bodytag {
      if (!$realm) { $realm='&nbsp;'; }
  # Set messages
      my $messages=&domainlogo($domain);
- # Port for miniserver
-     my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
-     if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
      my $extra_body_attr = &make_attr_string($forcereg,\%design);
  # construct main body tag
      my $bodytag = "<body $extra_body_attr>".
- 	&Apache::lontexconvert::init_math_support();
+ 	&Apache::lontexconvert::init_math_support($args->{'inherit_jsmath'});
-     if ($bodyonly
+     if ($bodyonly) {
- 	|| ($env{'request.state'} eq 'construct'
- 	    && $env{'environment.remote'} ne 'off' )) {
          return $bodytag;
      } elsif ($env{'browser.interface'} eq 'textual') {
  # Accessibility
- Line 3020  ENDROLE
+ Line 3573  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 = &lonhttpdurl($img);
+     }
+     my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
      # Explicit link to get inline menu
      my $menu= ($no_inline_link?''
- Line 3104  sub make_attr_string {
+ Line 3660  sub make_attr_string {
  =pod
- =back
- =head1 HTML Helpers
- =over 4
  =item * &endbodytag()
  Returns a uniform footer for LON-CAPA web pages.
  Inputs: none
- =back
  =cut
  sub endbodytag {
- Line 3134  sub endbodytag {
+ Line 3682  sub endbodytag {
  =pod
- =over 4
  =item * &standard_css()
  Returns a style sheet
- Line 3146  Inputs: (all optional)
+ Line 3692  Inputs: (all optional)
              function       -> force usage of a specific rolish color scheme
              bgcolor        -> override the default page bgcolor
- =back
  =cut
  sub standard_css {
- Line 3169  sub standard_css {
+ Line 3713  sub standard_css {
      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    = '#CCC';
+     my $data_table_darker    = '#CCCCCC';
      my $data_table_highlight = '#FFFF00';
      my $mail_new             = '#FFBB77';
      my $mail_new_hover       = '#DD9955';
- Line 3181  sub standard_css {
+ Line 3725  sub standard_css {
      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 {  border-style: solid; border-width: 1px; background: $tabbg;}
- table.thinborder tr td { border-style: solid; border-width: 1px}
+ table.thinborder tr th {
+   border-style: solid;
+   border-width: 1px;
+   background: $tabbg;
+ }
+ table.thinborder tr td {
+   border-style: solid;
+   border-width: 1px
+ }
  form, .inline { display: inline; }
  .center { text-align: center; }
- Line 3199  form, .inline { display: inline; }
+ Line 3753  form, .inline { display: inline; }
    color: red;
    font-size: larger;
  }
- .LC_warning {
+ .LC_warning,
+ .LC_diff_removed {
    color: red;
  }
- .LC_success {
+ .LC_info,
+ .LC_success,
+ .LC_diff_added {
    color: green;
  }
+ .LC_unknown {
+   color: yellow;
+ }
  .LC_icon {
    border: 0px;
  }
+ .LC_indexer_icon {
+   border: 0px;
+   height: 22px;
+ }
+ .LC_docs_spacer {
+   width: 25px;
+   height: 1px;
+   border: 0px;
+ }
+ .LC_internal_info {
+   color: #999;
+ }
+ table.LC_pastsubmission {
+   border: 1px solid black;
+   margin: 2px;
+ }
  table#LC_top_nav, table#LC_menubuttons {
    width: 100%;
- Line 3248  table#LC_title_bar td.LC_title_bar_who {
+ Line 3828  table#LC_title_bar td.LC_title_bar_who {
    font: small $sans;
    text-align: right;
  }
+ span.LC_metadata {
+     font-family: $sans;
+ }
  span.LC_title_bar_title {
    font: bold x-large $sans;
  }
- Line 3262  table#LC_title_bar td.LC_title_bar_role_
+ Line 3845  table#LC_title_bar td.LC_title_bar_role_
  }
  table#LC_menubuttons_mainmenu {
-   background: $pgbg;
+   width: 100%;
    border: 0px;
    border-spacing: 1px;
    padding: 0px 1px;
- Line 3317  td.LC_table_cell_checkbox {
+ Line 3900  td.LC_table_cell_checkbox {
    text-align: center;
  }
+ table#LC_mainmenu td.LC_mainmenu_column {
+     vertical-align: top;
+ }
  .LC_menubuttons_inline_text {
    color: $font;
    font-family: $sans;
    font-size: smaller;
  }
+ .LC_menubuttons_link {
+   text-decoration: none;
+ }
+ .LC_menubuttons_category {
+   color: $font;
+   background: $pgbg;
+   font-family: $sans;
+   font-size: larger;
+   font-weight: bold;
+ }
  td.LC_menubuttons_text {
+   width: 90%;
    color: $font;
    font-family: $sans;
  }
  td.LC_menubuttons_img {
-   background: $tabbg;
  }
  .LC_current_location {
    font-family: $sans;
    background: $tabbg;
- Line 3339  td.LC_menubuttons_img {
+ Line 3940  td.LC_menubuttons_img {
    font-weight: bold;
  }
+ .LC_rolesmenu_is {
+   font-family: $sans;
+ }
+ .LC_rolesmenu_selected {
+   font-family: $sans;
+ }
+ .LC_rolesmenu_future {
+   font-family: $sans;
+ }
+ .LC_rolesmenu_will {
+   font-family: $sans;
+ }
+ .LC_rolesmenu_will_not {
+   font-family: $sans;
+ }
+ .LC_rolesmenu_expired {
+   font-family: $sans;
+ }
+ .LC_rolesinfo {
+   font-family: $sans;
+ }
+ .LC_dropadd_labeltext {
+   font-family: $sans;
+   text-align: right;
+ }
+ .LC_preferences_labeltext {
+   font-family: $sans;
+   text-align: right;
+ }
  table.LC_aboutme_port {
    border: 0px;
    border-collapse: collapse;
- Line 3352  table.LC_data_table, table.LC_mail_list
+ Line 3992  table.LC_data_table, table.LC_mail_list
  .LC_data_table_dense {
    font-size: small;
  }
- table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th {
+ 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,
+ table.LC_prior_tries tr th {
    font-weight: bold;
    background-color: $data_table_head;
    font-size: smaller;
- Line 3370  table.LC_data_table tr.LC_data_table_hig
+ Line 4023  table.LC_data_table tr.LC_data_table_hig
    background-color: $data_table_darker;
  }
  table.LC_data_table tr.LC_empty_row td,
- table.LC_whatsnew 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 {
- table.LC_whatsnew {
+   padding: 4ex
  }
+ table.LC_nested_outer tr th {
- table.LC_whatsnew tr th,
+   font-weight: bold;
- table.LC_whatsnew tr.LC_info_row td {
+   background-color: $data_table_head;
-   background-color: #CCC;
+   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_whatsnew tr td {
+ table.LC_nested tr.LC_info_row td {
-   background-color: #FFF;
+   background-color: #CCC;
+   font-weight: bold;
    font-size: small;
-   text-align: right;
+   text-align: center;
  }
- table.LC_whatsnew tr td.LC_first_item {
+ 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_whatsnew tr.LC_odd_row td {
+ table.LC_nested tr.LC_odd_row td {
    background-color: #EEE;
  }
+ table.LC_createuser {
+ }
+ table.LC_createuser tr.LC_section_row td {
+   font-size: smaller;
+ }
+ table.LC_createuser tr.LC_info_row td  {
+   background-color: #CCC;
+   font-weight: bold;
+   text-align: center;
+ }
  table.LC_calendar {
    border: 1px solid #000000;
    border-collapse: collapse;
- Line 3443  table.LC_mail_list tr.LC_mail_other {
+ Line 4125  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;
- Line 3499  table#LC_browser tr.LC_browser_file_unpu
+ Line 4186  table#LC_browser tr.LC_browser_file_unpu
  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_modified,
+ table#LC_browser tr.LC_browser_file_metamodified {
    background: #FFFF77;
  }
  table#LC_browser tr.LC_browser_folder {
- Line 3686  table.LC_descriptive_input td.LC_descrip
+ Line 4374  table.LC_descriptive_input td.LC_descrip
    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: 1px solid #000000;
+   border-collapse: separate;
+   border-spacing: 1px;
+ }
+ table.LC_prior_tries td {
+   padding: 2px;
+ }
+ .LC_answer_correct {
+   background: #AAFFAA;
+   color: black;
+ }
+ .LC_answer_charged_try {
+   background: #FFAAAA ! important;
+   color: black;
+ }
+ .LC_answer_not_charged_try,
+ .LC_answer_no_grade,
+ .LC_answer_late {
+   background: #FFFFAA;
+   color: black;
+ }
+ .LC_answer_previous {
+   background: #AAAAFF;
+   color: black;
+ }
+ .LC_answer_no_message {
+   background: #FFFFFF;
+   color: black;
+ }
+ .LC_answer_unknown {
+   background: orange;
+   color: black;
+ }
+ span.LC_prior_numerical,
+ span.LC_prior_string,
+ span.LC_prior_custom,
+ span.LC_prior_reaction,
+ span.LC_prior_math {
+   font-family: monospace;
+   white-space: pre;
+ }
+ span.LC_prior_string {
+   font-family: monospace;
+   white-space: pre;
+ }
+ table.LC_prior_option {
+   width: 100%;
+   border-collapse: collapse;
+ }
+ table.LC_prior_rank, table.LC_prior_match {
+   border-collapse: collapse;
+ }
+ table.LC_prior_option tr td,
+ table.LC_prior_rank tr td,
+ table.LC_prior_match tr td {
+   border: 1px solid #000000;
+ }
+ span.LC_nobreak {
+   white-space: nowrap;
+ }
+ table.LC_docs_documents {
+   background: #BBBBBB;
+   border-width: 0px;
+   border-collapse: collapse;
+ }
+ table.LC_docs_documents td.LC_docs_document {
+   border: 2px solid black;
+   padding: 4px;
+ }
+ .LC_docs_course_commands div {
+   float: left;
+   border: 4px solid #AAAAAA;
+   padding: 4px;
+   background: #DDDDCC;
+ }
+ .LC_docs_entry_move {
+   border: 0px;
+   border-collapse: collapse;
+ }
+ .LC_docs_entry_move td {
+   border: 2px solid #BBBBBB;
+   background: #DDDDDD;
+ }
+ .LC_docs_editor td.LC_docs_entry_commands {
+   background: #DDDDDD;
+   font-size: x-small;
+ }
+ .LC_docs_copy {
+   color: #000099;
+ }
+ .LC_docs_cut {
+   color: #550044;
+ }
+ .LC_docs_rename {
+   color: #009900;
+ }
+ .LC_docs_remove {
+   color: #990000;
+ }
+ .LC_docs_reinit_warn,
+ .LC_docs_ext_edit {
+   font-size: x-small;
+ }
+ .LC_docs_editor td.LC_docs_entry_title,
+ .LC_docs_editor td.LC_docs_entry_icon {
+   background: #FFFFBB;
+ }
+ .LC_docs_editor td.LC_docs_entry_parameter {
+   background: #BBBBFF;
+   font-size: x-small;
+   white-space: nowrap;
+ }
+ table.LC_docs_adddocs td,
+ table.LC_docs_adddocs th {
+   border: 1px solid #BBBBBB;
+   padding: 4px;
+   background: #DDDDDD;
+ }
  END
  }
  =pod
- =over 4
  =item * &headtag()
  Returns a uniform footer for LON-CAPA web pages.
- Line 3714  Inputs: $title - optional title for the
+ Line 4543  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
- =back
+                            -> prevent &mt()ing the title arg
  =cut
- Line 3726  sub headtag {
+ Line 4555  sub headtag {
      my $domain   = $args->{'domain'}   || &determinedomain();
      my $bgcolor  = $args->{'bgcolor'}  || &designparm($function.'.pgbg',$domain);
      my $url = join(':',$env{'user.name'},$env{'user.domain'},
- 		   #time(),
  		   $Apache::lonnet::perlvar{'lonVersion'},
+ 		   #time(),
  		   $env{'environment.color.timestamp'},
  		   $function,$domain,$bgcolor);
- Line 3735  sub headtag {
+ Line 4564  sub headtag {
      my $result =
  	'<head>'.
- 	&font_settings().
+ 	&font_settings();
- 	&Apache::lonhtmlcommon::htmlareaheaders();
+     if (!$args->{'frameset'}) {
+ 	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
+     }
      if ($args->{'force_register'}) {
  	$result .= &Apache::lonmenu::registerurl(1);
      }
- Line 3761  ADDMETA
+ Line 4592  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>'
+     $result .= '<title> LON-CAPA '.$title.'</title>'
  	.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'
  	.$head_extra;
      return $result;
- Line 3770  ADDMETA
+ Line 4601  ADDMETA
  =pod
- =over 4
  =item * &font_settings()
  Returns neccessary <meta> to set the proper encoding
  Inputs: none
- =back
  =cut
  sub font_settings {
- Line 3796  sub font_settings {
+ Line 4623  sub font_settings {
  =pod
- =over 4
  =item * &xml_begin()
  Returns the needed doctype and <html>
  Inputs: none
- =back
  =cut
  sub xml_begin {
- Line 3830  sub xml_begin {
+ Line 4653  sub xml_begin {
  =pod
- =over 4
  =item * &endheadtag()
  Returns a uniform </head> for LON-CAPA web pages.
  Inputs: none
- =back
  =cut
  sub endheadtag {
- Line 3848  sub endheadtag {
+ Line 4667  sub endheadtag {
  =pod
- =over 4
  =item * &head()
  Returns a uniform complete <head>..</head> section for LON-CAPA web pages.
- Line 3857  Returns a uniform complete <head>..</hea
+ Line 4674  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
  sub head {
- Line 3868  sub head {
+ Line 4683  sub head {
  =pod
- =over 4
  =item * &start_page()
  Returns a complete <html> .. <body> section for LON-CAPA web pages.
- Line 3906  Inputs: $title - optional title for the
+ Line 4719  Inputs: $title - optional title for the
                    no_inline_link -> if true and in remote mode, don't show the
                                      'Switch To Inline Menu' link
- =back
+                   no_auto_mt_title -> prevent &mt()ing the title arg
+                   inherit_jsmath -> when creating popup window in a page,
+                                     should it have jsmath forced on by the
+                                     current page
  =cut
- Line 3915  sub start_page {
+ Line 4732  sub start_page {
      #&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
      my %head_args;
      foreach my $arg ('redirect','force_register','domain','function',
- 		     'bgcolor','frameset','no_nav_bar','only_body') {
+ 		     'bgcolor','frameset','no_nav_bar','only_body',
+ 		     'no_auto_mt_title') {
  	if (defined($args->{$arg})) {
  	    $head_args{$arg} = $args->{$arg};
  	}
- Line 3941  sub start_page {
+ Line 4759  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 3957  sub start_page {
+ Line 4776  sub start_page {
  =pod
- =over 4
  =item * &head()
  Returns a complete </body></html> section for LON-CAPA web pages.
- Line 3970  Inputs:         $args - additional optio
+ Line 4787  Inputs:         $args - additional optio
                                   a html attribute
                   frameset     -> if true will start with a <frameset>
                                   rather than <body>
+                  dicsussion   -> if true will get discussion from
+                                   lonxml::xmlend
+                                  (you can pass the target and parser arguments
+                                   through optional 'target' and 'parser' args
+                                   to this routine)
  =cut
- Line 4081  sub simple_error_page {
+ Line 4903  sub simple_error_page {
  	$css_class = (join(' ',$css_class,$add_class));
  	return  '<tr class="'.$css_class.'">'."\n";;
      }
+     sub continue_data_table_row {
+ 	my ($add_class) = @_;
+ 	my $css_class = ($row_count % 2)?'':'LC_even_row';
+ 	$css_class = (join(' ',$css_class,$add_class));
+ 	return  '<tr class="'.$css_class.'">'."\n";;
+     }
      sub end_data_table_row {
  	return '</tr>'."\n";;
- Line 4104  sub simple_error_page {
+ Line 4933  sub simple_error_page {
      }
  }
+ =pod
+ =item * &inhibit_menu_check($arg)
+ Checks for a inhibitmenu state and generates output to preserve it
+ Inputs:         $arg - can be any of
+                      - undef - in which case the return value is a string
+                                to add  into arguments list of a uri
+                      - 'input' - in which case the return value is a HTML
+                                  <form> <input> field of type hidden to
+                                  preserve the value
+                      - a url - in which case the return value is the url with
+                                the neccesary cgi args added to preserve the
+                                inhibitmenu state
+                      - a ref to a url - no return value, but the string is
+                                         updated to include the neccessary cgi
+                                         args to preserve the inhibitmenu state
+ =cut
+ sub inhibit_menu_check {
+     my ($arg) = @_;
+     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
+     if ($arg eq 'input') {
+ 	if ($env{'form.inhibitmenu'}) {
+ 	    return '<input type="hidden" name="inhibitmenu" value="'.$env{'form.inhibitmenu'}.'" />';
+ 	} else {
+ 	    return
+ 	}
+     }
+     if ($env{'form.inhibitmenu'}) {
+ 	if (ref($arg)) {
+ 	    $$arg .= '?inhibitmenu='.$env{'form.inhibitmenu'};
+ 	} elsif ($arg eq '') {
+ 	    $arg .= 'inhibitmenu='.$env{'form.inhibitmenu'};
+ 	} else {
+ 	    $arg .= '?inhibitmenu='.$env{'form.inhibitmenu'};
+ 	}
+     }
+     if (!ref($arg)) {
+ 	return $arg;
+     }
+ }
  ###############################################
  =pod
+ =back
+ =head1 User Information Routines
+ =over 4
  =item * &get_users_function()
  Used by &bodytag to determine the current users primary role.
- Line 4135  sub get_users_function {
+ Line 5015  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.
- Line 4421  sub get_course_users {
+ Line 5301  sub get_course_users {
                      $usec = 'none';
                  }
                  if ($uname ne '' && $udom ne '') {
-                     if ($end < $now) {
+                     if ($end > 0 && $end < $now) {
                          $status = 'previous';
                      } elsif ($start > $now) {
                          $status = 'future';
- Line 4483  sub get_user_info {
+ Line 5363  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.
+. (Optional) Type of setting: custom or default
+    (individually assigned or default for user's
+    institutional status).
+. (Optional) - User's institutional status (e.g., faculty, staff
+    or student - types as defined in localenroll::inst_usertypes
+    for user's domain, which determines default quota for user.
+. (Optional) - Default quota which would apply to the user.
+ If a value has been stored in the user's environment,
+ it will return that, otherwise it returns the maximal default
+ defined for the user's instituional status(es) in the domain.
+ =cut
+ ###############################################
+ sub get_user_quota {
+     my ($uname,$udom) = @_;
+     my ($quota,$quotatype,$settingstatus,$defquota);
+     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;
+         $quotatype = 'default';
+         $defquota = 0;
+     } else {
+         my $inststatus;
+         if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) {
+             $quota = $env{'environment.portfolioquota'};
+             $inststatus = $env{'environment.inststatus'};
+         } else {
+             my %userenv =
+                 &Apache::lonnet::get('environment',['portfolioquota',
+                                      'inststatus'],$udom,$uname);
+             my ($tmp) = keys(%userenv);
+             if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
+                 $quota = $userenv{'portfolioquota'};
+                 $inststatus = $userenv{'inststatus'};
+             } else {
+                 undef(%userenv);
+             }
+         }
+         ($defquota,$settingstatus) = &default_quota($udom,$inststatus);
+         if ($quota eq '') {
+             $quota = $defquota;
+             $quotatype = 'default';
+         } else {
+             $quotatype = 'custom';
+         }
+     }
+     if (wantarray) {
+         return ($quota,$quotatype,$settingstatus,$defquota);
+     } else {
+         return $quota;
+     }
+ }
+ ###############################################
+ =pod
+ =item * &default_quota()
+ Retrieves default quota assigned for storage of user portfolio files,
+ given an (optional) user's institutional status.
+ Incoming parameters:
+. domain
+. (Optional) institutional status(es).  This is a : separated list of
+    status types (e.g., faculty, staff, student etc.)
+    which apply to the user for whom the default is being retrieved.
+    If the institutional status string in undefined, the domain
+    default quota will be returned.
+ Returns:
+. Default disk quota (in Mb) for user portfolios in the domain.
+. (Optional) institutional type which determined the value of the
+    default quota.
+ If a value has been stored in the domain's configuration db,
+ it will return that, otherwise it returns 20 (for backwards
+ compatibility with domains which have not set up a configuration
+ db file; the original statically defined portfolio quota was 20 Mb).
+ If the user's status includes multiple types (e.g., staff and student),
+ the largest default quota which applies to the user determines the
+ default quota returned.
+ =cut
+ ###############################################
+ sub default_quota {
+     my ($udom,$inststatus) = @_;
+     my ($defquota,$settingstatus);
+     my %quotahash = &Apache::lonnet::get_dom('configuration',
+                                             ['quota'],$udom);
+     if (ref($quotahash{'quota'}) eq 'HASH') {
+         if ($inststatus ne '') {
+             my @statuses = split(/:/,$inststatus);
+             foreach my $item (@statuses) {
+                 if ($quotahash{'quota'}{$item} ne '') {
+                     if ($defquota eq '') {
+                         $defquota = $quotahash{'quota'}{$item};
+                         $settingstatus = $item;
+                     } elsif ($quotahash{'quota'}{$item} > $defquota) {
+                         $defquota = $quotahash{'quota'}{$item};
+                         $settingstatus = $item;
+                     }
+                 }
+             }
+         }
+         if ($defquota eq '') {
+             $defquota = $quotahash{'quota'}{'default'};
+             $settingstatus = 'default';
+         }
+     } else {
+         $settingstatus = 'default';
+         $defquota = 20;
+     }
+     if (wantarray) {
+         return ($defquota,$settingstatus);
+     } else {
+         return $defquota;
+     }
+ }
  sub get_secgrprole_info {
      my ($cdom,$cnum,$needroles,$type)  = @_;
      my %sections_count = &get_sections($cdom,$cnum);
- Line 4520  sub get_secgrprole_info {
+ Line 5548  sub get_secgrprole_info {
      return (\@sections,\@groups,$allroles,$rolehash,$accesshash);
  }
+ sub user_picker {
+     my ($dom,$srch,$forcenewuser) = @_;
+     my $currdom = $dom;
+     my %curr_selected = (
+                         srchin => 'dom',
+                         srchby => 'uname',
+                       );
+     my $srchterm;
+     if (ref($srch) eq 'HASH') {
+         if ($srch->{'srchby'} ne '') {
+             $curr_selected{'srchby'} = $srch->{'srchby'};
+         }
+         if ($srch->{'srchin'} ne '') {
+             $curr_selected{'srchin'} = $srch->{'srchin'};
+         }
+         if ($srch->{'srchtype'} ne '') {
+             $curr_selected{'srchtype'} = $srch->{'srchtype'};
+         }
+         if ($srch->{'srchdomain'} ne '') {
+             $currdom = $srch->{'srchdomain'};
+         }
+         $srchterm = $srch->{'srchterm'};
+     }
+     my %lt=&Apache::lonlocal::texthash(
+                     'doma'      => 'Domain/institution to search',
+                     'uname'     => 'username',
+                     'lastname'  => 'last name',
+                     'lastfirst' => 'last name, first name',
+                     'crs'       => 'in this course',
+                     'dom'       => 'in this domain',
+                     'alc'       => 'all LON-CAPA',
+                     'instd'     => 'in institutional directory',
+                     'exact'     => 'is',
+                     'contains'  => 'contains',
+                     'begins'    => 'begins with',
+                                        );
+     my $domform = &select_dom_form($currdom,'srchdomain',1,1);
+     my $srchinsel = ' <select name="srchin">';
+     my @srchins = ('crs','dom','alc','instd');
+     foreach my $option (@srchins) {
+         # FIXME 'alc' option unavailable until
+         #       loncreateuser::print_user_query_page()
+         #       has been completed.
+         next if ($option eq 'alc');
+         next if ($option eq 'crs' && !$env{'request.course.id'});
+         if ($curr_selected{'srchin'} eq $option) {
+             $srchinsel .= '
+    <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+         } else {
+             $srchinsel .= '
+    <option value="'.$option.'">'.$lt{$option}.'</option>';
+         }
+     }
+     $srchinsel .= "\n  </select>\n";
+     my $srchbysel =  ' <select name="srchby">';
+     foreach my $option ('uname','lastname','lastfirst') {
+         if ($curr_selected{'srchby'} eq $option) {
+             $srchbysel .= '
+    <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+         } else {
+             $srchbysel .= '
+    <option value="'.$option.'">'.$lt{$option}.'</option>';
+          }
+     }
+     $srchbysel .= "\n  </select>\n";
+     my $srchtypesel = ' <select name="srchtype">';
+     foreach my $option ('exact','begins','contains') {
+         if ($curr_selected{'srchtype'} eq $option) {
+             $srchtypesel .= '
+    <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+         } else {
+             $srchtypesel .= '
+    <option value="'.$option.'">'.$lt{$option}.'</option>';
+         }
+     }
+     $srchtypesel .= "\n  </select>\n";
+     my ($newuserscript,$new_user_create);
+     if ($forcenewuser) {
+ 	$new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\');" /> </p>';
+         $newuserscript = <<"ENDSCRIPT";
+ function setSearch(createnew) {
+     if (createnew == 1) {
+         for (var i=0; i<document.crtuser.srchby.length; i++) {
+             if (document.crtuser.srchby.options[i].value == 'uname') {
+                 document.crtuser.srchby.selectedIndex = i;
+             }
+         }
+         for (var i=0; i<document.crtuser.srchin.length; i++) {
+             if ( document.crtuser.srchin.options[i].value == 'dom') {
+ 		document.crtuser.srchin.selectedIndex = i;
+             }
+         }
+         for (var i=0; i<document.crtuser.srchtype.length; i++) {
+             if (document.crtuser.srchtype.options[i].value == 'exact') {
+                 document.crtuser.srchtype.selectedIndex = i;
+             }
+         }
+         for (var i=0; i<document.crtuser.srchdomain.length; i++) {
+             if (document.crtuser.srchdomain.options[i].value == '$env{'request.role.domain'}') {
+                 document.crtuser.srchdomain.selectedIndex = i;
+             }
+         }
+     }
+ }
+ ENDSCRIPT
+     }
+     my $output = <<"END_BLOCK";
+ <script type="text/javascript">
+ function validateEntry() {
+     var checkok = 1;
+     var srchin;
+     for (var i=0; i<document.crtuser.srchin.length; i++) {
+ 	if ( document.crtuser.srchin[i].checked ) {
+ 	    srchin = document.crtuser.srchin[i].value;
+ 	}
+     }
+     var srchtype = document.crtuser.srchtype.options[document.crtuser.srchtype.selectedIndex].value;
+     var srchby = document.crtuser.srchby.options[document.crtuser.srchby.selectedIndex].value;
+     var srchdomain = document.crtuser.srchdomain.options[document.crtuser.srchdomain.selectedIndex].value;
+     var srchterm =  document.crtuser.srchterm.value;
+     var srchin = document.crtuser.srchin.options[document.crtuser.srchin.selectedIndex].value;
+     var msg = "";
+     if (srchterm == "") {
+         checkok = 0;
+         msg += "You must include some text to search for.\\n";
+     }
+     if (srchtype== 'begins') {
+         if (srchterm.length < 2) {
+             checkok = 0;
+             msg += "The text you are searching for must contain at least two characters when using a 'begins' type search.\\n";
+         }
+     }
+     if (srchtype== 'contains') {
+         if (srchterm.length < 3) {
+             checkok = 0;
+             msg += "The text you are searching for must contain at least three characters when using a 'contains' type search.\\n";
+         }
+     }
+     if (srchin == 'instd') {
+         if (srchdomain == '') {
+             checkok = 0;
+             msg += "You must choose a domain when using an institutional directory search.\\n";
+         }
+     }
+     if (srchin == 'dom') {
+         if (srchdomain == '') {
+             checkok = 0;
+             msg += "You must choose a domain when using a domain search.\\n";
+         }
+     }
+     if (srchby == 'lastfirst') {
+         if (srchterm.indexOf(",") == -1) {
+             checkok = 0;
+             msg += "When using searching by last,first you must include a comma as separator between last name and first name.\\n";
+         }
+         if (srchterm.indexOf(",") == srchterm.length -1) {
+             checkok = 0;
+             msg += "When searching by last,first you must include at least one character in the first name.\\n";
+         }
+     }
+     if (checkok == 0) {
+         alert("The following need to be corrected before the search can be run:\\n"+msg);
+         return;
+     }
+     if (checkok == 1) {
+         document.crtuser.submit();
+     }
+ }
+ $newuserscript
+ </script>
+ $new_user_create
+ <table>
+  <tr>
+   <td>$srchbysel
+       $srchtypesel
+       <input type="text" size="15" name="srchterm" value="$srchterm" />
+       $srchinsel
+   </td>
+  </tr>
+  <tr>
+   <td>$lt{'doma'}: $domform</td>
+   </td>
+  </tr>
+ </table>
+ <br />
+ END_BLOCK
+     return $output;
+ }
  =pod
+ =back
+ =head1 HTTP Helpers
+ =over 4
  =item * get_unprocessed_cgi($query,$possible_names)
  Modify the %env hash to contain unprocessed CGI form parameters held in
- Line 4657  sub get_env_multiple {
+ Line 5901  sub get_env_multiple {
  =pod
  =back
  =head1 CSV Upload/Handling functions
- Line 4771  sub record_sep {
+ Line 6015  sub record_sep {
              $i++;
          }
      } else {
-         my @allfields=split(/\,/,$record);
+         my $separator=',';
+         if ($env{'form.upfiletype'} eq 'semisv') {
+             $separator=';';
+         }
          my $i=0;
-         my $j;
+ # the character we are looking for to indicate the end of a quote or a record
-         for ($j=0;$j<=$#allfields;$j++) {
+         my $looking_for=$separator;
-             my $field=$allfields[$j];
+ # do not add the characters to the fields
-             if ($field=~/^\s*(\"|\')/) {
+         my $ignore=0;
- 		my $delimiter=$1;
+ # we just encountered a separator (or the beginning of the record)
-                 while (($field!~/$delimiter$/) && ($j<$#allfields)) {
+         my $just_found_separator=1;
- 		    $j++;
+ # store the field we are working on here
- 		    $field.=','.$allfields[$j];
+         my $field='';
- 		}
+ # work our way through all characters in record
-                 $field=~s/^\s*$delimiter//;
+         foreach my $character ($record=~/(.)/g) {
-                 $field=~s/$delimiter\s*$//;
+             if ($character eq $looking_for) {
+                if ($character ne $separator) {
+ # Found the end of a quote, again looking for separator
+                   $looking_for=$separator;
+                   $ignore=1;
+                } else {
+ # Found a separator, store away what we got
+                   $components{&takeleft($i)}=$field;
+ 	          $i++;
+                   $just_found_separator=1;
+                   $ignore=0;
+                   $field='';
+                }
+                next;
              }
-             $components{&takeleft($i)}=$field;
+ # single or double quotation marks after a separator indicate beginning of a quote
- 	    $i++;
+ # we are now looking for the end of the quote and need to ignore separators
+             if ((($character eq '"') || ($character eq "'")) && ($just_found_separator))  {
+                $looking_for=$character;
+                next;
+             }
+ # ignore would be true after we reached the end of a quote
+             if ($ignore) { next; }
+             if (($just_found_separator) && ($character=~/\s/)) { next; }
+             $field.=$character;
+             $just_found_separator=0;
          }
+ # catch the very last entry, since we never encountered the separator
+         $components{&takeleft($i)}=$field;
      }
      return %components;
  }
- Line 4809  the file type.
+ Line 6080  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 5463  Returns: both routines return nothing
+ Line 6735  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 5512  sub store_course_settings {
+ Line 6787  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 5547  sub commit_customrole {
+ Line 6825  sub commit_customrole {
  }
  sub commit_standardrole {
-     my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
+     my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_;
-     my $output;
+     my ($output,$logmsg,$linefeed);
-     my $logmsg;
+     if ($context eq 'auto') {
+         $linefeed = "\n";
+     } else {
+         $linefeed = "<br />\n";
+     }
      if ($three eq 'st') {
-         my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec);
+         my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,
-         if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
+                                          $one,$two,$sec,$context);
+         if (($result =~ /^error/) || ($result eq 'not_in_class') ||
+             ($result eq 'unknown_course')) {
              $output = "Error: $result\n";
          } else {
-             $output = &mt('Assigning').' '.$three.' in '.$url.
+             $output = $logmsg.$linefeed.&mt('Assigning').' '.$three.' in '.$url.
                 ($start?', '.&mt('starting').' '.localtime($start):'').
-                ($end?', '.&mt('ending').' '.localtime($end):'').
+                ($end?', '.&mt('ending').' '.localtime($end):'').': ';
-                ': <b>'.$result.'</b><br />'.
+             if ($context eq 'auto') {
-                &mt('Add to classlist').': <b>ok</b><br />';
+                 $output .= $result.$linefeed.&mt('Add to classlist').': ok';
+             } else {
+                $output .= '<b>'.$result.'</b>'.$linefeed.
+                &mt('Add to classlist').': <b>ok</b>';
+             }
+             $output .= $linefeed;
          }
      } else {
          $output = &mt('Assigning').' '.$three.' in '.$url.
                 ($start?', '.&mt('starting').' '.localtime($start):'').
-                ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
+                ($end?', '.&mt('ending').' '.localtime($end):'').': ';
-                &Apache::lonnet::assignrole(
+         my $result = &Apache::lonnet::assignrole($udom,$uname,$url,$three,$end,$start);
-                    $udom,$uname,$url,$three,$end,$start).
+         if ($context eq 'auto') {
-                    '</b><br />';
+             $output .= $result.$linefeed;
+         } else {
+             $output .= '<b>'.$result.'</b>'.$linefeed;
+         }
      }
      return $output;
  }
  sub commit_studentrole {
-     my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
+     my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_;
-     my $linefeed =  '<br />'."\n";
+     my ($result,$linefeed);
-     my $result;
+     if ($context eq 'auto') {
+         $linefeed = "\n";
+     } else {
+         $linefeed = '<br />'."\n";
+     }
      if (defined($one) && defined($two)) {
          my $cid=$one.'_'.$two;
          my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid);
- Line 5621  sub commit_studentrole {
+ Line 6917  sub commit_studentrole {
  ############################################################
  ############################################################
+ sub check_clone {
+     my ($args) = @_;
+     my $cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
+     my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid);
+     my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
+     my $clonemsg;
+     my $can_clone = 0;
+     if ($clonehome eq 'no_host') {
+ 	$clonemsg = &mt('Attempting to clone non-existing [_1]',
+ 			$args->{'crstype'});
+     } else {
+ 	my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
+ 	if ($env{'request.role.domain'} eq $args->{'clonedomain'}) {
+ 	    $can_clone = 1;
+ 	} else {
+ 	    my %clonehash = &Apache::lonnet::get('environment',['cloners'],
+ 						 $args->{'clonedomain'},$args->{'clonecourse'});
+ 	    my @cloners = split(/,/,$clonehash{'cloners'});
+ 	    my %roleshash =
+ 		&Apache::lonnet::get_my_roles($args->{'ccuname'},
+ 					      $args->{'ccdomain'},'userroles',['active'],['cc'],
+ 					      [$args->{'clonedomain'}]);
+ 	    if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
+ 		$can_clone = 1;
+ 	    } else {
+ 		$clonemsg = &mt('The new course was not cloned from an existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+ 	    }
+ 	}
+     }
+     return ($can_clone, $clonemsg, $cloneid, $clonehome);
+ }
  sub construct_course {
-     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_;
+     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_;
      my $outcome;
+     my $linefeed =  '<br />'."\n";
+     if ($context eq 'auto') {
+         $linefeed = "\n";
+     }
+ #
+ # Are we cloning?
+ #
+     my ($can_clone, $clonemsg, $cloneid, $clonehome);
+     if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
+ 	($can_clone, $clonemsg, $cloneid, $clonehome) = &check_clone($args);
+ 	if ($context ne 'auto') {
+ 	    $clonemsg = '<span class="LC_error">'.$clonemsg.'</span>';
+ 	}
+ 	$outcome .= $clonemsg.$linefeed;
+         if (!$can_clone) {
+ 	    return (0,$outcome);
+ 	}
+     }
  #
  # Open course
- Line 5644  sub construct_course {
+ Line 6994  sub construct_course {
      # 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);
+     $outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;
  #
  # Check if created correctly
  #
-     ($$crsudom,$$crsunum)=($$courseid=~/^\/(\w+)\/(\w+)$/);
+     ($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid);
      my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
-     $outcome .= &mt('Created on').': '.$crsuhome.'<br>';
+     $outcome .= &mt('Created on').': '.$crsuhome.$linefeed;
- #
- # Are we cloning?
  #
-     my $cloneid='';
+ # Do the cloning
-     if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
+ #
- 	$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
+     if ($can_clone && $cloneid) {
-         my ($clonecrsudom,$clonecrsunum)=($cloneid=~/^\/(\w+)\/(\w+)$/);
+ 	$clonemsg = &mt('Cloning [_1] from [_2]',$crstype,$clonehome);
- 	my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
+ 	if ($context ne 'auto') {
- 	if ($clonehome eq 'no_host') {
+ 	    $clonemsg = '<span class="LC_success">'.$clonemsg.'</span>';
- 	    $outcome .=
+ 	}
-     '<br /><font color="red">'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.'</font>';
+ 	$outcome .= $clonemsg.$linefeed;
- 	} else {
+ 	my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
- 	    $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);
+ 	&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid);
  # Restore URL
- 	    $cenv{'url'}=$oldcenv{'url'};
+ 	$cenv{'url'}=$oldcenv{'url'};
  # Restore title
- 	    $cenv{'description'}=$oldcenv{'description'};
+ 	$cenv{'description'}=$oldcenv{'description'};
  # restore grading mode
- 	    if (defined($oldcenv{'grading'})) {
+ 	if (defined($oldcenv{'grading'})) {
- 		$cenv{'grading'}=$oldcenv{'grading'};
+ 	    $cenv{'grading'}=$oldcenv{'grading'};
- 	    }
- # Mark as cloned
- 	    $cenv{'clonedfrom'}=$cloneid;
- 	    delete($cenv{'default_enrollment_start_date'});
- 	    delete($cenv{'default_enrollment_end_date'});
  	}
+ # 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)
  #
- Line 5785  sub construct_course {
+ Line 7131  sub construct_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";
+         my $badclass_msg = $cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.
-         foreach (@badclasses) {
+                            ' ('.$lt{'adby'}.')';
-             $outcome .= "<li>$_</li>\n";
+         if ($context eq 'auto') {
-         }
+             $outcome .= $badclass_msg.$linefeed;
-         $outcome .= "</ul><br /><br /></font>\n";
+             $outcome .= '<div class="LC_warning">'.$badclass_msg.$linefeed.'<ul>'."\n";
+             foreach my $item (@badclasses) {
+                 if ($context eq 'auto') {
+                     $outcome .= " - $item\n";
+                 } else {
+                     $outcome .= "<li>$item</li>\n";
+                 }
+             }
+             if ($context eq 'auto') {
+                 $outcome .= $linefeed;
+             } else {
+                 $outcome .= "</ul><br /><br /></div>\n";
+             }
+         }
      }
      if ($args->{'no_end_date'}) {
          $args->{'endaccess'} = 0;
- Line 5805  sub construct_course {
+ Line 7164  sub construct_course {
      $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">'.
+             my $krb_msg = &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student');
-                       &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 ($context eq 'auto') {
+                 $outcome .= $krb_msg;
+             } else {
+                 $outcome .= '<span class="LC_error">'.$krb_msg.'</span>';
+             }
+             $outcome .= $linefeed;
          }
      }
      if (($args->{'ccdomain'}) && ($args->{'ccuname'})) {
- Line 5830  sub construct_course {
+ Line 7194  sub construct_course {
  # if specified, key authority is not course, but user
  # only active if keyaccess is yes
      if ($args->{'keyauth'}) {
- 	$args->{'keyauth'}=~s/[^\w\@]//g;
+ 	my ($user,$domain) = split(':',$args->{'keyauth'});
- 	if ($args->{'keyauth'}) {
+ 	$user = &LONCAPA::clean_username($user);
- 	    $cenv{'keyauth'}=$args->{'keyauth'};
+ 	$domain = &LONCAPA::clean_username($domain);
+ 	if ($user ne '' && $domain ne '') {
+ 	    $cenv{'keyauth'}=$user.':'.$domain;
  	}
      }
- Line 5860  sub construct_course {
+ Line 7226  sub construct_course {
      # By default, use standard grading
      if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; }
-     $outcome .= ('<br />'.&mt('Setting environment').': '.
+     $outcome .= $linefeed.&mt('Setting environment').': '.
-           &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).'<br>');
+           &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).$linefeed;
  #
  # Open all assignments
  #
- Line 5871  sub construct_course {
+ Line 7237  sub construct_course {
                             $storeunder.'.type' => 'date_start');
         $outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput
-                  ('resourcedata',\%storecontent,$$crsudom,$$crsunum).'<br>';
+                  ('resourcedata',\%storecontent,$$crsudom,$$crsunum).$linefeed;
     }
  #
  # Set first page
- Line 5898  sub construct_course {
+ Line 7264  sub construct_course {
  	(my $outtext,$errtext) = &LONCAPA::map::storemap($map,1);
  	if ($errtext) { $fatal=2; }
-         $outcome .= ($fatal?$errtext:'write ok').'<br />';
+         $outcome .= ($fatal?$errtext:'write ok').$linefeed;
      }
-     return $outcome;
+     return (1,$outcome);
  }
  ############################################################
- Line 5929  sub group_term {
+ Line 7296  sub group_term {
  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 5943  sub icon {
+ Line 7310  sub icon {
      return &lonhttpdurl($iconname);
  }
- sub lonhttpdurl {
+ sub lonhttpd_port {
-     my ($url)=@_;
      my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
      if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }
-     return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
+     # IE doesn't like a secure page getting images from a non-secure
+     # port (when logging we haven't parsed the browser type so default
+     # back to secure
+     if ((!exists($env{'browser.type'}) || $env{'browser.type'} eq 'explorer')
+ 	&& $ENV{'SERVER_PORT'} == 443) {
+ 	return 443;
+     }
+     return $lonhttpd_port;
  }
- sub absolute_url {
+ sub lonhttpdurl {
-     my ($host_name) = @_;
+     my ($url)=@_;
-     my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://');
-     if ($host_name eq '') {
+     my $lonhttpd_port = &lonhttpd_port();
- 	$host_name = $ENV{'SERVER_NAME'};
+     if ($lonhttpd_port == 443) {
+ 	return 'https://'.$ENV{'SERVER_NAME'}.$url;
      }
-     return $protocol.$host_name;
+     return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
  }
  sub connection_aborted {
- Line 5991  sub escape_url {
+ Line 7366  sub escape_url {
      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.454
changed lines
	Added in v.1.564.2.5