--- loncom/interface/domainprefs.pm	2015/05/12 00:20:42	1.160.6.63
+++ loncom/interface/domainprefs.pm	2016/08/07 00:28:39	1.160.6.68
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.63 2015/05/12 00:20:42 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.68 2016/08/07 00:28:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2398,7 +2398,7 @@ ENDSCRIPT
 sub print_autoenroll {
     my ($dom,$settings,$rowtotal) = @_;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
-    my ($defdom,$runon,$runoff,$coownerson,$coownersoff);
+    my ($defdom,$runon,$runoff,$coownerson,$coownersoff,$failsafe);
     if (ref($settings) eq 'HASH') {
         if (exists($settings->{'run'})) {
             if ($settings->{'run'} eq '0') {
@@ -2432,6 +2432,9 @@ sub print_autoenroll {
         if (exists($settings->{'sender_domain'})) {
             $defdom = $settings->{'sender_domain'};
         }
+        if (exists($settings->{'autofailsafe'})) {
+            $failsafe = $settings->{'autofailsafe'};
+        }
     } else {
         if ($autorun) {
             $runon = ' checked="checked" ';
@@ -2467,8 +2470,12 @@ sub print_autoenroll {
                   $coownerson.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
                   '<label><input type="radio" name="autoassign_coowners"'.
                   $coownersoff.' value="0" />'.&mt('No').'</label></span></td>'.
-                  '</tr>';
-    $$rowtotal += 3;
+                  '</tr><tr>'.
+                  '<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<input type="text" name="autoenroll_failsafe"'.
+                  ' value="'.$failsafe.'" size="4" /></td></tr>';
+    $$rowtotal += 4;
     return $datatable;
 }
 
@@ -2891,6 +2898,7 @@ sub print_coursedefaults {
         uselcmath            => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)',
         usejsme              => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
         postsubmit           => 'Disable submit button/keypress following student submission',
+        canclone             => "People who may clone a course (besides course's owner and coordinators)",
     );
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
@@ -2901,10 +2909,82 @@ sub print_coursedefaults {
         %defaultchecked = (
                             'uselcmath'       => 'on',
                             'usejsme'         => 'on',
+                            'canclone'        => 'none',
                           );
         @toggles = ('uselcmath','usejsme');
         ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
                                                      \%choices,$itemcount);
+        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+        $datatable .=
+            '<tr'.$css_class.'><td valign="top">'.
+            '<span class="LC_nobreak">'.$choices{'canclone'}.
+            '</span></td><td class="LC_left_item">';
+        my $currcanclone = 'none';
+        my $onclick;
+        my @cloneoptions = ('none','domain');
+        my %clonetitles = (
+                             none     => 'No additional course requesters',
+                             domain   => "Any course requester in course's domain",
+                             instcode => 'Course requests for official courses ...',
+                          );
+        my (%codedefaults,@code_order,@posscodes);
+        if (&Apache::lonnet::auto_instcode_defaults($dom,\%codedefaults,
+                                                    \@code_order) eq 'ok') {
+            if (@code_order > 0) {
+                push(@cloneoptions,'instcode');
+                $onclick = ' onclick="toggleDisplay(this.form,'."'cloneinstcode'".');"';
+            }
+        }
+        if (ref($settings) eq 'HASH') {
+            if ($settings->{'canclone'}) {
+                if (ref($settings->{'canclone'}) eq 'HASH') {
+                    if (ref($settings->{'canclone'}{'instcode'}) eq 'ARRAY') {
+                        if (@code_order > 0) {
+                            $currcanclone = 'instcode';
+                            @posscodes = @{$settings->{'canclone'}{'instcode'}};
+                        }
+                    }
+                } elsif ($settings->{'canclone'} eq 'domain') {
+                    $currcanclone = $settings->{'canclone'};
+                }
+            }
+        }
+        foreach my $option (@cloneoptions) {
+            my ($checked,$additional);
+            if ($currcanclone eq $option) {
+                $checked = ' checked="checked"';
+            }
+            if ($option eq 'instcode') {
+                if (@code_order) {
+                    my $show = 'none';
+                    if ($checked) {
+                        $show = 'block';
+                    }
+                    $additional = '<div id="cloneinstcode" style="display:'.$show.'" />'.
+                                  &mt('Institutional codes for new and cloned course have identical:').
+                                  '<br />';
+                    foreach my $item (@code_order) {
+                        my $codechk;
+                        if ($checked) {
+                            if (grep(/^\Q$item\E$/,@posscodes)) {
+                                $codechk = ' checked="checked"';
+                            }
+                        }
+                        $additional .= '<label>'.
+                                       '<input type="checkbox" name="clonecode" value="'.$item.'"'.$codechk.' />'.
+                                       $item.'</label>';
+                    }
+                    $additional .= ('&nbsp;'x2).'('.&mt('check as many as needed').')</div>';
+                }
+            }
+            $datatable .=
+                '<span class="LC_nobreak"><label><input type="radio" name="canclone"'.$checked.
+                ' value="'.$option.'"'.$onclick.' />'.$clonetitles{$option}.
+                '</label>&nbsp;'.$additional.'</span><br />';
+        }
+        $datatable .= '</td>'.
+                      '</tr>';
+        $itemcount ++;
     } else {
         $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
         my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout);
@@ -5393,7 +5473,10 @@ sub coursecategories_javascript {
     }
     my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"');
     my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"');
-    my $choose_again = '\\n'.&mt('Please use a different name for the new top level category.'); 
+    my $choose_again = "\n".&mt('Please use a different name for the new top level category.'); 
+    &js_escape(\$instcode_reserved);
+    &js_escape(\$communities_reserved);
+    &js_escape(\$choose_again);
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -6071,7 +6154,7 @@ sub modify_login {
                 if ($domservers{$lonhost}) {
                     if (ref($domconfig{'login'}{'headtag'}{$lonhost}) eq 'HASH') {
                         $currheadtagurls{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'url'};
-                        $currexempt{$lonhost} = $domconfig{'login'}{'headtagexempt'}{$lonhost}{'exempt'}
+                        $currexempt{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'exempt'}
                     }
                 }
             }
@@ -7322,10 +7405,14 @@ sub modify_quotas {
                         if (@{$confhash{'validation'}{$item}} > 0) {
                             @{$confhash{'validation'}{$item}} = sort(@{$confhash{'validation'}{$item}});
                         }
-                        if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                            if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') {
-                                @changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item},
-                                                                              $domconfig{'requestcourses'}{'validation'}{$item});
+                        if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                            if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                                if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') {
+                                    @changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item},
+                                                                                  $domconfig{'requestcourses'}{'validation'}{$item});
+                                } else {
+                                    @changed = @{$confhash{'validation'}{$item}};
+                                }
                             } else {
                                 @changed = @{$confhash{'validation'}{$item}};
                             }
