--- loncom/interface/domainprefs.pm	2009/08/23 17:22:54	1.109
+++ loncom/interface/domainprefs.pm	2010/12/08 04:22:16	1.123.2.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.109 2009/08/23 17:22:54 raeburn Exp $
+# $Id: domainprefs.pm,v 1.123.2.5 2010/12/08 04:22:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -202,11 +202,12 @@ sub handler {
                 'quotas','autoenroll','autoupdate','directorysrch',
                 'usercreation','usermodification','contacts','defaults',
                 'scantron','coursecategories','serverstatuses',
-                'requestcourses'],$dom);
+                'requestcourses','helpsettings','coursedefaults'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
-                       'requestcourses','coursecategories','serverstatuses');
+                       'requestcourses','coursecategories','serverstatuses','helpsettings',
+                       'coursedefaults');
     my %prefs = (
         'rolecolors' =>
                    { text => 'Default color schemes',
@@ -220,14 +221,15 @@ sub handler {
                                 {col1 => 'Administrator Settings',
                                  col2 => '',}],
                     },
-        'login' =>  
+        'login' =>
                     { text => 'Log-in page options',
                       help => 'Domain_Configuration_Login_Page',
                       header => [{col1 => 'Item',
                                   col2 => '',}],
                     },
+
         'defaults' => 
-                    { text => 'Default authentication/language/timezone',
+                    { text => 'Default authentication/language/timezone/portal',
                       help => 'Domain_Configuration_LangTZAuth',
                       header => [{col1 => 'Setting',
                                   col2 => 'Value'}],
@@ -302,7 +304,7 @@ sub handler {
                               col2 => 'Value'}],
                  },
         'coursecategories' =>
-                  { text => 'Cataloging of courses',
+                  { text => 'Cataloging of courses/communities',
                     help => 'Domain_Configuration_Cataloging_Courses',
                     header => [{col1 => 'Category settings',
                                 col2 => '',},
@@ -318,7 +320,37 @@ sub handler {
                               col3 => 'Specific IPs',
                             }],
                  },
+        'helpsettings' =>
+                 {text   => 'Help page settings',
+                  help   => 'Domain_Configuration_Help_Settings',
+                  header => [{col1 => 'Authenticated Help Settings',
+                              col2 => ''},
+                             {col1 => 'Unauthenticated Help Settings',
+                              col2 => ''}],
+                 },
+        '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',}],
+                 },
+        'privacy' => 
+                 {text   => 'User Privacy',
+                  help   => 'Domain_Configuration_User_Privacy',
+                  header => [{col1 => 'Setting',
+                              col2 => 'Value',}],
+                 },
     );
+    my %servers = &dom_servers($dom);
+    if (keys(%servers) > 1) {
+        $prefs{'login'}  = { text   => 'Log-in page options',
+                             help   => 'Domain_Configuration_Login_Page',
+                            header => [{col1 => 'Log-in Service',
+                                        col2 => 'Server Setting',},
+                                       {col1 => 'Log-in Page Items',
+                                        col2 => ''}],
+                           };
+    }
     my @roles = ('student','coordinator','author','admin');
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -404,6 +436,10 @@ 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);
     }
     return $output;
 }
