--- loncom/interface/courseprefs.pm	2014/06/09 20:36:56	1.49.2.14
+++ loncom/interface/courseprefs.pm	2015/05/22 16:39:43	1.49.2.18
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.49.2.14 2014/06/09 20:36:56 raeburn Exp $
+# $Id: courseprefs.pm,v 1.49.2.18 2015/05/22 16:39:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -217,6 +217,7 @@ use Apache::lonhtmlcommon();
 use Apache::lonconfigsettings;
 use Apache::lonrelrequtils;
 use Apache::lonparmset;
+use Apache::courseclassifier;
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
 
@@ -463,13 +464,15 @@ sub handler {
                      help => 'Course_Prefs_Display',
                      ordered => ['default_xml_style','pageseparators',
                                  'disable_receipt_display','texengine',
-                                 'tthoptions'],
+                                 'tthoptions','uselcmath','usejsme'],
                       itemtext => {
                           default_xml_style       => 'Default XML style file',
                           pageseparators          => 'Visibly Separate Items on Pages',
                           disable_receipt_display => 'Disable display of problem receipts',
                           texengine               => 'Force use of a specific math rendering engine',
                           tthoptions              => 'Default set of options to pass to tth/m when converting TeX',
+                          uselcmath               => 'Student formula entry uses inline preview, not DragMath pop-up',
+                          usejsme                 => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
                                   },
                   },
         'grading' =>
