--- loncom/interface/lonparmset.pm	2007/10/05 17:56:29	1.376.2.1
+++ loncom/interface/lonparmset.pm	2007/08/24 21:31:41	1.377
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.376.2.1 2007/10/05 17:56:29 albertel Exp $
+# $Id: lonparmset.pm,v 1.377 2007/08/24 21:31:41 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2101,13 +2101,13 @@ sub crsenv {
         #
         # Let the user know we made the changes
         if ($name && defined($value)) {
-            my %failed_cloners;
+            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);
+                $failed_cloners = &check_cloners(\$value,\@oldcloner);
             }
             my $put_result = &Apache::lonnet::put('environment',
                                                   {$name=>$value},$dom,$crs);
@@ -2124,34 +2124,17 @@ 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') && (keys(%failed_cloners) > 0)) {
-                $setoutput.= &mt('Unable to include').': ';
-                my @fails;
-                my $num = 0;
-                if (defined($failed_cloners{'format'})) {
-                    $fails[$num] .= '<b>'.$failed_cloners{'format'}.
-                                  '</b>, '.&mt('reason').' - '.
-                                  &mt('Invalid format');
-                    $num ++;
-                }
-                if (defined($failed_cloners{'domain'})) {
-                    $fails[$num] .= '<b>'.$failed_cloners{'domain'}.
-                                  '</b>, '.&mt('reason').' - '.
-                                  &mt('Domain does not exist');
-                    $num ++;
-                }
-                if (defined($failed_cloners{'newuser'})) {
-                    $fails[$num] .= '<b>'.$failed_cloners{'newuser'}.                                   '</b>, '.&mt('reason').' - '.
-                        &mt('LON-CAPA user(s) do(es) not exist.').
-                        '.<br />'.&mt('Please ').
-                        ' <a href="/adm/createuser">'.
-                        &mt('add the user(s)').'</a>, '.
-                        &mt('and then return to the ').
-                        '<a href="/adm/parmset?action=crsenv">'.
-                        &mt('Course Parameters page').'</a> '.
-                        &mt('to add the new user(s) to the list of possible cloners');
-                }
-                $setoutput .= join(';&nbsp;&nbsp;',@fails).'.<br />';
+            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 />';
             }
         }
     }
@@ -2182,9 +2165,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,*:domain)</tt><br />'.&mt('Users with active Course Coordinator role in course are permitted to clone and need not be included.<br />
-Use *:domain to allow course to be cloned by anyone in the specified domain.<br />
-Use * to allow unrestricted cloning in all domains.'),
+             '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'),
 	     'task_grading'   => '<b>'.&mt('Bridge Task Grading').'</b><br />'.
@@ -2211,11 +2192,11 @@ Use * to allow unrestricted cloning in a
              'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.
                                  '('.&mt('"[_1]" for visible separation','<tt>yes</tt>').', '.
                                  &mt('changes will not show until next login').')',
-             'student_classlist_view' => '<b>'.&mt('Allow students to view classlist.').'</b>'.&mt('("all":students can view all sections,"section":students can only view their own section.blank or "disabled" prevents student view.'),
+             'student_classlist_view' => '<b>'.&mt('Allow students to view classlist.').'</b><br />'.&mt('("all":students can view all sections,"section":students can only view their own section.blank or "disabled" prevents student view.)'),
              'student_classlist_portfiles' => '<b>'.&mt('Include link to accessible portfolio files').'</b><br />'.&mt('"[_1]" for link to each a listing of each student\'s files.','<tt>yes</tt>'),
              'student_classlist_opt_in' => '<b>'.&mt("Student's agreement needed for listing in student-viewable roster").'</b><br />'.&mt('"[_1]" to require students to opt-in to listing in the roster (on the roster page).','<tt>yes</tt>'),
              'plc.roles.denied'=> '<b>'.&mt('Disallow live chatroom use for Roles').
-                                  '</b><br />"<tt>st</tt>": '.
+                                  '</b><br />("<tt>st</tt>": '.
                                   &mt('student').', "<tt>ta</tt>": '.
                                   'TA, "<tt>in</tt>": '.
                                   &mt('instructor').';<br /><tt>'.&mt('role,role,...').'</tt>) '.