@@ -423,11 +459,13 @@ sub print_config_box {
            &Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
           '</tr>';
     $rowtotal ++;
-    if (($action eq 'autoupdate') || ($action eq 'rolecolors') || 
-        ($action eq 'usercreation') || ($action eq 'usermodification') ||
-        ($action eq 'coursecategories') || ($action eq 'requestcourses')) {
+    my $numheaders = 1;
+    if (ref($item->{'header'}) eq 'ARRAY') {
+        $numheaders = scalar(@{$item->{'header'}});
+    }
+    if ($numheaders > 1) {
         my $colspan = '';
-        if (($action eq 'rolecolors') || ($action eq 'coursecategories')) {
+        if (($action eq 'rolecolors') || ($action eq 'coursecategories') || ($action eq 'helpsettings')) {
             $colspan = ' colspan="2"';
         }
         $output .= '
@@ -447,9 +485,14 @@ sub print_config_box {
             $output .= &print_usermodification('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
             $output .= &print_coursecategories('top',$dom,$item,$settings,\$rowtotal);
+        } elsif ($action eq 'login') {
+            $output .= &print_login('top',$dom,$confname,$phase,$settings,\$rowtotal);
+            $colspan = ' colspan="2"';
         } elsif ($action eq 'requestcourses') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
-        } else {
+        } elsif ($action eq 'helpsettings') {
+            $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal);
         }
         $output .= '
@@ -496,9 +539,13 @@ sub print_config_box {
             $rowtotal ++;
         } elsif ($action eq 'coursecategories') {
             $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
+        } elsif ($action eq 'login') {
+            $output .= &print_login('bottom',$dom,$confname,$phase,$settings,\$rowtotal);
         } elsif ($action eq 'requestcourses') {
             $output .= &print_courserequestmail($dom,$settings,\$rowtotal);
-        } else {
+        } elsif ($action eq 'helpsettings') {
+            $output .= &print_helpsettings('bottom',$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
            </table>
           </td>
@@ -566,7 +613,8 @@ sub print_config_box {
         $output .= '</tr>';
         $rowtotal ++;
         if ($action eq 'login') {
-            $output .= &print_login($dom,$confname,$phase,$settings,\$rowtotal);
+            $output .= &print_login('bottom',$dom,$confname,$phase,$settings,
+                                    \$rowtotal);
         } elsif ($action eq 'quotas') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif ($action eq 'autoenroll') {
@@ -581,6 +629,10 @@ 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 'helpsettings') {
+            $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
+    	} elsif ($action eq 'coursedefaults') {
+            $output .= &print_coursedefaults($dom,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -592,8 +644,48 @@ sub print_config_box {
 }
 
 sub print_login {
-    my ($dom,$confname,$phase,$settings,$rowtotal) = @_;
+    my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_;
+    my ($css_class,$datatable);
     my %choices = &login_choices();
+    my $itemcount = 1;
+
+    if ($position eq 'top') {
+        my %servers = &dom_servers($dom);
+        my $choice = $choices{'disallowlogin'};
+        $css_class = ' class="LC_odd_row"';
+        $datatable .= '<tr'.$css_class.'><td>'.$choices{'disallowlogin'}.'</td>'.
+                      '<td align="right"><table><tr><th>'.$choices{'hostid'}.'</th>'.
+                      '<th>'.$choices{'serverurl'}.'</th></tr>'."\n";
+        my %disallowed;
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'loginvia'}) eq 'HASH') {
+               %disallowed = %{$settings->{'loginvia'}};
+            }
+        }
+        foreach my $lonhost (sort(keys(%servers))) {
+            my $direct = 'selected="selected"';
+            if ($disallowed{$lonhost} eq '') {
+                $direct = '';
+            }
+            $datatable .= '<tr><td>'.$servers{$lonhost}.'</td>'.
+                          '<td><select name="'.$lonhost.'_serverurl">'.
+                          '<option value=""'.$direct.'>'.$choices{'directlogin'}.
+                          '</option>';
+            foreach my $hostid (keys(%servers)) {
+                next if ($servers{$hostid} eq $servers{$lonhost});
+                my $selected = '';
+                if ($hostid eq $disallowed{$lonhost}) {
+                    $selected = 'selected="selected"';
+                }
+                $datatable .= '<option value="'.$hostid.'"'.$selected.'>'.
+                              $servers{$hostid}.'</option>';
+            }
+            $datatable .= '</select></td></tr>';
+        }
+        $datatable .= '</table></td></tr>';
+        return $datatable;
+    }
+
     my %defaultchecked = ( 
                            'coursecatalog' => 'on',
                            'adminmail'     => 'off',
@@ -728,24 +820,28 @@ sub print_login {
 sub login_choices {
     my %choices =
         &Apache::lonlocal::texthash (
-            coursecatalog => 'Display Course Catalog link?',
-            adminmail => "Display Administrator's E-mail Address?",
-            newuser   => "Link to create a user account",
-            img => "Header",
-            logo => "Main Logo",
-            domlogo => "Domain Logo",
-            login => "Log-in Header", 
-            textcol => "Text color",
-            bgcol   => "Box color",
-            bgs => "Background colors",
-            links => "Link colors",
-            font => "Font color",
-            pgbg => "Header",
-            mainbg => "Page",
-            sidebg => "Login box",
-            link => "Link",
-            alink => "Active link",
-            vlink => "Visited link",
+            coursecatalog => 'Display Course/Community Catalog link?',
+            adminmail     => "Display Administrator's E-mail Address?",
+            disallowlogin => "Login page requests redirected",
+            hostid        => "Server",
+            serverurl     => "Redirect to log-in via:",
+            directlogin   => "No redirect",
+            newuser       => "Link to create a user account",
+            img           => "Header",
+            logo          => "Main Logo",
+            domlogo       => "Domain Logo",
+            login         => "Log-in Header", 
+            textcol       => "Text color",
+            bgcol         => "Box color",
+            bgs           => "Background colors",
+            links         => "Link colors",
+            font          => "Font color",
+            pgbg          => "Header",
+            mainbg        => "Page",
+            sidebg        => "Login box",
+            link          => "Link",
+            alink         => "Active link",
+            vlink         => "Visited link",
         );
     return %choices;
 }
@@ -1853,6 +1949,174 @@ sub print_contacts {
     return $datatable;
 }
 
+sub print_helpsettings {
+
+	my ($position,$dom,$confname,$settings,$rowtotal) = @_;
+	my ($css_class,$datatable);
+	
+	my $switchserver = &check_switchserver($dom,$confname);
+	
+	my $itemcount = 1;
+	
+	if ($position eq 'top') {
+		
+		my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles);
+		
+		%choices =
+			&Apache::lonlocal::texthash (
+				submitbugs => 'Display &quot;Submit a bug&quot; link?',
+		);
+		
+		%defaultchecked = ('submitbugs' => 'on');
+		
+		@toggles = ('submitbugs',);
+		
+		foreach my $item (@toggles) {
+			if ($defaultchecked{$item} eq 'on') { 
+				$checkedon{$item} = ' checked="checked" ';
+				$checkedoff{$item} = ' ';
+			} elsif ($defaultchecked{$item} eq 'off') {
+				$checkedoff{$item} = ' checked="checked" ';
+				$checkedon{$item} = ' ';
+			}
+		}
+		
+		if (ref($settings) eq 'HASH') {
+			foreach my $item (@toggles) {
+				if ($settings->{$item} eq '1') {
+					$checkedon{$item} =  ' checked="checked" ';
+					$checkedoff{$item} = ' ';
+				} elsif ($settings->{$item} eq '0') {
+					$checkedoff{$item} =  ' checked="checked" ';
+					$checkedon{$item} = ' ';
+				}
+			}
+		 }
+		
+		 foreach my $item (@toggles) {
+			$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+			$datatable .=  
+				'<tr'.$css_class.'>
+				<td><span class="LC_nobreak">'.$choices{$item}.'</span></td>
+				<td><span class="LC_nobreak">&nbsp;</span></td>
+				<td class="LC_right_item"><span class="LC_nobreak">
+				<label><input type="radio" name="'.$item.'" '.$checkedon{$item}.' value="1" />'.&mt('Yes').'</label>&nbsp;
+				<label><input type="radio" name="'.$item.'" '.$checkedoff{$item}.' value="0" />'.&mt('No').'</label>'.
+				'</span></td>'.
+				'</tr>';
+			$itemcount ++;
+		 }
+     
+     } else {
+     
+     	$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+     	
+     	$datatable .= '<tr'.$css_class.'>';
+     	
+     	if (ref($settings) eq 'HASH') {
+			if ($settings->{'loginhelpurl'} ne '') {
+				my($directory, $filename) = $settings->{'loginhelpurl'} =~ m/(.*\/)(.*)$/;
+				$datatable .= '<td width="33%"><span class="LC_left_item"><label><a href="'.$settings->{'loginhelpurl'}.'" target="_blank">'.&mt('Custom Login Page Help File In Use').'</a></label></span></td>';
+				$datatable .= '<td width="33%"><span class="LC_right_item"><label><input type="checkbox" name="loginhelpurl_del" value="1" />'.&mt('Delete?').'</label></span></td>'
+			} else {
+				$datatable .= '<td width="33%"><span class="LC_left_item"><label>'.&mt('Default Login Page Help File In Use').'</label></span></td>';
+				$datatable .= '<td width="33%"><span class="LC_right_item">&nbsp;</span></td>';
+			}
+		} else {
+			$datatable .= '<td><span class="LC_left_item">&nbsp;</span></td>';
+			$datatable .= '<td><span class="LC_right_item">&nbsp;</span></td>';
+		}
+    	
+     	$datatable .= '<td width="33%"><span class="LC_right_item">';
+     	if ($switchserver) {
+            $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+        } else {
+        	$datatable .= &mt('Upload Custom Login Page Help File:');
+            $datatable .='<input type="file" name="loginhelpurl" />';
+        }
+        $datatable .= '</span></td></tr>';
+        
+     }
+     
+     return $datatable;
+	
+}
+
+
+sub radiobutton_prefs {
+    my ($settings,$toggles,$defaultchecked,$choices,$itemcount) = @_;
+    return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') &&
+                   (ref($choices) eq 'HASH'));
+
+    my (%checkedon,%checkedoff,$datatable,$css_class);
+
+    foreach my $item (@{$toggles}) {
+        if ($defaultchecked->{$item} eq 'on') {
+            $checkedon{$item} = ' checked="checked" ';
+            $checkedoff{$item} = ' ';
+        } elsif ($defaultchecked->{$item} eq 'off') {
+            $checkedoff{$item} = ' checked="checked" ';
+            $checkedon{$item} = ' ';
+        }
+    }
+    if (ref($settings) eq 'HASH') {
+        foreach my $item (@{$toggles}) {
+            if ($settings->{$item} eq '1') {
+                $checkedon{$item} =  ' checked="checked" ';
+                $checkedoff{$item} = ' ';
+            } elsif ($settings->{$item} eq '0') {
+                $checkedoff{$item} =  ' checked="checked" ';
+                $checkedon{$item} = ' ';
+            }
+        }
+    }
+    foreach my $item (@{$toggles}) {
+        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+        $datatable .=
+            '<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices->{$item}.
+            '</span></td>'.
+            '<td class="LC_right_item"><span class="LC_nobreak">'.
+            '<label><input type="radio" name="'.
+            $item.'" '.$checkedon{$item}.' value="1" />'.&mt('Yes').
+            '</label>&nbsp;<label><input type="radio" name="'.$item.'" '.
+            $checkedoff{$item}.' value="0" />'.&mt('No').'</label>'.
+            '</span></td>'.
+            '</tr>';
+        $itemcount ++;
+    }
+    return ($datatable,$itemcount);
+}
+
+sub print_coursedefaults {
+    my ($dom,$settings,$rowtotal) = @_;
+    my ($css_class,$datatable);
+    my $itemcount = 1;
+    my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles);
+    $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+    my %choices =
+        &Apache::lonlocal::texthash (
+            anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys',
+    );
+    my $currdefresponder;
+    if (ref($settings) eq 'HASH') {
+        $currdefresponder = $settings->{'anonsurvey_threshold'};
+    }
+    if (!$currdefresponder) {
+        $currdefresponder = 10;
+    } elsif ($currdefresponder < 1) {
+        $currdefresponder = 1;
+    }
+    $datatable .=
+           '<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices{'anonsurvey_threshold'}.
+            '</span></td>'.
+            '<td class="LC_right_item"><span class="LC_nobreak">'.
+            '<input type="text" name="anonsurvey_threshold"'.
+            ' value="'.$currdefresponder.'" size="5" /></span>'.
+            '</td></tr>';
+    $$rowtotal += $itemcount;
+    return $datatable;
+}
+
 sub contact_titles {
     my %titles = &Apache::lonlocal::texthash (
                    'supportemail' => 'Support E-mail address',
@@ -2224,9 +2488,9 @@ sub print_usermodification {
 sub print_defaults {
     my ($dom,$rowtotal) = @_;
     my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
-                 'datelocale_def');
+                 'datelocale_def','portal_def');
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-    my $titles = &defaults_titles();
+    my $titles = &defaults_titles($dom);
     my $rownum = 0;
     my ($datatable,$css_class);
     foreach my $item (@items) {
@@ -2263,8 +2527,12 @@ 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}.'" />';
+                          $domdefaults{$item}.'"'.$size.' />';
         }
         $datatable .= '</td></tr>';
         $rownum ++;
@@ -2274,13 +2542,25 @@ 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);
 }
 
@@ -2464,6 +2744,11 @@ sub print_coursecategories {
         my $toggle_cats_dom = ' checked="checked" ';
         my $can_cat_crs = ' ';
         my $can_cat_dom = ' checked="checked" ';
+        my $toggle_catscomm_comm = ' ';
+        my $toggle_catscomm_dom = ' checked="checked" ';
+        my $can_catcomm_comm = ' ';
+        my $can_catcomm_dom = ' checked="checked" ';
+
         if (ref($settings) eq 'HASH') {
             if ($settings->{'togglecats'} eq 'crs') {
                 $toggle_cats_crs = $toggle_cats_dom;
@@ -2473,14 +2758,25 @@ sub print_coursecategories {
                 $can_cat_crs = $can_cat_dom;
                 $can_cat_dom = ' ';
             }
+            if ($settings->{'togglecatscomm'} eq 'comm') {
+                $toggle_catscomm_comm = $toggle_catscomm_dom;
+                $toggle_catscomm_dom = ' ';
+            }
+            if ($settings->{'categorizecomm'} eq 'comm') {
+                $can_catcomm_comm = $can_catcomm_dom;
+                $can_catcomm_dom = ' ';
+            }
         }
         my %title = &Apache::lonlocal::texthash (
-                     togglecats => 'Show/Hide a course in the catalog',
-                     categorize    => 'Assign a category to a course',
+                     togglecats     => 'Show/Hide a course in catalog',
+                     togglecatscomm => 'Show/Hide a community in catalog',
+                     categorize     => 'Assign a category to a course',
+                     categorizecomm => 'Assign a category to a community',
                     );
         my %level = &Apache::lonlocal::texthash (
-                     dom => 'Set in "Modify Course" (Domain)',
-                     crs => 'Set in "Modify Parameters" (Course)',   
+                     dom  => 'Set in Domain',
+                     crs  => 'Set in Course',
+                     comm => 'Set in Community',
                     );
         $datatable = '<tr class="LC_odd_row">'.
                   '<td>'.$title{'togglecats'}.'</td>'.
@@ -2496,8 +2792,22 @@ sub print_coursecategories {
                   $can_cat_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
                   '<label><input type="radio" name="categorize"'.
                   $can_cat_crs.'value="crs" />'.$level{'crs'}.'</label></span></td>'.
+                  '</tr><tr class="LC_odd_row">'.
+                  '<td>'.$title{'togglecatscomm'}.'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="togglecatscomm"'.
+                  $toggle_catscomm_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
+                  '<label><input type="radio" name="togglecatscomm"'.
+                  $toggle_catscomm_comm.' value="comm" />'.$level{'comm'}.'</label></span></td>'.
+                  '</tr><tr>'.
+                  '<td>'.$title{'categorizecomm'}.'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<label><input type="radio" name="categorizecomm"'.
+                  $can_catcomm_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
+                  '<label><input type="radio" name="categorizecomm"'.
+                  $can_catcomm_comm.'value="comm" />'.$level{'comm'}.'</label></span></td>'.
                   '</tr>';
-        $$rowtotal += 2;
+        $$rowtotal += 4;
     } else {
         my $css_class;
         my $itemcount = 1;
@@ -2519,7 +2829,15 @@ sub print_coursecategories {
                 if (ref($cats[0]) eq 'ARRAY') {
                     my $numtop = @{$cats[0]};
                     my $maxnum = $numtop;
-                    if ((!grep(/^instcode$/,@{$cats[0]})) || ($cathash->{'instcode::0'} eq '')) {
+                    my %default_names = (
+                          instcode    => &mt('Official courses'),
+                          communities => &mt('Communities'),
+                    );
+
+                    if ((!grep(/^instcode$/,@{$cats[0]})) || 
+                        ($cathash->{'instcode::0'} eq '') ||
+                        (!grep(/^communities$/,@{$cats[0]})) || 
+                        ($cathash->{'communities::0'} eq '')) {
                         $maxnum ++;
                     }
                     my $lastidx;
@@ -2540,14 +2858,33 @@ sub print_coursecategories {
                             $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                         }
                         $datatable .= '</select></td><td>';
-                        if ($parent eq 'instcode') {
-                            $datatable .=  '<span class="LC_nobreak">'.&mt('Official courses')
-                                           .'</span><br /><span class="LC_nobreak">('
-                                           .&mt('with institutional codes').')</span></td>'
-                                           .'<td'.$colattrib.'><span class="LC_nobreak"><label><input type="radio" name="instcode" value="1" checked="checked" />'
-                                            .&mt('Display').'</label>&nbsp;'
-                                            .'<label><input type="radio" name="instcode" value="0" />'
-                                            .&mt('Do not display').'</label></span></td>';
+                        if ($parent eq 'instcode' || $parent eq 'communities') {
+                            $datatable .=  '<span class="LC_nobreak">'
+                                           .$default_names{$parent}.'</span>';
+                            if ($parent eq 'instcode') {
+                                $datatable .= '<br /><span class="LC_nobreak">('
+                                              .&mt('with institutional codes')
+                                              .')</span></td><td'.$colattrib.'>';
+                            } else {
+                                $datatable .= '<table><tr><td>';
+                            }
+                            $datatable .= '<span class="LC_nobreak">'
+                                          .'<label><input type="radio" name="'
+                                          .$parent.'" value="1" checked="checked" />'
+                                          .&mt('Display').'</label>';
+                            if ($parent eq 'instcode') {
+                                $datatable .= '&nbsp;';
+                            } else {
+                                $datatable .= '</span></td></tr><tr><td>'
+                                              .'<span class="LC_nobreak">';
+                            }
+                            $datatable .= '<label><input type="radio" name="'
+                                          .$parent.'" value="0" />'
+                                          .&mt('Do not display').'</label></span>';
+                            if ($parent eq 'communities') {
+                                $datatable .= '</td></tr></table>';
+                            }
+                            $datatable .= '</td>';
                         } else {
                             $datatable .= $parent
                                           .'&nbsp;<label><input type="checkbox" name="deletecategory" '
@@ -2575,26 +2912,33 @@ sub print_coursecategories {
                                   .'<input type="text" size="20" name="addcategory_name" value="" /></td>'
                                   .'</tr>'."\n";
                     $itemcount ++;
-                    if ((!grep(/^instcode$/,@{$cats[0]})) || ($cathash->{'instcode::0'} eq '')) {
-                        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-                        my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','instcode_pos','$lastidx'".');"';
-                        $datatable .= '<tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr><tr '.$css_class.'><td>'.
-                                      '<span class="LC_nobreak"><select name="instcode_pos"'.$chgstr.'>';
-                        for (my $k=0; $k<=$maxnum; $k++) {
-                            my $vpos = $k+1;
-                            my $selstr;
-                            if ($k == $maxnum) {
-                                $selstr = ' selected="selected" ';
+                    foreach my $default ('instcode','communities') {
+                        if ((!grep(/^\Q$default\E$/,@{$cats[0]})) || ($cathash->{$default.'::0'} eq '')) {
+                            $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                            my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','$lastidx'".');"';
+                            $datatable .= '<tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr><tr '.$css_class.'><td>'.
+                                          '<span class="LC_nobreak"><select name="'.$default.'_pos"'.$chgstr.'>';
+                            for (my $k=0; $k<=$maxnum; $k++) {
+                                my $vpos = $k+1;
+                                my $selstr;
+                                if ($k == $maxnum) {
+                                    $selstr = ' selected="selected" ';
+                                }
+                                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                             }
-                            $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+                            $datatable .= '</select></span></td>'.
+                                          '<td><span class="LC_nobreak">'.
+                                          $default_names{$default}.'</span>';
+                            if ($default eq 'instcode') {
+                                $datatable .= '<br /><span class="LC_nobreak">(' 
+                                              .&mt('with institutional codes').')</span>';
+                            }
+                            $datatable .= '</td>'
+                                          .'<td><span class="LC_nobreak"><label><input type="radio" name="'.$default.'" value="1" />'
+                                          .&mt('Display').'</label>&nbsp;'
+                                          .'<label><input type="radio" name="'.$default.'" value="0" checked="checked"/>'
+                                          .&mt('Do not display').'</label></span></td></tr>';
                         }
-                        $datatable .= '</select></span></td><td><span class="LC_nobreak">'
-                                      .&mt('Official courses').'</span>'.'<br /><span class="LC_nobreak">('
-                                      .&mt('with institutional codes').')</span></td>'
-                                      .'<td><span class="LC_nobreak"><label><input type="radio" name="instcode" value="1" />'
-                                      .&mt('Display').'</label>&nbsp;'
-                                      .'<label><input type="radio" name="instcode" value="0" checked="checked"/>'
-                                      .&mt('Do not display').'</label></span></td></tr>';
                     }
                 }
             } else {
@@ -2658,7 +3002,7 @@ sub print_serverstatuses {
 sub serverstatus_pages {
     return ('userstatus','lonstatus','loncron','server-status','codeversions',
             'clusterstatus','metadata_keywords','metadata_harvest',
-            'takeoffline','takeonline','showenv');
+            'takeoffline','takeonline','showenv','toggledebug');
 }
 
 sub coursecategories_javascript {
@@ -2683,6 +3027,9 @@ sub coursecategories_javascript {
         $jstext  = '    var categories = Array(1);'."\n".
                    '    categories[0] = Array("instcode_pos");'."\n"; 
     }
+    my $instcode_reserved = &mt('The name: "instcode" is a reserved category');
+    my $communities_reserved = &mt('The name: "communities" is a reserved category');
+    my $choose_again = '\\n'.&mt('Please use a different name for the new top level category'); 
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -2742,6 +3089,19 @@ $jstext
     }
     return;
 }
+
+function categoryCheck(form) {
+    if (form.elements['addcategory_name'].value == 'instcode') {
+        alert('$instcode_reserved\\n$choose_again');
+        return false;
+    }
+    if (form.elements['addcategory_name'].value == 'communities') {
+        alert('$communities_reserved\\n$choose_again');
+        return false;
+    }
+    return true;
+}
+
 // ]]>
 </script>
 
@@ -2751,25 +3111,40 @@ ENDSCRIPT
 
 sub initialize_categories {
     my ($itemcount) = @_;
-    my $datatable;
-    my $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','instcode_pos','0'".');"';
-
-    $datatable = '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                 .'<select name="instcode_pos"><option value="0" selected="selected">1</option>'
-                 .'<option value="1">2</option></select>&nbsp;'
-                 .&mt('Official courses (with institutional codes)')
-                 .'</span></td><td><span class="LC_nobreak">'
-                 .'<label><input type="radio" name="instcode" value="1" checked="checked" />'
-                 .&mt('Display').'</label>&nbsp;<label>'
-                 .'<input type="radio" name="instcode" value="0" />'.&mt('Do not display')
+    my ($datatable,$css_class,$chgstr);
+    my %default_names = (
+                      instcode    => 'Official courses (with institutional codes)',
+                      communities => 'Communities',
+                        );
+    my $select0 = ' selected="selected"';
+    my $select1 = '';
+    foreach my $default ('instcode','communities') {
+        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+        $chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"';
+        if ($default eq 'communities') {
+            $select1 = $select0;
+            $select0 = '';
+        }
+        $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
+                     .'<select name="'.$default.'_pos">'
+                     .'<option value="0"'.$select0.'>1</option>'
+                     .'<option value="1"'.$select1.'>2</option>'
+                     .'<option value="2">3</option></select>&nbsp;'
+                     .$default_names{$default}
+                     .'</span></td><td><span class="LC_nobreak">'
+                     .'<label><input type="radio" name="'.$default.'" value="1" checked="checked" />'
+                     .&mt('Display').'</label>&nbsp;<label>'
+                     .'<input type="radio" name="'.$default.'" value="0" />'.&mt('Do not display')
                  .'</label></span></td></tr>';
-    $itemcount ++;
+        $itemcount ++;
+    }
     $css_class = $itemcount%2?' class="LC_odd_row"':'';
     $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','addcategory_pos','0'".');"';
     $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                  .'<select name="addcategory_pos"'.$chgstr.'><option value="0">1</option>'
-                  .'<option value="1" selected="selected">2</option></select>&nbsp;'
+                  .'<select name="addcategory_pos"'.$chgstr.'>'
+                  .'<option value="0">1</option>'
+                  .'<option value="1">2</option>'
+                  .'<option value="2" selected="selected">3</option></select>&nbsp;'
                   .&mt('Add category').'</td><td>'.&mt('Name:')
                   .'&nbsp;<input type="text" size="20" name="addcategory_name" value="" /></td></tr>';
     return $datatable;
@@ -3076,6 +3451,14 @@ sub modify_login {
                   newuser => 'Link for visitors to create a user account',
                   loginheader => 'Log-in box header');
     my @offon = ('off','on');
+    my %curr_loginvia;
+    if (ref($domconfig{login}) eq 'HASH') {
+        if (ref($domconfig{login}{loginvia}) eq 'HASH') {
+            foreach my $lonhost (keys(%{$domconfig{login}{loginvia}})) {
+                $curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost};
+            }
+        }
+    }
     my %loginhash;
     ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
                                            \%domconfig,\%loginhash);
@@ -3088,6 +3471,26 @@ sub modify_login {
         $colchgtext = &display_colorchgs($dom,\%colchanges,['login'],
                                          \%loginhash);
     }
+
+    my %servers = &dom_servers($dom);
+    if (keys(%servers) > 1) {
+        foreach my $lonhost (keys(%servers)) {
+            next if ($env{'form.'.$lonhost.'_serverurl'} eq $lonhost);
+            if ($env{'form.'.$lonhost.'_serverurl'} eq $curr_loginvia{$lonhost}) {
+                $loginhash{login}{loginvia}{$lonhost} = $curr_loginvia{$lonhost};                next;
+            }
+            if ($curr_loginvia{$lonhost} ne '') {
+                $loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'};
+                $changes{'loginvia'}{$lonhost} = 1;
+            } else {
+                if (defined($servers{$env{'form.'.$lonhost.'_serverurl'}})) {
+                    $loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'};
+                    $changes{'loginvia'}{$lonhost} = 1;
+                }
+            }
+        }
+    }
+
     my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash,
                                              $dom);
     if ($putresult eq 'ok') {
@@ -3134,6 +3537,18 @@ sub modify_login {
             foreach my $item (sort(keys(%changes))) {
                 if ($item eq 'loginheader') {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $env{'form.loginheader'}").'</li>';
+                } elsif ($item eq 'loginvia') {
+                    if (ref($changes{$item}) eq 'HASH') {
+                        $resulttext .= '<li>'.&mt('Log-in page availability:').'<ul>';
+                        foreach my $lonhost (sort(keys(%{$changes{$item}}))) {
+                            if ($servers{$env{'form.'.$lonhost.'_serverurl'}} ne '') {
+                                $resulttext .= '<li>'.&mt('Server: [_1] log-in page now redirects to [_2]',$lonhost,$servers{$env{'form.'.$lonhost.'_serverurl'}}).'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt('Server: [_1] now has standard log-in page.',$lonhost).'</li>';
+                            }
+                        }
+                        $resulttext .= '</ul></li>'; 
+                    }
                 } else {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
                 }
@@ -5036,8 +5451,18 @@ 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');
+    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def',
+                 'portal_def');
     my @authtypes = ('internal','krb4','krb5','localauth');
+    my @doms = &Apache::lonnet::current_machine_domains();
+    my @langs;
+    foreach my $dom (@doms) {
+        if ($dom =~ /^(\w{2})\w?itest$/) {
+            push (@langs,$1.'t');
+        } elsif ($dom =~ /^(\w{2})\w?i$/) {
+            push(@langs,$1.'i');
+        }
+    }
     foreach my $item (@items) {
         $newvalues{$item} = $env{'form.'.$item};
         if ($item eq 'auth_def') {
@@ -5050,7 +5475,8 @@ sub modify_defaults {
             if ($newvalues{$item} ne '') {
                 if ($newvalues{$item} =~ /^(\w+)/) {
                     my $langcode = $1;
-                    if ($langcode ne 'x_chef') {
+                    if ((!grep(/^\Q$langcode\E/,@langs)) &&  
+                        ($langcode ne 'x_chef')) {
                         if (code2language($langcode) eq '') {
                             push(@errors,$item);
                         }
@@ -5072,6 +5498,12 @@ 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};
@@ -5227,6 +5659,14 @@ sub modify_coursecategories {
             $changes{'categorize'} = 1;
             $domconfig{'coursecategories'}{'categorize'} = $env{'form.categorize'};
         }
+        if ($domconfig{'coursecategories'}{'togglecatscomm'} ne $env{'form.togglecatscomm'}) {
+            $changes{'togglecatscomm'} = 1;
+            $domconfig{'coursecategories'}{'togglecatscomm'} = $env{'form.togglecatscomm'};
+        }
+        if ($domconfig{'coursecategories'}{'categorizecomm'} ne $env{'form.categorizecomm'}) {
+            $changes{'categorizecomm'} = 1;
+            $domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'};
+        }
     } else {
         $changes{'togglecats'} = 1;
         $changes{'categorize'} = 1;
@@ -5234,11 +5674,20 @@ sub modify_coursecategories {
                                              togglecats => $env{'form.togglecats'},
                                              categorize => $env{'form.categorize'},
                                          };
+        $changes{'togglecatscomm'} = 1;
+        $changes{'categorizecomm'} = 1;
+        $domconfig{'coursecategories'} = {
+                                             togglecats => $env{'form.togglecatscomm'},
+                                             categorize => $env{'form.categorizecomm'},
+                                         };
     }
     if (ref($cathash) eq 'HASH') {
         if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '')  && ($env{'form.instcode'} == 0)) {
             push (@deletecategory,'instcode::0');
         }
+        if (($domconfig{'coursecategories'}{'cats'}{'communities::0'} ne '')  && ($env{'form.communities'} == 0)) {
+            push(@deletecategory,'communities::0');
+        }
     }
     my (@predelcats,@predeltrails,%predelallitems,%sort_by_deltrail);
     if (ref($cathash) eq 'HASH') {
@@ -5288,10 +5737,26 @@ sub modify_coursecategories {
             $adds{$newitem} = 1;
         }
     }
+    if ($env{'form.communities'} eq '1') {
+        if (ref($cathash) eq 'HASH') {
+            my $newitem = 'communities::0';
+            if ($cathash->{$newitem} eq '') {
+                $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.communities_pos'};
+                $adds{$newitem} = 1;
+            }
+        } else {
+            my $newitem = 'communities::0';
+            $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.communities_pos'};
+            $adds{$newitem} = 1;
+        }
+    }
     if ($env{'form.addcategory_name'} ne '') {
-        my $newitem = &escape($env{'form.addcategory_name'}).'::0';
-        $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'};
-        $adds{$newitem} = 1;
+        if (($env{'form.addcategory_name'} ne 'instcode') &&
+            ($env{'form.addcategory_name'} ne 'communities')) {
+            my $newitem = &escape($env{'form.addcategory_name'}).'::0';
+            $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'};
+            $adds{$newitem} = 1;
+        }
     }
     my $putresult;
     if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) {
@@ -5328,12 +5793,15 @@ sub modify_coursecategories {
         $putresult = &Apache::lonnet::put_dom('configuration',\%domconfig,$dom);
         if ($putresult eq 'ok') {
             my %title = (
-                         togglecats  => 'Show/Hide a course in the catalog',
-                         categorize     => 'Category assigned to course',
+                         togglecats     => 'Show/Hide a course in catalog',
+                         categorize     => 'Assign a category to a course',
+                         togglecatscomm => 'Show/Hide a community in catalog',
+                         categorizecomm => 'Assign a category to a community',
                         );
             my %level = (
-                         dom => 'set from "Modify Course" (Domain)',
-                         crs => 'set from "Parameters" (Course)',
+                         dom  => 'set in Domain ("Modify Course/Community")',
+                         crs  => 'set in Course ("Course Configuration")',
+                         comm => 'set in Community ("Community Configuration")',
                         );
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'togglecats'}) {
@@ -5342,6 +5810,12 @@ sub modify_coursecategories {
             if ($changes{'categorize'}) {
                 $resulttext .= '<li>'.&mt("$title{'categorize'} $level{$env{'form.categorize'}}").'</li>';
             }
+            if ($changes{'togglecatscomm'}) {
+                $resulttext .= '<li>'.&mt("$title{'togglecatscomm'} $level{$env{'form.togglecatscomm'}}").'</li>';
+            }
+            if ($changes{'categorizecomm'}) {
+                $resulttext .= '<li>'.&mt("$title{'categorizecomm'} $level{$env{'form.categorizecomm'}}").'</li>';
+            }
             if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) {
                 my $cathash;
                 if (ref($domconfig{'coursecategories'}) eq 'HASH') {
@@ -5391,7 +5865,7 @@ sub modify_coursecategories {
                           &mt('An error occurred: [_1]',$putresult).'</span>';
         }
     } else {
-        $resulttext = &mt('No changes made to course categories');
+        $resulttext = &mt('No changes made to course and community categories');
     }
     return $resulttext;
 }
@@ -5521,6 +5995,210 @@ sub modify_serverstatuses {
     return $resulttext;
 }
 
+sub modify_helpsettings {
+    my ($r,$dom,$confname,%domconfig) = @_;
+ 	my ($resulttext,$errors,%changes,%helphash);
+ 	
+ 	my $customhelpfile  = $env{'form.loginhelpurl.filename'};
+    my $defaulthelpfile = 'defaulthelp.html';
+ 	my $servadm = $r->dir_config('lonAdmEMail');
+    my ($configuserok,$author_ok,$switchserver) = 
+        &config_check($dom,$confname,$servadm);
+ 	
+ 	my %defaultchecked = ('submitbugs'	=> 'on');
+ 	my @offon = ('off','on');
+    my %title = ( submitbugs     => 'Display link for users to submit a bug', 
+    			  loginhelpurl  => 'Unauthenticated login help page set to custom file');
+    			  
+    my @toggles = ('submitbugs');
+
+    $helphash{'helpsettings'} = {};
+    
+    if (ref($domconfig{'helpsettings'}) ne 'HASH') {
+        if ($domconfig{'helpsettings'} eq '') {
+            $domconfig{'helpsettings'} = {};
+        }
+    }
+    
+    if (ref($domconfig{'helpsettings'}) eq 'HASH') {
+    	
+        foreach my $item (@toggles) {
+        	
+			if ($defaultchecked{$item} eq 'on') { 
+				if (($domconfig{'helpsettings'}{$item} eq '') &&
+					 ($env{'form.'.$item} eq '0')) {
+					$changes{$item} = 1;
+				} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+					$changes{$item} = 1;
+				}
+			} elsif ($defaultchecked{$item} eq 'off') {
+				if (($domconfig{'helpsettings'}{$item} eq '') &&
+					 ($env{'form.'.$item} eq '1')) {
+					$changes{$item} = 1;
+				} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+					$changes{$item} = 1;
+				}
+			}
+			$helphash{'helpsettings'}{$item} = $env{'form.'.$item};
+		}
+		
+		if ($customhelpfile ne '') {
+			my $error;
+			if ($configuserok eq 'ok') {
+				if ($switchserver) {
+					$error = &mt("Upload of custom help file is not permitted to this server: [_1]",$switchserver);
+				} else {
+					if ($author_ok eq 'ok') {
+						my ($result,$loginhelpurl) =
+							&publishlogo($r,'upload','loginhelpurl',$dom,
+										 $confname,'help','','',$customhelpfile);
+						if ($result eq 'ok') {
+							$helphash{'helpsettings'}{'loginhelpurl'} = $loginhelpurl;
+							$changes{'loginhelpurl'} = 1;
+						} else {
+							$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$customhelpfile,$result);
+						}
+					} else {
+						$error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3].  Error was: [_4].",$customhelpfile,$confname,$dom,$author_ok);
+					}
+				}
+			} else {
+				$error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$customhelpfile,$confname,$dom,$configuserok);
+			}
+			if ($error) {
+				&Apache::lonnet::logthis($error);
+				$errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+			}
+		}
+		
+        if ($domconfig{'helpsettings'}{'loginhelpurl'} ne '') {
+            if ($env{'form.loginhelpurl_del'}) {
+                $helphash{'helpsettings'}{'loginhelpurl'} = '';
+                $changes{'loginhelpurl'} = 1;
+            }
+        }
+    }
+    
+    
+    my $putresult;
+    
+    if (keys(%changes) > 0) {
+    	$putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom);
+    } else {
+    	$putresult = 'ok';
+    }
+                                             
+    if ($putresult eq 'ok') {
+        if (keys(%changes) > 0) {
+			$resulttext = &mt('Changes made:').'<ul>';
+			foreach my $item (sort(keys(%changes))) {
+				if ($item eq 'submitbugs') {
+					$resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
+				}
+				if ($item eq 'loginhelpurl') {
+					if ($helphash{'helpsettings'}{'loginhelpurl'} eq '') {
+                        $resulttext .= '<li>'.&mt('[_1] help file removed; [_2] file will be used for the unathorized help page in this domain.',$customhelpfile,$defaulthelpfile).'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt("$title{$item} [_1]",$customhelpfile).'</li>';
+                    }
+				}
+			}
+			$resulttext .= '</ul>';
+		} else {
+			$resulttext = &mt('No changes made to help settings');
+		}
+    } else {
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
+    }
+    if ($errors) {
+        $resulttext .= &mt('The following errors occurred: ').'<ul>'.
+                       $errors.'</ul>';
+    }
+    return $resulttext;
+}
+
+sub modify_coursedefaults {
+    my ($dom,%domconfig) = @_;
+    my ($resulttext,$errors,%changes,%defaultshash);
+    my %defaultchecked = ('canuse_pdfforms' => 'off');
+    my @offon = ('off','on');
+    my @toggles = ('canuse_pdfforms');
+
+    $defaultshash{'coursedefaults'} = {};
+
+    if (ref($domconfig{'coursedefaults'}) ne 'HASH') {
+        if ($domconfig{'coursedefaults'} eq '') {
+            $domconfig{'coursedefaults'} = {};
+        }
+    }
+
+    if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+        foreach my $item (@toggles) {
+            if ($defaultchecked{$item} eq 'on') {
+                if (($domconfig{'coursedefaults'}{$item} eq '') &&
+                    ($env{'form.'.$item} eq '0')) {
+                    $changes{$item} = 1;
+                } elsif ($domconfig{'coursdefaults'}{$item} ne $env{'form.'.$item}) {
+                    $changes{$item} = 1;
+                }
+            } elsif ($defaultchecked{$item} eq 'off') {
+                if (($domconfig{'coursedefaults'}{$item} eq '') &&
+                    ($env{'form.'.$item} eq '1')) {
+                    $changes{$item} = 1;
+                } elsif ($domconfig{'coursedefaults'}{$item} ne $env{'form.'.$item}) {
+                    $changes{$item} = 1;
+                }
+            }
+            $defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item};
+        }
+        my $currdefresponder = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
+        my $newdefresponder = $env{'form.anonsurvey_threshold'};
+        $newdefresponder =~ s/\D//g;
+        if ($newdefresponder eq '' || $newdefresponder < 1) {
+            $newdefresponder = 1;
+        }
+        $defaultshash{'coursedefaults'}{'anonsurvey_threshold'} = $newdefresponder;
+        if ($currdefresponder ne $newdefresponder) {
+            unless ($currdefresponder eq '' && $newdefresponder == 10) {
+                $changes{'anonsurvey_threshold'} = 1;
+            }
+        }
+    }
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
+                                             $dom);
+    if ($putresult eq 'ok') {
+        if (keys(%changes) > 0) {
+            if ($changes{'canuse_pdfforms'}) {
+                my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+                $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};
+                my $cachetime = 24*60*60;
+                &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+            }
+            $resulttext = &mt('Changes made:').'<ul>';
+            foreach my $item (sort(keys(%changes))) {
+                if ($item eq 'canuse_pdfforms') {
+                    if ($env{'form.'.$item} eq '1') {
+                        $resulttext .= '<li>'.&mt("Course/Community users can create/upload PDF forms set to 'on'").'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>';
+                    }
+                } 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 {
+            $resulttext = &mt('No changes made to course defaults');
+        }
+    } else {
+        $resulttext = '<span class="LC_error">'.
+            &mt('An error occurred: [_1]',$putresult).'</span>';
+    }
+    return $resulttext;
+}
+
 sub recurse_check {
     my ($chkcats,$categories,$depth,$name) = @_;
     if (ref($chkcats->[$depth]{$name}) eq 'ARRAY') {
@@ -5561,4 +6239,37 @@ sub recurse_cat_deletes {
     return;
 }
 
+sub dom_servers {
+    my ($dom) = @_;
+    my (%uniqservers,%servers);
+    my $primaryserver = &Apache::lonnet::hostname(&Apache::lonnet::domain($dom,'primary'));
+    my @machinedoms = &Apache::lonnet::machine_domains($primaryserver);
+    foreach my $mdom (@machinedoms) {
+        my %currservers = %servers;
+        my %server = &Apache::lonnet::get_servers($mdom);
+        %servers = (%currservers,%server);
+    }
+    my %by_hostname;
+    foreach my $id (keys(%servers)) {
+        push(@{$by_hostname{$servers{$id}}},$id);
+    }
+    foreach my $hostname (sort(keys(%by_hostname))) {
+        if (@{$by_hostname{$hostname}} > 1) {
+            my $match = 0;
+            foreach my $id (@{$by_hostname{$hostname}}) {
+                if (&Apache::lonnet::host_domain($id) eq $dom) {
+                    $uniqservers{$id} = $hostname;
+                    $match = 1;
+                }
+            }
+            unless ($match) {
+                $uniqservers{$by_hostname{$hostname}[0]} = $hostname;
+            }
+        } else {
+            $uniqservers{$by_hostname{$hostname}[0]} = $hostname;
+        }
+    }
+    return %uniqservers;
+}
+
 1;