loncom/interface/lonparmset.pm - diff

Return to lonparmset.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonparmset.pm between versions 1.235 and 1.391

-version 1.235, 2005/06/28 15:28:08
+version 1.391, 2008/01/26 19:22:24
  Line 63  use Apache::lonhomework;
  use Apache::lonxml;
  use Apache::lonlocal;
  use Apache::lonnavmaps;
+ use Apache::longroup;
+ use Apache::lonrss;
+ use LONCAPA qw(:DEFAULT :match);
- # --- Caches local to lonparmset
- my $parmhashid;
- my %parmhash;
- my $symbsid;
- my %symbs;
- my $rulesid;
- my %rules;
- # --- end local caches
  ##################################################
  ##################################################
- Line 88  Inputs:  $what - a parameter spec (inclu
+ Line 81  Inputs:  $what - a parameter spec (inclu
           $id   - a bighash Id number
           $def  - the resource's default value   'stupid emacs
- Returns:  A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 11 possible levels
+ Returns:  A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 14 possible levels
 - General Course
 - Map or Folder level in course
 - resource default
 - map default
 - resource level in course
 - General for section
 - Map or Folder level for section
 - resource level in section
+- General for group
+- Map or Folder level for group
+- resource level in group
 - General for specific student
 - Map or Folder level for specific student
 - resource level for specific student
- Line 106  Returns:  A list, the first item is the
+ Line 102  Returns:  A list, the first item is the
  ##################################################
  sub parmval {
-     my ($what,$id,$def,$uname,$udom,$csec)=@_;
+     my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
-     return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec);
+     return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,
+                                                            $cgroup,$courseopt);
  }
  sub parmval_by_symb {
-     my ($what,$symb,$def,$uname,$udom,$csec)=@_;
+     my ($what,$symb,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
- # load caches
-     &cacheparmhash();
-     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-     my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
-     my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+     my $useropt;
+     if ($uname ne '' && $udom ne '') {
+ 	$useropt = &Apache::lonnet::get_userresdata($uname,$udom);
+     }
      my $result='';
      my @outpar=();
  # ----------------------------------------------------- Cascading lookup scheme
      my $map=(&Apache::lonnet::decode_symb($symb))[0];
+     $map = &Apache::lonnet::deversion($map);
      my $symbparm=$symb.'.'.$what;
      my $mapparm=$map.'___(all).'.$what;
+     my $grplevel=$env{'request.course.id'}.'.['.$cgroup.'].'.$what;
+     my $grplevelr=$env{'request.course.id'}.'.['.$cgroup.'].'.$symbparm;
+     my $grplevelm=$env{'request.course.id'}.'.['.$cgroup.'].'.$mapparm;
      my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$what;
      my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
      my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;
- Line 139  sub parmval_by_symb {
+ Line 137  sub parmval_by_symb {
      my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
  # --------------------------------------------------------- first, check course
      if (defined($$courseopt{$courselevel})) {
- 	$outpar[11]=$$courseopt{$courselevel};
+ 	$outpar[14]=$$courseopt{$courselevel};
- 	$result=11;
+ 	$result=14;
      }
      if (defined($$courseopt{$courselevelm})) {
- 	$outpar[10]=$$courseopt{$courselevelm};
+ 	$outpar[13]=$$courseopt{$courselevelm};
- 	$result=10;
+ 	$result=13;
      }
  # ------------------------------------------------------- second, check default
-     if (defined($def)) { $outpar[9]=$def; $result=9; }
+     if (defined($def)) { $outpar[12]=$def; $result=12; }
  # ------------------------------------------------------ third, check map parms
-     my $thisparm=$parmhash{$symbparm};
+     my $thisparm=&parmhash($symbparm);
-     if (defined($thisparm)) { $outpar[8]=$thisparm; $result=8; }
+     if (defined($thisparm)) { $outpar[11]=$thisparm; $result=11; }
      if (defined($$courseopt{$courselevelr})) {
- 	$outpar[7]=$$courseopt{$courselevelr};
+ 	$outpar[10]=$$courseopt{$courselevelr};
- 	$result=7;
+ 	$result=10;
      }
  # ------------------------------------------------------ fourth, back to course
-     if (defined($csec)) {
+     if ($csec ne '') {
          if (defined($$courseopt{$seclevel})) {
- 	    $outpar[6]=$$courseopt{$seclevel};
+ 	    $outpar[9]=$$courseopt{$seclevel};
- 	    $result=6;
+ 	    $result=9;
  	}
          if (defined($$courseopt{$seclevelm})) {
- 	    $outpar[5]=$$courseopt{$seclevelm};
+ 	    $outpar[8]=$$courseopt{$seclevelm};
- 	    $result=5;
+ 	    $result=8;
  	}
          if (defined($$courseopt{$seclevelr})) {
- 	    $outpar[4]=$$courseopt{$seclevelr};
+ 	    $outpar[7]=$$courseopt{$seclevelr};
- 	    $result=4;
+ 	    $result=7;
  	}
      }
+ # ------------------------------------------------------ fifth, check course group
+     if ($cgroup ne '') {
+         if (defined($$courseopt{$grplevel})) {
+             $outpar[6]=$$courseopt{$grplevel};
+             $result=6;
+         }
+         if (defined($$courseopt{$grplevelm})) {
+             $outpar[5]=$$courseopt{$grplevelm};
+             $result=5;
+         }
+         if (defined($$courseopt{$grplevelr})) {
+             $outpar[4]=$$courseopt{$grplevelr};
+             $result=4;
+         }
+     }
  # ---------------------------------------------------------- fifth, check user
-     if (defined($uname)) {
+     if ($uname ne '') {
  	if (defined($$useropt{$courselevel})) {
  	    $outpar[3]=$$useropt{$courselevel};
  	    $result=3;
- Line 204  sub parmval_by_symb {
+ Line 216  sub parmval_by_symb {
      return ($result,@outpar);
  }
- sub resetparmhash {
-     $parmhashid='';
- }
- sub cacheparmhash {
-     if ($parmhashid eq  $env{'request.course.fn'}) { return; }
-     my %parmhashfile;
-     if (tie(%parmhashfile,'GDBM_File',
- 	      $env{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640)) {
- 	%parmhash=%parmhashfile;
- 	untie %parmhashfile;
- 	$parmhashid=$env{'request.course.fn'};
-     }
- }
- sub resetsymbcache {
+ # --- Caches local to lonparmset
-     $symbsid='';
+ sub reset_caches {
+     &resetparmhash();
+     &resetsymbcache();
+     &resetrulescache();
  }
- sub symbcache {
+ {
-     my $id=shift;
+     my $parmhashid;
-     if ($symbsid ne $env{'request.course.id'}) {
+     my %parmhash;
- 	%symbs=();
+     sub resetparmhash {
+ 	undef($parmhashid);
+ 	undef(%parmhash);
      }
-     unless ($symbs{$id}) {
- 	my $navmap = Apache::lonnavmaps::navmap->new();
+     sub cacheparmhash {
- 	if ($id=~/\./) {
+ 	if ($parmhashid eq  $env{'request.course.fn'}) { return; }
- 	    my $resource=$navmap->getById($id);
+ 	my %parmhashfile;
- 	    $symbs{$id}=$resource->symb();
+ 	if (tie(%parmhashfile,'GDBM_File',
- 	} else {
+ 		$env{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640)) {
- 	    my $resource=$navmap->getByMapPc($id);
+ 	    %parmhash=%parmhashfile;
- 	    $symbs{$id}=&Apache::lonnet::declutter($resource->src());
+ 	    untie(%parmhashfile);
+ 	    $parmhashid=$env{'request.course.fn'};
  	}
- 	$symbsid=$env{'request.course.id'};
      }
-     return $symbs{$id};
- }
+     sub parmhash {
+ 	my ($id) = @_;
- sub resetrulescache {
+ 	&cacheparmhash();
-     $rulesid='';
+ 	return $parmhash{$id};
- }
+     }
+  }
+ {
+     my $symbsid;
+     my %symbs;
+     sub resetsymbcache {
+ 	undef($symbsid);
+ 	undef(%symbs);
+     }
+     sub symbcache {
+ 	my $id=shift;
+ 	if ($symbsid ne $env{'request.course.id'}) {
+ 	    undef(%symbs);
+ 	}
+ 	if (!$symbs{$id}) {
+ 	    my $navmap = Apache::lonnavmaps::navmap->new();
+ 	    if ($id=~/\./) {
+ 		my $resource=$navmap->getById($id);
+ 		$symbs{$id}=$resource->symb();
+ 	    } else {
+ 		my $resource=$navmap->getByMapPc($id);
+ 		$symbs{$id}=&Apache::lonnet::declutter($resource->src());
+ 	    }
+ 	    $symbsid=$env{'request.course.id'};
+ 	}
+ 	return $symbs{$id};
+     }
+  }
- sub rulescache {
+ {
-     my $id=shift;
+     my $rulesid;
-     if ($rulesid ne $env{'request.course.id'}) {
+     my %rules;
- 	%rules=();
+     sub resetrulescache {
+ 	undef($rulesid);
+ 	undef(%rules);
      }
-     unless (defined($rules{$id})) {
- 	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     sub rulescache {
- 	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+ 	my $id=shift;
- 	%rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
+ 	if ($rulesid ne $env{'request.course.id'}
- 	$rulesid=$env{'request.course.id'};
+ 	    && !defined($rules{$id})) {
+ 	    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ 	    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+ 	    %rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
+ 	    $rulesid=$env{'request.course.id'};
+ 	}
+ 	return $rules{$id};
      }
-     return $rules{$id};
  }
  sub preset_defaults {
- Line 275  sub preset_defaults {
+ Line 317  sub preset_defaults {
  }
  ##################################################
+ sub date_sanity_info {
+    my $checkdate=shift;
+    unless ($checkdate) { return ''; }
+    my $result='';
+    my $crsprefix='course.'.$env{'request.course.id'}.'.';
+    if ($env{$crsprefix.'default_enrollment_end_date'}) {
+       if ($checkdate>$env{$crsprefix.'default_enrollment_end_date'}) {
+          $result.='<br />'.&mt('After course enrollment end!');
+       }
+    }
+    if ($env{$crsprefix.'default_enrollment_start_date'}) {
+       if ($checkdate<$env{$crsprefix.'default_enrollment_start_date'}) {
+          $result.='<br />'.&mt('Before course enrollment start!');
+       }
+    }
+    return $result;
+ }
+ ##################################################
  ##################################################
  #
  # Store a parameter by ID
- Line 289  sub preset_defaults {
+ Line 350  sub preset_defaults {
  # - userdomain
  sub storeparm {
-     my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_;
+     my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
-     &storeparm_by_symb(&symbcache($sresid),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec);
+     &storeparm_by_symb(&symbcache($sresid),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,'',$cgroup);
  }
  #
- Line 304  sub storeparm {
+ Line 365  sub storeparm {
  # - new type
  # - username
  # - userdomain
  my %recstack;
  sub storeparm_by_symb {
-     my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$recflag)=@_;
+     my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$recflag,$cgroup)=@_;
      unless ($recflag) {
  # first time call
  	%recstack=();
- Line 315  sub storeparm_by_symb {
+ Line 375  sub storeparm_by_symb {
      }
  # store parameter
      &storeparm_by_symb_inner
- 	($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec);
+ 	($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup);
+ # don't do anything if parameter was reset
+     unless ($nval) { return; }
      my ($prefix,$parm)=($spnam=~/^(.*[\_\.])([^\_\.]+)$/);
  # remember that this was set
      $recstack{$parm}=1;
- Line 348  sub storeparm_by_symb {
+ Line 410  sub storeparm_by_symb {
  	   }
  	   if ($active) {
  	       &storeparm_by_symb($symb,$newspnam,$snum,$newvalue,&rulescache($triggered.'_type'),
- 				   $uname,$udom,$csec,$recflag);
+ 				   $uname,$udom,$csec,$recflag,$cgroup);
  	   }
         }
      }
      return '';
  }
+ sub log_parmset {
+     return &Apache::lonnet::instructor_log('parameterlog',@_);
+ }
  sub storeparm_by_symb_inner {
  # ---------------------------------------------------------- Get symb, map, etc
-     my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_;
+     my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
  # ---------------------------------------------------------- Construct prefixes
      $spnam=~s/\_([^\_]+)$/\.$1/;
      my $map=(&Apache::lonnet::decode_symb($symb))[0];
+     $map = &Apache::lonnet::deversion($map);
      my $symbparm=$symb.'.'.$spnam;
      my $mapparm=$map.'___(all).'.$spnam;
+     my $grplevel=$env{'request.course.id'}.'.['.$cgroup.'].'.$spnam;
+     my $grplevelr=$env{'request.course.id'}.'.['.$cgroup.'].'.$symbparm;
+     my $grplevelm=$env{'request.course.id'}.'.['.$cgroup.'].'.$mapparm;
      my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$spnam;
      my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
      my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;
- Line 373  sub storeparm_by_symb_inner {
+ Line 445  sub storeparm_by_symb_inner {
      my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
      my $storeunder='';
-     if (($snum==11) || ($snum==3)) { $storeunder=$courselevel; }
+     if (($snum==14) || ($snum==3)) { $storeunder=$courselevel; }
-     if (($snum==10) || ($snum==2)) { $storeunder=$courselevelm; }
+     if (($snum==13) || ($snum==2)) { $storeunder=$courselevelm; }
-     if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }
+     if (($snum==10) || ($snum==1)) { $storeunder=$courselevelr; }
-     if ($snum==6) { $storeunder=$seclevel; }
+     if ($snum==9) { $storeunder=$seclevel; }
-     if ($snum==5) { $storeunder=$seclevelm; }
+     if ($snum==8) { $storeunder=$seclevelm; }
-     if ($snum==4) { $storeunder=$seclevelr; }
+     if ($snum==7) { $storeunder=$seclevelr; }
+     if ($snum==6) { $storeunder=$grplevel; }
+     if ($snum==5) { $storeunder=$grplevelm; }
+     if ($snum==4) { $storeunder=$grplevelr; }
      my $delete;
      if ($nval eq '') { $delete=1;}
- Line 392  sub storeparm_by_symb_inner {
+ Line 468  sub storeparm_by_symb_inner {
  	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
  # Expire sheets
  	&Apache::lonnet::expirespread('','','studentcalc');
- 	if (($snum==7) || ($snum==4)) {
+ 	if (($snum==10) || ($snum==7) || ($snum==4)) {
  	    &Apache::lonnet::expirespread('','','assesscalc',$symb);
- 	} elsif (($snum==8) || ($snum==5)) {
+ 	} elsif (($snum==11) || ($snum==8) || ($snum==5)) {
  	    &Apache::lonnet::expirespread('','','assesscalc',$map);
  	} else {
  	    &Apache::lonnet::expirespread('','','assesscalc');
- Line 403  sub storeparm_by_symb_inner {
+ Line 479  sub storeparm_by_symb_inner {
  	if ($delete) {
  	    $reply=&Apache::lonnet::del
  		('resourcedata',[keys(%storecontent)],$cdom,$cnum);
+             &log_parmset(\%storecontent,1);
  	} else {
  	    $reply=&Apache::lonnet::cput
  		('resourcedata',\%storecontent,$cdom,$cnum);
+ 	    &log_parmset(\%storecontent);
  	}
  	&Apache::lonnet::devalidatecourseresdata($cnum,$cdom);
      } else {
- Line 426  sub storeparm_by_symb_inner {
+ Line 504  sub storeparm_by_symb_inner {
  	if ($delete) {
  	    $reply=&Apache::lonnet::del
  		('resourcedata',[keys(%storecontent)],$udom,$uname);
+ 	    &log_parmset(\%storecontent,1,$uname,$udom);
  	} else {
  	    $reply=&Apache::lonnet::cput
  		('resourcedata',\%storecontent,$udom,$uname);
+ 	    &log_parmset(\%storecontent,0,$uname,$udom);
  	}
  	&Apache::lonnet::devalidateuserresdata($uname,$udom);
      }
      if ($reply=~/^error\:(.*)/) {
- 	return "<font color=red>Write Error: $1</font>";
+ 	return "<span class=\"LC_error\">Write Error: $1</span>";
      }
      return '';
  }
- Line 448  sub storeparm_by_symb_inner {
+ Line 528  sub storeparm_by_symb_inner {
  Format a value for output.
- Inputs:  $value, $type
+ Inputs:  $value, $type, $editable
  Returns: $value, formatted for output.  If $type indicates it is a date,
  localtime($value) is returned.
+ $editable will return an icon to click on
  =cut
  ##################################################
  ##################################################
  sub valout {
-     my ($value,$type)=@_;
+     my ($value,$type,$editable)=@_;
      my $result = '';
      # Values of zero are valid.
      if (! $value && $value ne '0') {
- 	$result = '&nbsp;&nbsp;';
+ 	if ($editable) {
+ 	    $result = '<span class="LC_clickhere">*</span>';
+ 	} else {
+ 	    $result='&nbsp;';
+ 	}
      } else {
          if ($type eq 'date_interval') {
              my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
- Line 488  sub valout {
+ Line 573  sub valout {
              }
              $result=~s/\s+$//;
          } elsif (&isdateparm($type)) {
-             $result = localtime($value);
+             $result = &Apache::lonlocal::locallocaltime($value).
+ 		&date_sanity_info($value);
          } else {
              $result = $value;
+ 	    $result = &HTML::Entities::encode($result,'"<>&');
          }
      }
      return $result;
- Line 527  sub plink {
+ Line 614  sub plink {
      my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
      my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
      unless (defined($winvalue)) { $winvalue=$val; }
-     return
+     my $valout = &valout($value,$type,1);
+     foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
+ 		      \$hour, \$min, \$sec) {
+ 	$$item = &HTML::Entities::encode($$item,'"<>&');
+ 	$$item =~ s/\'/\\\'/g;
+     }
+     return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$marker.'" /></td></tr><tr><td align="center">'.
  	'<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
  	    .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
- 		&valout($value,$type).'</a><a name="'.$marker.'"></a>';
+ 	    $valout.'</a></td></tr></table>';
  }
- sub startpage {
+ sub page_js {
-     my $r=shift;
-     my $bodytag=&Apache::loncommon::bodytag('Set/Modify Course Parameters','',
-                                             'onUnload="pclose()"');
-     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Table Mode Parameter Setting');
      my $selscript=&Apache::loncommon::studentbrowser_javascript();
      my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
-     my $html=&Apache::lonxml::xmlbegin();
-     $r->print(<<ENDHEAD);
+     return(<<ENDJS);
- $html
+ <script type="text/javascript">
- <head>
- <title>LON-CAPA Course Parameters</title>
- <script>
      function pclose() {
          parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
- Line 588  $html
+ Line 674  $html
      }
  </script>
  $selscript
- </head>
+ ENDJS
- $bodytag
+ }
+ sub startpage {
+     my ($r) = @_;
+     my %loaditems = ('onunload' => "pclose()",
+ 		     'onload'   => "group_or_section('cgroup')",);
+     my $start_page =
+ 	&Apache::loncommon::start_page('Set/Modify Course Parameters',
+ 				       &page_js(),
+ 				       {'add_entries' => \%loaditems,});
+     my $breadcrumbs =
+ 	&Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
+     $r->print(<<ENDHEAD);
+ $start_page
  $breadcrumbs
  <form method="post" action="/adm/parmset?action=settable" name="parmform">
- <input type="hidden" value='' name="pres_value">
+ <input type="hidden" value='' name="pres_value" />
- <input type="hidden" value='' name="pres_type">
+ <input type="hidden" value='' name="pres_type" />
- <input type="hidden" value='' name="pres_marker">
+ <input type="hidden" value='' name="pres_marker" />
- <input type="hidden" value='1' name="prevvisit">
+ <input type="hidden" value='1' name="prevvisit" />
  ENDHEAD
  }
  sub print_row {
      my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,
- 	$defbgtwo,$parmlev,$uname,$udom,$csec)=@_;
+ 	$defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups)=@_;
+     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
  # get the values for the parameter in cascading order
  # empty levels will remain empty
      my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which},
- 				  $rid,$$default{$which},$uname,$udom,$csec);
+ 	  $rid,$$default{$which},$uname,$udom,$csec,$cgroup,$courseopt);
  # get the type for the parameters
  # problem: these may not be set for all levels
      my ($typeresult,@typeoutpar)=&parmval($$part{$which}.'.'.
-                                           $$name{$which}.'.type',
+                                           $$name{$which}.'.type',$rid,
- 				  $rid,$$defaulttype{$which},$uname,$udom,$csec);
+ 		 $$defaulttype{$which},$uname,$udom,$csec,$cgroup,$courseopt);
  # cascade down manually
      my $cascadetype=$$defaulttype{$which};
-     for (my $i=11;$i>0;$i--) {
+     for (my $i=14;$i>0;$i--) {
  	 if ($typeoutpar[$i]) {
              $cascadetype=$typeoutpar[$i];
  	} else {
- Line 631  sub print_row {
+ Line 735  sub print_row {
      }
      my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
      if ($automatic) {
- 	$parm.='<font color="red"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</font>';
+ 	$parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';
      }
      $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');
      my $thismarker=$which;
      $thismarker=~s/^parameter\_//;
      my $mprefix=$rid.'&'.$thismarker.'&';
+     my $effective_parm = &valout($outpar[$result],$typeoutpar[$result]);
+     my ($othergrp,$grp_parm,$controlgrp);
      if ($parmlev eq 'general') {
          if ($uname) {
              &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+         } elsif ($cgroup) {
+             &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          } elsif ($csec) {
-             &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+             &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          } else {
-             &print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+             &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          }
      } elsif ($parmlev eq 'map') {
          if ($uname) {
              &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+         } elsif ($cgroup) {
+             &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          } elsif ($csec) {
-             &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+             &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          } else {
-             &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+             &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
          }
      } else {
+         if ($uname) {
+             if (@{$usersgroups} > 1) {
+                 my ($coursereply,$grp_parm,$controlgrp);
+                 ($coursereply,$othergrp,$grp_parm,$controlgrp) =
+                     &print_usergroups($r,$$part{$which}.'.'.$$name{$which},
+                        $rid,$cgroup,$defbgone,$usersgroups,$result,$courseopt);
+                 if ($coursereply && $result > 3) {
+                     if (defined($controlgrp)) {
+                         if ($cgroup ne $controlgrp) {
+                             $effective_parm = $grp_parm;
+                             $result = 0;
+                         }
+                     }
+                 }
+             }
+         }
-         &print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+         &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+ 	&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+ 	&print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+ 	&print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
  	&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
- 	&print_td($r,9,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
- 	&print_td($r,8,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
- 	&print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
  	if ($csec) {
- 	    &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+ 	    &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
- 	    &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+ 	    &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
- 	    &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+ 	    &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
  	}
+         if ($cgroup) {
+             &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+             &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+             &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+         }
  	if ($uname) {
+             if ($othergrp) {
+                 $r->print($othergrp);
+             }
  	    &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
  	    &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
  	    &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
  	}
      } # end of $parmlev if/else
+     $r->print('<td bgcolor="#CCCCFF" align="center">'.$effective_parm.'</td>');
-     $r->print('<td bgcolor=#CCCCFF align="center">'.
-                   &valout($outpar[$result],$typeoutpar[$result]).'</td>');
      if ($parmlev eq 'full') {
          my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
                                          '.'.$$name{$which},$$symbp{$rid});
          my $sessionvaltype=$typeoutpar[$result];
          if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
-         $r->print('<td bgcolor=#999999 align="center"><font color=#FFFFFF>'.
+         $r->print('<td bgcolor="#999999" align="center"><font color="#FFFFFF">'.
                    &valout($sessionval,$sessionvaltype).'&nbsp;'.
                    '</font></td>');
      }
- Line 699  sub print_td {
+ Line 833  sub print_td {
      my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
      $r->print('<td bgcolor='.(($result==$which)?'"#AAFFAA"':$defbg).
                ' align="center">');
-     if ($which<8 || $which > 9) {
+     if ($which<11 || $which > 12) {
  	$r->print(&plink($$typeoutpar[$which],
  			 $$display{$value},$$outpar[$which],
  			 $mprefix."$which",'parmform.pres','psub'));
- Line 709  sub print_td {
+ Line 843  sub print_td {
      $r->print('</td>'."\n");
  }
+ sub print_usergroups {
+     my ($r,$what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;
+     my $courseid = $env{'request.course.id'};
+     my $output;
+     my $symb = &symbcache($rid);
+     my $symbparm=$symb.'.'.$what;
+     my $map=(&Apache::lonnet::decode_symb($symb))[0];
+     my $mapparm=$map.'___(all).'.$what;
+     my ($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype) =
+           &parm_control_group($courseid,$usersgroups,$symbparm,$mapparm,$what,
+                                                                    $courseopt);
+     my $bgcolor = $defbg;
+     my $grp_parm;
+     if (($coursereply) && ($cgroup ne $resultgroup)) {
+         if ($result > 3) {
+             $bgcolor = '"#AAFFAA"';
+             $grp_parm = &valout($coursereply,$resulttype);
+         }
+         $grp_parm = &valout($coursereply,$resulttype);
+         $output = '<td bgcolor='.$bgcolor.' align="center">';
+         if ($resultgroup && $resultlevel) {
+             $output .= '<small><b>'.$resultgroup.'</b> ('.$resultlevel.'): </small>'.$grp_parm;
+         } else {
+             $output .= '&nbsp;';
+         }
+         $output .= '</td>';
+     } else {
+         $output .= '<td bgcolor='.$bgcolor.'>&nbsp;</td>';
+     }
+     return ($coursereply,$output,$grp_parm,$resultgroup);
+ }
+ sub parm_control_group {
+     my ($courseid,$usersgroups,$symbparm,$mapparm,$what,$courseopt) = @_;
+     my ($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype);
+     my $grpfound = 0;
+     my @levels = ($symbparm,$mapparm,$what);
+     my @levelnames = ('resource','map/folder','general');
+     foreach my $group (@{$usersgroups}) {
+         if ($grpfound) { last; }
+         for (my $i=0; $i<@levels; $i++) {
+             my $item = $courseid.'.['.$group.'].'.$levels[$i];
+             if (defined($$courseopt{$item})) {
+                 $coursereply = $$courseopt{$item};
+                 $resultitem = $item;
+                 $resultgroup = $group;
+                 $resultlevel = $levelnames[$i];
+                 $resulttype = $$courseopt{$item.'.type'};
+                 $grpfound = 1;
+                 last;
+             }
+         }
+     }
+     return($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype);
+ }
  =pod
- Line 772  sub extractResourceInformation {
+ Line 961  sub extractResourceInformation {
  	$$typep{$id}=$1;
  	$$keyp{$id}='';
          $$uris{$id}=$srcf;
- 	foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
+ 	foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
- 	    if ($_=~/^parameter\_(.*)/) {
+ 	    next if ($key!~/^parameter_/);
- 		my $key=$_;
  # Hidden parameters
- 		if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm') {
+ 	    next if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm');
- 		    next;
- 		}
- 		my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
- 		my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
- 		my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
  #
  # allparms is a hash of parameter names
  #
+ 	    my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
+ 	    if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
+ 		my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
  		my $parmdis = $display;
  		$parmdis =~ s/\[Part.*$//g;
-                 $$allparms{$name}=$parmdis;
+ 		$$allparms{$name}=$parmdis;
- 		$$defkeytype{$name}=&Apache::lonnet::metadata($srcf,$key.'.type');
+ 		if (ref($defkeytype)) {
+ 		    $$defkeytype{$name}=
+ 			&Apache::lonnet::metadata($srcf,$key.'.type');
+ 		}
+ 	    }
  #
  # allparts is a hash of all parts
  #
- 		$$allparts{$part} = "Part: $part";
+ 	    my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
+ 	    $$allparts{$part} = "Part: $part";
  #
  # Remember all keys going with this resource
  #
- 		if ($$keyp{$id}) {
+ 	    if ($$keyp{$id}) {
- 		    $$keyp{$id}.=','.$key;
+ 		$$keyp{$id}.=','.$key;
- 		} else {
+ 	    } else {
- 		    $$keyp{$id}=$key;
+ 		$$keyp{$id}=$key;
- 		}
+ 	    }
  #
  # Put in order
  #
-                 unless ($$keyorder{$key}) {
+ 	    unless ($$keyorder{$key}) {
-                     $$keyorder{$key}=$keyordercnt;
+ 		$$keyorder{$key}=$keyordercnt;
-                     $keyordercnt++;
+ 		$keyordercnt++;
- 		}
  	    }
  	}
- 	$$mapp{$id}=
- 	    &Apache::lonnet::declutter($resource->enclosing_map_src());
- 	$$mapp{$mapid}=$$mapp{$id};
+ 	if (!exists($$mapp{$mapid})) {
- 	$$allmaps{$mapid}=$$mapp{$id};
+ 	    $$mapp{$id}=
- 	if ($mapid eq '1') {
+ 		&Apache::lonnet::declutter($resource->enclosing_map_src());
- 	    $$maptitles{$mapid}='Main Course Documents';
+ 	    $$mapp{$mapid}=$$mapp{$id};
+ 	    $$allmaps{$mapid}=$$mapp{$id};
+ 	    if ($mapid eq '1') {
+ 		$$maptitles{$mapid}='Main Course Documents';
+ 	    } else {
+ 		$$maptitles{$mapid}=
+ 		    &Apache::lonnet::gettitle($$mapp{$id});
+ 	    }
+ 	    $$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
+ 	    $$symbp{$mapid}=$$mapp{$id}.'___(all)';
  	} else {
- 	    $$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));
+ 	    $$mapp{$id} = $$mapp{$mapid};
  	}
- 	$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
  	$$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);
- 	$$symbp{$mapid}=$$mapp{$id}.'___(all)';
      }
  }
- Line 901  sub parmmenu {
+ Line 1099  sub parmmenu {
  </script>
  ENDSCRIPT
      $r->print();
-     $r->print("\n<table><tr>");
+     $r->print("\n<table id=\"LC_parm_overview_parm_menu\"><tr>");
      my $cnt=0;
      foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
- 	$r->print("\n<td><font size='-1'><label><input type='checkbox' name='pscat' ");
+ 	$r->print("\n<td><label><input type='checkbox' name='pscat' ");
  	$r->print('value="'.$tempkey.'"');
  	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
  	    $r->print(' checked');
  	}
- 	$r->print('>'.$$allparms{$tempkey}.'</label></font></td>');
+ 	$r->print('>'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+ 		                                  : $tempkey)
+ 		  .'</label></td>');
   	$cnt++;
          if ($cnt==3) {
  	    $r->print("</tr>\n<tr>");
- Line 917  ENDSCRIPT
+ Line 1117  ENDSCRIPT
  	}
      }
      $r->print('
- </tr><tr><td>
+ </tr><tr id=\"LC_parm_overview_parm_menu_selectors\"><td>
  <a href="javascript:checkall(true, \'pscat\')">Select&nbsp;All</a><br />
  <a href="javascript:checkstandard()">Select&nbsp;Common&nbsp;Only</a>
  </td><td>
- Line 956  sub partmenu {
+ Line 1156  sub partmenu {
  }
  sub usermenu {
-     my ($r,$uname,$id,$udom,$csec)=@_;
+     my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups)=@_;
      my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
          &Apache::loncommon::selectstudent_link('parmform','uname','udom');
      my $selscript=&Apache::loncommon::studentbrowser_javascript();
      my %lt=&Apache::lonlocal::texthash(
- 		    'sg'    => "Section/Group",
+ 		    'se'    => "Section",
+                     'gr'    => "Group",
  		    'fu'    => "For User",
  		    'oi'    => "or ID",
  		    'ad'    => "at Domain"
  				       );
-     my %sectionhash=();
      my $sections='';
-     if (&Apache::loncommon::get_sections(
+     my %sectionhash = &Apache::loncommon::get_sections();
-                  $env{'course.'.$env{'request.course.id'}.'.domain'},
-                  $env{'course.'.$env{'request.course.id'}.'.num'},
+     my $groups;
- 					 \%sectionhash)) {
+     my %grouphash = &Apache::longroup::coursegroups();
-         $sections=$lt{'sg'}.': <select name="csec">';
- 	foreach ('',sort keys %sectionhash) {
+     if (%sectionhash) {
- 	    $sections.='<option value="'.$_.'"'.
+         $sections=$lt{'se'}.': <select name="csec"';
- 		($_ eq $csec?'selected="selected"':'').'>'.$_.'</option>';
+         if (%grouphash && $parmlev ne 'full') {
+             $sections .= qq| onchange="group_or_section('csec')" |;
+         }
+         $sections .= '>';
+ 	foreach my $section ('',sort keys %sectionhash) {
+ 	    $sections.='<option value="'.$section.'" '.
+ 		($section eq $csec?'selected="selected"':'').'>'.$section.
+                                                               '</option>';
          }
          $sections.='</select>';
-      }
+     }
-      $r->print(<<ENDMENU);
+     if (%sectionhash && %grouphash && $parmlev ne 'full') {
+         $sections .= '&nbsp;or&nbsp;';
+         $sections .= qq|
+ <script type="text/javascript">
+ function group_or_section(caller) {
+    if (caller == "cgroup") {
+        if (document.parmform.cgroup.selectedIndex != 0) {
+            document.parmform.csec.selectedIndex = 0;
+        }
+    } else {
+        if (document.parmform.csec.selectedIndex != 0) {
+            document.parmform.cgroup.selectedIndex = 0;
+        }
+    }
+ }
+ </script>
+ |;
+     } else {
+         $sections .= qq|
+ <script type="text/javascript">
+ function group_or_section(caller) {
+     return;
+ }
+ </script>
+ |;
+     }
+     if (%grouphash) {
+         $groups=$lt{'gr'}.': <select name="cgroup"';
+         if (%sectionhash && $env{'form.action'} eq 'settable') {
+             $groups .= qq| onchange="group_or_section('cgroup')" |;
+         }
+         $groups .= '>';
+         foreach my $grp ('',sort keys %grouphash) {
+             $groups.='<option value="'.$grp.'" ';
+             if ($grp eq $cgroup) {
+                 unless ((defined($uname)) && ($grp eq '')) {
+                     $groups .=  'selected="selected" ';
+                 }
+             } elsif (!defined($cgroup)) {
+                 if (@{$usersgroups} == 1) {
+                     if ($grp eq $$usersgroups[0]) {
+                         $groups .=  'selected="selected" ';
+                     }
+                 }
+             }
+             $groups .= '>'.$grp.'</option>';
+         }
+         $groups.='</select>';
+     }
+     $r->print(<<ENDMENU);
  <b>
  $sections
+ $groups
  <br />
  $lt{'fu'}
  <input type="text" value="$uname" size="12" name="uname" />
- Line 1034  sub levelmenu {
+ Line 1292  sub levelmenu {
  sub sectionmenu {
      my ($r,$selectedsections)=@_;
-     my %sectionhash=();
+     my %sectionhash = &Apache::loncommon::get_sections();
+     return if (!%sectionhash);
-     if (&Apache::loncommon::get_sections(
+     $r->print('<select name="Section" multiple="true" size="8" >');
-                  $env{'course.'.$env{'request.course.id'}.'.domain'},
+     foreach my $s ('all',sort keys %sectionhash) {
-                  $env{'course.'.$env{'request.course.id'}.'.num'},
+ 	$r->print('    <option value="'.$s.'"');
- 					 \%sectionhash)) {
+ 	foreach (@{$selectedsections}) {
- 	$r->print('<select name="Section" multiple="true" size="8" >');
+ 	    if ($s eq $_) {
- 	foreach my $s ('all',sort keys %sectionhash) {
+ 		$r->print(' selected');
- 	    $r->print('    <option value="'.$s.'"');
+ 		last;
- 	    foreach (@{$selectedsections}) {
+ 	    }
- 		if ($s eq $_) {
+ 	}
- 		    $r->print(' selected');
+ 	$r->print('>'.$s."</option>\n");
- 		    last;
+     }
- 		}
+     $r->print("</select>\n");
+ }
+ sub groupmenu {
+     my ($r,$selectedgroups)=@_;
+     my %grouphash = &Apache::longroup::coursegroups();
+     return if (!%grouphash);
+     $r->print('<select name="Group" multiple="true" size="8" >');
+     foreach my $group (sort(keys(%grouphash))) {
+ 	$r->print('    <option value="'.$group.'"');
+ 	foreach (@{$selectedgroups}) {
+ 	    if ($group eq $_) {
+ 		$r->print(' selected');
+ 		last;
  	    }
- 	    $r->print('>'.$s."</option>\n");
  	}
- 	$r->print("</select>\n");
+ 	$r->print('>'.$group."</option>\n");
      }
+     $r->print("</select>\n");
  }
  sub keysplit {
      my $keyp=shift;
      return (split(/\,/,$keyp));
- Line 1067  sub keysinorder {
+ Line 1341  sub keysinorder {
      } (keys %{$name});
  }
+ sub keysinorder_bytype {
+     my ($name,$keyorder)=@_;
+     return sort {
+ 	my $ta=(split('_',$a))[-1];
+ 	my $tb=(split('_',$b))[-1];
+ 	if ($$keyorder{'parameter_0_'.$ta} == $$keyorder{'parameter_0_'.$tb}) {
+ 	    return ($a cmp $b);
+ 	}
+ 	$$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};
+     } (keys %{$name});
+ }
  sub keysindisplayorder {
      my ($name,$keyorder)=@_;
      return sort {
- Line 1076  sub keysindisplayorder {
+ Line 1362  sub keysindisplayorder {
  sub sortmenu {
      my ($r,$sortorder)=@_;
-     $r->print('<br /><input type="radio" name="sortorder" value="realmstudent"');
+     $r->print('<br /><label><input type="radio" name="sortorder" value="realmstudent"');
      if ($sortorder eq 'realmstudent') {
         $r->print(' checked="on"');
      }
      $r->print(' />'.&mt('Sort by realm first, then student (group/section)'));
-     $r->print('<br /><input type="radio" name="sortorder" value="studentrealm"');
+     $r->print('</label><br /><label><input type="radio" name="sortorder" value="studentrealm"');
      if ($sortorder eq 'studentrealm') {
         $r->print(' checked="on"');
      }
-     $r->print(' />'.&mt('Sort by student (group/section) first, then realm'));
+     $r->print(' />'.&mt('Sort by student (group/section) first, then realm').
+ 	      '</label>');
  }
  sub standardkeyorder {
- Line 1162  sub assessparms {
+ Line 1449  sub assessparms {
      my $udom;
      my $uhome;
      my $csec;
+     my $cgroup;
+     my @usersgroups = ();
      my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
- Line 1183  sub assessparms {
+ Line 1472  sub assessparms {
      my $message='';
      $csec=$env{'form.csec'};
+     $cgroup=$env{'form.cgroup'};
      if      ($udom=$env{'form.udom'}) {
      } elsif ($udom=$env{'request.role.domain'}) {
- Line 1231  sub assessparms {
+ Line 1521  sub assessparms {
  	    $id='';
  	} else {
  	    $message=
- 		"<font color=red>".&mt("Unknown ID")." '$id' ".
+ 		'<span class="LC_error">'.&mt("Unknown ID")." '$id' ".
- 		&mt('at domain')." '$udom'</font>";
+ 		&mt('at domain')." '$udom'</span>";
  	}
      } else {
  	$uname=$env{'form.uname'};
- Line 1243  sub assessparms {
+ Line 1533  sub assessparms {
  	$uhome=&Apache::lonnet::homeserver($uname,$udom);
          if ($uhome eq 'no_host') {
  	    $message=
- 		"<font color=red>".&mt("Unknown user")." '$uname' ".
+ 		'<span class="LC_error">'.&mt("Unknown user")." '$uname' ".
- 		&mt("at domain")." '$udom'</font>";
+ 		&mt("at domain")." '$udom'</span>";
  	    $uname='';
          } else {
  	    $csec=&Apache::lonnet::getsection($udom,$uname,
  					      $env{'request.course.id'});
  	    if ($csec eq '-1') {
- 		$message="<font color=red>".
+ 		$message='<span class="LC_error">'.
  		    &mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
- 		    &mt("not in this course")."</font>";
+ 		    &mt("not in this course")."</span>";
  		$uname='';
  		$csec=$env{'form.csec'};
+                 $cgroup=$env{'form.cgroup'};
  	    } else {
  		my %name=&Apache::lonnet::userenvironment($udom,$uname,
  		      ('firstname','middlename','lastname','generation','id'));
  		$message="\n<p>\n".&mt("Full Name").": ".
  		    $name{'firstname'}.' '.$name{'middlename'}.' '
  			.$name{'lastname'}.' '.$name{'generation'}.
- 			    "<br>\n".&mt('ID').": ".$name{'id'}.'<p>';
+ 			    "<br />\n".&mt('ID').": ".$name{'id'}.'<p>';
  	    }
+             @usersgroups = &Apache::lonnet::get_users_groups(
+                                        $udom,$uname,$env{'request.course.id'});
+             if (@usersgroups > 0) {
+                 unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
+                     $cgroup = $usersgroups[0];
+                 }
+             }
          }
      }
      unless ($csec) { $csec=''; }
+     unless ($cgroup) { $cgroup=''; }
  # --------------------------------------------------------- Get all assessments
      &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
- Line 1285  sub assessparms {
+ Line 1585  sub assessparms {
  	    $message.=&storeparm(split(/\&/,$markers[$i]),
  				 $values[$i],
  				 $types[$i],
- 				 $uname,$udom,$csec);
+ 				 $uname,$udom,$csec,$cgroup);
  	}
  # ---------------------------------------------------------------- Done storing
  	$message.='<h3>'.&mt('Changes can take up to 10 minutes before being active for all students.').&Apache::loncommon::help_open_topic('Caching').'</h3>';
- Line 1301  sub assessparms {
+ Line 1601  sub assessparms {
      foreach ('tolerance','date_default','date_start','date_end',
  	     'date_interval','int','float','string') {
  	$r->print('<input type="hidden" value="'.
- 		  $env{'form.recent_'.$_}.'" name="recent_'.$_.'">');
+ 		  &HTML::Entities::encode($env{'form.recent_'.$_},'"&<>').
+ 		  '" name="recent_'.$_.'" />');
      }
      if (!$pssymb) {
- Line 1316  sub assessparms {
+ Line 1617  sub assessparms {
  	&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
      } else {
          my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
-         $r->print(&mt('Specific Resource').": ".$resource.
+ 	my $title = &Apache::lonnet::gettitle($pssymb);
-                   '<input type="hidden" value="'.$pssymb.'" name="symb"><br />');
+         $r->print(&mt('Specific Resource: [_1] ([_2])',$title,$resource).
+                   '<input type="hidden" value="'.$pssymb.'" name="symb" />'.
+ 		  '<br /><label><b>'.&mt('Show all parts').': <input type="checkbox" name="psprt" value="all"'.
+ 		  ($env{'form.psprt'}?' checked="checked"':'').' /></b></label><br />');
      }
-     &usermenu($r,$uname,$id,$udom,$csec);
+     &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
      $r->print('<p>'.$message.'</p>');
- Line 1341  sub assessparms {
+ Line 1645  sub assessparms {
          if ($parmlev eq 'full') {
             my $coursespan=$csec?8:5;
+            my $userspan=3;
+            if ($cgroup ne '') {
+               $coursespan += 3;
+            }
             $r->print('<p><table border=2>');
             $r->print('<tr><td colspan=5></td>');
             $r->print('<th colspan='.($coursespan).'>'.&mt('Any User').'</th>');
             if ($uname) {
-                $r->print("<th colspan=3 rowspan=2>");
+                if (@usersgroups > 1) {
+                    $userspan ++;
+                }
+                $r->print('<th colspan="'.$userspan.'" rowspan="2">');
                 $r->print(&mt("User")." $uname ".&mt('at Domain')." $udom</th>");
             }
  	   my %lt=&Apache::lonlocal::texthash(
- Line 1367  sub assessparms {
+ Line 1679  sub assessparms {
  					      );
             $r->print(<<ENDTABLETWO);
  <th rowspan=3>$lt{'pie'}</th>
- <th rowspan=3>$lt{'csv'}<br>($csuname $lt{'at'} $csudom)</th>
+ <th rowspan=3>$lt{'csv'}<br />($csuname $lt{'at'} $csudom)</th>
  </tr><tr><td colspan=5></td><th colspan=2>$lt{'ic'}</th><th colspan=2>$lt{'rl'}</th>
  <th colspan=1>$lt{'ic'}</th>
  ENDTABLETWO
             if ($csec) {
                  $r->print("<th colspan=3>".
- 			  &mt("in Section/Group")." $csec</th>");
+ 			  &mt("in Section")." $csec</th>");
+            }
+            if ($cgroup) {
+                 $r->print("<th colspan=3>".
+                           &mt("in Group")." $cgroup</th>");
             }
             $r->print(<<ENDTABLEHEADFOUR);
  </tr><tr><th>$lt{'aut'}</th><th>$lt{'type'}</th>
- Line 1387  ENDTABLEHEADFOUR
+ Line 1703  ENDTABLEHEADFOUR
                 $r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');
             }
+            if ($cgroup) {
+                $r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');
+            }
             if ($uname) {
+                if (@usersgroups > 1) {
+                    $r->print('<th>'.&mt('Control by other group?').'</th>');
+                }
                 $r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');
             }
- Line 1395  ENDTABLEHEADFOUR
+ Line 1718  ENDTABLEHEADFOUR
             my $defbgone='';
             my $defbgtwo='';
+            my $defbgthree = '';
             foreach (@ids) {
- Line 1416  ENDTABLEHEADFOUR
+ Line 1740  ENDTABLEHEADFOUR
                      } else {
                          $defbgtwo='"#FFFF99"';
                      }
+                     if ($defbgthree eq '"#FFBB99"') {
+                         $defbgthree='"#FFBBDD"';
+                     } else {
+                         $defbgthree='"#FFBB99"';
+                     }
                      my $thistitle='';
                      my %name=   ();
                      undef %name;
- Line 1441  ENDTABLEHEADFOUR
+ Line 1771  ENDTABLEHEADFOUR
                      my $totalparms=scalar keys %name;
                      if ($totalparms>0) {
                          my $firstrow=1;
- 			my $title=&Apache::lonnet::gettitle($uri);
+ 			my $title=&Apache::lonnet::gettitle($symbp{$rid});
                          $r->print('<tr><td bgcolor='.$defbgone.
                               ' rowspan='.$totalparms.
                               '><tt><font size=-1>'.
                               join(' / ',split(/\//,$uri)).
                               '</font></tt><p><b>'.
                               "<a href=\"javascript:openWindow('".
- 				  &Apache::lonnet::clutter($uri).
+ 				  &Apache::lonnet::clutter($uri).'?symb='.
-                              "', 'metadatafile', '450', '500', 'no', 'yes')\";".
+ 				  &escape($symbp{$rid}).
-                              " TARGET=_self>$title");
+                              "', 'metadatafile', '450', '500', 'no', 'yes');\"".
+                              " target=\"_self\">$title");
                          if ($thistitle) {
                              $r->print(' ('.$thistitle.')');
- Line 1462  ENDTABLEHEADFOUR
+ Line 1793  ENDTABLEHEADFOUR
                          $r->print('<td bgcolor='.$defbgone.
                                        ' rowspan='.$totalparms.
-                                       '><tt><font size=-1>');
+                                       '>'.$maptitles{$mapp{$rid}}.'</td>');
-                         $r->print(' / res / ');
-                         $r->print(join(' / ', split(/\//,$mapp{$rid})));
-                         $r->print('</font></tt></td>');
+                         foreach (&keysinorder_bytype(\%name,\%keyorder)) {
-                         foreach (&keysinorder(\%name,\%keyorder)) {
                              unless ($firstrow) {
                                  $r->print('<tr>');
                              } else {
                                  undef $firstrow;
                              }
                              &print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,
                                         \%type,\%display,$defbgone,$defbgtwo,
-                                        $parmlev,$uname,$udom,$csec);
+                                        $defbgthree,$parmlev,$uname,$udom,$csec,
+                                                             $cgroup,\@usersgroups);
                          }
                      }
                  }
- Line 1490  ENDTABLEHEADFOUR
+ Line 1816  ENDTABLEHEADFOUR
          if ($parmlev eq 'map') {
              my $defbgone = '"E0E099"';
              my $defbgtwo = '"FFFF99"';
+             my $defbgthree = '"FFBB99"';
              my %maplist;
- Line 1561  Set Defaults for All Resources in $folde
+ Line 1888  Set Defaults for All Resources in $folde
  Specifically for
  ENDMAPONE
                  if ($uname) {
-                     my %name=&Apache::lonnet::userenvironment($udom,$uname,
+ 		    my $person=&Apache::loncommon::plainname($uname,$udom);
-                       ('firstname','middlename','lastname','generation', 'id'));
-                     my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
-                            .$name{'lastname'}.' '.$name{'generation'};
                      $r->print(&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
                          &mt('in')." \n");
                  } else {
                      $r->print("<font color=\"red\"><i>".&mt('all').'</i></font> '.&mt('users in')." \n");
                  }
+                 if ($cgroup) {
-                 if ($csec) {$r->print(&mt("Section")." <font color=\"red\"><i>$csec</i></font> ".
+                     $r->print(&mt("Group")." <font color=\"red\"><i>$cgroup".
- 				      &mt('of')." \n")};
+                               "</i></font> ".&mt('of')." \n");
+                     $csec = '';
+                 } elsif ($csec) {
+                     $r->print(&mt("Section")." <font color=\"red\"><i>$csec".
+                               "</i></font> ".&mt('of')." \n");
+                 }
                  $r->print("<font color=\"red\"><i>$coursename</i></font><br />");
                  $r->print("</h4>\n");
  #---------------------------------------------------------------- print table
- Line 1585  ENDMAPONE
+ Line 1913  ENDMAPONE
  	        foreach (&keysinorder(\%name,\%keyorder)) {
                      $r->print('<tr>');
                      &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
-                            \%type,\%display,$defbgone,$defbgtwo,
+                            \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
-                            $parmlev,$uname,$udom,$csec);
+                            $parmlev,$uname,$udom,$csec,$cgroup);
                  }
                  $r->print("</table></center>");
              } # end each map
- Line 1595  ENDMAPONE
+ Line 1923  ENDMAPONE
          if ($parmlev eq 'general') {
              my $defbgone = '"E0E099"';
              my $defbgtwo = '"FFFF99"';
+             my $defbgthree = '"FFBB99"';
  #-------------------------------------------- for each map, gather information
              my $mapid="0.0";
- Line 1642  ENDMAPONE
+ Line 1971  ENDMAPONE
  <font color="red"><i>$coursename</i></font><br />
  ENDMAPONE
              if ($uname) {
-                 my %name=&Apache::lonnet::userenvironment($udom,$uname,
+ 		my $person=&Apache::loncommon::plainname($uname,$udom);
-                   ('firstname','middlename','lastname','generation', 'id'));
-                 my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
-                        .$name{'lastname'}.' '.$name{'generation'};
                  $r->print(" ".&mt("User")."<font color=\"red\"> <i>$uname \($person\) </i></font> \n");
              } else {
                  $r->print("<i><font color=\"red\"> ".&mt("ALL")."</i> ".&mt("USERS")."</font> \n");
              }
              if ($csec) {$r->print(&mt("Section")."<font color=\"red\"> <i>$csec</i></font>\n")};
+             if ($cgroup) {$r->print(&mt("Group")."<font color=\"red\"> <i>$cgroup</i></font>\n")};
              $r->print("</h4>\n");
  #---------------------------------------------------------------- print table
              $r->print('<p><table border="2">');
- Line 1662  ENDMAPONE
+ Line 1989  ENDMAPONE
  	    foreach (&keysinorder(\%name,\%keyorder)) {
                  $r->print('<tr>');
                  &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
-                        \%type,\%display,$defbgone,$defbgtwo,$parmlev,$uname,$udom,$csec);
+                        \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
+                                    $parmlev,$uname,$udom,$csec,$cgroup);
              }
              $r->print("</table></center>");
          } # end of $parmlev eq general
      }
-     $r->print('</form></body></html>');
+     $r->print('</form>'.&Apache::loncommon::end_page());
  } # end sub assessparms
- Line 1692  Returns: nothing
+ Line 2020  Returns: nothing
  sub crsenv {
      my $r=shift;
      my $setoutput='';
-     my $bodytag=&Apache::loncommon::bodytag(
-                              'Set Course Environment Parameters');
+     my $breadcrumbs =
-     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,
+ 	&Apache::lonhtmlcommon::breadcrumbs('Edit Course Environment');
- 						    'Edit Course Environment');
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
- Line 1718  sub crsenv {
+ Line 2045  sub crsenv {
                  ('environment',
                   {'top level map backup '.$bkuptime => $tmp[1] },
                   $dom,$crs).
-                      '<br>';
+                      '<br />';
          }
          #
          # Deal with modified default spreadsheets
- Line 1746  sub crsenv {
+ Line 2073  sub crsenv {
          if ($name =~ /^default_enrollment_(start|end)_date$/) {
              $value=&Apache::lonhtmlcommon::get_date_from_form($name.'_value');
          }
+ 	#
+         # Deal with the emails
+         if ($name =~ /\.email$/) {
+ 	    foreach my $specifier (split(',',$value)) {
+ 		my ($user,$sections_or_groups)=
+ 		    ($specifier=~/^([^\(]+)\(([^\)]+)\)/);
+ 		if (!$sections_or_groups) {
+ 		    $user = $specifier;
+ 		}
+ 		my ($name,$domain) = split(':',$user);
+ 		if (!defined($user) || !defined($domain)) {
+ 		    $setoutput.= '<br /> <span class="LC_error">'.
+ 			&mt("Invalid email address specified, address must be of the form username:domain what was specified was ([_1])",$user).
+ 			'</span>';
+ 		    undef($value);
+ 		} elsif (&Apache::lonnet::homeserver($user,$domain) eq 'no_host') {
+ 		    $setoutput.= '<br /> <span class="LC_error">'.
+ 			&mt("Invalid email address specified, user [_1] is unknown.",$name).
+ 			'</span>';
+ 		    undef($value);
+ 		}
+ 	    }
+         }
          # Get existing cloners
          my @oldcloner = ();
          if ($name eq 'cloners') {
- Line 1759  sub crsenv {
+ Line 2109  sub crsenv {
          #
          # Let the user know we made the changes
          if ($name && defined($value)) {
+             my %failed_cloners;
              if ($name eq 'cloners') {
+                 $value =~ s/\s//g;
                  $value =~ s/^,//;
                  $value =~ s/,$//;
+                 # check requested clones are valid users.
+                 %failed_cloners = &check_cloners(\$value,\@oldcloner);
              }
              my $put_result = &Apache::lonnet::put('environment',
                                                    {$name=>$value},$dom,$crs);
- Line 1770  sub crsenv {
+ Line 2124  sub crsenv {
                  if ($name eq 'cloners') {
                      &change_clone($value,\@oldcloner);
                  }
-                 # Flush the course logs so course description is immediately updated
+                 # Update environment and nohist_courseids.db
                  if ($name eq 'description' && defined($value)) {
-                     &Apache::lonnet::flushcourselogs();
+                     my %crsinfo =
+                         &Apache::lonnet::courseiddump($dom,'.',1,'.','.',
+                                                  $crs,undef,undef,'Course');
+                     &Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.description' => $value);
+                     if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
+                         $crsinfo{$env{'request.course.id'}}{'description'} = $value;
+                         my $chome = &Apache::lonnet::homeserver($crs,$dom);
+                         my $putresult =
+                             &Apache::lonnet::courseidput($dom,\%crsinfo,
+                                                          $chome,'notime');
+                     }
                  }
              } else {
                  $setoutput.=&mt('Unable to set').' <b>'.$name.'</b> '.&mt('to').
  		    ' <b>'.$value.'</b> '.&mt('due to').' '.$put_result.'.<br />';
              }
+             if (($name eq 'cloners') && (keys(%failed_cloners) > 0)) {
+                 $setoutput.= &mt('Unable to include').': ';
+                 my @fails;
+                 my $num = 0;
+                 if (defined($failed_cloners{'format'})) {
+                     $fails[$num] .= '<b>'.$failed_cloners{'format'}.
+                                   '</b>, '.&mt('reason').' - '.
+                                   &mt('Invalid format');
+                     $num ++;
+                 }
+                 if (defined($failed_cloners{'domain'})) {
+                     $fails[$num] .= '<b>'.$failed_cloners{'domain'}.
+                                   '</b>, '.&mt('reason').' - '.
+                                   &mt('Domain does not exist');
+                     $num ++;
+                 }
+                 if (defined($failed_cloners{'newuser'})) {
+                     $fails[$num] .= '<b>'.$failed_cloners{'newuser'}.                                   '</b>, '.&mt('reason').' - '.
+                         &mt('LON-CAPA user(s) do(es) not exist.').
+                         '.<br />'.&mt('Please ').
+                         ' <a href="/adm/createuser">'.
+                         &mt('add the user(s)').'</a>, '.
+                         &mt('and then return to the ').
+                         '<a href="/adm/parmset?action=crsenv">'.
+                         &mt('Course Parameters page').'</a> '.
+                         &mt('to add the new user(s) to the list of possible cloners');
+                 }
+                 $setoutput .= join(';&nbsp;&nbsp;',@fails).'.<br />';
+             }
          }
      }
+     my $start_table     =&Apache::loncommon::start_data_table();
+     my $start_header_row=&Apache::loncommon::start_data_table_header_row();
+     my $end_header_row  =&Apache::loncommon::end_data_table_header_row();
  # ------------------------- Re-init course environment entries for this session
-     &Apache::lonnet::coursedescription($env{'request.course.id'});
+     &Apache::lonnet::coursedescription($env{'request.course.id'},
+ 				       {'freshen_cache' => 1});
  # -------------------------------------------------------- Get parameters again
- Line 1795  sub crsenv {
+ Line 2193  sub crsenv {
  	    ('url'            => '<b>'.&mt('Top Level Map').'</b> '.
                                   '<a href="javascript:openbrowser'.
                                   "('envform','url','sequence')\">".
-                                  &mt('Select Map').'</a><br /><font color=red> '.
+                                  &mt('Select Map').'</a><br /><span class="LC_warning"> '.
                                   &mt('Modification may make assessment data inaccessible').
-                                  '</font>',
+                                  '</span>',
               'description'    => '<b>'.&mt('Course Description').'</b>',
               'courseid'       => '<b>'.&mt('Course ID or number').
                                   '</b><br />'.
                                   '('.&mt('internal').', '.&mt('optional').')',
-              'cloners'        => '<b>'.&mt('Users allowed to clone course').'</b><br /><tt>(user:domain,user:domain)</tt><br />'.&mt('Users with active Course Coordinator role in the course automatically have the right to clone it, and can be omitted from list.'),
+              'cloners'        => '<b>'.&mt('Users allowed to clone course').'</b><br /><tt>(user:domain,user:domain,*:domain)</tt><br />'.&mt('Users with active Course Coordinator role in course are permitted to clone and need not be included.<br />
+ Use *:domain to allow course to be cloned by anyone in the specified domain.<br />
+ Use * to allow unrestricted cloning in all domains.'),
               'grading'        => '<b>'.&mt('Grading').'</b><br />'.
                                   '<tt>"standard", "external", or "spreadsheet"</tt> '.&Apache::loncommon::help_open_topic('GradingOptions'),
+ 	     'task_grading'   => '<b>'.&mt('Bridge Task Grading').'</b><br />'.
+                                  &mt('Instructors and TAs in sections, when grading bridge tasks, should be allowed to grade other sections, "[_1]" they are allowed (this is the default), "[_2]" no, they can only grade their own section','<tt>any</tt>','<tt>section</tt>'),
               'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b> '.
                      '<a href="javascript:openbrowser'.
                      "('envform','default_xml_style'".
-                     ",'sty')\">$SelectStyleFile</a><br>",
+                     ",'sty')\">$SelectStyleFile</a><br />",
               'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').
                                   '</b><br />(<tt>user:domain,'.
                                   'user:domain(section;section;...;*;...),...</tt>)',
+              'question.email.text' => '<b>'.&mt('Custom Text for Resource Content Question Option in Feedback').
+                                  '</b>',
               'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'.
                                   '(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
+              'comment.email.text' => '<b>'.&mt('Custom Text for Course Content Option in Feedback').
+                                  '</b>',
               'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.
                                   '<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
+              'policy.email.text' => '<b>'.&mt('Custom Text for Course Policy Option in Feedback').
+                                  '</b>',
               'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'.
                                   '('.&mt('"[_1]" for default hiding','<tt>yes</tt>').')',
               'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.
                                   '('.&mt('"[_1]" for visible separation','<tt>yes</tt>').', '.
                                   &mt('changes will not show until next login').')',
-              'student_classlist_view' => '<b>'.&mt('Allow students to view classlist.').'</b>'.&mt('("all":students can view all sections,"section":students can only view their own section.blank or "disabled" prevents student view.'),
+              'student_classlist_view' => '<b>'.&mt('Allow students to view classlist.').'</b><br />'.&mt('("all":students can view all sections,"section":students can only view their own section.blank or "disabled" prevents student view.)'),
+              'student_classlist_portfiles' => '<b>'.&mt('Include link to accessible portfolio files').'</b><br />'.&mt('"[_1]" for link to each a listing of each student\'s files.','<tt>yes</tt>'),
+              'student_classlist_opt_in' => '<b>'.&mt("Student's agreement needed for listing in student-viewable roster").'</b><br />'.&mt('"[_1]" to require students to opt-in to listing in the roster (on the roster page).','<tt>yes</tt>'),
               'plc.roles.denied'=> '<b>'.&mt('Disallow live chatroom use for Roles').
-                                   '</b><br />"<tt>st</tt>": '.
+                                   '</b><br />("<tt>st</tt>": '.
                                    &mt('student').', "<tt>ta</tt>": '.
                                    'TA, "<tt>in</tt>": '.
                                    &mt('instructor').';<br /><tt>'.&mt('role,role,...').'</tt>) '.
- Line 1834  sub crsenv {
+ Line 2243  sub crsenv {
                                   '(<tt>user:domain,user:domain,...</tt>)',
               'pch.roles.denied'=> '<b>'.&mt('Disallow Resource Discussion for Roles').
-                                   '</b><br />"<tt>st</tt>": '.
+                                   '</b><br />("<tt>st</tt>": '.
                                    'student, "<tt>ta</tt>": '.
                                    'TA, "<tt>in</tt>": '.
                                    'instructor;<br /><tt>role,role,...</tt>) '.
- Line 1861  sub crsenv {
+ Line 2270  sub crsenv {
  	         => '<b>'.&mt('Allow limited HTML in discussion posts').'</b><br />'.
  	            '('.&mt('Set value to "[_1]" to allow',"<tt>yes</tt>").')',
               'allow_discussion_post_editing'
-                  => '<b>'.&mt('Allow users to edit/delete their own discussion posts').'</b><br />'.
+                  => '<b>'.&mt('Allow users with specified roles to edit/delete their own discussion posts').'</b><br />"<tt>st</tt>": '.
-                     '('.&mt('Set value to "[_1]" to allow',"<tt>yes</tt>").')',
+                                   &mt('student').', "<tt>ta</tt>": '.
+                                   'TA, "<tt>in</tt>": '.
+                                   &mt('instructor').';&nbsp;(<tt>'.&mt('role:section,role:section,..., e.g., st:001,st:002,in,cc would permit students in sections 001 and 002 and instructors in any section, and course coordinators to edit their own posts.').'</tt>)<br />'.
+                     '('.&mt('or set value to "[_1]" to allow all roles',"<tt>yes</tt>").')',
  	     'rndseed'
  	         => '<b>'.&mt('Randomization algorithm used').'</b> <br />'.
-                     '<font color="red">'.&mt('Modifying this will make problems').' '.
+                     '<span class="LC_error">'.&mt('Modifying this will make problems').' '.
-                     &mt('have different numbers and answers').'</font>',
+                     &mt('have different numbers and answers').'</span>',
  	     'receiptalg'
  	         => '<b>'.&mt('Receipt algorithm used').'</b> <br />'.
                      &mt('This controls how receipt numbers are generated.'),
               'suppress_tries'
-                  => '<b>'.&mt('Suppress number of tries in printing').'</b>('.
+                  => '<b>'.&mt('Suppress number of tries in printing').'</b><br />'.
-                     &mt('yes if supress').')',
+                     ' ('.&mt('"[_1]" to suppress, anything else to not suppress','<tt>yes</tt>').')',
               'problem_stream_switch'
                   => '<b>'.&mt('Allow problems to be split over pages').'</b><br />'.
                      ' ('.&mt('"[_1]" if allowed, anything else if not','<tt>yes</tt>').')',
- Line 1881  sub crsenv {
+ Line 2293  sub crsenv {
                      ' ('.&mt('supported types').': Letter [8 1/2x11 in], Legal [8 1/2x14 in],'.
                      ' Tabloid [11x17 in], Executive [7 1/2x10 in], A2 [420x594 mm],'.
                      ' A3 [297x420 mm], A4 [210x297 mm], A5 [148x210 mm], A6 [105x148 mm])',
-              'anonymous_quiz'
+ 	     'print_header_format'
-                  => '<b>'.&mt('Anonymous quiz/exam').'</b><br />'.
+ 	         => &mtn('<b> Print header format; substitutions </b>:  %n student name %c course id %a assignment note, numbers after the % limit the field size.').'</b>',
-                     ' (<tt><b>'.&mt('yes').'</b> '.&mt('to avoid print students names').' </tt>)',
               'default_enrollment_start_date' => '<b>'.&mt('Default beginning date for student access.').'</b>',
               'default_enrollment_end_date'   => '<b>'.&mt('Default ending date for student access.').'</b>',
               'nothideprivileged'   => '<b>'.&mt('Privileged users that should not be hidden on staff listings').'</b>'.
- Line 1892  sub crsenv {
+ Line 2303  sub crsenv {
               'disable_receipt_display'
                   => '<b>'.&mt('Disable display of problem receipts').'</b><br />'.
                      ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
+ 	     'task_messages'
+ 	         => '<b>'.&mt('Send message to student when clicking Done on Tasks').'</b><br /> ('.&mt('[_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','<tt>only_student</tt>','<tt>student_and_user_notes_screen</tt>').')',
  	     'disablesigfigs'
  	         => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
                      ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
+ 	     'disableexampointprint'
+ 	         => '<b>'.&mt('Disable automatically printing point values onto exams.').'</b><br />'.
+                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
+              'externalsyllabus'
+                  => '<b>'.&mt('URL of Syllabus (not using internal handler)').'</b>',
  	     'tthoptions'
- 	         => '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>'
+ 	         => '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>',
+ 	     'texengine'
+ 	         => '<b>'.&mt('Force all students in the course to use a specific math rendering engine.').'</b><br />'.&mt('(Valid options are [_1].)','"tth", "jsMath", "mimetex"').'</b>',
               );
          my @Display_Order = ('url','description','courseid','cloners','grading',
+                              'externalsyllabus',
                               'default_xml_style','pageseparators',
-                              'question.email','comment.email','policy.email',
+                              'question.email','question.email.text','comment.email','comment.email.text','policy.email','policy.email.text',
                               'student_classlist_view',
+                              'student_classlist_opt_in',
+                              'student_classlist_portfiles',
                               'plc.roles.denied','plc.users.denied',
                               'pch.roles.denied','pch.users.denied',
                               'allow_limited_html_in_feedback',
- Line 1913  sub crsenv {
+ Line 2337  sub crsenv {
                               'problem_stream_switch',
  			     'suppress_tries',
                               'default_paper_size',
+ 			     'print_header_format',
                               'disable_receipt_display',
                               'spreadsheet_default_classcalc',
                               'spreadsheet_default_studentcalc',
- Line 1921  sub crsenv {
+ Line 2346  sub crsenv {
                               'default_enrollment_start_date',
                               'default_enrollment_end_date',
  			     'tthoptions',
- 			     'disablesigfigs'
+ 			     'texengine',
+ 			     'disablesigfigs',
+ 			     'disableexampointprint',
+ 			     'task_messages','task_grading',
                               );
  	foreach my $parameter (sort(keys(%values))) {
-             unless ($parameter =~ m/^internal\./) {
+             unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
                  if (! $descriptions{$parameter}) {
                      $descriptions{$parameter}=$parameter;
                      push(@Display_Order,$parameter);
                  }
              }
  	}
          foreach my $parameter (@Display_Order) {
              my $description = $descriptions{$parameter};
              # onchange is javascript to automatically check the 'Set' button.
              my $onchange = 'onFocus="javascript:window.document.forms'.
                  "['envform'].elements['".$parameter."_setparmval']".
                  '.checked=true;"';
-             $output .= '<tr><td>'.$description.'</td>';
+             $output .= &Apache::loncommon::start_data_table_row().
+ 		'<td>'.$description.'</td>';
              if ($parameter =~ /^default_enrollment_(start|end)_date$/) {
                  $output .= '<td>'.
                      &Apache::lonhtmlcommon::date_setter('envform',
- Line 1954  sub crsenv {
+ Line 2384  sub crsenv {
              $output .= '<td>'.
                  &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
                  '</td>';
-             $output .= "</tr>\n";
+             $output .= &Apache::loncommon::end_data_table_row()."\n";
  	}
          my $onchange = 'onFocus="javascript:window.document.forms'.
              '[\'envform\'].elements[\'newp_setparmval\']'.
              '.checked=true;"';
- 	$output.='<tr><td><i>'.&mt('Create New Environment Variable').'</i><br />'.
+ 	$output.=&Apache::loncommon::start_data_table_row().
+ 	    '<td><i>'.&mt('Create New Environment Variable').'</i><br />'.
  	    '<input type="text" size=40 name="newp_name" '.
                  $onchange.' /></td><td>'.
              '<input type="text" size=40 name="newp_value" '.
                  $onchange.' /></td><td>'.
- 	    '<input type="checkbox" name="newp_setparmval" /></td></tr>';
+ 	    '<input type="checkbox" name="newp_setparmval" /></td>'.
+ 	    &Apache::loncommon::end_data_table_row()."\n";
      }
      my %lt=&Apache::lonlocal::texthash(
  		    'par'   => 'Parameter',
- Line 1976  sub crsenv {
+ Line 2408  sub crsenv {
      my $Parameter=&mt('Parameter');
      my $Value=&mt('Value');
      my $Set=&mt('Set');
-     my $browse_js=&Apache::loncommon::browser_and_searcher_javascript('parmset');
+     my $browse_js=
-     my $html=&Apache::lonxml::xmlbegin();
+ 	'<script type="text/javascript" language="Javascript">'.
-     $r->print(<<ENDenv);
+ 	&Apache::loncommon::browser_and_searcher_javascript('parmset').
- $html
+ 	'</script>';
- <head>
- <script type="text/javascript" language="Javascript" >
+     my $start_page =
- $browse_js
+ 	&Apache::loncommon::start_page('Set Course Environment',
- </script>
+ 				       $browse_js);
- <title>LON-CAPA Course Environment</title>
+     my $end_page =
- </head>
+ 	&Apache::loncommon::end_page();
- $bodytag
+     my $end_table=&Apache::loncommon::end_data_table();
+     $r->print(<<ENDENV);
+ $start_page
  $breadcrumbs
  <form method="post" action="/adm/parmset?action=crsenv" name="envform">
  $setoutput
- <p>
+ $start_table
- <table border=2>
+ $start_header_row
- <tr><th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}?</th></tr>
+ <th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}?</th>
+ $end_header_row
  $output
- </table>
+ $end_table
- <input type="submit" name="crsenv" value="$lt{'sce'}">
+ <input type="submit" name="crsenv" value="$lt{'sce'}" />
  </form>
- </body>
+ $end_page
- </html>
+ ENDENV
- ENDenv
  }
  ##################################################
  # Overview mode
- Line 2011  sub tablestart {
+ Line 2445  sub tablestart {
  	return '';
      } else {
  	$tableopen=1;
- 	return '<table border="2"><tr><th>'.&mt('Parameter').'</th><th>'.
+ 	return &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th><th>'.
  	    &mt('Delete').'</th><th>'.&mt('Set to ...').'</th></tr>';
      }
  }
- Line 2019  sub tablestart {
+ Line 2453  sub tablestart {
  sub tableend {
      if ($tableopen) {
  	$tableopen=0;
- 	return '</table>';
+ 	return &Apache::loncommon::end_data_table();
      } else {
  	return'';
      }
- Line 2033  sub readdata {
+ Line 2467  sub readdata {
      my $classlist=&Apache::loncoursedata::get_classlist();
      foreach (keys %$classlist) {
-         # the following undefs are for 'domain', and 'username' respectively.
+         if ($_=~/^($match_username)\:($match_domain)$/) {
-         if ($_=~/^(\w+)\:(\w+)$/) {
  	    my ($tuname,$tudom)=($1,$2);
  	    my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
              foreach my $userkey (keys %{$useropt}) {
- Line 2070  sub storedata {
+ Line 2503  sub storedata {
              if ($tuname) {
  		$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
  	    }
- 	    if ($cmd eq 'set') {
+ 	    if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
- 		my $data=$env{$_};
+ 		my ($data, $typeof, $text);
-                 my $typeof=$env{'form.typeof_'.$thiskey};
+ 		if ($cmd eq 'set') {
-  		if ($$olddata{$thiskey} ne $data) {
+ 		    $data=$env{$_};
+ 		    $typeof=$env{'form.typeof_'.$thiskey};
+ 		    $text = &mt('Saved modified parameter for');
+ 		} elsif ($cmd eq 'datepointer') {
+ 		    $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
+ 		    $typeof=$env{'form.typeof_'.$thiskey};
+ 		    $text = &mt('Saved modified date for');
+ 		} elsif ($cmd eq 'dateinterval') {
+ 		    $data=&get_date_interval_from_form($thiskey);
+ 		    $typeof=$env{'form.typeof_'.$thiskey};
+ 		    $text = &mt('Saved modified date for');
+ 		}
+ 		if (defined($data) and $$olddata{$thiskey} ne $data) {
  		    if ($tuname) {
  			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
  								 $tkey.'.type' => $typeof},
  						 $tudom,$tuname) eq 'ok') {
- 			    $r->print('<br />'.&mt('Stored modified parameter for').' '.
+ 			    &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
+ 			    $r->print('<br />'.$text.' '.
  				      &Apache::loncommon::plainname($tuname,$tudom));
  			} else {
- 			    $r->print('<h2><font color="red">'.
+ 			    $r->print('<div class="LC_error">'.
- 				      &mt('Error storing parameters').'</font></h2>');
+ 				      &mt('Error saving parameters').'</div>');
  			}
  			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
  		    } else {
- Line 2093  sub storedata {
+ Line 2539  sub storedata {
  	    } elsif ($cmd eq 'del') {
  		if ($tuname) {
  		    if (&Apache::lonnet::del('resourcedata',[$tkey],$tudom,$tuname) eq 'ok') {
+ 			    &log_parmset({$tkey=>''},1,$tuname,$tudom);
  			$r->print('<br />'.&mt('Deleted parameter for').' '.&Apache::loncommon::plainname($tuname,$tudom));
  		    } else {
- 			$r->print('<h2><font color="red">'.
+ 			$r->print('<div class="LC_error">'.
- 				  &mt('Error deleting parameters').'</font></h2>');
+ 				  &mt('Error deleting parameters').'</div>');
  		    }
  		    &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
  		} else {
- 		    push (@deldata,$thiskey);
+ 		    push (@deldata,$thiskey,$thiskey.'.type');
- 		}
- 	    } elsif ($cmd eq 'datepointer') {
- 		my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
-                 my $typeof=$env{'form.typeof_'.$thiskey};
- 		if (defined($data) and $$olddata{$thiskey} ne $data) {
- 		    if ($tuname) {
- 			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
- 								 $tkey.'.type' => $typeof},
- 						 $tudom,$tuname) eq 'ok') {
- 			    $r->print('<br />'.&mt('Stored modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
- 			} else {
- 			    $r->print('<h2><font color="red">'.
- 				      &mt('Error storing parameters').'</font></h2>');
- 			}
- 			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
- 		    } else {
- 			$newdata{$thiskey}=$data;
- 			$newdata{$thiskey.'.type'}=$typeof;
- 		    }
  		}
  	    }
  	}
- Line 2130  sub storedata {
+ Line 2558  sub storedata {
      my $putentries=$#newdatakeys+1;
      if ($delentries) {
  	if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
+ 	    my %loghash=map { $_ => '' } @deldata;
+ 	    &log_parmset(\%loghash,1);
  	    $r->print('<h2>'.&mt('Deleted [_1] parameter(s)</h2>',$delentries));
  	} else {
- 	    $r->print('<h2><font color="red">'.
+ 	    $r->print('<div class="LC_error">'.
- 		      &mt('Error deleting parameters').'</font></h2>');
+ 		      &mt('Error deleting parameters').'</div>');
  	}
  	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
      }
      if ($putentries) {
  	if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
- 	    $r->print('<h3>'.&mt('Stored [_1] parameter(s)',$putentries/2).'</h3>');
+ 			    &log_parmset(\%newdata,0);
+ 	    $r->print('<h3>'.&mt('Saved [_1] parameter(s)',$putentries/2).'</h3>');
  	} else {
- 	    $r->print('<h2><font color="red">'.
+ 	    $r->print('<div class="LC_error">'.
- 		      &mt('Error storing parameters').'</font></h2>');
+ 		      &mt('Error saving parameters').'</div>');
  	}
  	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
      }
- Line 2150  sub storedata {
+ Line 2581  sub storedata {
  sub extractuser {
      my $key=shift;
-     return ($key=~/^$env{'request.course.id'}.\[useropt\:(\w+)\:(\w+)\]\./);
+     return ($key=~/^$env{'request.course.id'}.\[useropt\:($match_username)\:($match_domain)\]\./);
+ }
+ sub parse_listdata_key {
+     my ($key,$listdata) = @_;
+     # split into student/section affected, and
+     # the realm (folder/resource part and parameter
+     my ($student,$realm) =
+ 	($key=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)$/);
+     # if course wide student would be undefined
+     if (!defined($student)) {
+ 	($realm)=($key=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+     }
+     # strip off the .type if it's not the Question type parameter
+     if ($realm=~/\.type$/ && !exists($listdata->{$key.'.type'})) {
+ 	$realm=~s/\.type//;
+     }
+     # split into resource+part and parameter name
+     my ($res,    $parm) = ($realm=~/^(.*)\.(.*)$/);
+        ($res, my $part) = ($res  =~/^(.*)\.(.*)$/);
+     return ($student,$res,$part,$parm);
  }
  sub listdata {
- Line 2163  sub listdata {
+ Line 2614  sub listdata {
      my $pointer=0;
      $tableopen=0;
      my $foundkeys=0;
+     my %keyorder=&standardkeyorder();
      foreach my $thiskey (sort {
+ 	my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);
+ 	my ($bstudent,$bres,$bpart,$bparm) = &parse_listdata_key($b,$listdata);
+ 	# get the numerical order for the param
+ 	$aparm=$keyorder{'parameter_0_'.$aparm};
+ 	$bparm=$keyorder{'parameter_0_'.$bparm};
+ 	my $result=0;
  	if ($sortorder eq 'realmstudent') {
- 	    my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
+             if ($ares     ne $bres    ) {
- 	    my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
+ 		$result = ($ares     cmp $bres);
-             ($arealm cmp $brealm) || ($astudent cmp $bstudent);
+             } elsif ($astudent ne $bstudent) {
+ 		$result = ($astudent cmp $bstudent);
+ 	    } elsif ($apart    ne $bpart   ) {
+ 		$result = ($apart    cmp $bpart);
+ 	    }
  	} else {
- 	    $a cmp $b;
+ 	    if      ($astudent ne $bstudent) {
+ 		$result = ($astudent cmp $bstudent);
+ 	    } elsif ($ares     ne $bres    ) {
+ 		$result = ($ares     cmp $bres);
+ 	    } elsif ($apart    ne $bpart   ) {
+ 		$result = ($apart    cmp $bpart);
+ 	    }
+ 	}
+ 	if (!$result) {
+             if (defined($aparm) && defined($bparm)) {
+ 		$result = ($aparm <=> $bparm);
+             } elsif (defined($aparm)) {
+ 		$result = -1;
+             } elsif (defined($bparm)) {
+ 		$result = 1;
+ 	    }
  	}
+ 	$result;
      } keys %{$listdata}) {
  	if ($$listdata{$thiskey.'.type'}) {
              my $thistype=$$listdata{$thiskey.'.type'};
              if ($$resourcedata{$thiskey.'.type'}) {
- Line 2182  sub listdata {
+ Line 2667  sub listdata {
  	    my $section=&mt('All Students');
  	    if ($middle=~/^\[(.*)\]/) {
  		my $issection=$1;
- 		if ($issection=~/^useropt\:(\w+)\:(\w+)/) {
+ 		if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
  		    $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
  		} else {
  		    $section=&mt('Group/Section').': '.$issection;
- Line 2191  sub listdata {
+ Line 2676  sub listdata {
  	    }
  	    $middle=~s/\.+$//;
  	    $middle=~s/^\.+//;
- 	    my $realm='<font color="red">'.&mt('All Resources').'</font>';
+ 	    my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
  	    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
- 		$realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';
+ 		$realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><span class="LC_parm_folder">('.$1.')</span></span>';
  	    } elsif ($middle) {
  		my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
- 		$realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';
+ 		$realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
  	    }
  	    if ($sortorder eq 'realmstudent') {
  		if ($realm ne $oldrealm) {
- Line 2223  sub listdata {
+ Line 2708  sub listdata {
  	    }
  	    if ($part ne $oldpart) {
  		$r->print(&tableend().
- 			  "\n<font color='blue'>".&mt('Part').": $part</font>");
+ 			  "\n<span class=\"LC_parm_part\">".&mt('Part').": $part</span>");
  		$oldpart=$part;
  	    }
  #
- # Preset defaults?
- #
-             my ($hour,$min,$sec,$val)=('','','','');
- 	    unless ($$resourcedata{$thiskey}) {
- 		my ($parmname)=($thiskey=~/\.(\w+)$/);
- 		($hour,$min,$sec,$val)=&preset_defaults($parmname);
- 	    }
- #
  # Ready to print
  #
- 	    $r->print(&tablestart().'<tr><td><b>'.$name.
+ 	    $r->print(&tablestart().
- 		      ':</b></td><td><input type="checkbox" name="del_'.
+ 		      &Apache::loncommon::start_data_table_row().
+ 		      '<td><b>'.&standard_parameter_names($name).
+ 		      '</b></td><td><input type="checkbox" name="del_'.
  		      $thiskey.'" /></td><td>');
  	    $foundkeys++;
  	    if (&isdateparm($thistype)) {
- Line 2249  sub listdata {
+ Line 2727  sub listdata {
  			  &Apache::lonhtmlcommon::date_setter('parmform',
  							      $jskey,
  						      $$resourcedata{$thiskey},
- 							      '',1,'','',$hour,$min,$sec).
+ 							      '',1,'','').
- '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'
+ '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
+ (($$resourcedata{$thiskey}!=0)?'<a href="/adm/parmset?&action=dateshift1&timebase='.$$resourcedata{$thiskey}.'">'.
+ &mt('Shift all dates based on this date').'</a>':'').
+ &date_sanity_info($$resourcedata{$thiskey})
  			  );
- 	    } elsif ($thistype eq 'string_yesno') {
+ 	    } elsif ($thistype eq 'date_interval') {
- 		my $showval;
+ 		$r->print(&date_interval_selector($thiskey,
- 		if (defined($$resourcedata{$thiskey})) {
+ 						  $$resourcedata{$thiskey}));
- 		    $showval=$$resourcedata{$thiskey};
+ 	    } elsif ($thistype =~ m/^string/) {
- 		} else {
+ 		$r->print(&string_selector($thistype,$thiskey,
- 		    $showval=$val;
+ 					   $$resourcedata{$thiskey}));
- 		}
- 		$r->print('<label><input type="radio" name="set_'.$thiskey.
- 			  '" value="yes"');
- 		if ($showval eq 'yes') {
- 		    $r->print(' checked="checked"');
- 		}
-                 $r->print(' />'.&mt('Yes').'</label> ');
- 		$r->print('<label><input type="radio" name="set_'.$thiskey.
- 			  '" value="no"');
- 		if ($showval eq 'no') {
- 		    $r->print(' checked="checked"');
- 		}
-                 $r->print(' />'.&mt('No').'</label>');
  	    } else {
- 		my $showval;
+ 		$r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
- 		if (defined($$resourcedata{$thiskey})) {
- 		    $showval=$$resourcedata{$thiskey};
- 		} else {
- 		    $showval=$val;
- 		}
- 		$r->print('<input type="text" name="set_'.$thiskey.'" value="'.
- 			  $showval.'">');
  	    }
  	    $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
  		      $thistype.'">');
- 	    $r->print('</td></tr>');
+ 	    $r->print('</td>'.&Apache::loncommon::end_data_table_row());
  	}
      }
      return $foundkeys;
  }
+ sub date_interval_selector {
+     my ($thiskey, $showval) = @_;
+     my $result;
+     foreach my $which (['days', 86400, 31],
+ 		       ['hours', 3600, 23],
+ 		       ['minutes', 60, 59],
+ 		       ['seconds',  1, 59]) {
+ 	my ($name, $factor, $max) = @{ $which };
+ 	my $amount = int($showval/$factor);
+ 	$showval  %= $factor;
+ 	my %select = ((map {$_ => $_} (0..$max)),
+ 		      'select_form_order' => [0..$max]);
+ 	$result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
+ 						   %select);
+ 	$result .= ' '.&mt($name);
+     }
+     $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
+     return $result;
+ }
+ sub get_date_interval_from_form {
+     my ($key) = @_;
+     my $seconds = 0;
+     foreach my $which (['days', 86400],
+ 		       ['hours', 3600],
+ 		       ['minutes', 60],
+ 		       ['seconds',  1]) {
+ 	my ($name, $factor) = @{ $which };
+ 	if (defined($env{'form.'.$name.'_'.$key})) {
+ 	    $seconds += $env{'form.'.$name.'_'.$key} * $factor;
+ 	}
+     }
+     return $seconds;
+ }
+ sub default_selector {
+     my ($thiskey, $showval) = @_;
+     return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';
+ }
+ my %strings =
+     (
+      'string_yesno'
+              => [[ 'yes', 'Yes' ],
+ 		 [ 'no', 'No' ]],
+      'string_problemstatus'
+              => [[ 'yes', 'Yes' ],
+ 		 [ 'answer', 'Yes, and show correct answer if they exceed the maxium number of tries.' ],
+ 		 [ 'no', 'No, don\'t show correct/incorrect feedback.' ],
+ 		 [ 'no_feedback_ever', 'No, show no feedback at all.' ]],
+      );
+ sub string_selector {
+     my ($thistype, $thiskey, $showval) = @_;
+     if (!exists($strings{$thistype})) {
+ 	return &default_selector($thiskey,$showval);
+     }
+     my $result;
+     foreach my $possibilities (@{ $strings{$thistype} }) {
+ 	my ($name, $description) = @{ $possibilities };
+ 	$result .= '<label><input type="radio" name="set_'.$thiskey.
+ 		  '" value="'.$name.'"';
+ 	if ($showval eq $name) {
+ 	    $result .= ' checked="checked"';
+ 	}
+ 	$result .= ' />'.&mt($description).'</label> ';
+     }
+     return $result;
+ }
+ #
+ # Shift all start and end dates by $shift
+ #
+ sub dateshift {
+     my ($shift)=@_;
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+ # ugly retro fix for broken version of types
+     foreach my $key (keys %data) {
+         if ($key=~/\wtype$/) {
+             my $newkey=$key;
+             $newkey=~s/type$/\.type/;
+             $data{$newkey}=$data{$key};
+             delete $data{$key};
+         }
+     }
+     my %storecontent=();
+ # go through all parameters and look for dates
+     foreach my $key (keys %data) {
+        if ($data{$key.'.type'}=~/^date_(start|end)$/) {
+           my $newdate=$data{$key}+$shift;
+           $storecontent{$key}=$newdate;
+        }
+     }
+     my $reply=&Apache::lonnet::cput
+                 ('resourcedata',\%storecontent,$dom,$crs);
+     if ($reply eq 'ok') {
+        &log_parmset(\%storecontent);
+     }
+     &Apache::lonnet::devalidatecourseresdata($crs,$dom);
+     return $reply;
+ }
  sub newoverview {
-     my $r=shift;
+     my ($r) = @_;
-     my $bodytag=&Apache::loncommon::bodytag('Set Parameters');
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+     my $start_page = &Apache::loncommon::start_page('Set Parameters');
-     my $html=&Apache::lonxml::xmlbegin();
+     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
      $r->print(<<ENDOVER);
- $html
+ $start_page
- <head>
- <title>LON-CAPA Parameters</title>
- </head>
- $bodytag
  $breadcrumbs
  <form method="post" action="/adm/parmset?action=newoverview" name="parmform">
  ENDOVER
- Line 2324  ENDOVER
+ Line 2892  ENDOVER
      $alllevs{'Course Level'}='general';
      my $csec=$env{'form.csec'};
+     my $cgroup=$env{'form.cgroup'};
      my @pscat=&Apache::loncommon::get_env_multiple('form.pscat');
      my $pschp=$env{'form.pschp'};
- Line 2333  ENDOVER
+ Line 2902  ENDOVER
      my @selected_sections =
  	&Apache::loncommon::get_env_multiple('form.Section');
      @selected_sections = ('all') if (! @selected_sections);
-     foreach (@selected_sections) {
+     foreach my $sec (@selected_sections) {
-         if ($_ eq 'all') {
+         if ($sec eq 'all') {
              @selected_sections = ('all');
          }
      }
+     my @selected_groups =
+         &Apache::loncommon::get_env_multiple('form.Group');
      my $pssymb='';
      my $parmlev='';
- Line 2352  ENDOVER
+ Line 2923  ENDOVER
  				\%mapp, \%symbp,\%maptitles,\%uris,
  				\%keyorder,\%defkeytype);
+     if (grep {$_ eq 'all'} (@psprt)) {
+ 	@psprt = keys(%allparts);
+     }
  # Menu to select levels, etc
-     $r->print('<table border="1"><tr><td>');
+     $r->print('<table id="LC_parm_overview_scope">
+                <tr><td class="LC_parm_overview_level_menu">');
      &levelmenu($r,\%alllevs,$parmlev);
      if ($parmlev ne 'general') {
- 	$r->print('<td>');
+ 	$r->print('<td class="LC_parm_overview_map_menu">');
  	&mapmenu($r,\%allmaps,$pschp,\%maptitles);
  	$r->print('</td>');
      }
      $r->print('</td></tr></table>');
-     $r->print('<table border="1"><tr><td>');
+     $r->print('<table id="LC_parm_overview_controls">
+                <tr><td class="LC_parm_overview_parm_selectors">');
      &parmmenu($r,\%allparms,\@pscat,\%keyorder);
-     $r->print('</td><td>');
+     $r->print('</td><td class="LC_parm_overview_restrictions">
+                 <table class="LC_parm_overview_restrictions">'.
+               '<tr><th>'.&mt('Parts').'</th><th>'.&mt('Section(s)').
+               '</th><th>'.&mt('Group(s)').'</th></tr><tr><td>');
      &partmenu($r,\%allparts,\@psprt);
      $r->print('</td><td>');
      &sectionmenu($r,\@selected_sections);
+     $r->print('</td><td>');
+     &groupmenu($r,\@selected_groups);
+     $r->print('</td></tr></table>');
      $r->print('</td></tr></table>');
      my $sortorder=$env{'form.sortorder'};
- Line 2384  ENDOVER
+ Line 2965  ENDOVER
      %{$listdata}=();
      foreach my $cat (@pscat) {
- 	foreach my $section (@selected_sections) {
+         &secgroup_lister($cat,$pschp,$parmlev,$listdata,\@psprt,\@selected_sections,\%defkeytype,\%allmaps,\@ids,\%symbp);
- 	    foreach my $part (@psprt) {
+         &secgroup_lister($cat,$pschp,$parmlev,$listdata,\@psprt,\@selected_groups,\%defkeytype,\%allmaps,\@ids,\%symbp);
-                 my $rootparmkey=$env{'request.course.id'};
-                 if (($section ne 'all') && ($section ne 'none') && ($section)) {
- 		    $rootparmkey.='.['.$section.']';
- 		}
- 		if ($parmlev eq 'general') {
- # course-level parameter
- 		    my $newparmkey=$rootparmkey.'.'.$part.'.'.$cat;
- 		    $$listdata{$newparmkey}=1;
- 		    $$listdata{$newparmkey.'.type'}=$defkeytype{$cat};
- 		} elsif ($parmlev eq 'map') {
- # map-level parameter
- 		    foreach my $mapid (keys %allmaps) {
- 			if (($pschp ne 'all') && ($pschp ne $mapid)) { next; }
- 			my $newparmkey=$rootparmkey.'.'.$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;
-                         $$listdata{$newparmkey}=1;
-                         $$listdata{$newparmkey.'.type'}=$defkeytype{$cat};
- 		    }
- 		} else {
- # resource-level parameter
- 		    foreach my $rid (@ids) {
- 			my ($map,$resid,$url)=&Apache::lonnet::decode_symb($symbp{$rid});
- 			if (($pschp ne 'all') && ($allmaps{$pschp} ne $map)) { next; }
- 			my $newparmkey=$rootparmkey.'.'.$symbp{$rid}.'.'.$part.'.'.$cat;
-                         $$listdata{$newparmkey}=1;
-                         $$listdata{$newparmkey.'.type'}=$defkeytype{$cat};
- 		    }
- 		}
- 	    }
- 	}
      }
      if (($env{'form.store'}) || ($env{'form.dis'})) {
- Line 2430  ENDOVER
+ Line 2982  ENDOVER
  	&listdata($r,$resourcedata,$listdata,$sortorder);
      }
      $r->print(&tableend().
- 	     ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Store').'" /></p>':'').
+ 	     ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
- 	      '</form></body></html>');
+ 	      '</form>'.&Apache::loncommon::end_page());
+ }
+ sub secgroup_lister {
+     my ($cat,$pschp,$parmlev,$listdata,$psprt,$selections,$defkeytype,$allmaps,$ids,$symbp) = @_;
+     foreach my $item (@{$selections}) {
+         foreach my $part (@{$psprt}) {
+             my $rootparmkey=$env{'request.course.id'};
+             if (($item ne 'all') && ($item ne 'none') && ($item)) {
+                 $rootparmkey.='.['.$item.']';
+             }
+             if ($parmlev eq 'general') {
+ # course-level parameter
+                 my $newparmkey=$rootparmkey.'.'.$part.'.'.$cat;
+                 $$listdata{$newparmkey}=1;
+                 $$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
+             } elsif ($parmlev eq 'map') {
+ # map-level parameter
+                 foreach my $mapid (keys %{$allmaps}) {
+                     if (($pschp ne 'all') && ($pschp ne $mapid)) { next; }
+                     my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;
+                     $$listdata{$newparmkey}=1;
+                     $$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
+                 }
+             } else {
+ # resource-level parameter
+                 foreach my $rid (@{$ids}) {
+                     my ($map,$resid,$url)=&Apache::lonnet::decode_symb($$symbp{$rid});
+                     if (($pschp ne 'all') && ($$allmaps{$pschp} ne $map)) { next; }
+                     my $newparmkey=$rootparmkey.'.'.$$symbp{$rid}.'.'.$part.'.'.$cat;
+                     $$listdata{$newparmkey}=1;
+                     $$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
+                 }
+             }
+         }
+     }
  }
  sub overview {
-     my $r=shift;
+     my ($r) = @_;
-     my $bodytag=&Apache::loncommon::bodytag('Modify Parameters');
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
-     my $html=&Apache::lonxml::xmlbegin();
+     my $start_page=&Apache::loncommon::start_page('Modify Parameters');
+     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
      $r->print(<<ENDOVER);
- $html
+ $start_page
- <head>
- <title>LON-CAPA Parameters</title>
- </head>
- $bodytag
  $breadcrumbs
  <form method="post" action="/adm/parmset?action=setoverview" name="parmform">
  ENDOVER
- Line 2468  ENDOVER
+ Line 3051  ENDOVER
      my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
      $r->print(&tableend().'<p>'.
- 	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form></body></html>');
+ 	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form>'.
+ 	      &Apache::loncommon::end_page());
+ }
+ sub clean_parameters {
+     my ($r) = @_;
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my $start_page=&Apache::loncommon::start_page('Clean Parameters');
+     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Clean');
+     $r->print(<<ENDOVER);
+ $start_page
+ $breadcrumbs
+ <form method="post" action="/adm/parmset?action=cleanparameters" name="parmform">
+ ENDOVER
+ # Store modified
+     &storedata($r,$crs,$dom);
+ # Read modified data
+     my $resourcedata=&readdata($crs,$dom);
+ # List data
+     $r->print('<h3>'.
+ 	      &mt('These parameters refer to resources that do not exist.').
+ 	      '</h3>'.
+ 	      '<input type="submit" value="'.&mt('Delete Checked Parameters').'" />'.'<br />'.
+ 	      '<br />');
+     $r->print(&Apache::loncommon::start_data_table().
+ 	      '<tr>'.
+ 	      '<th>'.&mt('Delete').'</th>'.
+ 	      '<th>'.&mt('Parameter').'</th>'.
+ 	      '</tr>');
+     foreach my $thiskey (sort(keys(%{$resourcedata}))) {
+ 	next if (!exists($resourcedata->{$thiskey.'.type'})
+ 		 && $thiskey=~/\.type$/);
+ 	my %data = &parse_key($thiskey);
+ 	if (1) { #exists($data{'realm_exists'})
+ 	    #&& !$data{'realm_exists'}) {
+ 	    $r->print(&Apache::loncommon::start_data_table_row().
+ 		      '<tr>'.
+ 		      '<td><input type="checkbox" name="del_'.$thiskey.'" /></td>'		      );
+ 	    $r->print('<td>');
+ 	    my $display_value = $resourcedata->{$thiskey};
+ 	    if (&isdateparm($resourcedata->{$thiskey.'.type'})) {
+ 		$display_value =
+ 		    &Apache::lonlocal::locallocaltime($display_value);
+ 	    }
+ 	    $r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
+ 			  &standard_parameter_names($data{'parameter_name'}),
+ 			  $resourcedata->{$thiskey}));
+ 	    $r->print('<br />');
+ 	    if ($data{'scope_type'} eq 'all') {
+ 		$r->print(&mt('All users'));
+ 	    } elsif ($data{'scope_type'} eq 'user') {
+ 		$r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));
+ 	    } elsif ($data{'scope_type'} eq 'section') {
+ 		$r->print(&mt('Section: [_1]',$data{'scope'}));
+ 	    } elsif ($data{'scope_type'} eq 'group') {
+ 		$r->print(&mt('Group: [_1]',$data{'scope'}));
+ 	    }
+ 	    $r->print('<br />');
+ 	    if ($data{'realm_type'} eq 'all') {
+ 		$r->print(&mt('All Resources'));
+ 	    } elsif ($data{'realm_type'} eq 'folder') {
+ 		$r->print(&mt('Folder: [_1]'),$data{'realm'});
+ 	    } elsif ($data{'realm_type'} eq 'symb') {
+ 		my ($map,$resid,$url) =
+ 		    &Apache::lonnet::decode_symb($data{'realm'});
+ 		$r->print(&mt('Resource: [_1] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',
+ 			      $url,$resid,$map));
+ 	    }
+ 	    $r->print(' <br />&nbsp;&nbsp;&nbsp;'.&mt('Part: [_1]',$data{'parameter_part'}));
+ 	    $r->print('</td></tr>');
+ 	}
+     }
+     $r->print(&Apache::loncommon::end_data_table().'<p>'.
+ 	      '<input type="submit" value="'.&mt('Delete Checked Parameters').'" />'.
+ 	      '</p></form>'.
+ 	      &Apache::loncommon::end_page());
+ }
+ sub date_shift_one {
+     my ($r) = @_;
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my $start_page=&Apache::loncommon::start_page('Shift Dates');
+     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
+     $r->print(<<ENDOVER);
+ $start_page
+ $breadcrumbs
+ ENDOVER
+     $r->print('<form name="shiftform" method="post">'.
+               '<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
+               &Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
+               '<tr><td>'.&mt('Shifted date:').'</td><td>'.
+                     &Apache::lonhtmlcommon::date_setter('shiftform',
+                                                         'timeshifted',
+                                                         $env{'form.timebase'},,
+                                                         '').
+               '</td></tr></table>'.
+               '<input type="hidden" name="action" value="dateshift2" />'.
+               '<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
+               '<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
+     $r->print(&Apache::loncommon::end_page());
+ }
+ sub date_shift_two {
+     my ($r) = @_;
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my $start_page=&Apache::loncommon::start_page('Shift Dates');
+     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
+     $r->print(<<ENDOVER);
+ $start_page
+ $breadcrumbs
+ ENDOVER
+     my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
+     $r->print(&mt('Shifting all dates such that [_1] becomes [_2]',
+               &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+               &Apache::lonlocal::locallocaltime($timeshifted)));
+     my $delta=$timeshifted-$env{'form.timebase'};
+     &dateshift($delta);
+     $r->print(&Apache::loncommon::end_page());
+ }
+ sub parse_key {
+     my ($key) = @_;
+     my %data;
+     my ($middle,$part,$name)=
+ 	($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+     $data{'scope_type'} = 'all';
+     if ($middle=~/^\[(.*)\]/) {
+        	$data{'scope'} = $1;
+ 	if ($data{'scope'}=~/^useropt\:($match_username)\:($match_domain)/) {
+ 	    $data{'scope_type'} = 'user';
+ 	    $data{'scope'} = [$1,$2];
+ 	} else {
+ 	    #FIXME check for group scope
+ 	    $data{'scope_type'} = 'section';
+ 	}
+ 	$middle=~s/^\[(.*)\]//;
+     }
+     $middle=~s/\.+$//;
+     $middle=~s/^\.+//;
+     $data{'realm_type'}='all';
+     if ($middle=~/^(.+)\_\_\_\(all\)$/) {
+ 	$data{'realm'} = $1;
+ 	$data{'realm_type'} = 'folder';
+ 	$data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
+ 	($data{'realm_exists'}) = &Apache::lonnet::is_on_map($data{'realm'});
+     } elsif ($middle) {
+ 	$data{'realm'} = $middle;
+ 	$data{'realm_type'} = 'symb';
+ 	$data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
+ 	my ($map,$resid,$url) = &Apache::lonnet::decode_symb($data{'realm'});
+ 	$data{'realm_exists'} = &Apache::lonnet::symbverify($data{'realm'},$url);
+     }
+     $data{'parameter_part'} = $part;
+     $data{'parameter_name'} = $name;
+     return %data;
  }
  ##################################################
  ##################################################
  =pod
- =item change clone
+ =item check_cloners
+ Checks if new users included in list of allowed cloners
+ are valid users.  Replaces supplied list with
+ cleaned list containing only users with valid usernames
+ and domains.
+ Inputs: $clonelist, $oldcloner
+ where $clonelist is ref to array of requested cloners,
+ and $oldcloner is ref to array of currently allowed
+ cloners.
+ Returns: string - comma separated list of requested
+ cloners (username:domain) who do not exist in system.
+ =item change_clone
  Modifies the list of courses a user can clone (stored
- in the user's environemnt.db file), called when a
+ in the user's environment.db file), called when a
  change is made to the list of users allowed to clone
  a course.
  Inputs: $action,$cloner
  where $action is add or drop, and $cloner is identity of
  user for whom cloning ability is to be changed in course.
- Returns:
  =cut
  ##################################################
  ##################################################
+ sub extract_cloners {
+     my ($clonelist,$allowclone) = @_;
+     if ($clonelist =~ /,/) {
+         @{$allowclone} = split(/,/,$clonelist);
+     } else {
+         $$allowclone[0] = $clonelist;
+     }
+ }
+ sub check_cloners {
+     my ($clonelist,$oldcloner) = @_;
+     my ($clean_clonelist,%disallowed);
+     my @allowclone = ();
+     &extract_cloners($$clonelist,\@allowclone);
+     foreach my $currclone (@allowclone) {
+         if (!grep(/^\Q$currclone\E$/,@$oldcloner)) {
+             if ($currclone eq '*') {
+                 $clean_clonelist .= $currclone.',';
+             } else {
+                 my ($uname,$udom) = split(/:/,$currclone);
+                 if ($uname eq '*') {
+                     if ($udom =~ /^$match_domain$/) {
+                         if (!&Apache::lonnet::domain($udom)) {
+                             $disallowed{'domain'} .= $currclone.',';
+                         } else {
+                             $clean_clonelist .= $currclone.',';
+                         }
+                     } else {
+                         $disallowed{'format'} .= $currclone.',';
+                     }
+                 } elsif ($currclone !~/^($match_username)\:($match_domain)$/) {
+                     $disallowed{'format'} .= $currclone.',';
+                 } else {
+                     if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                         $disallowed{'newuser'} .= $currclone.',';
+                     } else {
+                         $clean_clonelist .= $currclone.',';
+                     }
+                 }
+             }
+         } else {
+             $clean_clonelist .= $currclone.',';
+         }
+     }
+     foreach my $key (keys(%disallowed)) {
+         $disallowed{$key} =~ s/,$//;
+     }
+     if ($clean_clonelist) {
+         $clean_clonelist =~ s/,$//;
+     }
+     $$clonelist = $clean_clonelist;
+     return %disallowed;
+ }
  sub change_clone {
      my ($clonelist,$oldcloner) = @_;
- Line 2503  sub change_clone {
+ Line 3320  sub change_clone {
      my $clone_crs = $cnum.':'.$cdom;
      if ($cnum && $cdom) {
-         my @allowclone = ();
+         my @allowclone;
-         if ($clonelist =~ /,/) {
+         &extract_cloners($clonelist,\@allowclone);
-             @allowclone = split/,/,$clonelist;
-         } else {
-             $allowclone[0] = $clonelist;
-         }
          foreach my $currclone (@allowclone) {
-             if (!grep/^$currclone$/,@$oldcloner) {
+             if (!grep(/^$currclone$/,@$oldcloner)) {
-                 ($uname,$udom) = split/:/,$currclone;
+                 if ($currclone ne '*') {
-                 if ($uname && $udom) {
+                     ($uname,$udom) = split(/:/,$currclone);
-                     unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                     if ($uname && $udom && $uname ne '*') {
-                         my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+                         if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
-                         if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
+                             my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
-                             if ($currclonecrs{'cloneable'} eq '') {
+                             if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
-                                 $currclonecrs{'cloneable'} = $clone_crs;
+                                 if ($currclonecrs{'cloneable'} eq '') {
-                             } else {
+                                     $currclonecrs{'cloneable'} = $clone_crs;
-                                 $currclonecrs{'cloneable'} .= ','.$clone_crs;
+                                 } else {
+                                     $currclonecrs{'cloneable'} .= ','.$clone_crs;
+                                 }
+                                 &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
                              }
-                             &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
                          }
                      }
                  }
              }
          }
          foreach my $oldclone (@$oldcloner) {
-             if (!grep/^$oldclone$/,@allowclone) {
+             if (!grep(/^\Q$oldclone\E$/,@allowclone)) {
-                 ($uname,$udom) = split/:/,$oldclone;
+                 if ($oldclone ne '*') {
-                 if ($uname && $udom) {
+                     ($uname,$udom) = split(/:/,$oldclone);
-                     unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                     if ($uname && $udom && $uname ne '*' ) {
-                         my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+                         if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
-                         my %newclonecrs = ();
+                             my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
-                         if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
+                             my %newclonecrs = ();
-                             if ($currclonecrs{'cloneable'} =~ /,/) {
+                             if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
-                                 my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
+                                 if ($currclonecrs{'cloneable'} =~ /,/) {
-                                 foreach (@currclonecrs) {
+                                     my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
-                                     unless ($_ eq $clone_crs) {
+                                     foreach my $crs (@currclonecrs) {
-                                         $newclonecrs{'cloneable'} .= $_.',';
+                                         if ($crs ne $clone_crs) {
+                                             $newclonecrs{'cloneable'} .= $crs.',';
+                                         }
                                      }
+                                     $newclonecrs{'cloneable'} =~ s/,$//;
+                                 } else {
+                                     $newclonecrs{'cloneable'} = '';
                                  }
-                                 $newclonecrs{'cloneable'} =~ s/,$//;
+                                 &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
-                             } else {
-                                 $newclonecrs{'cloneable'} = '';
                              }
-                             &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
                          }
                      }
                  }
- Line 2570  Output html header for page
+ Line 3387  Output html header for page
  ##################################################
  ##################################################
  sub header {
-     my $html=&Apache::lonxml::xmlbegin();
+     return &Apache::loncommon::start_page('Parameter Manager');
-     my $bodytag=&Apache::loncommon::bodytag('Parameter Manager');
-     my $title = &mt('LON-CAPA Parameter Manager');
-     return(<<ENDHEAD);
- $html
- <head>
- <title>$title</title>
- </head>
- $bodytag
- ENDHEAD
  }
  ##################################################
  ##################################################
- Line 2593  ENDMAINFORMHEAD
+ Line 3401  ENDMAINFORMHEAD
  #
      my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $vgr  = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+     my $mgr  = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
      my @menu =
-         (
+         ( { divider=>'Settings for Your Course',
-           { text => 'Set Course Environment Parameters',
+ 	  },
+           { text => 'Set Course Environment',
  	    action => 'crsenv',
              permission => $parm_permission,
+             help => 'Course_Environment',
              },
-           { text => 'Set/Modify Resource Parameters - Helper Mode',
+           { text => 'Set Portfolio Metadata',
-             url => '/adm/helper/parameter.helper',
+ 	    action => 'setrestrictmeta',
              permission => $parm_permission,
              },
-           { text => 'Modify Resource Parameters - Overview Mode',
+ 	  { text => 'Manage Course Slots',
-             action => 'setoverview',
+ 	    url => '/adm/slotrequest?command=showslots',
+ 	    permission => $vgr,
+             },
+ 	  { text => 'Reset Student Access Times',
+ 	    url => '/adm/helper/resettimes.helper',
+ 	    permission => $mgr,
+             },
+           { text => 'Set Parameter Setting Default Actions',
+             action => 'setdefaults',
              permission => $parm_permission,
              },
- 	  { text => 'Set Resource Parameters - Overview Mode',
+ 	  { divider => 'New and Existing Parameter Settings for Your Resources',
+ 	    },
+           { text => 'Set/Modify Resource Parameters - Helper Mode',
+             url => '/adm/helper/parameter.helper',
+             permission => $parm_permission,
+             help => 'Parameter_Helper',
+             },
+  	  { text => 'Set/Modify Resource Parameters - Overview Mode',
              action => 'newoverview',
              permission => $parm_permission,
+             help => 'Parameter_Overview',
              },
            { text => 'Set/Modify Resource Parameters - Table Mode',
              action => 'settable',
              permission => $parm_permission,
-             help => 'Cascading_Parameters',
+             help => 'Table_Mode',
              },
-           { text => 'Set Parameter Setting Default Actions',
+            { divider => 'Existing Parameter Settings for Your Resources',
-             action => 'setdefaults',
+ 	  },
+ 	  { text => 'Modify Resource Parameters - Overview Mode',
+             action => 'setoverview',
+             permission => $parm_permission,
+             help => 'Parameter_Overview',
+  	    },
+ 	  { text => 'Parameter Change Log and Course Blog Posting/User Notification',
+             action => 'parameterchangelog',
              permission => $parm_permission,
              },
            );
      my $menu_html = '';
      foreach my $menu_item (@menu) {
+ 	if ($menu_item->{'divider'}) {
+ 	    $menu_html .= '<h3>'.&mt($menu_item->{'divider'}).'</h3>';
+ 	    next;
+ 	}
          next if (! $menu_item->{'permission'});
          $menu_html.='<p>';
-         $menu_html.='<font size="+1">';
+         $menu_html.='<span class="LC_parm_menu_item">';
          if (exists($menu_item->{'url'})) {
              $menu_html.=qq{<a href="$menu_item->{'url'}">};
          } else {
              $menu_html.=
                  qq{<a href="/adm/parmset?action=$menu_item->{'action'}">};
          }
-         $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
+         $menu_html.= &mt($menu_item->{'text'}).'</a></span>';
          if (exists($menu_item->{'help'})) {
              $menu_html.=
                  &Apache::loncommon::help_open_topic($menu_item->{'help'});
- Line 2642  ENDMAINFORMHEAD
+ Line 3483  ENDMAINFORMHEAD
      $r->print($menu_html);
      return;
  }
+ ### Set portfolio metadata
+ sub output_row {
- ##################################################
+     my ($r, $field_name, $field_text, $added_flag) = @_;
+     my $output;
- sub defaultsetter {
+     my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
-     my $r=shift;
+     my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
-     my $bodytag=&Apache::loncommon::bodytag('Parameter Setting Default Actions');
+     if (!defined($options)) {
+         $options = 'active,stuadd';
+         $values = '';
+     }
+     if (!($options =~ /deleted/)) {
+         my @options= ( ['active', 'Show to student'],
+                     ['stuadd', 'Provide text area for students to type catalog information'],
+                     ['choices','Provide choices for students to select from']);
+ #		   ['onlyone','Student may select only one choice']);
+         if ($added_flag) {
+             push @options,['deleted', 'Delete Metadata Field'];
+         }
+        $output = &Apache::loncommon::start_data_table_row();
+         $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';
+         $output .= &Apache::loncommon::end_data_table_row();
+         foreach my $opt (@options) {
+ 	    my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+ 	    $output .= &Apache::loncommon::continue_data_table_row();
+ 	    $output .= '<td>'.('&nbsp;' x 5).'<span class="LC_metadata"><label>
+ 	               <input type="checkbox" name="'.
+ 	               $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+ 	               &mt($opt->[1]).'</label></span> </td>';
+ 	    $output .= &Apache::loncommon::end_data_table_row();
+ 	}
+         $output .= &Apache::loncommon::continue_data_table_row();
+         $output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata"><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';
+         $output .= &Apache::loncommon::end_data_table_row();
+         my $multiple_checked;
+         my $single_checked;
+         if ($options =~ m/onlyone/) {
+             $multiple_checked = "";
+             $single_checked = " CHECKED ";
+         } else {
+             $multiple_checked = " CHECKED ";
+             $single_checked = "";
+         }
+ 	$output .= &Apache::loncommon::continue_data_table_row();
+ 	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
+ 	            <input type="radio" name="'.$field_name.'_onlyone" value="multiple" '.$multiple_checked .'/>
+ 	            Student may select multiple choices from list</span></td>';
+ 	$output .= &Apache::loncommon::end_data_table_row();
+ 	$output .= &Apache::loncommon::continue_data_table_row();
+ 	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
+ 	            <input type="radio" name="'.$field_name.'_onlyone"  value="single" '.$single_checked.'/>
+ 	            Student may select only one choice from list</span></td>';
+ 	$output .= &Apache::loncommon::end_data_table_row();
+     }
+     return ($output);
+ }
+ sub order_meta_fields {
+     my ($r)=@_;
+     my $idx = 1;
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Defaults');
+     $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
-     my $html=&Apache::lonxml::xmlbegin();
+     &Apache::lonhtmlcommon::add_breadcrumb
+             ({href=>"/adm/parmset?action=setrestrictmeta",
+               text=>"Restrict Metadata"},
+              {text=>"Order Metadata"});
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
+     if ($env{'form.storeorder'}) {
+         my $newpos = $env{'form.newpos'} - 1;
+         my $currentpos = $env{'form.currentpos'} - 1;
+         my @neworder = ();
+         my @oldorder = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+         my $i;
+         if ($newpos > $currentpos) {
+         # moving stuff up
+             for ($i=0;$i<$currentpos;$i++) {
+         	$neworder[$i]=$oldorder[$i];
+             }
+             for ($i=$currentpos;$i<$newpos;$i++) {
+         	$neworder[$i]=$oldorder[$i+1];
+             }
+             $neworder[$newpos]=$oldorder[$currentpos];
+             for ($i=$newpos+1;$i<=$#oldorder;$i++) {
+         	$neworder[$i]=$oldorder[$i];
+             }
+         } else {
+         # moving stuff down
+     	    for ($i=0;$i<$newpos;$i++) {
+     	        $neworder[$i]=$oldorder[$i];
+     	    }
+     	    $neworder[$newpos]=$oldorder[$currentpos];
+     	    for ($i=$newpos+1;$i<$currentpos+1;$i++) {
+     	        $neworder[$i]=$oldorder[$i-1];
+     	    }
+     	    for ($i=$currentpos+1;$i<=$#oldorder;$i++) {
+     	        $neworder[$i]=$oldorder[$i];
+     	    }
+         }
+ 	my $ordered_fields = join ",", @neworder;
+         my $put_result = &Apache::lonnet::put('environment',
+                            {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
+ 	&Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);
+     }
+     my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
+     my $ordered_fields;
+     my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+     if (!@fields_in_order) {
+         # no order found, pick sorted order then create metadata.addedorder key.
+         foreach my $key (sort keys %$fields) {
+             push @fields_in_order, $key;
+             $ordered_fields = join ",", @fields_in_order;
+         }
+         my $put_result = &Apache::lonnet::put('environment',
+                             {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
+     }
+     $r->print('<table>');
+     my $num_fields = scalar(@fields_in_order);
+     foreach my $key (@fields_in_order) {
+         $r->print('<tr><td>');
+         $r->print('<form method="post" action="">');
+         $r->print('<select name="newpos" onChange="this.form.submit()">');
+         for (my $i = 1;$i le $num_fields;$i ++) {
+             if ($i eq $idx) {
+                 $r->print('<option value="'.$i.'"  SELECTED>('.$i.')</option>');
+             } else {
+                 $r->print('<option value="'.$i.'">'.$i.'</option>');
+             }
+         }
+         $r->print('</select></td><td>');
+         $r->print('<input type="hidden" name="currentpos" value="'.$idx.'" />');
+         $r->print('<input type="hidden" name="storeorder" value="true" />');
+         $r->print('</form>');
+         $r->print($$fields{$key}.'</td></tr>');
+         $idx ++;
+     }
+     $r->print('</table>');
+     return 'ok';
+ }
+ sub continue {
+     my $output;
+     $output .= '<form action="" method="post">';
+     $output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
+     $output .= '<input type="submit" value="Continue" />';
+     return ($output);
+ }
+ sub addmetafield {
+     my ($r)=@_;
+     $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     if (exists($env{'form.undelete'})) {
+         my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
+         foreach my $meta_field(@meta_fields) {
+             my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};
+             $options =~ s/deleted//;
+             $options =~ s/,,/,/;
+             my $put_result = &Apache::lonnet::put('environment',
+                                         {'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);
+             $r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
+         }
+         $r->print(&continue());
+     } elsif (exists($env{'form.fieldname'})) {
+         my $meta_field = $env{'form.fieldname'};
+         my $display_field = $env{'form.fieldname'};
+         $meta_field =~ s/\W/_/g;
+         $meta_field =~ tr/A-Z/a-z/;
+         my $put_result = &Apache::lonnet::put('environment',
+                             {'metadata.'.$meta_field.'.values'=>"",
+                              'metadata.'.$meta_field.'.added'=>"$display_field",
+                              'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
+         $r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');
+         $r->print(&continue());
+     } else {
+         my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
+         if ($fields) {
+             $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
+             $r->print('<form method="post" action="">');
+             foreach my $key(keys(%$fields)) {
+                 $r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
+             }
+             $r->print('<input type="submit" name="undelete" value="Undelete" />');
+             $r->print('</form>');
+         }
+         $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
+         $r->print('<input type="text" name="fieldname" /><br />');
+         $r->print('<input type="submit" value="Add Metadata Field" />');
+     }
+     $r->print('</form>');
+ }
+ sub setrestrictmeta {
+     my ($r)=@_;
+     my $next_meta;
+     my $output;
+     my $item_num;
+     my $put_result;
+     $r->print(&Apache::loncommon::start_page('Restrict Metadata'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
+     my $save_field = '';
+     if ($env{'form.restrictmeta'}) {
+         foreach my $field (sort(keys(%env))) {
+             if ($field=~m/^form.(.+)_(.+)$/) {
+                 my $options;
+                 my $meta_field = $1;
+                 my $meta_key = $2;
+                 if ($save_field ne $meta_field) {
+                     $save_field = $meta_field;
+             	    if ($env{'form.'.$meta_field.'_stuadd'}) {
+             	        $options.='stuadd,';
+             	    }
+             	    if ($env{'form.'.$meta_field.'_choices'}) {
+             	        $options.='choices,';
+             	    }
+             	    if ($env{'form.'.$meta_field.'_onlyone'} eq 'single') {
+             	        $options.='onlyone,';
+             	    }
+             	    if ($env{'form.'.$meta_field.'_active'}) {
+             	        $options.='active,';
+             	    }
+             	    if ($env{'form.'.$meta_field.'_deleted'}) {
+             	        $options.='deleted,';
+             	    }
+                     my $name = $save_field;
+                      $put_result = &Apache::lonnet::put('environment',
+                                                   {'metadata.'.$meta_field.'.options'=>$options,
+                                                    'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
+                                                    },$dom,$crs);
+                 }
+             }
+         }
+     }
+     &Apache::lonnet::coursedescription($env{'request.course.id'},
+ 				       {'freshen_cache' => 1});
+     # Get the default metadata fields
+     my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
+     # Now get possible added metadata fields
+     my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
+     my $row_alt = 1;
+     $output .= &Apache::loncommon::start_data_table();
+     foreach my $field (sort(keys(%metadata_fields))) {
+         if ($field ne 'courserestricted') {
+             $row_alt = $row_alt ? 0 : 1;
+ 	    $output.= &output_row($r, $field, $metadata_fields{$field});
+ 	}
+     }
+     my $buttons = (<<ENDButtons);
+         <input type="submit" name="restrictmeta" value="Save" />
+         </form><br />
+         <form method="post" action="/adm/parmset?action=addmetadata" name="form1">
+         <input type="submit" name="restrictmeta" value="Add a Metadata Field" />
+         </form>
+         <br />
+         <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
+         <input type="submit" name="restrictmeta" value="Order Metadata Fields" />
+ ENDButtons
+     my $added_flag = 1;
+     foreach my $field (sort(keys(%$added_metadata_fields))) {
+         $row_alt = $row_alt ? 0 : 1;
+         $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
+     }
+     $output .= &Apache::loncommon::end_data_table();
+     $r->print(<<ENDenv);
+         <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
+         $output
+         $buttons
+         </form>
+ ENDenv
+     $r->print(&Apache::loncommon::end_page());
+     return 'ok';
+ }
+ ##################################################
+ sub get_added_meta_fieldnames {
+     my ($cid) = @_;
+     my %fields;
+     foreach my $key(%env) {
+         if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
+             my $field_name = $1;
+             my ($display_field_name) = $env{$key};
+             $fields{$field_name} = $display_field_name;
+         }
+     }
+     return \%fields;
+ }
+ sub get_deleted_meta_fieldnames {
+     my ($cid) = @_;
+     my %fields;
+     foreach my $key(%env) {
+         if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
+             my $field_name = $1;
+             if ($env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) {
+                 my ($display_field_name) = $env{$key};
+                 $fields{$field_name} = $display_field_name;
+             }
+         }
+     }
+     return \%fields;
+ }
+ sub defaultsetter {
+     my ($r) = @_;
+     my $start_page =
+ 	&Apache::loncommon::start_page('Parameter Setting Default Actions');
+     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
      $r->print(<<ENDDEFHEAD);
- $html
+ $start_page
- <head>
- <title>LON-CAPA Parameters</title>
- </head>
- $bodytag
  $breadcrumbs
  <form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">
  ENDDEFHEAD
+     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
      my @ids=();
      my %typep=();
      my %keyp=();
- Line 2742  ENDDEFHEAD
+ Line 3877  ENDDEFHEAD
      }
  $r->print(&mt('Manual setting rules apply to all interfaces.').'<br />'.
  	  &mt('Automatic setting rules apply to table mode interfaces only.'));
-     $r->print("\n<table border='1'><tr><th>".&mt('Rule for parameter').'</th><th>'.
+     $r->print("\n".&Apache::loncommon::start_data_table().
- 	      &mt('Action').'</th><th>'.&mt('Value').'</th></tr>');
+ 	      &Apache::loncommon::start_data_table_header_row().
+ 	      "<th>".&mt('Rule for parameter').'</th><th>'.
+ 	      &mt('Action').'</th><th>'.&mt('Value').'</th>'.
+ 	      &Apache::loncommon::end_data_table_header_row());
      foreach my $tempkey (&keysindisplayorder(\%allparms,\%keyorder)) {
  	unless ($tempkey) { next; }
- 	$r->print("\n<tr><td>".$allparms{$tempkey}."\n<br />(".$tempkey.')</td><td>');
+ 	$r->print("\n".&Apache::loncommon::start_data_table_row().
+ 		  "<td>".$allparms{$tempkey}."\n<br />(".$tempkey.')</td><td>');
  	my $action=&rulescache($tempkey.'_action');
  	$r->print('<select name="'.$tempkey.'_action">');
  	if (&isdateparm($defkeytype{$tempkey})) {
- Line 2795  ENDYESNO
+ Line 3934  ENDYESNO
          } else {
  	    $r->print('<input type="text" size="20" name="'.$tempkey.'_value" value="'.&rulescache($tempkey.'_value').'" />');
  	}
-         $r->print('</td></tr>');
+         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
      }
-     $r->print("</table>\n<input type='submit' name='storerules' value='".
+     $r->print(&Apache::loncommon::end_data_table().
- 	      &mt('Store Rules')."' /></form>\n</body>\n</html>");
+ 	      "\n<input type='submit' name='storerules' value='".
+ 	      &mt('Save Rules')."' /></form>\n".
+ 	      &Apache::loncommon::end_page());
      return;
  }
+ sub components {
+     my ($key,$uname,$udom,$exeuser,$exedomain,$typeflag)=@_;
+     if ($typeflag) {
+ 	$key=~s/\.type$//;
+     }
+     my ($middle,$part,$name)=
+ 	($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+     my $issection;
+     my $section=&mt('All Students');
+     if ($middle=~/^\[(.*)\]/) {
+ 	$issection=$1;
+ 	$section=&mt('Group/Section').': '.$issection;
+ 	$middle=~s/^\[(.*)\]//;
+     }
+     $middle=~s/\.+$//;
+     $middle=~s/^\.+//;
+     if ($uname) {
+ 	$section=&mt('User').": ".&Apache::loncommon::plainname($uname,$udom);
+ 	$issection='';
+     }
+     my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
+     my $realmdescription=&mt('all resources');
+     if ($middle=~/^(.+)\_\_\_\(all\)$/) {
+ 	$realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <span class="LC_parm_folder"><br />('.$1.')</span></span>';
+  	$realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($1);
+    } elsif ($middle) {
+ 	my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
+ 	$realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
+ 	$realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);
+     }
+     my $what=$part.'.'.$name;
+     return ($realm,$section,$name,$part,
+ 	    $what,$middle,$uname,$udom,$issection,$realmdescription);
+ }
+ my %standard_parms;
+ sub load_parameter_names {
+     open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
+     while (my $configline=<$config>) {
+ 	if ($configline !~ /\S/ || $configline=~/^\#/) { next; }
+ 	chomp($configline);
+ 	my ($short,$plain)=split(/:/,$configline);
+ 	my (undef,$name,$type)=split(/\&/,$short,3);
+ 	if ($type eq 'display') {
+ 	    $standard_parms{$name} = $plain;
+ 	}
+     }
+     close($config);
+     $standard_parms{'int_pos'}      = 'Positive Integer';
+     $standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';
+     %standard_parms=&Apache::lonlocal::texthash(%standard_parms);
+ }
+ sub standard_parameter_names {
+     my ($name)=@_;
+     if (!%standard_parms) {
+ 	&load_parameter_names();
+     }
+     if ($standard_parms{$name}) {
+ 	return $standard_parms{$name};
+     } else {
+ 	return $name;
+     }
+ }
+ #
+ # Parameter Change Log
+ #
+ sub parm_change_log {
+     my ($r)=@_;
+     $r->print(&Apache::loncommon::start_page('Parameter Change Log'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
+     my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',
+ 				      $env{'course.'.$env{'request.course.id'}.'.domain'},
+ 				      $env{'course.'.$env{'request.course.id'}.'.num'});
+     if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }
+     $r->print('<form action="/adm/parmset?action=parameterchangelog"
+                      method="post" name="parameterlog">');
+     my %saveable_parameters = ('show' => 'scalar',);
+     &Apache::loncommon::store_course_settings('parameter_log',
+                                               \%saveable_parameters);
+     &Apache::loncommon::restore_course_settings('parameter_log',
+                                                 \%saveable_parameters);
+     $r->print(&Apache::loncommon::display_filter().
+               '<label>'.&Apache::lonhtmlcommon::checkbox('includetypes',$env{'form.includetypes'},'1').
+ 	      ' '.&mt('Include parameter types').'</label>'.
+ 	      '<input type="submit" value="'.&mt('Display').'" /></form>');
+     my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
+ 						     $env{'course.'.$env{'request.course.id'}.'.domain'});
+     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
+ 	      '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Extent').'</th><th>'.&mt('Users').'</th><th>'.
+ 	      &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
+ 	      &Apache::loncommon::end_data_table_header_row());
+     my $shown=0;
+     my $folder='';
+     if ($env{'form.displayfilter'} eq 'currentfolder') {
+ 	my $last='';
+ 	if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+ 		&GDBM_READER(),0640)) {
+ 	    $last=$hash{'last_known'};
+ 	    untie(%hash);
+ 	}
+ 	if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
+     }
+     foreach my $id (sort
+ 		    {
+ 			if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
+ 			    return $parmlog{$b}{'exe_time'} <=>$parmlog{$a}{'exe_time'}
+ 			}
+ 			my $aid = (split('00000',$a))[-1];
+ 			my $bid = (split('00000',$b))[-1];
+ 			return $bid<=>$aid;
+ 		    } (keys(%parmlog))) {
+         my @changes=keys(%{$parmlog{$id}{'logentry'}});
+ 	my $count = 0;
+ 	my $time =
+ 	    &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});
+ 	my $plainname =
+ 	    &Apache::loncommon::plainname($parmlog{$id}{'exe_uname'},
+ 					  $parmlog{$id}{'exe_udom'});
+ 	my $about_me_link =
+ 	    &Apache::loncommon::aboutmewrapper($plainname,
+ 					       $parmlog{$id}{'exe_uname'},
+ 					       $parmlog{$id}{'exe_udom'});
+ 	my $send_msg_link='';
+ 	if ((($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
+ 	     || ($parmlog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
+ 	    $send_msg_link ='<br />'.
+ 		&Apache::loncommon::messagewrapper(&mt('Send message'),
+ 						   $parmlog{$id}{'exe_uname'},
+ 						   $parmlog{$id}{'exe_udom'});
+ 	}
+ 	my $row_start=&Apache::loncommon::start_data_table_row();
+ 	my $makenewrow=0;
+ 	my %istype=();
+ 	my $output;
+ 	foreach my $changed (reverse(sort(@changes))) {
+             my $value=$parmlog{$id}{'logentry'}{$changed};
+ 	    my $typeflag = ($changed =~/\.type$/ &&
+ 			    !exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
+             my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
+ 		&components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
+ 	    if ($env{'form.displayfilter'} eq 'currentfolder') {
+ 		if ($folder) {
+ 		    if ($middle!~/^\Q$folder\E/) { next; }
+ 		}
+ 	    }
+ 	    if ($typeflag) {
+ 		$istype{$parmname}=$value;
+ 		if (!$env{'form.includetypes'}) { next; }
+ 	    }
+ 	    $count++;
+ 	    if ($makenewrow) {
+ 		$output .= $row_start;
+ 	    } else {
+ 		$makenewrow=1;
+ 	    }
+ 	    $output .='<td>'.$realm.'</td><td>'.$section.'</td><td>'.
+ 		      &standard_parameter_names($parmname).'</td><td>'.
+ 		      ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>';
+ 	    my $stillactive=0;
+ 	    if ($parmlog{$id}{'delflag'}) {
+ 		$output .= &mt('Deleted');
+ 	    } else {
+ 		if ($typeflag) {
+ 		    $output .= &mt('Type: [_1]',&standard_parameter_names($value));
+ 		} else {
+ 		    my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
+ 						      $uname,$udom,$issection,$issection,$courseopt);
+ 		    if (&isdateparm($istype{$parmname})) {
+ 			$output .= &Apache::lonlocal::locallocaltime($value);
+ 		    } else {
+ 			$output .= $value;
+ 		    }
+ 		    if ($value ne $all[$level]) {
+ 			$output .= '<br /><span class="LC_warning">'.&mt('Not active anymore').'</span>';
+ 		    } else {
+ 			$stillactive=1;
+ 		    }
+ 		}
+ 	    }
+ 	    $output .= '</td><td>';
+ 	    if ($stillactive) {
+ 		my $title=&mt('Changed [_1]',&standard_parameter_names($parmname));
+                 my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription,
+ 				    (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
+ 		if (($uname) && ($udom)) {
+ 		    $output .=
+ 			&Apache::loncommon::messagewrapper('Notify User',
+ 							   $uname,$udom,$title,
+ 							   $description);
+ 		} else {
+ 		    $output .=
+ 			&Apache::lonrss::course_blog_link($id,$title,
+ 							  $description);
+ 		}
+ 	    }
+ 	    $output .= '</td>'.&Apache::loncommon::end_data_table_row();
+ 	}
+         if ($env{'form.displayfilter'} eq 'containing') {
+ 	    my $wholeentry=$about_me_link.':'.
+ 		$parmlog{$id}{'exe_uname'}.':'.$parmlog{$id}{'exe_udom'}.':'.
+ 		$output;
+ 	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }
+ 	}
+         if ($count) {
+ 	    $r->print($row_start.'<td rowspan="'.$count.'">'.$time.'</td>
+                        <td rowspan="'.$count.'">'.$about_me_link.
+ 		  '<br /><tt>'.$parmlog{$id}{'exe_uname'}.
+ 			          ':'.$parmlog{$id}{'exe_udom'}.'</tt>'.
+ 		  $send_msg_link.'</td>'.$output);
+ 	    $shown++;
+ 	}
+ 	if (!($env{'form.show'} eq &mt('all')
+ 	      || $shown<=$env{'form.show'})) { last; }
+     }
+     $r->print(&Apache::loncommon::end_data_table());
+     $r->print(&Apache::loncommon::end_page());
+ }
+ sub check_for_course_info {
+     my $navmap = Apache::lonnavmaps::navmap->new();
+     return 1 if ($navmap);
+     return 0;
+ }
  ##################################################
  ##################################################
- Line 2812  ENDYESNO
+ Line 4189  ENDYESNO
  Main handler.  Calls &assessparms and &crsenv subroutines.
  =cut
  ##################################################
  ##################################################
- #    use Data::Dumper;
  sub handler {
      my $r=shift;
+     &reset_caches();
      if ($r->header_only) {
  	&Apache::loncommon::content_type($r,'text/html');
  	$r->send_http_header;
- Line 2829  sub handler {
+ Line 4208  sub handler {
                                               'pres_marker',
                                               'pres_value',
                                               'pres_type',
-                                              'udom','uname','symb']);
+                                              'udom','uname','symb','serial','timebase']);
      &Apache::lonhtmlcommon::clear_breadcrumbs();
      &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
  					    text=>"Parameter Manager",
  					    faq=>10,
- 					    bug=>'Instructor Interface'});
+ 					    bug=>'Instructor Interface',
+                                             help => 'Parameter_Manager'});
  # ----------------------------------------------------- Needs to be in a course
      my $parm_permission =
  	(&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
  	 &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
  				  $env{'request.course.sec'}));
-     if ($env{'request.course.id'} &&  $parm_permission) {
+     my $exists = &check_for_course_info();
+     if ($env{'request.course.id'} &&  $parm_permission && $exists) {
          # Start Page
          &Apache::loncommon::content_type($r,'text/html');
          $r->send_http_header;
-         # id numbers can change on re-ordering of folders
-         &resetsymbcache();
          #
          # Main switch on form.action and form.state, as appropriate
          #
- Line 2861  sub handler {
+ Line 4239  sub handler {
          #  the table mode
          if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
  	     && (!$env{'form.dis'})) || ($env{'form.symb'})) {
+             &Apache::lonhtmlcommon::add_breadcrumb({help=>'Problem_Parameters',
+ 						    text=>"Problem Parameters"});
  	    &assessparms($r);
          } elsif (! exists($env{'form.action'})) {
              $r->print(&header());
-             $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
+             $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Manager'));
- 							 'Parameter Manager'));
              &print_main_menu($r,$parm_permission);
          } elsif ($env{'form.action'} eq 'crsenv' && $parm_permission) {
              &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
- Line 2876  sub handler {
+ Line 4255  sub handler {
              &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
  						    text=>"Overview Mode"});
  	    &overview($r);
+ 	} elsif ($env{'form.action'} eq 'addmetadata' && $parm_permission) {
+             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+ 						    text=>"Add Metadata Field"});
+ 	    &addmetafield($r);
+ 	} elsif ($env{'form.action'} eq 'ordermetadata' && $parm_permission) {
+             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+ 						    text=>"Add Metadata Field"});
+ 	    &order_meta_fields($r);
+         } elsif ($env{'form.action'} eq 'setrestrictmeta' && $parm_permission) {
+             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
+ 						    text=>"Restrict Metadata"});
+ 	    &setrestrictmeta($r);
          } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
              &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
  						    text=>"Overview Mode"});
- Line 2889  sub handler {
+ Line 4280  sub handler {
  						    text=>"Table Mode",
  						    help => 'Course_Setting_Parameters'});
  	    &assessparms($r);
-         }
+         } elsif ($env{'form.action'} eq 'parameterchangelog' && $parm_permission) {
+             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
+ 						    text=>"Parameter Change Log"});
+ 	    &parm_change_log($r);
+         } elsif ($env{'form.action'} eq 'cleanparameters' && $parm_permission) {
+             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=cleanparameters',
+ 						    text=>"Clean Parameters"});
+ 	    &clean_parameters($r);
+         } elsif ($env{'form.action'} eq 'dateshift1' && $parm_permission) {
+             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
+                                                     text=>"Shifting Dates"});
+             &date_shift_one($r);
+         } elsif ($env{'form.action'} eq 'dateshift2' && $parm_permission) {
+             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
+                                                     text=>"Shifting Dates"});
+             &date_shift_two($r);
+ 	}
      } else {
  # ----------------------------- Not in a course, or not allowed to modify parms
- 	$env{'user.error.msg'}=
+ 	if ($exists) {
- 	    "/adm/parmset:opa:0:0:Cannot modify assessment parameters";
+ 	    $env{'user.error.msg'}=
+ 		"/adm/parmset:opa:0:0:Cannot modify assessment parameters";
+ 	} else {
+ 	    $env{'user.error.msg'}=
+ 		"/adm/parmset::0:1:Course environment gone, reinitialize the course";
+ 	}
  	return HTTP_NOT_ACCEPTABLE;
      }
+     &reset_caches();
      return OK;
  }

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

Removed from v.1.235
changed lines
	Added in v.1.391