--- loncom/interface/domainprefs.pm	2009/03/31 16:59:01	1.91
+++ loncom/interface/domainprefs.pm	2009/07/25 14:44:50	1.98
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.91 2009/03/31 16:59:01 raeburn Exp $
+# $Id: domainprefs.pm,v 1.98 2009/07/25 14:44:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -162,7 +162,7 @@ sub handler {
                                 col2 => 'Information settable when self-creating account (if directory data blank)'}],
                   },
         'scantron' =>
-                  { text => 'Scantron format file',
+                  { text => 'Bubblesheet format file',
                     help => 'Domain_Configuration_Scantron_Format',
                     header => [ {col1 => 'Item',
                                  col2 => '',
@@ -204,7 +204,6 @@ sub handler {
         &Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname);
     } else {
         if (keys(%domconfig) == 0) {
-            &Apache::lonconfigsettings::print_header($r,$phase,$context);
             my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
             my @ids=&Apache::lonnet::current_machine_ids();
             if (!grep(/^\Q$primarylibserv\E$/,@ids)) {
@@ -222,6 +221,7 @@ sub handler {
                     }
                 }
                 if ($custom_img_count > 0) {
+                    &Apache::lonconfigsettings::print_header($r,$phase,$context);
                     my $switch_server = &check_switchserver($dom,$confname);
                     $r->print(
     &mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'<br />'.
@@ -242,7 +242,11 @@ sub handler {
 }
 
 sub process_changes {
-    my ($r,$dom,$confname,$action,$roles,%domconfig) = @_;
+    my ($r,$dom,$confname,$action,$roles,$values) = @_;
+    my %domconfig;
+    if (ref($values) eq 'HASH') {
+        %domconfig = %{$values};
+    }
     my $output;
     if ($action eq 'login') {
         $output = &modify_login($r,$dom,$confname,%domconfig);
@@ -630,6 +634,7 @@ sub print_rolecolors {
     my %defaults = (
                    img => $defaultdesign{$role.'.img'},
                    font => $defaultdesign{$role.'.font'},
+		   fontmenu => $defaultdesign{$role.'.fontmenu'},
                    );
     foreach my $item (@bgs) {
         $defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item};
@@ -647,6 +652,10 @@ sub print_rolecolors {
                 $designs{'font'} = $settings->{$role}->{'font'};
                 $is_custom{'font'} = 1;
             }
+            if ($settings->{$role}->{'fontmenu'} ne '') {
+                $designs{'fontmenu'} = $settings->{$role}->{'fontmenu'};
+                $is_custom{'fontmenu'} = 1;
+            }
             foreach my $item (@bgs) {
                 if ($settings->{$role}->{$item} ne '') {
                     $designs{'bgs'}{$item} = $settings->{$role}->{$item};
@@ -665,6 +674,10 @@ sub print_rolecolors {
             $designs{img} = $designhash{$dom.'.'.$role.'.img'};
             $is_custom{'img'} = 1;
         }
+        if ($designhash{$dom.'.'.$role.'.fontmenu'} ne '') {
+            $designs{fontmenu} = $designhash{$dom.'.'.$role.'.fontmenu'};
+            $is_custom{'fontmenu'} = 1; 
+        }
         if ($designhash{$dom.'.'.$role.'.font'} ne '') {
             $designs{font} = $designhash{$dom.'.'.$role.'.font'};
             $is_custom{'font'} = 1;
@@ -693,7 +706,7 @@ sub display_color_options {
     my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,
         $images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_;
     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    my $datatable = '<tr'.$css_class.'>'.
+    my $datatable = '<tr>'.
         '<td>'.$choices->{'font'}.'</td>';
     if (!$is_custom->{'font'}) {
         $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>';
@@ -707,6 +720,20 @@ sub display_color_options {
                   '&nbsp;<span id="css_'.$role.'_font" style="background-color: '.
                   $designs->{'font'}.';">&nbsp;&nbsp;&nbsp;</span>'.
                   '</span></td></tr>';
+    $datatable .= '<tr'.$css_class.'>'.
+        '<td>'.$choices->{'fontmenu'}.'</td>';
+    if (!$is_custom->{'fontmenu'}) {
+        $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>';
+    } else {
+        $datatable .= '<td>&nbsp;</td>';
+    }
+    $fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'});
+    $datatable .= '<td><span class="LC_nobreak">'.
+                  '<input type="text" size="10" name="'.$role.'_fontmenu"'.
+                  ' value="'.$designs->{'fontmenu'}.'" />&nbsp;'.$fontlink.
+                  '&nbsp;<span id="css_'.$role.'_fontmenu" style="background-color: '.
+                  $designs->{'fontmenu'}.';">&nbsp;&nbsp;&nbsp;</span>'.
+                  '</span></td></tr>';
     my $switchserver = &check_switchserver($dom,$confname);
     foreach my $img (@{$images}) {
 	$itemcount ++;
@@ -992,7 +1019,7 @@ sub print_quotas {
     my $typecount = 0;
     my $css_class;
     if ($context eq 'requestcourses') {
-        @usertools = ('official','unofficial');
+        @usertools = ('official','unofficial','community');
     } else {
         @usertools = ('aboutme','blog','portfolio');
     }
@@ -1090,7 +1117,9 @@ sub print_quotas {
     $typecount ++;
     $css_class = $typecount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>'.
-                  '<td><br/>'.&mt('LON-CAPA Advanced Users').'</td>'.
+                  '<td>'.&mt('LON-CAPA Advanced Users').
+                  ' <span class="LC_nobreak">('.
+                  &mt('overrides affiliation').')</span></td>'.
                   '<td class="LC_left_item" colspan="2"><br />';
     foreach my $item (@usertools) {
         my $checked;
@@ -1111,8 +1140,7 @@ sub print_quotas {
                       '" value="_LC_adv" '.$checked.'/>'.$titles{$item}.
                       '</label></span>&nbsp; ';
     }
-    $datatable .= '<span class="LC_nobreak">('.&mt('overrides affiliation').
-                  ')</span></td></tr>';
+    $datatable .= '</td></tr>';
     $$rowtotal += $typecount;
     return $datatable;
 }
@@ -1295,8 +1323,8 @@ sub print_directorysrch {
     $$rowtotal += 2;
     if (ref($usertypes) eq 'HASH') {
         if (keys(%{$usertypes}) > 0) {
-            $datatable .= &users_cansearch_row($settings,$types,$usertypes,$dom,
-                                               $numinrow,$othertitle);
+            $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
+                                         $numinrow,$othertitle,'cansearch');
             $cansrchrow = 1;
         }
     }
@@ -1311,7 +1339,7 @@ sub print_directorysrch {
     foreach my $title (@{$titleorder}) {
         if (defined($searchtitles->{$title})) {
             my $check = ' ';
-            if (ref($settings) eq 'HASH') { 
+            if (ref($settings) eq 'HASH') {
                 if (ref($settings->{'searchby'}) eq 'ARRAY') {
                     if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
                         $check = ' checked="checked" ';
@@ -1444,6 +1472,7 @@ sub tool_titles {
                      portfolio  => 'Portfolio',
                      official   => 'Official courses (with institutional codes)',
                      unofficial => 'Unofficial courses',
+                     community  => 'Communities',
                  );
     return %titles;
 }
@@ -1566,6 +1595,16 @@ sub print_usercreation {
             }
             $datatable .= '</td></tr>';
         }
+        my ($othertitle,$usertypes,$types) =
+            &Apache::loncommon::sorted_inst_types($dom);
+        if (ref($usertypes) eq 'HASH') {
+            if (keys(%{$usertypes}) > 0) {
+                $datatable .= &insttypes_row($settings->{cancreate},$types,$usertypes,
+                                             $dom,$numinrow,$othertitle,
+                                             'statustocreate');
+                $$rowtotal ++;
+            }
+        }
     } else {
         my @contexts = ('author','course','domain');
         my @authtypes = ('int','krb4','krb5','loc');
@@ -1819,8 +1858,8 @@ sub print_scantronformat {
         %confhash);
     my $switchserver = &check_switchserver($dom,$confname);
     my %lt = &Apache::lonlocal::texthash (
-                default => 'Default scantron format file error',
-                custom  => 'Custom scantron format file error',
+                default => 'Default bubblesheet format file error',
+                custom  => 'Custom bubblesheet format file error',
              );
     my %scantronfiles = (
         default => 'default.tab',
@@ -1893,7 +1932,7 @@ sub print_scantronformat {
                 }
             }
         } else {
-            $error{'default'} = &mt("Unable to copy default scantron formatfile to domain's RES space: [_1]",$switchserver);
+            $error{'default'} = &mt("Unable to copy default bubblesheet formatfile to domain's RES space: [_1]",$switchserver);
         }
     }
     if (ref($settings) eq 'HASH') {
@@ -2456,10 +2495,18 @@ sub modifiable_userdata_row {
     return $output;
 }
 
-sub users_cansearch_row {
-    my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle) = @_;
+sub insttypes_row {
+    my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context) = @_;
+    my %lt = &Apache::lonlocal::texthash (
+                      cansearch => 'Users allowed to search',
+                      statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)',
+             );
+    my $showdom;
+    if ($context eq 'cansearch') {
+        $showdom = ' ('.$dom.')';
+    }
     my $output =  '<tr class="LC_odd_row">'.
-                  '<td>'.&mt('Users allowed to search').' ('.$dom.')'.
+                  '<td>'.$lt{$context}.$showdom.
                   '</td><td class="LC_left_item" colspan="2"><table>';
     my $rem;
     if (ref($types) eq 'ARRAY') {
@@ -2473,14 +2520,16 @@ sub users_cansearch_row {
                     $output .= '<tr>';
                 }
                 my $check = ' ';
-                if (ref($settings->{'cansearch'}) eq 'ARRAY') {
-                    if (grep(/^\Q$types->[$i]\E$/,@{$settings->{'cansearch'}})) {
+                if (ref($settings->{$context}) eq 'ARRAY') {
+                    if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) {
                         $check = ' checked="checked" ';
                     }
+                } elsif ($context eq 'statustocreate') {
+                    $check = ' checked="checked" ';
                 }
                 $output .= '<td class="LC_left_item">'.
                            '<span class="LC_nobreak"><label>'.
-                           '<input type="checkbox" name="cansearch" '.
+                           '<input type="checkbox" name="'.$context.'" '.
                            'value="'.$types->[$i].'"'.$check.'/>'.
                            $usertypes->{$types->[$i]}.'</label></span></td>';
             }
@@ -2495,13 +2544,15 @@ sub users_cansearch_row {
         $output .= '<td class="LC_left_item">';
     }
     my $defcheck = ' ';
-    if (ref($settings->{'cansearch'}) eq 'ARRAY') {
-        if (grep(/^default$/,@{$settings->{'cansearch'}})) {
+    if (ref($settings->{$context}) eq 'ARRAY') {
+        if (grep(/^default$/,@{$settings->{$context}})) {
             $defcheck = ' checked="checked" ';
         }
+    } elsif ($context eq 'statustocreate') {
+        $defcheck = ' checked="checked" ';
     }
     $output .= '<span class="LC_nobreak"><label>'.
-               '<input type="checkbox" name="cansearch" '.
+               '<input type="checkbox" name="'.$context.'" '.
                'value="default"'.$defcheck.'/>'.
                $othertitle.'</label></span></td>'.
                '</tr></table></td></tr>';
@@ -2671,6 +2722,7 @@ sub color_font_choices {
             links => "Link colors",
             images => "Images",
             font => "Font color",
+            fontmenu => "Font Menu",
             pgbg => "Page",
             tabbg => "Header",
             sidebg => "Border",
@@ -2737,6 +2789,7 @@ sub modify_colors {
             @bgs = ('pgbg','tabbg','sidebg'); 
         }
         $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
+	$confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
         foreach my $item (@bgs,@links,@logintext) {
             $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
         }
@@ -2850,6 +2903,15 @@ sub modify_colors {
                         $changes{$role}{'font'} = 1;
                     }
                 }
+                if ($domconfig->{$role}{'fontmenu'} ne '') {
+                    if ($confhash->{$role}{'fontmenu'} ne $domconfig->{$role}{'fontmenu'}) {
+                        $changes{$role}{'fontmenu'} = 1;
+                    }
+                } else {
+                    if ($confhash->{$role}{'fontmenu'}) {
+                        $changes{$role}{'fontmenu'} = 1;
+                    }
+                }
                 foreach my $item (@bgs) {
                     if ($domconfig->{$role}{$item} ne '') {
                         if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) {
@@ -3288,7 +3350,7 @@ sub modify_quotas {
         $context = $action;
     }
     if ($context eq 'requestcourses') {
-        @usertools = ('official','unofficial');
+        @usertools = ('official','unofficial','community');
     } else {
         @usertools = ('aboutme','blog','portfolio');
     }
@@ -3974,10 +4036,19 @@ sub modify_usercreation {
             $cancreate{$item} = $env{'form.can_createuser_'.$item};
         }
     }
+    my ($othertitle,$usertypes,$types) = 
+        &Apache::loncommon::sorted_inst_types($dom);
+    if (ref($types) eq 'ARRAY') {
+        if (@{$types} > 0) {
+            @{$cancreate{'statustocreate'}} = 
+                &Apache::loncommon::get_env_multiple('form.statustocreate');
+        }
+        push(@contexts,'statustocreate');
+    }
     if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {
         foreach my $item (@contexts) {
-            if ($item eq 'selfcreate') {
-                if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') { 
+            if (($item eq 'selfcreate') || ($item eq 'statustocreate')) {
+                if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') {
                     foreach my $curr (@{$curr_usercreation{'cancreate'}{$item}}) {
                         if (!grep(/^$curr$/,@{$cancreate{$item}})) {
                             if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
@@ -4164,6 +4235,29 @@ sub modify_usercreation {
                             }
                             $chgtext .= '</ul>';
                         }
+                    } elsif ($type eq 'statustocreate') {
+                        if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') &&
+                            (ref($cancreate{'statustocreate'}) eq 'ARRAY')) {
+                            if (@{$cancreate{'selfcreate'}} > 0) {
+                                if (@{$cancreate{'statustocreate'}} == 0) {
+                                    if (!grep(/^email$/,@{$cancreate{'selfcreate'}})) {
+                                        $chgtext .= &mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.");
+                                    }
+                                } elsif (ref($usertypes) eq 'HASH') {
+                                    if (grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) {
+                                        $chgtext .= &mt('creation of a new account for an institutional user is restricted to the following institutional affiliation(s):').'<ul>';
+                                        foreach my $case (@{$cancreate{$type}}) {
+                                            if ($case eq 'default') {
+                                                $chgtext .= '<li>'.$othertitle.'</li>';
+                                            } else {
+                                                $chgtext .= '<li>'.$usertypes->{$case}.'</li>';
+                                            }
+                                        }
+                                        $chgtext .= '</ul>';
+                                    }
+                                }
+                            }
+                        }
                     } else {
                         if ($cancreate{$type} eq 'none') {
                             $chgtext .= &mt('creation of new users is not permitted, except by a Domain Coordinator.');