--- loncom/interface/lonparmset.pm	2004/10/15 22:29:31	1.176
+++ loncom/interface/lonparmset.pm	2005/03/17 22:12:52	1.187
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.176 2004/10/15 22:29:31 albertel Exp $
+# $Id: lonparmset.pm,v 1.187 2005/03/17 22:12:52 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,12 +75,6 @@ my %keyp;
 
 my %maptitles;
 
-my $uname;
-my $udom;
-my $uhome;
-my $csec;
-my $coursename;
-
 ##################################################
 ##################################################
 
@@ -96,10 +90,10 @@ Inputs:  $what - a parameter spec (inclu
 
 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
 
-11- resource default
-10- map default
-9 - General Course
-8 - Map or Folder level in course
+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
@@ -113,7 +107,7 @@ Returns:  A list, the first item is the
 ##################################################
 ##################################################
 sub parmval {
-    my ($what,$id,$def)=@_;
+    my ($what,$id,$def,$uname,$udom,$csec)=@_;
     my $result='';
     my @outpar=();
 # ----------------------------------------------------- Cascading lookup scheme
@@ -129,32 +123,35 @@ sub parmval {
     my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
     my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;
 
-# -------------------------------------------------------- first, check default
-
-    if (defined($def)) { $outpar[11]=$def; $result=11; }
 
-# ----------------------------------------------------- second, check map parms
-
-    my $thisparm=$parmhash{$symbparm};
-    if (defined($thisparm)) { $outpar[10]=$thisparm; $result=10; }
 
-# --------------------------------------------------------- third, check course
+# --------------------------------------------------------- first, check course
 
     if (defined($courseopt{$courselevel})) {
-	$outpar[9]=$courseopt{$courselevel};
-	$result=9;
+	$outpar[11]=$courseopt{$courselevel};
+	$result=11;
     }
 
     if (defined($courseopt{$courselevelm})) {
-	$outpar[8]=$courseopt{$courselevelm};
-	$result=8;
+	$outpar[10]=$courseopt{$courselevelm};
+	$result=10;
     }
 
+# ------------------------------------------------------- second, check default
+
+    if (defined($def)) { $outpar[9]=$def; $result=9; }
+
+# ------------------------------------------------------ third, check map parms
+
+    my $thisparm=$parmhash{$symbparm};
+    if (defined($thisparm)) { $outpar[8]=$thisparm; $result=8; }
+
     if (defined($courseopt{$courselevelr})) {
 	$outpar[7]=$courseopt{$courselevelr};
 	$result=7;
     }
 
+# ------------------------------------------------------ fourth, back to course
     if (defined($csec)) {
         if (defined($courseopt{$seclevel})) {
 	    $outpar[6]=$courseopt{$seclevel};
@@ -171,7 +168,7 @@ sub parmval {
 	}
     }
 
-# ---------------------------------------------------------- fourth, check user
+# ---------------------------------------------------------- fifth, check user
 
     if (defined($uname)) {
 	if (defined($useropt{$courselevel})) {
@@ -192,6 +189,104 @@ sub parmval {
     return ($result,@outpar);
 }
 
+
+##################################################
+##################################################
+#
+# Store a parameter
+#
+# Takes
+# - resource id
+# - name of parameter
+# - level
+# - new value
+# - new type
+# - username
+# - userdomain
+
+sub storeparm {
+    my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_;
+    $spnam=~s/\_([^\_]+)$/\.$1/;
+# ---------------------------------------------------------- Construct prefixes
+    
+    my $symbparm=$symbp{$sresid}.'.'.$spnam;
+    my $mapparm=$mapp{$sresid}.'___(all).'.$spnam;
+    
+    my $seclevel=$ENV{'request.course.id'}.'.['.$csec.'].'.$spnam;
+    my $seclevelr=$ENV{'request.course.id'}.'.['.$csec.'].'.$symbparm;
+    my $seclevelm=$ENV{'request.course.id'}.'.['.$csec.'].'.$mapparm;
+    
+    my $courselevel=$ENV{'request.course.id'}.'.'.$spnam;
+    my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
+    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; }
+    
+    my $delete;
+    if ($nval eq '') { $delete=1;}
+    my %storecontent = ($storeunder         => $nval,
+			$storeunder.'.type' => $ntype);
+    my $reply='';
+    if ($snum>3) {
+# ---------------------------------------------------------------- Store Course
+#
+# Expire sheets
+	&Apache::lonnet::expirespread('','','studentcalc');
+	if (($snum==7) || ($snum==4)) {
+	    &Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid});
+	} elsif (($snum==8) || ($snum==5)) {
+	    &Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid});
+	} else {
+	    &Apache::lonnet::expirespread('','','assesscalc');
+	}
+# Store parameter
+	if ($delete) {
+	    $reply=&Apache::lonnet::del
+		('resourcedata',[keys(%storecontent)],
+		 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+	} else {
+	    $reply=&Apache::lonnet::cput
+		('resourcedata',\%storecontent,
+		 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+	}
+    } else {
+# ------------------------------------------------------------------ Store User
+#
+# Expire sheets
+	&Apache::lonnet::expirespread($uname,$udom,'studentcalc');
+	if ($snum==1) {
+	    &Apache::lonnet::expirespread
+		($uname,$udom,'assesscalc',$symbp{$sresid});
+	} elsif ($snum==2) {
+	    &Apache::lonnet::expirespread
+		($uname,$udom,'assesscalc',$mapp{$sresid});
+	} else {
+	    &Apache::lonnet::expirespread($uname,$udom,'assesscalc');
+	}
+# Store parameter
+	if ($delete) {
+	    $reply=&Apache::lonnet::del
+		('resourcedata',[keys(%storecontent)],$udom,$uname);
+	} else {
+	    $reply=&Apache::lonnet::cput
+		('resourcedata',\%storecontent,$udom,$uname);
+	}
+    }
+    
+    if ($reply=~/^error\:(.*)/) {
+	return "<font color=red>Write Error: $1</font>";
+    }
+    return '';
+}
+
 ##################################################
 ##################################################
 
@@ -309,8 +404,9 @@ sub startpage {
     my $overallhelp=
 	&Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface');
     my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEAD);
-<html>
+$html
 <head>
 <title>LON-CAPA Course Parameters</title>
 <script>
@@ -408,26 +504,25 @@ ENDHEAD
 
 sub print_row {
     my ($r,$which,$part,$name,$rid,$default,$defaulttype,$display,$defbgone,
-	$defbgtwo,$parmlev)=@_;
+	$defbgtwo,$parmlev,$uname,$udom,$csec)=@_;
 # 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});
+				  $rid,$$default{$which},$uname,$udom,$csec);
 # 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});
+				  $rid,$$defaulttype{$which},$uname,$udom,$csec);
 # cascade down manually
-    my $cascadetype=$defaulttype;
-    for (my $i=$#typeoutpar;$i>0;$i--) {
+    my $cascadetype=$$defaulttype{$which};
+    for (my $i=11;$i>0;$i--) {
 	 if ($typeoutpar[$i]) { 
             $cascadetype=$typeoutpar[$i];
 	} else {
             $typeoutpar[$i]=$cascadetype;
         }
     }
- 
     my $parm=$$display{$which};
 
     if ($parmlev eq 'full' || $parmlev eq 'brief') {
@@ -450,7 +545,7 @@ sub print_row {
         } elsif ($csec) {
             &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
         } else {
-            &print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
+            &print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
         }
     } elsif ($parmlev eq 'map') {
 
@@ -459,11 +554,11 @@ sub print_row {
         } elsif ($csec) {
             &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         } else {
-            &print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         }
     } else {
 
-        &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+        &print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
 
         if ($parmlev eq 'brief') {
 
@@ -477,9 +572,9 @@ sub print_row {
            }
         } else {
 
-           &print_td($r,10,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           &print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           &print_td($r,8,$defbgone,$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) {
@@ -520,7 +615,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<10) {
+    if ($which<8 || $which > 9) {
 	$r->print(&plink($$typeoutpar[$which],
 			 $$display{$value},$$outpar[$which],
 			 $mprefix."$which",'parmform.pres','psub'));
@@ -628,13 +723,10 @@ sub extractResourceInformation {
 		if ($mapid eq '1') {
 		    $$maptitles{$mapid}='Main Course Documents';
 		} else {
-		    $$maptitles{$mapid}=
-			$$bighash{'title_'.$$bighash{'ids_'.&Apache::lonnet::clutter($$mapp{$id})}};
+		    $$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));
 		}
 		$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
-		$$symbp{$id}=$$mapp{$id}.
-			'___'.$resid.'___'.
-			    &Apache::lonnet::declutter($srcf);
+		$$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);
                 $$symbp{$mapid}=$$mapp{$id}.'___(all)';
 	    }
 	}
@@ -679,8 +771,14 @@ sub assessparms {
     my %allmaps=();
     my %alllevs=();
 
+    my $uname;
+    my $udom;
+    my $uhome;
+    my $csec;
+ 
+    my $coursename=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+
     $alllevs{'Resource Level'}='full';
-#    $alllevs{'Resource Level [BRIEF]'}='brief';
     $alllevs{'Map Level'}='map';
     $alllevs{'Course Level'}='general';
 
@@ -716,10 +814,6 @@ sub assessparms {
     my $parmlev='';
     my $trimheader='';
     my $prevvisit=$ENV{'form.prevvisit'};
-
-#    unless ($parmlev==$ENV{'form.parmlev'}) {
-#        $parmlev = 'full';
-#    }
  
     unless ($ENV{'form.parmlev'}) {
         $parmlev = 'map';
@@ -815,85 +909,10 @@ sub assessparms {
 
 # ---------------------------------------------------------- Anything to store?
     if ($ENV{'form.pres_marker'}) {
-	my ($sresid,$spnam,$snum)=split(/\&/,$ENV{'form.pres_marker'});
-	$spnam=~s/\_([^\_]+)$/\.$1/;
-# ---------------------------------------------------------- Construct prefixes
-
-	my $symbparm=$symbp{$sresid}.'.'.$spnam;
-	my $mapparm=$mapp{$sresid}.'___(all).'.$spnam;
-	
-	my $seclevel=$ENV{'request.course.id'}.'.['.$csec.'].'.$spnam;
-	my $seclevelr=$ENV{'request.course.id'}.'.['.$csec.'].'.$symbparm;
-	my $seclevelm=$ENV{'request.course.id'}.'.['.$csec.'].'.$mapparm;
-	
-	my $courselevel=$ENV{'request.course.id'}.'.'.$spnam;
-	my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
-	my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;
-	
-	my $storeunder='';
-	if (($snum==9) || ($snum==3)) { $storeunder=$courselevel; }
-	if (($snum==8) || ($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; }
-	
-	my $delete;
-	if ($ENV{'form.pres_value'} eq '') { $delete=1;}
-        my %storecontent = ($storeunder         => $ENV{'form.pres_value'},
-                            $storeunder.'.type' => $ENV{'form.pres_type'});
-	my $reply='';
-	if ($snum>3) {
-# ---------------------------------------------------------------- Store Course
-#
-# Expire sheets
-	    &Apache::lonnet::expirespread('','','studentcalc');
-	    if (($snum==7) || ($snum==4)) {
-		&Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid});
-	    } elsif (($snum==8) || ($snum==5)) {
-		&Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid});
-	    } else {
-		&Apache::lonnet::expirespread('','','assesscalc');
-	    }
-# Store parameter
-	    if ($delete) {
-		$reply=&Apache::lonnet::del
-		    ('resourcedata',[keys(%storecontent)],
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-	    } else {
-		$reply=&Apache::lonnet::cput
-		    ('resourcedata',\%storecontent,
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-	    }
-	} else {
-# ------------------------------------------------------------------ Store User
-#
-# Expire sheets
-	    &Apache::lonnet::expirespread($uname,$udom,'studentcalc');
-	    if ($snum==1) {
-		&Apache::lonnet::expirespread
-		    ($uname,$udom,'assesscalc',$symbp{$sresid});
-	    } elsif ($snum==2) {
-		&Apache::lonnet::expirespread
-		    ($uname,$udom,'assesscalc',$mapp{$sresid});
-	    } else {
-		&Apache::lonnet::expirespread($uname,$udom,'assesscalc');
-	    }
-# Store parameter
-	    if ($delete) {
-		$reply=&Apache::lonnet::del
-		    ('resourcedata',[keys(%storecontent)],$udom,$uname);
-	    } else {
-		$reply=&Apache::lonnet::cput
-		    ('resourcedata',\%storecontent,$udom,$uname);
-	    }
-	}
-
-	if ($reply=~/^error\:(.*)/) {
-	    $message.="<font color=red>Write Error: $1</font>";
-	}
+	$message.=&storeparm(split(/\&/,$ENV{'form.pres_marker'}),
+			     $ENV{'form.pres_value'},
+			     $ENV{'form.pres_type'},
+                             $uname,$udom,$csec);
 # ---------------------------------------------------------------- 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>';
     }
@@ -918,9 +937,9 @@ sub assessparms {
 	if ($fcat eq '') {
 	    $a<=>$b;
 	} else {
-	    my ($result,@outpar)=&parmval($fcat,$a,$defp{$a});
+	    my ($result,@outpar)=&parmval($fcat,$a,$defp{$a},$uname,$udom,$csec);
 	    my $aparm=$outpar[$result];
-	    ($result,@outpar)=&parmval($fcat,$b,$defp{$b});
+	    ($result,@outpar)=&parmval($fcat,$b,$defp{$b},$uname,$udom,$csec);
 	    my $bparm=$outpar[$result];
 	    1*$aparm<=>1*$bparm;
 	}
@@ -989,9 +1008,9 @@ sub assessparms {
         $r->print('<input type="hidden" value="'.$pssymb.'" name="symb">');
     }
 
-    $r->print('<tr><td colspan="3"><hr /><input type="checkbox"');
+    $r->print('<tr><td colspan="3"><hr /><label><input type="checkbox"');
     if ($showoptions eq 'show') {$r->print(" checked ");}
-    $r->print(' name="showoptions" value="show">'.&mt('Show More Options').'<hr /></td></tr>');
+    $r->print(' name="showoptions" value="show" />'.&mt('Show More Options').'</label><hr /></td></tr>');
 #    $r->print("<tr><td>Show: $showoptions</td></tr>");
 #    $r->print("<tr><td>pscat: @pscat</td></tr>");
 #    $r->print("<tr><td>psprt: @psprt</td></tr>");
@@ -1147,8 +1166,9 @@ sub assessparms {
            $r->print(<<ENDTABLETWO);
 <th rowspan=3>$lt{'pie'}</th>
 <th rowspan=3>$lt{'csv'}<br>($csuname $lt{'at'} $csudom)</th>
-</tr><tr><td colspan=5></td><th colspan=2>$lt{'rl'}</th>
-<th colspan=3>$lt{'ic'}</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>".
@@ -1157,8 +1177,8 @@ ENDTABLETWO
            $r->print(<<ENDTABLEHEADFOUR);
 </tr><tr><th>$lt{'aut'}</th><th>$lt{'type'}</th>
 <th>$lt{'emof'}</th><th>$lt{'part'}</th><th>$lt{'pn'}</th>
-<th>$lt{'def'}</th><th>$lt{'femof'}</th>
-<th>$lt{'gen'}</th><th>$lt{'foremf'}</th><th>$lt{'fr'}</th>
+<th>$lt{'gen'}</th><th>$lt{'femof'}</th>
+<th>$lt{'def'}</th><th>$lt{'foremf'}</th><th>$lt{'fr'}</th>
 ENDTABLEHEADFOUR
 
            if ($csec) {
@@ -1184,15 +1204,15 @@ ENDTABLEHEADFOUR
 		    ||
 		    ($pssymb && $pssymb eq $symbp{$rid})) {
 # ------------------------------------------------------ Entry for one resource
-                    if ($defbgone eq '"E0E099"') {
-                        $defbgone='"E0E0DD"';
+                    if ($defbgone eq '"#E0E099"') {
+                        $defbgone='"#E0E0DD"';
                     } else {
-                        $defbgone='"E0E099"';
+                        $defbgone='"#E0E099"';
                     }
-                    if ($defbgtwo eq '"FFFF99"') {
-                        $defbgtwo='"FFFFDD"';
+                    if ($defbgtwo eq '"#FFFF99"') {
+                        $defbgtwo='"#FFFFDD"';
                     } else {
-                        $defbgtwo='"FFFF99"';
+                        $defbgtwo='"#FFFF99"';
                     }
                     my $thistitle='';
                     my %name=   ();
@@ -1219,8 +1239,7 @@ ENDTABLEHEADFOUR
                     my $totalparms=scalar keys %name;
                     if ($totalparms>0) {
                         my $firstrow=1;
-			my $title=$bighash{'title_'.$rid};
-			$title=~s/\&colon;/:/g;
+			my $title=&Apache::lonnet::gettitle($uri);
                         $r->print('<tr><td bgcolor='.$defbgone.
                              ' rowspan='.$totalparms.
                              '><tt><font size=-1>'.
@@ -1257,7 +1276,7 @@ ENDTABLEHEADFOUR
 
                             &print_row($r,$_,\%part,\%name,$rid,\%default,
                                        \%type,\%display,$defbgone,$defbgtwo,
-                                       $parmlev);
+                                       $parmlev,$uname,$udom,$csec);
                         }
                     }
                 }
@@ -1365,7 +1384,7 @@ ENDMAPONE
                     $r->print('<tr>');
                     &print_row($r,$_,\%part,\%name,$mapid,\%default,
                            \%type,\%display,$defbgone,$defbgtwo,
-                           $parmlev);
+                           $parmlev,$uname,$udom,$csec);
 #                    $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
                 }
                 $r->print("</table></center>");
@@ -1442,7 +1461,7 @@ ENDMAPONE
 	    foreach (sort keys %name) {
                 $r->print('<tr>');
                 &print_row($r,$_,\%part,\%name,$mapid,\%default,
-                       \%type,\%display,$defbgone,$defbgtwo,$parmlev);
+                       \%type,\%display,$defbgone,$defbgtwo,$parmlev,$uname,$udom,$csec);
 #                    $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
             }
             $r->print("</table></center>");
@@ -1527,13 +1546,34 @@ sub crsenv {
         if ($name =~ /^default_enrollment_(start|end)_date$/) {
             $value=&Apache::lonhtmlcommon::get_date_from_form($name.'_value');
         }
+        # Get existing cloners
+        my @oldcloner = ();
+        if ($name eq 'cloners') {
+            my %clonenames=&Apache::lonnet::dump('environment',$dom,$crs,'cloners');
+            if ($clonenames{'cloners'} =~ /,/) {
+                @oldcloner = split/,/,$clonenames{'cloners'};
+            } else {
+                $oldcloner[0] = $clonenames{'cloners'};
+            }
+        }
         #
         # Let the user know we made the changes
         if ($name && defined($value)) {
+            if ($name eq 'cloners') {
+                $value =~ s/^,//;
+                $value =~ s/,$//;
+            }
             my $put_result = &Apache::lonnet::put('environment',
                                                   {$name=>$value},$dom,$crs);
             if ($put_result eq 'ok') {
                 $setoutput.=&mt('Set').' <b>'.$name.'</b> '.&mt('to').' <b>'.$value.'</b>.<br />';
+                if ($name eq 'cloners') {
+                    &change_clone($value,\@oldcloner);
+                }
+                # Flush the course logs so course description is immediately updated
+                if ($name eq 'description' && defined($value)) {
+                    &Apache::lonnet::flushcourselogs();
+                }
             } else {
                 $setoutput.=&mt('Unable to set').' <b>'.$name.'</b> '.&mt('to').
 		    ' <b>'.$value.'</b> '.&mt('due to').' '.$put_result.'.<br />';
@@ -1562,6 +1602,7 @@ sub crsenv {
              '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.'),
              'grading'        => '<b>'.&mt('Grading').'</b><br />'.
                                  '<tt>"standard", "external", or "spreadsheet"</tt> '.&Apache::loncommon::help_open_topic('GradingOptions'),
              'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b> '.
@@ -1657,7 +1698,7 @@ sub crsenv {
 	     'tthoptions'
 	         => '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>'
              ); 
-        my @Display_Order = ('url','description','courseid','grading',
+        my @Display_Order = ('url','description','courseid','cloners','grading',
                              'default_xml_style','pageseparators',
                              'question.email','comment.email','policy.email',
                              'student_classlist_view',
@@ -1736,12 +1777,13 @@ sub crsenv {
     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>
+$html
+<head>
 <script type="text/javascript" language="Javascript" >
 $browse_js
 </script>
-<head>
 <title>LON-CAPA Course Environment</title>
 </head>
 $bodytag
@@ -1787,8 +1829,9 @@ sub overview {
                              'Set/Modify Course Assessment Parameters');
     my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
     my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDOVER);
-<html>
+$html
 <head>
 <title>LON-CAPA Course Environment</title>
 </head>
@@ -1908,6 +1951,90 @@ ENDOVER
 
 ##################################################
 ##################################################
+                                                                                            
+=pod
+                                                                                            
+=item change clone
+                                                                                            
+Modifies the list of courses a user can clone (stored
+in the user's environemnt.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 change_clone {
+    my ($clonelist,$oldcloner) = @_;
+    my ($uname,$udom);
+    my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $cdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    my $clone_crs = $cnum.':'.$cdom;
+    
+    if ($cnum && $cdom) {
+        my @allowclone = ();
+        if ($clonelist =~ /,/) {
+            @allowclone = split/,/,$clonelist;
+        } else {
+            $allowclone[0] = $clonelist;
+        }
+        foreach my $currclone (@allowclone) {
+            if (!grep/^$currclone$/,@$oldcloner) {
+                ($uname,$udom) = split/:/,$currclone;
+                if ($uname && $udom) {
+                    unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                        my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+                        if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
+                            if ($currclonecrs{'cloneable'} eq '') {
+                                $currclonecrs{'cloneable'} = $clone_crs;
+                            } else {
+                                $currclonecrs{'cloneable'} .= ','.$clone_crs;
+                            }
+                            &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
+                        }
+                    }
+                }
+            }
+        }
+        foreach my $oldclone (@$oldcloner) {
+            if (!grep/^$oldclone$/,@allowclone) {
+                ($uname,$udom) = split/:/,$oldclone;
+                if ($uname && $udom) {
+                    unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                        my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+                        my %newclonecrs = ();
+                        if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
+                            if ($currclonecrs{'cloneable'} =~ /,/) {
+                                my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
+                                foreach (@currclonecrs) {
+                                    unless ($_ eq $clone_crs) {
+                                        $newclonecrs{'cloneable'} .= $_.',';
+                                    }
+                                }
+                                $newclonecrs{'cloneable'} =~ s/,$//;
+                            } else {
+                                $newclonecrs{'cloneable'} = '';
+                            }
+                            &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+##################################################
+##################################################
 
 =pod
 
@@ -1954,8 +2081,6 @@ sub handler {
 
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
- 
-        $coursename=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
 
 	if (($ENV{'form.crsenv'}) || (!$ENV{'request.course.fn'})) {
 # ---------------------------------------------- This is for course environment