@@ -2225,7 +2206,7 @@ Use * to allow unrestricted cloning in a
                                  '(<tt>user:domain,user:domain,...</tt>)',
 
              'pch.roles.denied'=> '<b>'.&mt('Disallow Resource Discussion for Roles').
-                                  '</b><br />"<tt>st</tt>": '.
+                                  '</b><br />("<tt>st</tt>": '.
                                   'student, "<tt>ta</tt>": '.
                                   'TA, "<tt>in</tt>": '.
                                   'instructor;<br /><tt>role,role,...</tt>) '.
@@ -3074,63 +3055,48 @@ where $action is add or drop, and $clone
 user for whom cloning ability is to be changed in course. 
 
 =cut
-
+                                                                                            
 ##################################################
 ##################################################
 
 sub extract_cloners {
     my ($clonelist,$allowclone) = @_;
     if ($clonelist =~ /,/) {
-        @{$allowclone} = split(/,/,$clonelist);
+        @{$allowclone} = split/,/,$clonelist;
     } else {
         $$allowclone[0] = $clonelist;
     }
 }
 
+
 sub check_cloners {
     my ($clonelist,$oldcloner) = @_;
-    my ($clean_clonelist,%disallowed);
+    my ($clean_clonelist,$disallowed);
     my @allowclone = ();
     &extract_cloners($$clonelist,\@allowclone);
     foreach my $currclone (@allowclone) {
-        if (!grep(/^\Q$currclone\E$/,@$oldcloner)) {
-            if ($currclone eq '*') {
-                $clean_clonelist .= $currclone.',';
-            } else {
-                my ($uname,$udom) = split(/:/,$currclone);
-                if ($uname eq '*') {
-                    if ($udom =~ /^$match_domain$/) {
-                        if (!&Apache::lonnet::domain($udom)) {
-                            $disallowed{'domain'} .= $currclone.',';
-                        } else {
-                            $clean_clonelist .= $currclone.',';
-                        }
-                    } else {
-                        $disallowed{'format'} .= $currclone.',';
-                    }
-                } elsif ($currclone !~/^($match_username)\:($match_domain)$/) {
-                    $disallowed{'format'} .= $currclone.','; 
+        if (!grep/^$currclone$/,@$oldcloner) {
+            my ($uname,$udom) = split/:/,$currclone;
+            if ($uname && $udom) {
+                if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                    $disallowed .= $currclone.',';   
                 } else {
-                    if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
-                        $disallowed{'newuser'} .= $currclone.',';
-                    } else {
-                        $clean_clonelist .= $currclone.',';
-                    }
+                    $clean_clonelist .= $currclone.',';
                 }
             }
         } else {
             $clean_clonelist .= $currclone.',';
         }
     }
-    foreach my $key (keys(%disallowed)) {
-        $disallowed{$key} =~ s/,$//;
+    if ($disallowed) {
+        $disallowed =~ s/,$//;
     }
     if ($clean_clonelist) {
         $clean_clonelist =~ s/,$//;
     }
     $$clonelist = $clean_clonelist;
-    return %disallowed;
-}
+    return $disallowed;
+}  
 
 sub change_clone {
     my ($clonelist,$oldcloner) = @_;
@@ -3143,47 +3109,43 @@ sub change_clone {
         my @allowclone;
         &extract_cloners($clonelist,\@allowclone);
         foreach my $currclone (@allowclone) {
-            if (!grep(/^$currclone$/,@$oldcloner)) {
-                if ($currclone ne '*') {
-                    ($uname,$udom) = split(/:/,$currclone);
-                    if ($uname && $udom && $uname ne '*') {
-                        if (&Apache::lonnet::homeserver($uname,$udom) ne '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);
+            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(/^\Q$oldclone\E$/,@allowclone)) {
-                if ($oldclone ne '*') {
-                    ($uname,$udom) = split(/:/,$oldclone);
-                    if ($uname && $udom && $uname ne '*' ) {
-                        if (&Apache::lonnet::homeserver($uname,$udom) ne '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 my $crs (@currclonecrs) {
-                                        if ($crs ne $clone_crs) {
-                                            $newclonecrs{'cloneable'} .= $crs.',';
-                                        }
+            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);
+                                $newclonecrs{'cloneable'} =~ s/,$//;
+                            } else {
+                                $newclonecrs{'cloneable'} = '';
                             }
+                            &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
                         }
                     }
                 }