@@ -7346,9 +7433,15 @@ sub modify_quotas {
                                 $env{'form.requestcourses_validation_'.$item} =~ s/[\n\r\f]+/\s/gs;
                             }
                         }
-                        if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                            if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) {
-                                $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                        if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                            if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                                if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) {
+                                    $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                                }
+                            } else {
+                                if ($confhash{'validation'}{$item} ne '') {
+                                    $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                                }
                             }
                         } else {
                             if ($confhash{'validation'}{$item} ne '') {
@@ -7366,14 +7459,18 @@ sub modify_quotas {
                 }
             }
             if (ref($confhash{'validation'}) eq 'HASH') {
-                if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                    if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                        unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                            if ($confhash{'validation'}{'dc'} eq '') {
-                                $changes{'validation'}{'dc'} = &mt('None');
-                            } else {
-                                $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
+                if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                    if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                        if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                            unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                                if ($confhash{'validation'}{'dc'} eq '') {
+                                    $changes{'validation'}{'dc'} = &mt('None');
+                                } else {
+                                    $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
+                                }
                             }
+                        } elsif ($confhash{'validation'}{'dc'} ne '') {
+                            $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
                         }
                     } elsif ($confhash{'validation'}{'dc'} ne '') {
                         $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
@@ -7381,9 +7478,13 @@ sub modify_quotas {
                 } elsif ($confhash{'validation'}{'dc'} ne '') {
                     $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
                 }
-            } elsif (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                    $changes{'validation'}{'dc'} = &mt('None');
+            } else {
+                if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                    if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                        if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                            $changes{'validation'}{'dc'} = &mt('None');
+                        }
+                    }
                 }
             }
         }