@@ -538,7 +541,7 @@ sub handler {
                                                  \@prefs_order,\%prefs,\%values,
                                                   $cnum,undef,\@allitems,'coursepref');
     } elsif ($phase eq 'display') {
-        my $jscript = &get_jscript($cid,$cdom,$phase,$crstype);
+        my $jscript = &get_jscript($cid,$cdom,$phase,$crstype,\%values);
         my @allitems = &get_allitems(%prefs);
         &Apache::lonconfigsettings::display_settings($r,$cdom,$phase,$context,
             \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype,'coursepref');
@@ -784,7 +787,7 @@ sub process_changes {
                                 my @clonedoms;
                                 if (exists($env{'form.cloners_activate'})) {
                                     my $actnum = $env{'form.cloners_activate'};
-                                    if ($actnum ne '') {
+                                    if ($actnum ne '-1') {
                                         if ($env{'form.cloners_dom_'.$actnum} ne '') {
                                             my $clonedom = $env{'form.cloners_dom_'.$actnum};
                                             if (&check_clone($clonedom,$disallowed) eq 'ok') {
@@ -802,7 +805,7 @@ sub process_changes {
                                             my $clonedom = $env{'form.cloners_dom_'.$i};
                                             if (&check_clone($clonedom,$disallowed) eq 'ok') {
                                                 if (!grep(/^\*:\Q$clonedom\E$/,@clonedoms)) {
-                                                    push (@clonedoms,'*:'.$clonedom);
+                                                    push(@clonedoms,'*:'.$clonedom);
                                                 }
                                             }
                                         }
@@ -848,6 +851,37 @@ sub process_changes {
                                         }
                                     }
                                 }
+                                if (ref($values) eq 'HASH') {
+                                    my (@code_order,%codedefaults);
+                                    &Apache::lonnet::auto_instcode_defaults($cdom,\%codedefaults,
+                                                                            \@code_order);
+                                    my $clonebycode;
+                                    if ($env{'form.cloners_instcode'}) {
+                                        if (@code_order > 0) {
+                                            my @standardnames = &Apache::loncommon::get_standard_codeitems();
+                                            my %local_to_standard;
+                                            for (my $i=0; $i<@code_order; $i++) {
+                                                $local_to_standard{$code_order[$i]} = $standardnames[$i];
+                                            }
+                                            foreach my $item (@code_order) {
+                                                my $key = $local_to_standard{$item};
+                                                if ($key ne '') {
+                                                    if ($env{'form.'.$key}) {
+                                                        $clonebycode .= $key.'='.&escape($env{'form.'.$key}).'&';
+                                                    }
+                                                }
+                                            }
+                                            $clonebycode =~ s/\&$//;
+                                        }
+                                    }
+                                    if ($clonebycode) {
+                                        if ($newvalues{$entry}) {
+                                            $newvalues{$entry} .= ','.$clonebycode;
+                                        } else {
+                                            $newvalues{$entry} = $clonebycode;
+                                        }
+                                    }
+                                }
                             }
                             if (ref($disallowed) eq 'HASH') {
                                 if (ref($disallowed->{'cloners'}) eq 'HASH') {
@@ -1405,7 +1439,7 @@ sub store_changes {
                                         $displayval = &Apache::lonlocal::locallocaltime($displayval);
                                     } elsif ($key eq 'categories') {
                                         $displayval = $env{'form.categories_display'};
-                                    } elsif ($key eq 'canuse_pdfforms') {
+                                    } elsif (($key eq 'canuse_pdfforms') || ($key eq 'usejsme') || ($key eq 'uselcmath')) {
                                         if ($changes->{$item}{$key} eq '1') {
                                             $displayval = &mt('Yes');
                                         } elsif ($changes->{$item}{$key} eq '0') {
@@ -1682,12 +1716,93 @@ sub get_course {
 }
 
 sub get_jscript {
-    my ($cid,$cdom,$phase,$crstype) = @_;
+    my ($cid,$cdom,$phase,$crstype,$settings) = @_;
     my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
-    my ($jscript,$categorize_js,$loncaparev_js);
+    my ($jscript,$categorize_js,$loncaparev_js,$instcode_js);
     my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
     my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
     my $cloners_js = &cloners_javascript($phase);
+    my @code_order;
+    if ($crstype ne 'Community') {
+        if (ref($settings) eq 'HASH') {
+            my %codedefaults;
+            &Apache::lonnet::auto_instcode_defaults($cdom,\%codedefaults,
+                                                    \@code_order);
+            if (@code_order > 0) {
+                if ($phase eq 'display') {
+                    my @actions = &Apache::loncommon::get_env_multiple('form.actions');
+                    if (grep(/^courseinfo$/,@actions)) {
+                        if ($settings->{'cloners'} ne '') {
+                            unless ($settings->{'cloners'} eq '*') {
+                                my @cloners = split(/,/,$settings->{'cloners'});
+                                my @standardnames = &Apache::loncommon::get_standard_codeitems();
+                                my %local_to_standard;
+                                for (my $i=0; $i<@code_order; $i++) {
+                                    $local_to_standard{$code_order[$i]} = $standardnames[$i];
+                                }
+                                foreach my $cloner (@cloners) {
+                                    if (($cloner !~ /^\Q*:\E$match_domain$/) &&
+                                        ($cloner !~ /^$match_username\:$match_domain$/)) {
+                                        foreach my $item (split(/\&/,$cloner)) {
+                                            my ($key,$val) = split(/\=/,$item);
+                                            $val = &unescape($val);
+                                            foreach my $code (@code_order) {
+                                                if ($key eq $local_to_standard{$code}) {
+                                                    $env{'form.'.$key} = $val;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                my @codetitles;
+                (undef,$instcode_js) =
+                    &Apache::courseclassifier::instcode_selectors($cdom,'display',undef,
+                                                                  \@codetitles);
+                $instcode_js .= <<ENDSCRIPT;
+function toggleCloners(callerradio) {
+    if (document.getElementById('LC_cloners_instcode')) {
+        if (callerradio.value == 1) {
+            document.getElementById('LC_cloners_instcode').style.display = "block";
+        } else {
+            uncheckOfficialLists();
+            document.getElementById('LC_cloners_instcode').style.display = "none";
+        }
+    }
+}
+
+if (!document.getElementsByClassName) {
+    function getElementsByClassName(node, classname) {
+        var a = [];
+        var re = new RegExp('(^| )'+classname+'( |$)');
+        var els = node.getElementsByTagName("*");
+        for(var i=0,j=els.length; i<j; i++)
+            if(re.test(els[i].className))a.push(els[i]);
+        return a;
+    }
+}
+
+function uncheckOfficialLists() {
+    var codepicks;
+    if (document.getElementsByClassName) {
+        codepicks = document.getElementsByClassName('LC_cloners_instcodes');
+    } else {
+        codepicks = getElementsByClassName(document.body,'LC_cloners_instcodes');
+    }
+    if (codepicks.length) {
+        for (var i=0; i<codepicks.length; i++) {
+            codepicks[i].selectedIndex = 0;
+        }
+    }
+}
+
+ENDSCRIPT
+            }
+        }
+    }
     if ($can_categorize) {
         $categorize_js = <<ENDSCRIPT;
 function catsbrowser() {
@@ -1730,7 +1845,7 @@ ENDSCRIPT
     $jscript = '<script type="text/javascript" language="Javascript">'."\n".
                '// <![CDATA['."\n".
                $browse_js."\n".$categorize_js."\n".$loncaparev_js."\n".
-               $cloners_js."\n".
+               $cloners_js."\n".$instcode_js.
                $syllabus_js."\n".'//]]>'."\n".
                '</script>'."\n".$stubrowse_js."\n";
     return $jscript;
@@ -1766,7 +1881,7 @@ function update_cloners(caller,num) {
                         if (document.$formname.cloners_activate[i].value == '0') {
                             document.$formname.cloners_activate[i].checked = false;
                         }
-                        if (document.$formname.cloners_activate[i].value == '') {
+                        if (document.$formname.cloners_activate[i].value == '-1') {
                             document.$formname.cloners_activate[i].checked = true;
                         }
                     }
@@ -1823,9 +1938,10 @@ sub print_courseinfo {
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
-    my ($cathash,$categoriesform,$autocoowner);
+    my ($cathash,$categoriesform,$autocoowner,$clonedefaults);
     my %domconf = 
-        &Apache::lonnet::get_dom('configuration',['coursecategories','autoenroll'],$cdom);
+        &Apache::lonnet::get_dom('configuration',
+                                 ['coursecategories','autoenroll','coursedefaults'],$cdom);
     if (ref($domconf{'coursecategories'}) eq 'HASH') {
         $cathash = $domconf{'coursecategories'}{'cats'};
         if (ref($cathash) eq 'HASH') {
@@ -1837,10 +1953,58 @@ sub print_courseinfo {
     if (ref($domconf{'autoenroll'}) eq 'HASH') {
         $autocoowner = $domconf{'autoenroll'}{'co-owners'};
     }
+    my ($currcanclone,@code_order,$cloner_instcode);
+    my %codedefaults;
+    &Apache::lonnet::auto_instcode_defaults($cdom,\%codedefaults,
+                                            \@code_order);
+    if ($settings->{'cloners'}) {
+        unless ($settings->{'cloners'} eq '*') {
+            my @currclone = split(/,/,$settings->{'cloners'});
+            foreach my $item (@currclone) {
+                unless ($item eq '*') {
+                    if (($item !~ /\:/) && ($item =~ /=/)) {
+                        $cloner_instcode = 1;
+                    }
+                }
+            }
+        }
+    }
+    if (ref($domconf{'coursedefaults'}) eq 'HASH') {
+        my $canclone = $domconf{'coursedefaults'}{'canclone'};
+        if (ref($canclone) eq 'HASH') {
+            if (ref($canclone->{'instcode'}) eq 'ARRAY') {
+                if ($settings->{'internal.coursecode'}) {
+                    my @posscodes;
+                    if (@code_order > 0) {
+                        $currcanclone = 'instcode';
+                        foreach my $item (@{$canclone->{'instcode'}}) {
+                            if (grep(/^\Q$item\E$/,@code_order)) {
+                                push(@posscodes,$item);
+                            }
+                        }
+                        my $codestr = join(' + ',@posscodes);
+                        $clonedefaults = &mt('Default for official courses is to also allow cloning if [_1] match in cloner and cloned.',
+                                             '"<span class="LC_nobreak" style="font-style:italic">'.$codestr.'</span>"').'<br />';
+                    }
+                }
+            }
+        } elsif ($canclone eq 'domain') {
+            $clonedefaults = &mt('Default is for any course requester in [_1] domain to be able to clone.',
+                                 '<span class="LC_nobreak" style="font-style:italic">'.$cdom.'</span>').'<br />';
+            $currcanclone = 'domain';
+        }
+        if ($clonedefaults) {
+            if ($settings->{'cloners'} ne '') {
+                $clonedefaults .= '<br />'.&mt('Default does [_1]not[_2] currently apply because values have been set in the course.','<b>','</b>');
+            } else {
+                $clonedefaults .= &mt('Default is disregarded if [_1]any[_2] values are set here in the course.','<i>','</i>');
+            }
+            $clonedefaults = '<br /><br />'.$clonedefaults;
+        }
+    }
     if (!defined($categoriesform)) {
         $categoriesform = &mt('No categories defined in this domain.');
     }
-
     my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
 
@@ -1887,7 +2051,8 @@ sub print_courseinfo {
                           },
         'cloners'      => { 
                    text => '<b>'.&mt($itemtext->{'cloners'}).'</b><br />'.
-                           &mt('Owner and Coordinators included automatically'),
+                           &mt('Owner and Coordinators included automatically').
+                           $clonedefaults,
                    input => 'textbox',
                    size  => '40'
                          },
@@ -1958,12 +2123,13 @@ sub print_courseinfo {
             }
             $datatable .= 'onchange="javascript:update_cloners('.
                           "'cloners_all'".');" />'.&mt('Yes').'</label>'.
-                          ('&nbsp;'x2).'<input type="radio" name="cloners_all" value="0" ';
+                          ('&nbsp;'x2).'<label>'.
+                          '<input type="radio" name="cloners_all" value="0" ';
             if ($settings->{$item} ne '*') {
                 $datatable .= ' checked="checked" ';
             }
             $datatable .= ' onchange="javascript:update_cloners('.
-                          "'cloners_all'".');"/>'.&mt('No').'</label></td>'.
+                          "'cloners_all'".');" />'.&mt('No').'</label></td>'.
                           &Apache::loncommon::end_data_table_row().
                           &Apache::loncommon::end_data_table().
                           '<table><tr><td align="left"><b>'.&mt('Or').
@@ -1971,7 +2137,11 @@ sub print_courseinfo {
                           &Apache::loncommon::start_data_table();
             my @cloners;
             if ($settings->{$item} eq '') {
-                $datatable .= &new_cloners_dom_row($cdom,'0');
+                my $default;
+                if ($currcanclone eq 'domain') {
+                    $default = '0';
+                }
+                $datatable .= &new_cloners_dom_row($cdom,'0',$default);
             } elsif ($settings->{$item} ne '*') {
                 my @entries = split(/,/,$settings->{$item});
                 if (@entries > 0) {
@@ -2030,6 +2200,37 @@ sub print_courseinfo {
                                                           $items{$item}{'size'}).
                           '</td>'.&Apache::loncommon::end_data_table_row().
                           &Apache::loncommon::end_data_table();
+            if (@code_order > 0) {
+                my (%cat_items,@codetitles,%cat_titles,%cat_order);
+                my ($jscript,$totcodes,$numtitles,$lasttitle) =
+                    &Apache::courseclassifier::instcode_selectors_data($cdom,'display',
+                                                                       \%cat_items,\@codetitles,
+                                                                       \%cat_titles,\%cat_order);
+                my $showncodes = 'off';
+                my $checkedoff = ' checked="checked"';
+                my $checkedon = '';
+                if ($cloner_instcode) {
+                    $checkedon = $checkedoff;
+                    $checkedoff = '';
+                    $showncodes = 'on';
+                }
+                $datatable .= '<table><tr><td align="left"><b>'.&mt('And').
+                              '</b></td></tr></table>'.
+                              &Apache::loncommon::start_data_table().
+                              &Apache::loncommon::start_data_table_row().
+                              '<td align="left"><span class="LC_nobreak">'.
+                              &mt('Cloning by official course(s) based on course category').('&nbsp;'x2).
+                              '<label>'.
+                              '<input type="radio" name="cloners_instcode" value="1" onclick="toggleCloners(this);"'.$checkedon.' />'.&mt('Yes').'</label>'.
+                              ('&nbsp;').
+                              '<label>'.
+                              '<input type="radio" name="cloners_instcode" value="0" onclick="toggleCloners(this);"'.$checkedoff.' />'.&mt('No').'</label>'.
+                              &Apache::courseclassifier::build_instcode_selectors($numtitles,
+                                  $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order,
+                                  $showncodes,'LC_cloners_instcodes','LC_cloners_instcode').
+                              '</td>'.&Apache::loncommon::end_data_table_row().
+                              &Apache::loncommon::end_data_table();
+            }
         } elsif ($item eq 'rolenames') {
             $datatable .= '</td><td align="right">'.
                           &Apache::loncommon::start_data_table();
@@ -2151,19 +2352,24 @@ sub print_courseinfo {
 }
 
 sub new_cloners_dom_row {
-    my ($newdom,$num) = @_;
-    my $output;
+    my ($newdom,$num,$default) = @_;
+    my ($output,$checkedon,$checkedoff);
     if ($newdom ne '') {
+        if ($num eq $default) {
+           $checkedon = 'checked="checked" ';
+        } else {
+           $checkedoff = 'checked="checked" ';
+        }
         $output .= &Apache::loncommon::start_data_table_row().
                    '<td valign="top"><span class="LC_nobreak">'.
                    &mt('Any user in domain:').'&nbsp;<b>'.$newdom.'</b>'.
                    ('&nbsp;'x2).'<label><input type="radio" '.
-                   'name="cloners_activate" value="'.$num.'" '.
+                   'name="cloners_activate" value="'.$num.'" '.$checkedon.
                    'onchange="javascript:update_cloners('.
                    "'cloners_activate','$num'".');" />'.
                    &mt('Yes').'</label>'.('&nbsp;'x2).
                    '<label><input type="radio" '.
-                   'name="cloners_activate" value="" checked="checked" '.
+                   'name="cloners_activate" value="-1" '.$checkedoff.
                    'onchange="javascript:update_cloners('.
                    "'cloners_activate','$num'".');" />'.
                    &mt('No').'</label><input type="hidden" name="cloners_dom_'.
@@ -2319,6 +2525,7 @@ sub display_loncaparev_constraints {
     my (%fromparam,%rowspan,%bymap,%byresource,@scopeorder,%toshow,%allmaps,
         %byresponsetype,%bysubmission,%fromblocks);
     @scopeorder = ('all','section/group','user');
+    my $now = time;
     my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom);
     if (ref($resourcedata) eq 'HASH') {
         foreach my $key (keys(%{$resourcedata})) {
@@ -2332,6 +2539,19 @@ sub display_loncaparev_constraints {
                              } else {
                                  $value = '';
                              }
+                         } elsif ($item eq 'printstartdate') {
+                             if ($value =~ /^\d+$/) {
+                                 if ($value > $now) {
+                                     $value = 'future';
+                                 }
+                             }
+                         } elsif ($item eq 'printenddate') {
+                             if ($value =~ /^\d+$/) {
+                                 if ($value < $now) {
+                                     $value = 'past';
+                                 }
+                             }
+
                          }
                          my ($middle,$scope,$which,$level,$map,$resource);
                          if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) {
@@ -2611,9 +2831,9 @@ sub display_loncaparev_constraints {
         }
         foreach my $map (keys(%allmaps)) {
             my $mapres = $navmap->getResourceByUrl($map);
-            my $mapsymb = $mapres->symb();
-            $toshow{$mapsymb} = 1;
             if (ref($mapres)) {
+                my $mapsymb = $mapres->symb();
+                $toshow{$mapsymb} = 1;
                 my $pcslist = $mapres->map_hierarchy();
                 if ($pcslist ne '') {
                     foreach my $pc (split(/,/,$pcslist)) {
@@ -3684,6 +3904,14 @@ sub print_appearance {
                    input => 'textbox',
                    size => 40,
                  },
+         'uselcmath' => {
+                   text => '<b>'.&mt($itemtext->{'uselcmath'}).'</b>',
+                   input => 'radio',
+                 },
+         'usejsme'  => {
+                   text => '<b>'.&mt($itemtext->{'usejsme'}).'</b>',
+                   input => 'radio',
+                 },
     );
     return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'appearance');
 }
@@ -3945,20 +4173,30 @@ sub item_table_row_end {
 }
 
 sub yesno_radio {
-    my ($item,$settings) = @_;
+    my ($item,$settings,$unsetdefault,$valueyes,$valueno) = @_;
     my $itemon = ' ';
     my $itemoff = ' checked="checked" ';
+    if (($valueyes eq '') && ($valueno eq '')) {
+        $valueyes = 'yes';
+        $valueno = '';
+    }
     if (ref($settings) eq 'HASH') {
-        if ($settings->{$item} eq 'yes') {
+        if ($settings->{$item} eq $valueyes) {
             $itemon = $itemoff;
             $itemoff = ' ';
         }
+        unless (exists($settings->{$item})) {
+            if ($unsetdefault eq $valueyes) {
+                $itemon = $itemoff;
+                $itemoff = ' ';
+            }
+        }
     }
     return '<span class="LC_nobreak"><label>'.
            '<input type="radio" name="'.$item.'"'.
-           $itemon.' value="yes" />'.&mt('Yes').'</label>&nbsp;'.
+           $itemon.' value="'.$valueyes.'" />'.&mt('Yes').'</label>&nbsp;'.
            '<label><input type="radio" name="'.$item.'"'.
-           $itemoff.' value="" />'.&mt('No').'</label></span>';
+           $itemoff.' value="'.$valueno.'" />'.&mt('No').'</label></span>';
 }
 
 sub select_from_options {
@@ -4043,7 +4281,16 @@ sub make_item_rows {
                    &Apache::lonhtmlcommon::date_setter('display',$item,
                                                        $settings->{$item});
             } elsif ($items->{$item}{input} eq 'radio') {
-                $datatable .= &yesno_radio($item,$settings);
+                my ($unsetdefault,$valueyes,$valueno);
+                if (($item eq 'usejsme') || ($item eq 'uselcmath')) {
+                     my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+                     unless ($domdefs{$item} eq '0') {
+                         $unsetdefault = 1;
+                     }
+                     $valueyes = "1";
+                     $valueno = "0";
+                }
+                $datatable .= &yesno_radio($item,$settings,$unsetdefault,$valueyes,$valueno);
             } elsif ($items->{$item}{input} eq 'selectbox') {
                 my $curr = $settings->{$item};
                 $datatable .=
@@ -4119,7 +4366,8 @@ sub nothidepriv_row {
                           '<span class="LC_nobreak"><label>'.
                           '<input type="radio" name="'.$item.'_'.$user.'"'.
                           $hideon.' value="" />'.&mt('Hidden').'</label>&nbsp;'.
-                          '<label><input type="radio" name="'.$item.'_'.$user.'"'.                          $hideoff.' value="yes" />'.&mt('Shown').'</label></span></td>'.
+                          '<label><input type="radio" name="'.$item.'_'.$user.'"'.
+                          $hideoff.' value="yes" />'.&mt('Shown').'</label></span></td>'.
                           '</tr>';
         }
         $datatable .= '</table>';
@@ -4372,17 +4620,19 @@ sub change_clone {
         foreach my $currclone (@allowclone) {
             if (!grep(/^$currclone$/,@$oldcloner)) {
                 if ($currclone ne '*') {
-                    my ($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;
+                    if ($currclone =~ /:/) {
+                        my ($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);
                                 }
-                                &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
                             }
                         }
                     }
@@ -4392,24 +4642,26 @@ sub change_clone {
         foreach my $oldclone (@$oldcloner) {
             if (!grep(/^\Q$oldclone\E$/,@allowclone)) {
                 if ($oldclone ne '*') {
-                    my ($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 ($oldclone =~ /:/) {
+                        my ($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.',';
+                                            }
                                         }
+                                        $newclonecrs{'cloneable'} =~ s/,$//;
+                                    } else {
+                                        $newclonecrs{'cloneable'} = '';
                                     }
-                                    $newclonecrs{'cloneable'} =~ s/,$//;
-                                } else {
-                                    $newclonecrs{'cloneable'} = '';
+                                    &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
                                 }
-                                &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
                             }
                         }
                     }