--- loncom/interface/domainprefs.pm	2014/04/13 00:42:06	1.234
+++ loncom/interface/domainprefs.pm	2014/04/16 13:32:43	1.235
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.234 2014/04/13 00:42:06 raeburn Exp $
+# $Id: domainprefs.pm,v 1.235 2014/04/16 13:32:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -165,6 +165,7 @@ use Apache::lonlocal;
 use Apache::lonmsg();
 use Apache::lonconfigsettings;
 use Apache::lonuserutils();
+use Apache::loncoursequeueadmin();
 use LONCAPA qw(:DEFAULT :match);
 use LONCAPA::Enrollment;
 use LONCAPA::lonauthcgi();
@@ -365,7 +366,9 @@ sub handler {
                              {col1 => 'Setting',
                               col2 => 'Value'},
                              {col1 => 'Available textbooks',
-                              col2 => ''}],
+                              col2 => ''},
+                             {col1 => 'Validation (not official courses)',
+                              col2 => 'Value'},],
                   print => \&print_quotas,
                   modify => \&modify_quotas,
                  },
@@ -753,7 +756,18 @@ sub print_config_box {
              <tr class="LC_info_row">
               <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
               <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'.
-                       &print_textbookcourses($dom,$settings,\$rowtotal);
+                       &print_textbookcourses($dom,$settings,\$rowtotal).'
+            </table>
+           </td>
+          </tr>
+          <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
+              <td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[3]->{'col2'}).'</td>
+             </tr>'.
+            &print_validation_rows('requestcourses',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'requestauthor') {
             $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
         } elsif ($action eq 'rolecolors') {
@@ -2974,48 +2988,85 @@ sub print_selfenrollment {
             $datatable .= '</table></td></tr>';
         }
     } elsif ($position eq 'bottom') {
-        my ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types();
-        my %currvalidation;
-        if (ref($settings) eq 'HASH') {
-            if (ref($settings->{'validation'}) eq 'HASH') {
-                %currvalidation = %{$settings->{'validation'}}; 
-            }
+        $datatable .= &print_validation_rows('selfenroll',$dom,$settings,\$itemcount);
+    }
+    $$rowtotal += $itemcount;
+    return $datatable;
+}
+
+sub print_validation_rows {
+    my ($caller,$dom,$settings,$rowtotal) = @_;
+    my ($itemsref,$namesref,$fieldsref);
+    if ($caller eq 'selfenroll') { 
+        ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types();
+    } elsif ($caller eq 'requestcourses') {
+        ($itemsref,$namesref,$fieldsref) = &Apache::loncoursequeueadmin::requestcourses_validation_types();
+    }
+    my %currvalidation;
+    if (ref($settings) eq 'HASH') {
+        if (ref($settings->{'validation'}) eq 'HASH') {
+            %currvalidation = %{$settings->{'validation'}};
         }
-        foreach my $item (@{$itemsref}) {
-            $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-            $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
-                          $namesref->{$item}.
-                          '</span></td>'.
-                          '<td class="LC_left_item">';
-            if (($item eq 'url') || ($item eq 'button')) {
-                $datatable .= '<span class="LC_nobreak">'.
-                              '<input type="text" name="selfenroll_validation_'.$item.'"'.
-                              ' value="'.$currvalidation{$item}.'" size="50" /></span>';
-            } elsif ($item eq 'fields') {
-                my @currfields;
-                if (ref($currvalidation{$item}) eq 'ARRAY') {
-                    @currfields = @{$currvalidation{$item}};
-                }
-                foreach my $field (@{$fieldsref}) {
-                    my $check = '';
-                    if (grep(/^\Q$field\E$/,@currfields)) {
-                        $check = ' checked="checked"';
-                    }
-                    $datatable .= '<span class="LC_nobreak"><label>'.
-                                  '<input type="checkbox" name="selfenroll_validation_fields"'.
-                                  ' value="'.$field.'"'.$check.' />'.$field.
-                                  '</label></span> ';
-                }
-            } elsif ($item eq 'markup') {
-                $datatable .= '<textarea name="selfenroll_validation_markup" cols="50" rows="5" wrap="soft">'.
-                              $currvalidation{$item}. 
+    }
+    my $datatable;
+    my $itemcount = 0;
+    foreach my $item (@{$itemsref}) {
+        my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
+                      $namesref->{$item}.
+                      '</span></td>'.
+                      '<td class="LC_left_item">';
+        if (($item eq 'url') || ($item eq 'button')) {
+            $datatable .= '<span class="LC_nobreak">'.
+                          '<input type="text" name="'.$caller.'_validation_'.$item.'"'.
+                          ' value="'.$currvalidation{$item}.'" size="50" /></span>';
+        } elsif ($item eq 'fields') {
+            my @currfields;
+            if (ref($currvalidation{$item}) eq 'ARRAY') {
+                @currfields = @{$currvalidation{$item}};
+            }
+            foreach my $field (@{$fieldsref}) {
+                my $check = '';
+                if (grep(/^\Q$field\E$/,@currfields)) {
+                    $check = ' checked="checked"';
+                }
+                $datatable .= '<span class="LC_nobreak"><label>'.
+                              '<input type="checkbox" name="'.$caller.'_validation_fields"'.
+                              ' value="'.$field.'"'.$check.' />'.$field.
+                              '</label></span> ';
+            }
+        } elsif ($item eq 'markup') {
+            $datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5" wrap="soft">'.
+                           $currvalidation{$item}.
                               '</textarea>';
-            }
-            $datatable .= '</td></tr>'."\n";
+        }
+        $datatable .= '</td></tr>'."\n";
+        if (ref($rowtotal)) {
             $itemcount ++;
         }
     }
-    $$rowtotal += $itemcount;
+    if ($caller eq 'requestcourses') {
+        my %currhash;
+        if (ref($settings->{'validation'}) eq 'HASH') {
+            if ($settings->{'validation'}{'dc'} ne '') {
+                $currhash{$settings->{'validation'}{'dc'}} = 1;
+            }
+        }
+        my $numinrow = 2;
+        my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
+                                                       'validationdc',%currhash);
+        if ($numdc > 1) {
+            $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
+                          &mt('Course creation processed as: (choose Dom. Coord.)').
+                          '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
+        } else {
+            $datatable .= $dctable.'</td></tr>';
+        }
+        $itemcount ++;
+    }
+    if (ref($rowtotal)) {
+        $$rowtotal += $itemcount;
+    }
     return $datatable;
 }
 