@@ -7791,7 +7892,8 @@ sub modify_autoenroll {
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
     my %title = ( run => 'Auto-enrollment active',
                   sender => 'Sender for notification messages',
-                  coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)');
+                  coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)',
+                  failsafe => 'Failsafe for no drops if institutional data missing for a section');
     my @offon = ('off','on');
     my $sender_uname = $env{'form.sender_uname'};
     my $sender_domain = $env{'form.sender_domain'};
@@ -7801,11 +7903,17 @@ sub modify_autoenroll {
         $sender_domain = '';
     }
     my $coowners = $env{'form.autoassign_coowners'};
+    my $failsafe = $env{'form.autoenroll_failsafe'};
+    $failsafe =~ s{^\s+|\s+$}{}g;
+    if ($failsafe =~ /\D/) {
+        undef($failsafe);
+    }
     my %autoenrollhash =  (
                        autoenroll => { 'run' => $env{'form.autoenroll_run'},
                                        'sender_uname' => $sender_uname,
                                        'sender_domain' => $sender_domain,
                                        'co-owners' => $coowners,
+                                       'autofailsafe' => $failsafe,
                                 }
                      );
     my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash,
@@ -7832,7 +7940,10 @@ sub modify_autoenroll {
             }
         } elsif ($coowners) {
             $changes{'coowners'} = 1;
-        }      
+        }
+        if ($currautoenroll{'autofailsafe'} ne $failsafe) {
+            $changes{'autofailsafe'} = 1;
+        }
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'run'}) {
@@ -7852,6 +7963,17 @@ sub modify_autoenroll {
                     $lastactref->{'domainconfig'} = 1;
                 }
             }
+            if ($changes{'autofailsafe'}) {
+                if ($failsafe ne '') {
+                    $resulttext .= '<li>'.&mt("$title{'failsafe'} set to [_1]",$failsafe).'</li>';
+                } else {
+                    $resulttext .= '<li>'.&mt("$title{'failsafe'} deleted");
+                }
+                &Apache::lonnet::get_domain_defaults($dom,1);
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domdefaults'} = 1;
+                }
+            }
             $resulttext .= '</ul>';
         } else {
             $resulttext = &mt('No changes made to auto-enrollment settings');
@@ -10297,7 +10419,42 @@ sub modify_coursedefaults {
                 }
             }
         }
