--- loncom/interface/lonparmset.pm	2005/06/13 15:35:37	1.220
+++ loncom/interface/lonparmset.pm	2006/04/13 21:32:23	1.285
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.220 2005/06/13 15:35:37 www Exp $
+# $Id: lonparmset.pm,v 1.285 2006/04/13 21:32:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,6 +70,8 @@ my $parmhashid;
 my %parmhash;
 my $symbsid;
 my %symbs;
+my $rulesid;
+my %rules;
 
 # --- end local caches
 
@@ -86,16 +88,19 @@ 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
 
-11 - General Course
-10 - Map or Folder level in course
-9- resource default
-8- map default
-7 - resource level in course
-6 - General for section
-5 - Map or Folder level for section
-4 - resource level in section
+14 - General Course
+13 - Map or Folder level in course
+12- resource default
+11- map default
+10 - resource level in course
+9 - General for section
+8 - Map or Folder level for section
+7 - resource level in section
+6 - General for group
+5 - Map or Folder level for group
+4 - resource level in group
 3 - General for specific student
 2 - Map or Folder level for specific student
 1 - resource level for specific student
@@ -104,21 +109,18 @@ Returns:  A list, the first item is the
 
 ##################################################
 sub parmval {
-    my ($what,$id,$def,$uname,$udom,$csec)=@_;
-    return &parmval_by_symb($what,&symbcache($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,
+                                                           $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 $result='';
     my @outpar=();
@@ -128,6 +130,10 @@ sub parmval_by_symb {
     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;
@@ -137,49 +143,63 @@ sub parmval_by_symb {
     my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
 
 
-
 # --------------------------------------------------------- first, check course
 
     if (defined($$courseopt{$courselevel})) {
-	$outpar[11]=$$courseopt{$courselevel};
-	$result=11;
+	$outpar[14]=$$courseopt{$courselevel};
+	$result=14;
     }
 
     if (defined($$courseopt{$courselevelm})) {
-	$outpar[10]=$$courseopt{$courselevelm};
-	$result=10;
+	$outpar[13]=$$courseopt{$courselevelm};
+	$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};
-    if (defined($thisparm)) { $outpar[8]=$thisparm; $result=8; }
+    if (defined($thisparm)) { $outpar[11]=$thisparm; $result=11; }
 
     if (defined($$courseopt{$courselevelr})) {
-	$outpar[7]=$$courseopt{$courselevelr};
-	$result=7;
+	$outpar[10]=$$courseopt{$courselevelr};
+	$result=10;
     }
 
 # ------------------------------------------------------ fourth, back to course
     if (defined($csec)) {
         if (defined($$courseopt{$seclevel})) {
-	    $outpar[6]=$$courseopt{$seclevel};
-	    $result=6;
+	    $outpar[9]=$$courseopt{$seclevel};
+	    $result=9;
 	}
         if (defined($$courseopt{$seclevelm})) {
-	    $outpar[5]=$$courseopt{$seclevelm};
-	    $result=5;
+	    $outpar[8]=$$courseopt{$seclevelm};
+	    $result=8;
 	}
 
         if (defined($$courseopt{$seclevelr})) {
-	    $outpar[4]=$$courseopt{$seclevelr};
-	    $result=4;
+	    $outpar[7]=$$courseopt{$seclevelr};
+	    $result=7;
 	}
     }
+# ------------------------------------------------------ fifth, check course group
+    if (defined($cgroup)) {
+        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
 
@@ -240,6 +260,57 @@ sub symbcache {
     return $symbs{$id};
 }
 
+sub resetrulescache {
+    $rulesid='';
+}
+
+sub rulescache {
+    my $id=shift;
+    if ($rulesid ne $env{'request.course.id'}) {
+	%rules=();
+    }
+    unless (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};
+}
+
+sub preset_defaults {
+    my $type=shift;
+    if (&rulescache($type.'_action') eq 'default') {
+# yes, there is something
+	return (&rulescache($type.'_hours'),
+		&rulescache($type.'_min'),
+		&rulescache($type.'_sec'),
+		&rulescache($type.'_value'));
+    } else {
+# nothing there or something else
+	return ('','','','','');
+    }
+}
+
+##################################################
+
+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;
+}
 ##################################################
 ##################################################
 #
@@ -255,8 +326,8 @@ sub symbcache {
 # - userdomain
 
 sub storeparm {
-    my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_;
-    &storeparm_by_symb(&symbcache($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,'',$cgroup);
 }
 
 #
@@ -271,15 +342,100 @@ sub storeparm {
 # - username
 # - userdomain
 
+my %recstack;
 sub storeparm_by_symb {
+    my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$recflag,$cgroup)=@_;
+    unless ($recflag) {
+# first time call
+	%recstack=();
+	$recflag=1;
+    }
+# store parameter
+    &storeparm_by_symb_inner
+	($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;
+# what does this trigger?
+    foreach my $triggered (split(/\:/,&rulescache($parm.'_triggers'))) {
+# don't backfire
+       unless ((!$triggered) || ($recstack{$triggered})) {
+	   my $action=&rulescache($triggered.'_action');
+	   my ($whichaction,$whichparm)=($action=~/^(.*\_)([^\_]+)$/);
+# set triggered parameter on same level
+	   my $newspnam=$prefix.$triggered;
+	   my $newvalue='';
+	   my $active=1;
+	   if ($action=~/^when\_setting/) {
+# are there restrictions?
+	       if (&rulescache($triggered.'_triggervalue')=~/\w/) {
+		   $active=0;
+		   foreach my $possiblevalue (split(/\s*\,\s*/,&rulescache($triggered.'_triggervalue'))) {
+		       if (lc($possiblevalue) eq lc($nval)) { $active=1; }
+		   }
+	       }
+	       $newvalue=&rulescache($triggered.'_value');
+	   } else {
+	       my $totalsecs=((&rulescache($triggered.'_days')*24+&rulescache($triggered.'_hours'))*60+&rulescache($triggered.'_min'))*60+&rulescache($triggered.'_sec');
+	       if ($action=~/^later\_than/) {
+		   $newvalue=$nval+$totalsecs;
+	       } else {
+		   $newvalue=$nval-$totalsecs;
+	       }
+	   }
+	   if ($active) {
+	       &storeparm_by_symb($symb,$newspnam,$snum,$newvalue,&rulescache($triggered.'_type'),
+				   $uname,$udom,$csec,$recflag,$cgroup);
+	   }
+       }
+    }
+    return '';
+}
+
+{
+    my $logid;
+    sub log_parmset {
+	my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
+	$logid++;
+	my $id=time().'00000'.$$.'00000'.$logid;
+	&Apache::lonnet::put('parameterlog',
+			     {
+				 $id.'_exe_uname' => $env{'user.name'},
+				 $id.'_exe_udom'  => $env{'user.domain'},
+				 $id.'_exe_time'  => time(),
+				 $id.'_exe_ip'    => $ENV{'REMOTE_ADDR'},
+				 $id.'_symb'      => $symb,
+				 $id.'_spnam'     => $spnam,
+				 $id.'_snum'      => $snum,
+				 $id.'_nval'      => $nval,
+				 $id.'_ntype'     => $ntype,
+				 $id.'_uname'     => $uname,
+				 $id.'_udom'      => $udom,
+				 $id.'_csec'      => $csec,
+				 $id.'_cgroup'    => $cgroup
+			     },
+			     $env{'course.'.$env{'request.course.id'}.'.domain'},
+			     $env{'course.'.$env{'request.course.id'}.'.num'}
+			     );
+    }
+}
+
+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)=@_;
+    &log_parmset(@_);
 # ---------------------------------------------------------- Construct prefixes
     $spnam=~s/\_([^\_]+)$/\.$1/;
     my $map=(&Apache::lonnet::decode_symb($symb))[0];    
     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;
@@ -289,12 +445,16 @@ sub storeparm_by_symb {
     my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
     
     my $storeunder='';
-    if (($snum==11) || ($snum==3)) { $storeunder=$courselevel; }
-    if (($snum==10) || ($snum==2)) { $storeunder=$courselevelm; }
-    if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }
-    if ($snum==6) { $storeunder=$seclevel; }
-    if ($snum==5) { $storeunder=$seclevelm; }
-    if ($snum==4) { $storeunder=$seclevelr; }
+    if (($snum==14) || ($snum==3)) { $storeunder=$courselevel; }
+    if (($snum==13) || ($snum==2)) { $storeunder=$courselevelm; }
+    if (($snum==10) || ($snum==1)) { $storeunder=$courselevelr; }
+    if ($snum==9) { $storeunder=$seclevel; }
+    if ($snum==8) { $storeunder=$seclevelm; }
+    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;}
@@ -308,9 +468,9 @@ sub storeparm_by_symb {
 	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');
@@ -404,7 +564,7 @@ sub valout {
             }
             $result=~s/\s+$//;
         } elsif (&isdateparm($type)) {
-            $result = localtime($value);
+            $result = localtime($value).&date_sanity_info($value);
         } else {
             $result = $value;
         }
@@ -440,28 +600,22 @@ sub plink {
             $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
         }
     }
-
-
-    return 
+    my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
+    my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
+    unless (defined($winvalue)) { $winvalue=$val; }
+    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."'".');">'.
-		&valout($value,$type).'</a><a name="'.$marker.'"></a>';
+	    .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
+		&valout($value,$type).'</a></td></tr></table>';
 }
 
-sub startpage {
-    my $r=shift;
+sub page_js {
 
-    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);
-$html
-<head>
-<title>LON-CAPA Course Parameters</title>
-<script>
+
+    return(<<ENDJS);
+<script type="text/javascript">
 
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -503,33 +657,52 @@ $html
     }
 </script>
 $selscript
-</head>
-$bodytag
+ENDJS
+
+}
+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(undef,
+					    'Table Mode Parameter Setting');
+    $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_type">
-<input type="hidden" value='' name="pres_marker">
-<input type="hidden" value='1' name="prevvisit">
+<input type="hidden" value='' name="pres_value" />
+<input type="hidden" value='' name="pres_type" />
+<input type="hidden" value='' name="pres_marker" />
+<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',
-				  $rid,$$defaulttype{$which},$uname,$udom,$csec);
+                                          $$name{$which}.'.type',$rid,
+		 $$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 {
@@ -544,62 +717,95 @@ sub print_row {
     } else {    
         $parm=~s|\[.*\]\s||g;
     }
-
+    my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
+    if ($automatic) {
+	$parm.='<font color="red"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</font>';
+    }
     $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,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-	    &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,8,$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">'.
-                  &valout($outpar[$result],$typeoutpar[$result]).'</td>');
+    $r->print('<td bgcolor="#CCCCFF" align="center">'.$effective_parm.'</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>');
     }
@@ -611,7 +817,7 @@ 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'));
@@ -621,6 +827,61 @@ 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
 
@@ -816,12 +1077,12 @@ ENDSCRIPT
     $r->print("\n<table><tr>");
     my $cnt=0;
     foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
-	$r->print("\n<td><font size='-1'><input type='checkbox' name='pscat' ");
+	$r->print("\n<td><font size='-1'><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}.'</font></td>');
+	$r->print('>'.$$allparms{$tempkey}.'</label></font></td>');
  	$cnt++;
         if ($cnt==3) {
 	    $r->print("</tr>\n<tr>");
@@ -830,16 +1091,16 @@ ENDSCRIPT
     }
     $r->print('
 </tr><tr><td>
-<a href="javascript:checkall(true, \'pscat\')">Select All</a><br />
-<a href="javascript:checkstandard()">Select Common Only</a>
+<a href="javascript:checkall(true, \'pscat\')">Select&nbsp;All</a><br />
+<a href="javascript:checkstandard()">Select&nbsp;Common&nbsp;Only</a>
 </td><td>
-<a href="javascript:checkdates()">Add Problem Dates</a>
-<a href="javascript:checkcontdates()">Add Content Dates</a><br />
-<a href="javascript:checkdisset()">Add Discussion Settings</a>
-<a href="javascript:checkvisi()">Add Visibilities</a><br />
-<a href="javascript:checkparts()">Add Part Parameters</a>
+<a href="javascript:checkdates()">Add&nbsp;Problem&nbsp;Dates</a>
+<a href="javascript:checkcontdates()">Add&nbsp;Content&nbsp;Dates</a><br />
+<a href="javascript:checkdisset()">Add&nbsp;Discussion&nbsp;Settings</a>
+<a href="javascript:checkvisi()">Add&nbsp;Visibilities</a><br />
+<a href="javascript:checkparts()">Add&nbsp;Part&nbsp;Parameters</a>
 </td><td>
-<a href="javascript:checkall(false, \'pscat\')">Unselect All</a>
+<a href="javascript:checkall(false, \'pscat\')">Unselect&nbsp;All</a>
 </td>
 ');
     $r->print('</tr></table>');
@@ -853,7 +1114,9 @@ sub partmenu {
     $r->print('>'.&mt('All Parts').'</option>');
     my %temphash=();
     foreach (@{$psprt}) { $temphash{$_}=1; }
-    foreach my $tempkey (sort keys %{$allparts}) {
+    foreach my $tempkey (sort {
+	if ($a==$b) { return ($a cmp $b) } else { return ($a <=> $b); }
+    } keys(%{$allparts})) {
 	unless ($tempkey =~ /\./) {
 	    $r->print('<option value="'.$tempkey.'"');
 	    if ($$psprt[0] eq "all" ||  $temphash{$tempkey}) {
@@ -866,32 +1129,95 @@ 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 $numsec = &Apache::loncommon::get_sections(
                  $env{'course.'.$env{'request.course.id'}.'.domain'},
                  $env{'course.'.$env{'request.course.id'}.'.num'},
-					 \%sectionhash)) {
-        $sections=$lt{'sg'}.': <select name="csec">';
-	foreach ('',sort keys %sectionhash) {
-	    $sections.='<option value="'.$_.'"'.
-		($_ eq $csec?'selected="selected"':'').'>'.$_.'</option>';
+					 \%sectionhash);
+    my $groups;
+    my %grouphash;
+    my $numgrp = &Apache::loncommon::coursegroups(
+                 \%grouphash,
+                 $env{'course.'.$env{'request.course.id'}.'.domain'},
+                 $env{'course.'.$env{'request.course.id'}.'.num'});
+    if ($numsec > 0) {
+        $sections=$lt{'se'}.': <select name="csec"';
+        if ($numsec && $numgrp && $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 ($numsec && $numgrp && $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 ($numgrp > 0) {
+        $groups=$lt{'gr'}.': <select name="cgroup"';
+        if ($numsec && $numgrp && $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" />
@@ -915,7 +1241,7 @@ sub displaymenu {
 
 sub mapmenu {
     my ($r,$allmaps,$pschp,$maptitles)=@_;
-    $r->print(&mt('Select Enclosing Map or Folder').' ');
+    $r->print('<b>'.&mt('Select Enclosing Map or Folder').'</b> ');
     $r->print('<select name="pschp">');
     $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
     foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
@@ -928,8 +1254,8 @@ sub mapmenu {
 
 sub levelmenu {
     my ($r,$alllevs,$parmlev)=@_;
-    $r->print(&mt('Select Parameter Level').
-	      &Apache::loncommon::help_open_topic('Course_Parameter_Levels').' ');
+    $r->print('<b>'.&mt('Select Parameter Level').
+	      &Apache::loncommon::help_open_topic('Course_Parameter_Levels').'</b> ');
     $r->print('<select name="parmlev">');
     foreach (reverse sort keys %{$alllevs}) {
 	$r->print('<option value="'.$$alllevs{$_}.'"');
@@ -945,11 +1271,12 @@ sub levelmenu {
 sub sectionmenu {
     my ($r,$selectedsections)=@_;
     my %sectionhash=();
-
-    if (&Apache::loncommon::get_sections(
+    my $sections='';
+    my $numsec = &Apache::loncommon::get_sections(
                  $env{'course.'.$env{'request.course.id'}.'.domain'},
                  $env{'course.'.$env{'request.course.id'}.'.num'},
-					 \%sectionhash)) {
+					 \%sectionhash);
+    if ($numsec) {
 	$r->print('<select name="Section" multiple="true" size="8" >');
 	foreach my $s ('all',sort keys %sectionhash) {
 	    $r->print('    <option value="'.$s.'"');
@@ -961,10 +1288,34 @@ sub sectionmenu {
 	    }
 	    $r->print('>'.$s."</option>\n");
 	}
-	$r->print("</select>\n");
+        $r->print("</select>\n");
+   }
+}
+
+sub groupmenu {
+    my ($r,$selectedgroups)=@_;
+    my %grouphash;
+    my $numgrp = &Apache::loncommon::coursegroups(
+                 \%grouphash,
+                 $env{'course.'.$env{'request.course.id'}.'.domain'},
+                 $env{'course.'.$env{'request.course.id'}.'.num'});
+    if ($numgrp) {
+        $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('>'.$group."</option>\n");
+        }
+        $r->print("</select>\n");
     }
 }
 
+
 sub keysplit {
     my $keyp=shift;
     return (split(/\,/,$keyp));
@@ -977,6 +1328,18 @@ 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 {
@@ -986,16 +1349,17 @@ 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 {
@@ -1072,6 +1436,9 @@ sub assessparms {
     my $udom;
     my $uhome;
     my $csec;
+    my $cgroup;
+    my $grouplist;
+    my @usersgroups = ();
  
     my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
 
@@ -1093,6 +1460,7 @@ sub assessparms {
     my $message='';
 
     $csec=$env{'form.csec'};
+    $cgroup=$env{'form.cgroup'};
 
     if      ($udom=$env{'form.udom'}) {
     } elsif ($udom=$env{'request.role.domain'}) {
@@ -1159,12 +1527,14 @@ sub assessparms {
         } else {
 	    $csec=&Apache::lonnet::getsection($udom,$uname,
 					      $env{'request.course.id'});
+            
 	    if ($csec eq '-1') {
 		$message="<font color=red>".
 		    &mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
 		    &mt("not in this course")."</font>";
 		$uname='';
 		$csec=$env{'form.csec'};
+                $cgroup=$env{'form.cgroup'};
 	    } else {
 		my %name=&Apache::lonnet::userenvironment($udom,$uname,
 		      ('firstname','middlename','lastname','generation','id'));
@@ -1173,10 +1543,22 @@ sub assessparms {
 			.$name{'lastname'}.' '.$name{'generation'}.
 			    "<br>\n".&mt('ID').": ".$name{'id'}.'<p>';
 	    }
+            $grouplist = &Apache::lonnet::get_users_groups(
+                                       $udom,$uname,$env{'request.course.id'});
+            if ($grouplist) {
+                @usersgroups = &Apache::lonnet::sort_course_groups($grouplist,
+                                                    $env{'request.course.id'});
+                unless (grep/^\Q$cgroup\E$/,@usersgroups) {
+                    $cgroup = $usersgroups[0];
+                } 
+            } else {
+                $cgroup = '';
+            }
         }
     }
 
     unless ($csec) { $csec=''; }
+    unless ($cgroup) { $cgroup=''; }
 
 # --------------------------------------------------------- Get all assessments
     &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps, 
@@ -1195,7 +1577,7 @@ 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>';
@@ -1227,9 +1609,11 @@ sub assessparms {
     } else {
         my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
         $r->print(&mt('Specific Resource').": ".$resource.
-                  '<input type="hidden" value="'.$pssymb.'" name="symb"><br />');
+                  '<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>');
 
@@ -1251,11 +1635,19 @@ 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(
@@ -1284,7 +1676,11 @@ sub assessparms {
 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>
@@ -1297,7 +1693,14 @@ 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>');
            }
 
@@ -1305,6 +1708,7 @@ ENDTABLEHEADFOUR
 
            my $defbgone='';
            my $defbgtwo='';
+           my $defbgthree = '';
 
            foreach (@ids) {
 
@@ -1326,6 +1730,12 @@ ENDTABLEHEADFOUR
                     } else {
                         $defbgtwo='"#FFFF99"';
                     }
+                    if ($defbgthree eq '"#FFBB99"') {
+                        $defbgthree='"#FFBBDD"';
+                    } else {
+                        $defbgthree='"#FFBB99"';
+                    }
+
                     my $thistitle='';
                     my %name=   ();
                     undef %name;
@@ -1351,14 +1761,15 @@ 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='.
+				  &Apache::lonnet::escape($symbp{$rid}).
                              "', 'metadatafile', '450', '500', 'no', 'yes')\";".
                              " TARGET=_self>$title");
 
@@ -1372,23 +1783,18 @@ ENDTABLEHEADFOUR
 
                         $r->print('<td bgcolor='.$defbgone.
                                       ' rowspan='.$totalparms.
-                                      '><tt><font size=-1>');
-
-                        $r->print(' / res / ');
-                        $r->print(join(' / ', split(/\//,$mapp{$rid})));
+                                      '>'.$maptitles{$mapp{$rid}}.'</td>');
 
-                        $r->print('</font></tt></td>');
-
-                        foreach (&keysinorder(\%name,\%keyorder)) {
+                        foreach (&keysinorder_bytype(\%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);
                         }
                     }
                 }
@@ -1400,6 +1806,7 @@ ENDTABLEHEADFOUR
         if ($parmlev eq 'map') {
             my $defbgone = '"E0E099"';
             my $defbgtwo = '"FFFF99"';
+            my $defbgthree = '"FFBB99"';
 
             my %maplist;
 
@@ -1471,19 +1878,20 @@ Set Defaults for All Resources in $folde
 Specifically for
 ENDMAPONE
                 if ($uname) {
-                    my %name=&Apache::lonnet::userenvironment($udom,$uname,
-                      ('firstname','middlename','lastname','generation', 'id'));
-                    my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
-                           .$name{'lastname'}.' '.$name{'generation'};
+		    my $person=&Apache::loncommon::plainname($uname,$udom);
                     $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 ($csec) {$r->print(&mt("Section")." <font color=\"red\"><i>$csec</i></font> ".
-				      &mt('of')." \n")};
-
+                if ($cgroup) {
+                    $r->print(&mt("Group")." <font color=\"red\"><i>$cgroup".
+                              "</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
@@ -1495,8 +1903,8 @@ 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 each map
@@ -1505,6 +1913,7 @@ ENDMAPONE
         if ($parmlev eq 'general') {
             my $defbgone = '"E0E099"';
             my $defbgtwo = '"FFFF99"';
+            my $defbgthree = '"FFBB99"';
 
 #-------------------------------------------- for each map, gather information
             my $mapid="0.0";
@@ -1552,16 +1961,14 @@ ENDMAPONE
 <font color="red"><i>$coursename</i></font><br />
 ENDMAPONE
             if ($uname) {
-                my %name=&Apache::lonnet::userenvironment($udom,$uname,
-                  ('firstname','middlename','lastname','generation', 'id'));
-                my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
-                       .$name{'lastname'}.' '.$name{'generation'};
+		my $person=&Apache::loncommon::plainname($uname,$udom);
                 $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>$csec</i></font>\n")};
             $r->print("</h4>\n");
 #---------------------------------------------------------------- print table
             $r->print('<p><table border="2">');
@@ -1572,12 +1979,13 @@ 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
 
 
@@ -1602,8 +2010,7 @@ Returns: nothing
 sub crsenv {
     my $r=shift;
     my $setoutput='';
-    my $bodytag=&Apache::loncommon::bodytag(
-                             'Set Course Environment Parameters');
+
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,
 						    'Edit Course Environment');
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -1669,9 +2076,13 @@ 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);
@@ -1688,6 +2099,18 @@ sub crsenv {
                 $setoutput.=&mt('Unable to set').' <b>'.$name.'</b> '.&mt('to').
 		    ' <b>'.$value.'</b> '.&mt('due to').' '.$put_result.'.<br />';
             }
+            if (($name eq 'cloners') && ($failed_cloners)) {
+                $setoutput.= &mt('Unable to include').' - <b>'.$failed_cloners.'</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="/admparmset?action=crsenv">'.
+                 &mt('Course Parameters page').'</a> '.
+                 &mt('to add the new user(s) to the list of possible cloners').
+                 '.<br />';
+            }
         }
     }
 # ------------------------- Re-init course environment entries for this session
@@ -1771,8 +2194,11 @@ 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 />'.
-                    '('.&mt('Set value to "[_1]" to allow',"<tt>yes</tt>").')',
+                 => '<b>'.&mt('Allow users with specified roles to edit/delete their own discussion posts').'</b><br />"<tt>st</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').' '.
@@ -1781,8 +2207,8 @@ sub crsenv {
 	         => '<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>('.
-                    &mt('yes if supress').')',
+                 => '<b>'.&mt('Suppress number of tries in printing').'</b><br />'.
+                    ' ('.&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>').')',
@@ -1805,10 +2231,16 @@ sub crsenv {
 	     '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>'
              ); 
         my @Display_Order = ('url','description','courseid','cloners','grading',
+                             'externalsyllabus',
                              'default_xml_style','pageseparators',
                              'question.email','comment.email','policy.email',
                              'student_classlist_view',
@@ -1831,10 +2263,11 @@ sub crsenv {
                              'default_enrollment_start_date',
                              'default_enrollment_end_date',
 			     'tthoptions',
-			     'disablesigfigs'
+			     'disablesigfigs',
+			     'disableexampointprint'
                              );
 	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);
@@ -1886,17 +2319,18 @@ 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 $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<ENDenv);
-$html
-<head>
-<script type="text/javascript" language="Javascript" >
-$browse_js
-</script>
-<title>LON-CAPA Course Environment</title>
-</head>
-$bodytag
+    my $browse_js=
+	'<script type="text/javascript" language="Javascript">'.
+	&Apache::loncommon::browser_and_searcher_javascript('parmset').
+	'</script>';
+    
+    my $start_page = 
+	&Apache::loncommon::start_page('Set Course Environment Parameters',
+				       $browse_js);
+    my $end_page = 
+	&Apache::loncommon::end_page();
+    $r->print(<<ENDENV);
+$start_page
 $breadcrumbs
 <form method="post" action="/adm/parmset?action=crsenv" name="envform">
 $setoutput
@@ -1907,9 +2341,8 @@ $output
 </table>
 <input type="submit" name="crsenv" value="$lt{'sce'}">
 </form>
-</body>
-</html>    
-ENDenv
+$end_page
+ENDENV
 }
 ##################################################
 # Overview mode
@@ -2073,15 +2506,41 @@ sub listdata {
     my $pointer=0;
     $tableopen=0;
     my $foundkeys=0;
+    my %keyorder=&standardkeyorder();
     foreach my $thiskey (sort {
 	if ($sortorder eq 'realmstudent') {
-	    my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
-	    my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
-            ($arealm cmp $brealm) || ($astudent cmp $bstudent);
+	    my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
+	    my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
+	    if (!defined($astudent)) {
+		($arealm)=($a=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+	    }
+	    if (!defined($bstudent)) {
+		($brealm)=($b=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+	    }
+	    $arealm=~s/\.type//;
+	    my ($ares, $aparm) = ($arealm=~/^(.*)\.(.*)$/);
+	    $aparm=$keyorder{'parameter_0_'.$aparm};
+	    $brealm=~s/\.type//;
+	    my ($bres, $bparm) = ($brealm=~/^(.*)\.(.*)$/);
+	    $bparm=$keyorder{'parameter_0_'.$bparm};	   
+	    if ($ares eq $bres) {
+		if (defined($aparm) && defined($bparm)) {
+		    ($aparm <=> $bparm);
+		} elsif (defined($aparm)) {
+		    -1;
+		} elsif (defined($bparm)) {
+		    1;
+		} else {
+		    ($arealm cmp $brealm) || ($astudent cmp $bstudent);
+		}
+	    } else {
+		($arealm cmp $brealm) || ($astudent cmp $bstudent);
+	    }
 	} else {
 	    $a cmp $b;
 	}
     } keys %{$listdata}) {
+	 
 	if ($$listdata{$thiskey.'.type'}) {
             my $thistype=$$listdata{$thiskey.'.type'};
             if ($$resourcedata{$thiskey.'.type'}) {
@@ -2137,6 +2596,15 @@ sub listdata {
 		$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.
@@ -2147,28 +2615,41 @@ sub listdata {
 		my $jskey='key_'.$pointer;
 		$pointer++;
 		$r->print(
-			  &Apache::lonhtmlcommon::date_setter('overviewform',
+			  &Apache::lonhtmlcommon::date_setter('parmform',
 							      $jskey,
 						      $$resourcedata{$thiskey},
-							      '',1).
-'<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'
+							      '',1,'','',$hour,$min,$sec).
+'<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
+&date_sanity_info($$resourcedata{$thiskey})
 			  );
 	    } elsif ($thistype eq 'string_yesno') {
+		my $showval;
+		if (defined($$resourcedata{$thiskey})) {
+		    $showval=$$resourcedata{$thiskey};
+		} else {
+		    $showval=$val;
+		}
 		$r->print('<label><input type="radio" name="set_'.$thiskey.
 			  '" value="yes"');
-		if ($$resourcedata{$thiskey} eq '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 ($$resourcedata{$thiskey} eq 'no') {
+		if ($showval eq 'no') {
 		    $r->print(' checked="checked"');
 		}
                 $r->print(' />'.&mt('No').'</label>');
 	    } else {
+		my $showval;
+		if (defined($$resourcedata{$thiskey})) {
+		    $showval=$$resourcedata{$thiskey};
+		} else {
+		    $showval=$val;
+		}
 		$r->print('<input type="text" name="set_'.$thiskey.'" value="'.
-			  $$resourcedata{$thiskey}.'">');
+			  $showval.'">');
 	    }
 	    $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
 		      $thistype.'">');
@@ -2179,18 +2660,14 @@ sub listdata {
 }
 
 sub newoverview {
-    my $r=shift;
-    my $bodytag=&Apache::loncommon::bodytag('Set 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('Set Parameters');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
-    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDOVER);
-$html
-<head>
-<title>LON-CAPA Parameters</title>
-</head>
-$bodytag
+$start_page
 $breadcrumbs
 <form method="post" action="/adm/parmset?action=newoverview" name="parmform">
 ENDOVER
@@ -2213,6 +2690,7 @@ 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'};
@@ -2227,6 +2705,8 @@ ENDOVER
             @selected_sections = ('all');
         }
     }
+    my @selected_groups =
+        &Apache::loncommon::get_env_multiple('form.Group');
 
     my $pssymb='';
     my $parmlev='';
@@ -2254,11 +2734,15 @@ ENDOVER
 
     $r->print('<table border="1"><tr><td>');  
     &parmmenu($r,\%allparms,\@pscat,\%keyorder);
-    $r->print('</td><td>');
+    $r->print('</td><td><table border="0" cellspacing="0" cellpadding="0">'.
+              '<tr><td>'.&mt('Parts').'</td><td></td><td>'.&mt('Section(s)').
+              '</td><td></td><td>'.&mt('Group(s)').'</td></tr><tr><td>');
     &partmenu($r,\%allparts,\@psprt);
-    $r->print('</td><td>');
+    $r->print('</td><td>&nbsp;</td><td>');
     &sectionmenu($r,\@selected_sections);
-
+    $r->print('</td><td>&nbsp;</td><td>');
+    &groupmenu($r,\@selected_groups);
+    $r->print('</td></tr></table>');
     $r->print('</td></tr></table>');
  
     my $sortorder=$env{'form.sortorder'};
@@ -2273,37 +2757,8 @@ ENDOVER
     %{$listdata}=();
 
     foreach my $cat (@pscat) {
-	foreach my $section (@selected_sections) {
-	    foreach my $part (@psprt) {
-                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};
-		    }
-		}
-	    }
-	}
+        &secgroup_lister($cat,$pschp,$parmlev,$listdata,\@psprt,\@selected_sections,\%defkeytype,\%allmaps,\@ids,\%symbp);
+        &secgroup_lister($cat,$pschp,$parmlev,$listdata,\@psprt,\@selected_groups,\%defkeytype,\%allmaps,\@ids,\%symbp);
     }
 
     if (($env{'form.store'}) || ($env{'form.dis'})) {
@@ -2320,24 +2775,55 @@ ENDOVER
     }
     $r->print(&tableend().
 	     ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Store').'" /></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 $bodytag=&Apache::loncommon::bodytag('Modify 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('Modify Parameters');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
-    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDOVER);
-$html
-<head>
-<title>LON-CAPA Parameters</title>
-</head>
-$bodytag
+$start_page
 $breadcrumbs
-<form method="post" action="/adm/parmset?action=setoverview" name="overviewform">
+<form method="post" action="/adm/parmset?action=setoverview" name="parmform">
 ENDOVER
 # Store modified
 
@@ -2357,32 +2843,84 @@ 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());
 }
 
 ##################################################
 ##################################################
                                                                                             
 =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/^$currclone$/,@$oldcloner) {
+            my ($uname,$udom) = split/:/,$currclone;
+            if ($uname && $udom) {
+                if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                    $disallowed .= $currclone.',';   
+                } else {
+                    $clean_clonelist .= $currclone.',';
+                }
+            }
+        } else {
+            $clean_clonelist .= $currclone.',';
+        }
+    }
+    if ($disallowed) {
+        $disallowed =~ s/,$//;
+    }
+    if ($clean_clonelist) {
+        $clean_clonelist =~ s/,$//;
+    }
+    $$clonelist = $clean_clonelist;
+    return $disallowed;
+}  
 
 sub change_clone {
     my ($clonelist,$oldcloner) = @_;
@@ -2392,12 +2930,8 @@ sub change_clone {
     my $clone_crs = $cnum.':'.$cdom;
     
     if ($cnum && $cdom) {
-        my @allowclone = ();
-        if ($clonelist =~ /,/) {
-            @allowclone = split/,/,$clonelist;
-        } else {
-            $allowclone[0] = $clonelist;
-        }
+        my @allowclone;
+        &extract_cloners($clonelist,\@allowclone);
         foreach my $currclone (@allowclone) {
             if (!grep/^$currclone$/,@$oldcloner) {
                 ($uname,$udom) = split/:/,$currclone;
@@ -2459,16 +2993,7 @@ Output html header for page
 ##################################################
 ##################################################
 sub header {
-    my $html=&Apache::lonxml::xmlbegin();
-    my $bodytag=&Apache::loncommon::bodytag('Parameter Manager');
-    my $title = &mt('LON-CAPA Parameter Manager');
-    return(<<ENDHEAD);
-$html
-<head>
-<title>$title</title>
-</head>
-$bodytag
-ENDHEAD
+    return &Apache::loncommon::start_page('Parameter Manager');
 }
 ##################################################
 ##################################################
@@ -2482,12 +3007,24 @@ 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 @menu =
         (
           { text => 'Set Course Environment Parameters',
 	    action => 'crsenv',
             permission => $parm_permission,
             },
+          { text => 'Set Portfolio Metadata',
+	    action => 'setrestrictmeta',
+            permission => $parm_permission,
+            },
+	  { text => 'Manage Course Slots',
+	    url => '/adm/slotrequest?command=showslots',
+	    permission => $vgr,
+            },
+	  { divider => 1,
+	    },
           { text => 'Set/Modify Resource Parameters - Helper Mode',
             url => '/adm/helper/parameter.helper',
             permission => $parm_permission,
@@ -2508,10 +3045,18 @@ ENDMAINFORMHEAD
           { text => 'Set Parameter Setting Default Actions',
             action => 'setdefaults',
             permission => $parm_permission,
+            },          
+	  { text => 'Parameter Change Log and Course Blog Posting',
+            action => 'parameterchangelog',
+            permission => $parm_permission,
             },
           );
     my $menu_html = '';
     foreach my $menu_item (@menu) {
+	if ($menu_item->{'divider'}) {
+	    $menu_html .= '<hr />';
+	    next;
+	}
         next if (! $menu_item->{'permission'});
         $menu_html.='<p>';
         $menu_html.='<font size="+1">';
@@ -2531,35 +3076,252 @@ ENDMAINFORMHEAD
     $r->print($menu_html);
     return;
 }
-
-
+### Set portfolio metadata
+sub output_row {
+    my ($r, $field_name, $field_text) = @_;
+    my $output;
+    my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
+    my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
+    unless (defined($options)) {
+        $options = 'active,stuadd';
+        $values = '';
+    }
+    $output.='<strong>'.$field_text.':</strong>';
+    $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /><br />';
+
+    my @options= ( ['active', 'Show to student'],
+		   ['onlyone','Student may select only one choice'],
+		   ['stuadd', 'Student may type choices']);
+    foreach my $opt (@options) {
+	my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+	$output.=('&nbsp;'x5).'<label><input type="checkbox" name="'.
+	    $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+	    &mt($opt->[1]).'</label> <br />';
+    }
+    return ($output);
+}
+
+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(undef,
+						    '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.'_onlyone'}) {
+            	        $options.='onlyone,';
+            	    } 
+            	    if ($env{'form.'.$meta_field.'_active'}) {
+            	        $options.='active,';
+            	    }
+                    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'});
+    my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
+    foreach my $field (sort(keys(%metadata_fields))) {
+        &Apache::lonnet::logthis ($field);
+        if ($field ne 'courserestricted') {
+	    $output.= &output_row($r, $field, $metadata_fields{$field});
+	}
+    }
+    $r->print(<<ENDenv);       
+        <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
+        <p>
+        $output
+        <input type="submit" name="restrictmeta" value="Update Metadata Restrictions">
+        </form>
+ENDenv
+    $r->print(&Apache::loncommon::end_page());
+    return 'ok';
+}
 ##################################################
 
 sub defaultsetter {
-    my $r=shift;
-    my $bodytag=&Apache::loncommon::bodytag('Parameter Setting Default Actions');
-    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my ($r) = @_;
+
+    my $start_page = 
+	&Apache::loncommon::start_page('Parameter Setting Default Actions');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Defaults');
-    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDEFHEAD);
-$html
-<head>
-<title>LON-CAPA Parameters</title>
-</head>
-$bodytag
+$start_page
 $breadcrumbs
 <form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">
 ENDDEFHEAD
-    my %rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
+
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my @ids=();
+    my %typep=();
+    my %keyp=();
+    my %allparms=();
+    my %allparts=();
+    my %allmaps=();
+    my %mapp=();
+    my %symbp=();
+    my %maptitles=();
+    my %uris=();
+    my %keyorder=&standardkeyorder();
+    my %defkeytype=();
+
+    &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps, 
+				\%mapp, \%symbp,\%maptitles,\%uris,
+				\%keyorder,\%defkeytype);
     if ($env{'form.storerules'}) {
-	%rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
+	my %newrules=();
+	my @delrules=();
+	my %triggers=();
+	foreach my $key (keys(%env)) {
+            if ($key=~/^form\.(\w+)\_action$/) {
+		my $tempkey=$1;
+		my $action=$env{$key};
+                if ($action) {
+		    $newrules{$tempkey.'_action'}=$action;
+		    if ($action ne 'default') {
+			my ($whichaction,$whichparm)=($action=~/^(.*\_)([^\_]+)$/);
+			$triggers{$whichparm}.=$tempkey.':';
+		    }
+		    $newrules{$tempkey.'_type'}=$defkeytype{$tempkey};
+		    if (&isdateparm($defkeytype{$tempkey})) {
+			$newrules{$tempkey.'_days'}=$env{'form.'.$tempkey.'_days'};
+			$newrules{$tempkey.'_hours'}=$env{'form.'.$tempkey.'_hours'};
+			$newrules{$tempkey.'_min'}=$env{'form.'.$tempkey.'_min'};
+			$newrules{$tempkey.'_sec'}=$env{'form.'.$tempkey.'_sec'};
+		    } else {
+			$newrules{$tempkey.'_value'}=$env{'form.'.$tempkey.'_value'};
+			$newrules{$tempkey.'_triggervalue'}=$env{'form.'.$tempkey.'_triggervalue'};
+		    }
+		} else {
+		    push(@delrules,$tempkey.'_action');
+		    push(@delrules,$tempkey.'_type');
+		    push(@delrules,$tempkey.'_hours');
+		    push(@delrules,$tempkey.'_min');
+		    push(@delrules,$tempkey.'_sec');
+		    push(@delrules,$tempkey.'_value');
+		}
+	    }
+	}
+	foreach my $key (keys %allparms) {
+	    $newrules{$key.'_triggers'}=$triggers{$key};
+	}
+	&Apache::lonnet::put('parmdefactions',\%newrules,$dom,$crs);
+	&Apache::lonnet::del('parmdefactions',\@delrules,$dom,$crs);
+	&resetrulescache();
+    }
+    my %lt=&Apache::lonlocal::texthash('days' => 'Days',
+				       'hours' => 'Hours',
+				       'min' => 'Minutes',
+				       'sec' => 'Seconds',
+				       'yes' => 'Yes',
+				       'no' => 'No');
+    my @standardoptions=('','default');
+    my @standarddisplay=('',&mt('Default value when manually setting'));
+    my @dateoptions=('','default');
+    my @datedisplay=('',&mt('Default value when manually setting'));
+    foreach my $tempkey (&keysindisplayorder(\%allparms,\%keyorder)) {
+	unless ($tempkey) { next; }
+	push @standardoptions,'when_setting_'.$tempkey;
+	push @standarddisplay,&mt('Automatically set when setting ').$tempkey;
+	if (&isdateparm($defkeytype{$tempkey})) {
+	    push @dateoptions,'later_than_'.$tempkey;
+	    push @datedisplay,&mt('Automatically set later than ').$tempkey;
+	    push @dateoptions,'earlier_than_'.$tempkey;
+	    push @datedisplay,&mt('Automatically set earlier than ').$tempkey;
+	} 
+    }
+$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>'.
+	      &mt('Action').'</th><th>'.&mt('Value').'</th></tr>');
+    foreach my $tempkey (&keysindisplayorder(\%allparms,\%keyorder)) {
+	unless ($tempkey) { next; }
+	$r->print("\n<tr><td>".$allparms{$tempkey}."\n<br />(".$tempkey.')</td><td>');
+	my $action=&rulescache($tempkey.'_action');
+	$r->print('<select name="'.$tempkey.'_action">');
+	if (&isdateparm($defkeytype{$tempkey})) {
+	    for (my $i=0;$i<=$#dateoptions;$i++) {
+		if ($dateoptions[$i]=~/\_$tempkey$/) { next; }
+		$r->print("\n<option value='$dateoptions[$i]'".
+			  ($dateoptions[$i] eq $action?' selected="selected"':'').
+			  ">$datedisplay[$i]</option>");
+	    }
+	} else {
+	    for (my $i=0;$i<=$#standardoptions;$i++) {
+		if ($standardoptions[$i]=~/\_$tempkey$/) { next; }
+		$r->print("\n<option value='$standardoptions[$i]'".
+			  ($standardoptions[$i] eq $action?' selected="selected"':'').
+			  ">$standarddisplay[$i]</option>");
+	    }
+	}
+	$r->print('</select>');
+	unless (&isdateparm($defkeytype{$tempkey})) {
+	    $r->print("\n<br />".&mt('Triggering value(s) of other parameter (optional, comma-separated):').
+		      '<input type="text" size="20" name="'.$tempkey.'_triggervalue" value="'.&rulescache($tempkey.'_triggervalue').'" />');
+	}
+	$r->print("\n</td><td>\n");
+
+        if (&isdateparm($defkeytype{$tempkey})) {
+	    my $days=&rulescache($tempkey.'_days');
+	    my $hours=&rulescache($tempkey.'_hours');
+	    my $min=&rulescache($tempkey.'_min');
+	    my $sec=&rulescache($tempkey.'_sec');
+	    $r->print(<<ENDINPUTDATE);
+<input name="$tempkey\_days" type="text" size="4" value="$days" />$lt{'days'}<br />
+<input name="$tempkey\_hours" type="text" size="4" value="$hours" />$lt{'hours'}<br />
+<input name="$tempkey\_min" type="text" size="4" value="$min" />$lt{'min'}<br />
+<input name="$tempkey\_sec" type="text" size="4" value="$sec" />$lt{'sec'}
+ENDINPUTDATE
+	} elsif ($defkeytype{$tempkey} eq 'string_yesno') {
+            my $yeschecked='';
+            my $nochecked='';
+            if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked='checked="checked"'; }
+            if (&rulescache($tempkey.'_value') eq 'no') { $nochecked='checked="checked"'; }
+
+	    $r->print(<<ENDYESNO);
+<label><input type="radio" name="$tempkey\_value" value="yes" $yeschecked /> $lt{'yes'}</label><br />
+<label><input type="radio" name="$tempkey\_value" value="no" $nochecked /> $lt{'no'}</label>
+ENDYESNO
+        } else {
+	    $r->print('<input type="text" size="20" name="'.$tempkey.'_value" value="'.&rulescache($tempkey.'_value').'" />');
+	}
+        $r->print('</td></tr>');
     }
-    
-    
+    $r->print("</table>\n<input type='submit' name='storerules' value='".
+	      &mt('Store Rules')."' /></form>\n".
+	      &Apache::loncommon::end_page());
     return;
 }
 
+sub parm_change_log {
+    my ($r)=@_;
+    &startpage($r);
+    $r->print(&Apache::loncommon::end_page());
+}
+
 ##################################################
 ##################################################
 
@@ -2574,6 +3336,7 @@ Main handler.  Calls &assessparms and &c
 ##################################################
 #    use Data::Dumper;
 
+
 sub handler {
     my $r=shift;
 
@@ -2587,7 +3350,7 @@ sub handler {
                                              'pres_marker',
                                              'pres_value',
                                              'pres_type',
-                                             'udom','uname','symb']);
+                                             'udom','uname','symb','serial']);
 
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -2629,13 +3392,15 @@ sub handler {
         } elsif ($env{'form.action'} eq 'crsenv' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
 						    text=>"Course Environment"});
-            $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
-						   'Edit Course Environment'));
             &crsenv($r); 
         } elsif ($env{'form.action'} eq 'setoverview' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
 						    text=>"Overview Mode"});
 	    &overview($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"});
@@ -2649,8 +3414,11 @@ 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 and Course Blog Posting"});
+	    &parm_change_log($r);
+	}       
     } else {
 # ----------------------------- Not in a course, or not allowed to modify parms
 	$env{'user.error.msg'}=