--- loncom/interface/domainprefs.pm	2011/07/29 14:28:24	1.138.2.9
+++ loncom/interface/domainprefs.pm	2010/08/24 13:37:50	1.139
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.138.2.9 2011/07/29 14:28:24 raeburn Exp $
+# $Id: domainprefs.pm,v 1.139 2010/08/24 13:37:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -140,7 +140,7 @@ autolimit
 
 =over
  
-- course requests will be processed automatically up to a limit of
+- course requests will be processed autoatically up to a limit of
 N requests for the course type for the particular requestor.
 If N is undefined, there is no limit to the number of course requests
 which a course owner may submit and have processed automatically. 
@@ -202,12 +202,12 @@ sub handler {
                 'quotas','autoenroll','autoupdate','autocreate',
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
-                'serverstatuses','requestcourses','coursedefaults',
-                'usersessions'],$dom);
+                'serverstatuses','requestcourses','helpsettings',
+                'coursedefaults','usersessions'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
-                       'requestcourses','coursecategories','serverstatuses',
+                       'requestcourses','coursecategories','serverstatuses','helpsettings',
                        'coursedefaults','usersessions');
     my %prefs = (
         'rolecolors' =>
@@ -230,7 +230,7 @@ sub handler {
                     },
 
         'defaults' => 
-                    { text => 'Default authentication/language/timezone/portal',
+                    { text => 'Default authentication/language/timezone',
                       help => 'Domain_Configuration_LangTZAuth',
                       header => [{col1 => 'Setting',
                                   col2 => 'Value'}],
@@ -337,11 +337,13 @@ sub handler {
                              {col1 => 'Unauthenticated Help Settings',
                               col2 => ''}],
                  },
-        'coursedefaults' =>
+        'coursedefaults' => 
                  {text => 'Course/Community defaults',
                   help => 'Domain_Configuration_Course_Defaults',
-                  header => [{col1 => 'Defaults which can be overridden for each course by a DC',
-                              col2 => 'Value',}],
+                  header => [{col1 => 'Defaults which can be overridden in each course by a CC',
+                              col2 => 'Value',},
+                             {col1 => 'Defaults which can be overridden for each course by a DC',
+                              col2 => 'Value',},],
                  },
         'privacy' => 
                  {text   => 'User Privacy',
@@ -455,6 +457,8 @@ sub process_changes {
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
         $output = &modify_quotas($dom,$action,%domconfig);
+    } elsif ($action eq 'helpsettings') {
+        $output = &modify_helpsettings($r,$dom,$confname,%domconfig);
     } elsif ($action eq 'coursedefaults') {
         $output = &modify_coursedefaults($dom,%domconfig);
     } elsif ($action eq 'usersessions') {
@@ -512,9 +516,11 @@ sub print_config_box {
         } elsif ($action eq 'helpsettings') {
             $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'usersessions') {
-            $output .= &print_usersessions('top',$dom,$settings,\$rowtotal);
+            $output .= &print_usersessions('top',$dom,$settings,\$rowtotal); 
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'coursedefaults') {
+            $output .= &print_coursedefaults('top',$dom,$settings,\$rowtotal);
         }
         $output .= '
            </table>
@@ -578,6 +584,8 @@ sub print_config_box {
             $output .= &print_helpsettings('bottom',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'usersessions') {
             $output .= &print_usersessions('bottom',$dom,$settings,\$rowtotal);
+        } elsif ($action eq 'coursedefaults') {
+            $output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
            </table>
@@ -664,8 +672,8 @@ sub print_config_box {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'serverstatuses') {
             $output .= &print_serverstatuses($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'coursedefaults') {
-            $output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal);
+        } elsif ($action eq 'helpsettings') {
+            $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -859,6 +867,7 @@ sub print_login {
                                                   domlogo => 'Domain Logo',
                                                   login => 'Login box');
     my $itemcount = 1;
+    my ($css_class,$datatable);
     foreach my $item (@toggles) {
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $datatable .=  
@@ -1878,23 +1887,24 @@ sub print_autocreate {
                   '<input type="radio" name="autocreate_xml"'.
                   $createon{'xml'}.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
                   '<label><input type="radio" name="autocreate_xml"'.
-                  $createoff{'xml'}.' value="0" />'.&mt('No').'</label></span>'.
-                  '</td></tr><tr>'.
-                  '<td>'.&mt('Create pending requests for official courses (if validated)').'</td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                  '<input type="radio" name="autocreate_req"'.
-                  $createon{'req'}.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-                  '<label><input type="radio" name="autocreate_req"'.
-                  $createoff{'req'}.' value="0" />'.&mt('No').'</label></span>';
+                  $createoff{'xml'}.' value="0" />'.&mt('No').'</label></span>';
     my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc);
     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>';
+        $datatable .= '</td><tr><td>'.
+                      &mt('XML files processed as: (choose Dom. Coord.)'). 
+                      '</td><td class="LC_left_item">'.$dctable.'</td></tr>'.
+                      '<tr class="LC_odd_row">';
         $$rowtotal ++ ;
     } else {
-        $datatable .= $dctable.'</td></tr>';
+        $datatable .= '</td></tr><tr>';
     }
+    $datatable .= '<td>'.&mt('Create pending requests for official courses (if validated)').'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="autocreate_req"'.
+                  $createon{'req'}.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="autocreate_req"'.
+                  $createoff{'req'}.' value="0" />'.&mt('No').'</label></span></td>'.
+                  '</tr>';
     return $datatable;
 }
 
@@ -2277,17 +2287,9 @@ sub print_coursedefaults {
 sub print_usersessions {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my ($css_class,$datatable,%checked,%choices);
-    my (%by_ip,%by_location,@intdoms);
-    &build_location_hashes(\@intdoms,\%by_ip,\%by_location);
-    if (keys(%by_location) == 0) {
-        if ($position eq 'top') {
-            $datatable .= '<tr'.$css_class.'><td colspan="2">'.
-                          &mt('Nothing to set here, as the cluster to which this domain belongs only contains this institution.');
-        }
-    }
     my %lt = &usersession_titles();
     my $itemcount = 1;
-    my $numinrow = 5;
+    my $numinrow = 6;
     my $prefix;
     my @types;
     if ($position eq 'top') {
@@ -2299,6 +2301,8 @@ sub print_usersessions {
     }
     my (%current,%checkedon,%checkedoff);
     my @lcversions = &Apache::lonnet::all_loncaparevs();
+    my (%by_ip,%by_location,@intdoms);
+    &build_location_hashes(\@intdoms,\%by_ip,\%by_location);
     my @locations = sort(keys(%by_location));
     foreach my $type (@types) {
         $checkedon{$type} = '';
@@ -2321,7 +2325,6 @@ sub print_usersessions {
         }
     }
     foreach my $type (@types) {
-        next if ($type ne 'version' && !@locations);
         $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
         $datatable .= '<tr'.$css_class.'>
                        <td><span class="LC_nobreak">'.$lt{$type}.'</span><br />
@@ -2815,9 +2818,9 @@ sub print_usermodification {
 sub print_defaults {
     my ($dom,$rowtotal) = @_;
     my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
-                 'datelocale_def','portal_def');
+                 'datelocale_def');
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-    my $titles = &defaults_titles($dom);
+    my $titles = &defaults_titles();
     my $rownum = 0;
     my ($datatable,$css_class);
     foreach my $item (@items) {
@@ -2854,12 +2857,8 @@ sub print_defaults {
             my $includeempty = 1;
             $datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty);
         } else {
-            my $size;
-            if ($item eq 'portal_def') {
-                $size = ' size="25"';
-            }
             $datatable .= '<input type="text" name="'.$item.'" value="'.
-                          $domdefaults{$item}.'"'.$size.' />';
+                          $domdefaults{$item}.'" />';
         }
         $datatable .= '</td></tr>';
         $rownum ++;
@@ -2869,25 +2868,13 @@ sub print_defaults {
 }
 
 sub defaults_titles {
-    my ($dom) = @_;
     my %titles = &Apache::lonlocal::texthash (
                    'auth_def'      => 'Default authentication type',
                    'auth_arg_def'  => 'Default authentication argument',
                    'lang_def'      => 'Default language',
                    'timezone_def'  => 'Default timezone',
                    'datelocale_def' => 'Default locale for dates',
-                   'portal_def'     => 'Portal/Default URL',
                  );
-    if ($dom) {
-        my $uprimary_id = &Apache::lonnet::domain($dom,'primary');
-        my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
-        my $protocol = $Apache::lonnet::protocol{$uprimary_id};
-        $protocol = 'http' if ($protocol ne 'https');
-        if ($uint_dom) {
-            $titles{'portal_def'} .= ' '.&mt('(for example: [_1])',$protocol.'://loncapa.'.
-                                         $uint_dom);
-        }
-    }
     return (\%titles);
 }
 
@@ -4653,12 +4640,12 @@ sub modify_quotas {
                     $changes{'notify'}{'approval'} = 1;
                 }
             } else {
-                if ($confhash{'notify'}{'approval'}) {
+                if ($domconfig{$action}{'notify'}{'approval'}) {
                     $changes{'notify'}{'approval'} = 1;
                 }
             }
         } else {
-            if ($confhash{'notify'}{'approval'}) {
+            if ($domconfig{$action}{'notify'}{'approval'}) {
                 $changes{'notify'}{'approval'} = 1;
             }
         }
@@ -4979,7 +4966,7 @@ sub modify_autoupdate {
                         middlename => 'Middle Name',
                         generation => 'Generation',
                       );
-    $othertitle = &mt('All users');
+    my $othertitle = &mt('All users');
     if (keys(%{$usertypes}) >  0) {
         $othertitle = &mt('Other users');
     }
@@ -6023,7 +6010,7 @@ sub modify_defaults {
     my ($dom,$r) = @_;
     my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors);
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def','portal_def');
+    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def');
     my @authtypes = ('internal','krb4','krb5','localauth');
     foreach my $item (@items) {
         $newvalues{$item} = $env{'form.'.$item};
@@ -6059,12 +6046,6 @@ sub modify_defaults {
                     push(@errors,$item);
                 }
             }
-        } elsif ($item eq 'portal_def') {
-            if ($newvalues{$item} ne '') {
-                unless ($newvalues{$item} =~ /^https?\:\/\/(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])\/?$/) {
-                    push(@errors,$item);
-                }
-            }
         }
         if (grep(/^\Q$item\E$/,@errors)) {
             $newvalues{$item} = $domdefaults{$item};
@@ -6481,6 +6462,7 @@ sub modify_serverstatuses {
     my %serverstatushash =  (
                                 serverstatuses => \%newserverstatus,
                             );
+    my %changes;
     foreach my $type (@pages) {
         foreach my $setting ('namedusers','machines') {
             my (@current,@new);
@@ -6681,7 +6663,7 @@ sub modify_coursedefaults {
     my ($resulttext,$errors,%changes,%defaultshash);
     my %defaultchecked = ('canuse_pdfforms' => 'off');
     my @offon = ('off','on');
-    my @toggles = ();
+    my @toggles = ('canuse_pdfforms');
 
     $defaultshash{'coursedefaults'} = {};
 
@@ -6743,7 +6725,7 @@ sub modify_coursedefaults {
                     }
                 } elsif ($item eq 'anonsurvey_threshold') {
                         $resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>';
-                }
+                } 
             }
             $resulttext .= '</ul>';
         } else {