-
+        my $currclone = $domconfig{'coursedefaults'}{'canclone'};
+        my @currclonecode;
+        if (ref($currclone) eq 'HASH') {
+            if (ref($currclone->{'instcode'}) eq 'ARRAY') {
+                @currclonecode = @{$currclone->{'instcode'}};
+            }
+        }
+        my $newclone;
+        if ($env{'form.canclone'} =~ /^(none|domain|instcode)$/) {
+            $newclone = $env{'form.canclone'};
+        }
+        if ($newclone eq 'instcode') {
+            my @newcodes = &Apache::loncommon::get_env_multiple('form.clonecode');
+            my (%codedefaults,@code_order,@clonecode);
+            &Apache::lonnet::auto_instcode_defaults($dom,\%codedefaults,
+                                                    \@code_order);
+            foreach my $item (@code_order) {
+                if (grep(/^\Q$item\E$/,@newcodes)) {
+                    push(@clonecode,$item);
+                }
+            }
+            if (@clonecode) {
+                $defaultshash{'coursedefaults'}{'canclone'} = { $newclone => \@clonecode };
+                my @diffs = &Apache::loncommon::compare_arrays(\@currclonecode,\@clonecode);
+                if (@diffs) {
+                    $changes{'canclone'} = 1;
+                }
+            } else {
+                $newclone eq '';
+            }
+        } elsif ($newclone ne '') {
+            $defaultshash{'coursedefaults'}{'canclone'} = $newclone;
+        }
+        if ($newclone ne $currclone) {
+            $changes{'canclone'} = 1;
+        }
         my %credits;
         foreach my $type (@types) {
             unless ($type eq 'community') {
@@ -10381,7 +10538,8 @@ sub modify_coursedefaults {
         if (keys(%changes) > 0) {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
             if (($changes{'uploadquota'}) || ($changes{'postsubmit'}) ||
-                ($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'})) {
+                ($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) ||
+                ($changes{'canclone'})) {
                 foreach my $item ('uselcmath','usejsme') {
                     if ($changes{$item}) {
                         $domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
@@ -10413,6 +10571,18 @@ sub modify_coursedefaults {
                         }
                     }
                 }
+                if ($changes{'canclone'}) {
+                    if (ref($defaultshash{'coursedefaults'}{'canclone'}) eq 'HASH') {
+                        if (ref($defaultshash{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') {
+                            my @clonecodes = @{$defaultshash{'coursedefaults'}{'canclone'}{'instcode'}};
+                            if (@clonecodes) {
+                                $domdefaults{'canclone'} = join('+',@clonecodes);
+                            }
+                        }
+                    } else {
+                        $domdefaults{'canclone'}=$defaultshash{'coursedefaults'}{'canclone'};
+                    }
+                }
                 my $cachetime = 24*60*60;
                 &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
                 if (ref($lastactref) eq 'HASH') {
@@ -10501,6 +10671,17 @@ sub modify_coursedefaults {
                     } else {
                         $resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>';
                     }
+                } elsif ($item eq 'canclone') {
+                    if (ref($defaultshash{'coursedefaults'}{'canclone'}) eq 'HASH') {
+                        if (ref($defaultshash{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') {
+                            my $clonecodes = join(' '.&mt('and').' ',@{$defaultshash{'coursedefaults'}{'canclone'}{'instcode'}});
+                            $resulttext .= '<li>'.&mt('By default, official courses can be cloned from existing courses with the same: [_1]','<b>'.$clonecodes.'</b>').'</li>';
+                        }
+                    } elsif ($defaultshash{'coursedefaults'}{'canclone'} eq 'domain') {
+                        $resulttext .= '<li>'.&mt('By default, a course requester can clone any course from his/her domain.').'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('By default, only course owner and coordinators may clone a course.').'</li>';
+                    }
                 }
             }
             $resulttext .= '</ul>';
@@ -12010,12 +12191,18 @@ function toggleDisplay(domForm,caller) {
     if (document.getElementById(caller)) {
         var divitem = document.getElementById(caller);
         var optionsElement = domForm.coursecredits;
+        var checkval = 1;
+        var dispval = 'block';
         if (caller == 'emailoptions') {
             optionsElement = domForm.cancreate_email; 
         }
         if (caller == 'studentsubmission') {
             optionsElement = domForm.postsubmit;
         }
+        if (caller == 'cloneinstcode') {
+            optionsElement = domForm.canclone;
+            checkval = 'instcode';
+        }
         if (optionsElement.length) {
             var currval;
             for (var i=0; i<optionsElement.length; i++) {
@@ -12023,8 +12210,8 @@ function toggleDisplay(domForm,caller) {
                    currval = optionsElement[i].value;
                 }
             }
-            if (currval == 1) {
-                divitem.style.display = 'block';
+            if (currval == checkval) {
+                divitem.style.display = dispval;
             } else {
                 divitem.style.display = 'none';
             }