@@ -6422,7 +6473,8 @@ sub modify_quotas {
     my ($r,$dom,$action,$lastactref,%domconfig) = @_;
     my ($context,@usertools,@options,%validations,%titles,%confhash,%toolshash,
         %limithash,$toolregexp,%conditions,$resulttext,%changes,$confname,$configuserok,
-        $author_ok,$switchserver,$errors);
+        $author_ok,$switchserver,$errors,$validationitemsref,$validationnamesref,
+        $validationfieldsref);
     if ($action eq 'quotas') {
         $context = 'tools'; 
     } else {
@@ -6438,6 +6490,8 @@ sub modify_quotas {
         $confname = $dom.'-domainconfig';
         my $servadm = $r->dir_config('lonAdmEMail');
         ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
+        ($validationitemsref,$validationnamesref,$validationfieldsref) = 
+            &Apache::loncoursequeueadmin::requestcourses_validation_types();
     } elsif ($context eq 'requestauthor') {
         @usertools = ('author');
         %titles = &authorrequest_titles();
@@ -6505,6 +6559,7 @@ sub modify_quotas {
                                '</span></li>';
                 }
             }
+
         }
         if (ref($domconfig{$action}) eq 'HASH') {
             if (ref($domconfig{$action}{'notify'}) eq 'HASH') {
@@ -6611,7 +6666,7 @@ sub modify_quotas {
                 }
                 if ($env{'form.addbook_image.filename'} ne '') {
                     my ($cdom,$cnum) = split(/_/,$newbook);
-                    my ($imageurl,$error) = 
+                    my ($imageurl,$error) =
                         &process_textbook_image($r,$dom,$confname,'addbook_image',$cdom,$cnum,$configuserok,
                                                 $switchserver,$author_ok);
                     if ($imageurl) {
@@ -6641,6 +6696,78 @@ sub modify_quotas {
                     }
                 }
             }
+            if (ref($validationitemsref) eq 'ARRAY') {
+                foreach my $item (@{$validationitemsref}) {
+                    if ($item eq 'fields') {
+                        my @changed;
+                        @{$confhash{'validation'}{$item}} = &Apache::loncommon::get_env_multiple('form.requestcourses_validation_'.$item);
+                        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});
+                            } else {
+                                @changed = @{$confhash{'validation'}{$item}};
+                            }
+                        } else {
+                            @changed = @{$confhash{'validation'}{$item}};
+                        }
+                        if (@changed) {
+                            if ($confhash{'validation'}{$item}) {
+                                $changes{'validation'}{$item} = join(', ',@{$confhash{'validation'}{$item}});
+                            } else {
+                                $changes{'validation'}{$item} = &mt('None');
+                            }
+                        }
+                    } else {
+                        $confhash{'validation'}{$item} = $env{'form.requestcourses_validation_'.$item};
+                        if ($item eq 'markup') {
+                            if ($env{'form.requestcourses_validation_'.$item}) {
+                                $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};
+                            }
+                        } else {
+                            if ($confhash{'validation'}{$item} ne '') {
+                                $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                            }
+                        }
+                    }
+                }
+            }
+            if ($env{'form.validationdc'}) {
+                my $newval = $env{'form.validationdc'};
+                my %domcoords = &get_active_dcs($dom);
+                if (exists($domcoords{$newval})) {
+                    $confhash{'validation'}{'dc'} = $newval;
+                }
+            }
+            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'};
+                            }
+                        }
+                    } elsif ($confhash{'validation'}{'dc'} ne '') {
+                        $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
+                    }
+                } 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 {
         $confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'};
@@ -6956,6 +7083,26 @@ sub modify_quotas {
                     }
                     $resulttext .= '</ul></li>';
                 }
+                if (ref($changes{'validation'}) eq 'HASH') {
+                    if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) {
+                        $resulttext .= '<li>'.&mt('Validation of courses/communities updated').'<ul>';
+                        foreach my $item (@{$validationitemsref}) {
+                            if (exists($changes{'validation'}{$item})) {
+                                if ($item eq 'markup') {
+                                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$validationnamesref->{$item},
+                                                              '<br /><pre>'.$changes{'validation'}{$item}.'</pre>').'</li>';
+                                } else {
+                                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$validationnamesref->{$item},
+                                                              '<b>'.$changes{'validation'}{$item}.'</b>').'</li>';
+                                }
+                            }
+                        }
+                        if (exists($changes{'validation'}{'dc'})) {
+                            $resulttext .= '<li>'.&mt('Validated course requests identified as processed by: [_1]',
+                                                     '<b>'.$changes{'validation'}{'dc'}.'</b>').'</li>';
+                        }
+                    }
+                }
             }
             $resulttext .= '</ul>';
             if (keys(%newenv)) {
@@ -10141,7 +10288,7 @@ sub get_active_dcs {
 
 sub active_dc_picker {
     my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;
-    my %domcoords = &get_active_dcs($dom); 
+    my %domcoords = &get_active_dcs($dom);
     my @domcoord = keys(%domcoords);
     if (keys(%currhash)) {
         foreach my $dc (keys(%currhash)) {