--- loncom/interface/domainprefs.pm	2014/05/05 23:34:42	1.160.6.45
+++ loncom/interface/domainprefs.pm	2014/04/23 10:11:26	1.236
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.45 2014/05/05 23:34:42 raeburn Exp $
+# $Id: domainprefs.pm,v 1.236 2014/04/23 10:11:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -213,15 +213,15 @@ sub handler {
                 'quotas','autoenroll','autoupdate','autocreate',
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
-                'serverstatuses','requestcourses','coursedefaults',
-                'usersessions','loadbalancing','requestauthor',
-                'selfenrollment','inststatus'],$dom);
+                'serverstatuses','requestcourses','helpsettings',
+                'coursedefaults','usersessions','loadbalancing',
+                'requestauthor','selfenrollment','inststatus'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','selfcreation','usermodification','scantron',
                        'requestcourses','requestauthor','coursecategories',
-                       'serverstatuses','coursedefaults','selfenrollment',
-                       'usersessions');
+                       'serverstatuses','helpsettings',
+                       'coursedefaults','selfenrollment','usersessions');
     my %existing;
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
         %existing = %{$domconfig{'loadbalancing'}};
@@ -387,9 +387,7 @@ sub handler {
         'coursecategories' =>
                   { text => 'Cataloging of courses/communities',
                     help => 'Domain_Configuration_Cataloging_Courses',
-                    header => [{col1 => 'Catalog type/availability',
-                                col2 => '',},
-                               {col1 => 'Category settings for standard catalog',
+                    header => [{col1 => 'Category settings',
                                 col2 => '',},
                                {col1 => 'Categories',
                                 col2 => '',
@@ -407,6 +405,14 @@ sub handler {
                   print => \&print_serverstatuses,
                   modify => \&modify_serverstatuses,
                  },
+        'helpsettings' =>
+                 {text   => 'Help page settings',
+                  help   => 'Domain_Configuration_Help_Settings',
+                  header => [{col1 => 'Help Settings (logged-in users)',
+                              col2 => 'Value'}],
+                  print  => \&print_helpsettings,
+                  modify => \&modify_helpsettings,
+                 },
         'coursedefaults' => 
                  {text => 'Course/Community defaults',
                   help => 'Domain_Configuration_Course_Defaults',
@@ -429,6 +435,14 @@ sub handler {
                   print => \&print_selfenrollment,
                   modify => \&modify_selfenrollment,
                  },
+        'privacy' => 
+                 {text   => 'User Privacy',
+                  help   => 'Domain_Configuration_User_Privacy',
+                  header => [{col1 => 'Setting',
+                              col2 => 'Value',}],
+                  print => \&print_privacy,
+                  modify => \&modify_privacy,
+                 },
         'usersessions' =>
                  {text  => 'User session hosting/offloading',
                   help  => 'Domain_Configuration_User_Sessions',
@@ -606,13 +620,15 @@ sub process_changes {
     } elsif ($action eq 'scantron') {
         $output = &modify_scantron($r,$dom,$confname,$lastactref,%domconfig);
     } elsif ($action eq 'coursecategories') {
-        $output = &modify_coursecategories($dom,$lastactref,%domconfig);
+        $output = &modify_coursecategories($dom,%domconfig);
     } elsif ($action eq 'serverstatuses') {
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
         $output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'requestauthor') {
         $output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig);
+    } elsif ($action eq 'helpsettings') {
+        $output = &modify_helpsettings($r,$dom,$confname,%domconfig);
     } elsif ($action eq 'coursedefaults') {
         $output = &modify_coursedefaults($dom,$lastactref,%domconfig);
     } elsif ($action eq 'selfenrollment') {
@@ -649,7 +665,7 @@ sub print_config_box {
     if ($numheaders > 1) {
         my $colspan = '';
         my $rightcolspan = '';
-        if (($action eq 'rolecolors') || ($action eq 'defaults') ||
+        if (($action eq 'rolecolors') || ($action eq 'coursecategories') || ($action eq 'defaults') ||
             (($action eq 'login') && ($numheaders < 3))) {
             $colspan = ' colspan="2"';
         }
@@ -666,7 +682,7 @@ sub print_config_box {
              </tr>';
         $rowtotal ++;
         if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') ||
-            ($action eq 'usermodification') || ($action eq 'defaults') ||
+            ($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') ||
             ($action eq 'selfenrollment') || ($action eq 'usersessions')) {
             $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
@@ -697,14 +713,8 @@ sub print_config_box {
             $rowtotal ++;
         if (($action eq 'autoupdate') || ($action eq 'usercreation') ||
             ($action eq 'selfcreation') || ($action eq 'selfenrollment') ||
-            ($action eq 'usersessions') || ($action eq 'coursecategories')) {
-            if ($action eq 'coursecategories') {
-                $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
-                $colspan = ' colspan="2"';
-            } else {
-                $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal);
-            }
-            $output .= '
+            ($action eq 'usersessions')) {
+            $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal).'
            </table>
           </td>
          </tr>
@@ -714,16 +724,14 @@ 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>'."\n";
-            if ($action eq 'coursecategories') {
-                $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
-            } else {
-                $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
-            }
+             </tr>'."\n".
+            $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
             $rowtotal ++;
         } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
                   ($action eq 'defaults')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
+        } elsif ($action eq 'coursecategories') {
+            $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
             if ($numheaders == 3) {
                 $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'
@@ -4063,43 +4071,6 @@ sub print_selfcreation {
                 $$rowtotal ++;
             }
         }
-        my @fields = ('lastname','firstname','middlename','permanentemail','id','inststatus');
-        my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
-        $fieldtitles{'inststatus'} = &mt('Institutional status');
-        my $rem;
-        my $numperrow = 2;
-        my $css_class = $$rowtotal%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'>'.
-                     '<td class="LC_left_item">'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'</td>'.
-                     '<td class="LC_left_item">'."\n".
-                     '<table><tr><td>'."\n";
-        for (my $i=0; $i<@fields; $i++) {
-            $rem = $i%($numperrow);
-            if ($rem == 0) {
-                if ($i > 0) {
-                    $datatable .= '</tr>';
-                }
-                $datatable .= '<tr>';
-            }
-            my $currval;
-            if (ref($createsettings->{'shibenv'}) eq 'HASH') {
-                $currval = $createsettings->{'shibenv'}{$fields[$i]};
-            }
-            $datatable .= '<td class="LC_left_item">'.
-                          '<span class="LC_nobreak">'.
-                          '<input type="text" name="shibenv_'.$fields[$i].'" '.
-                          'value="'.$currval.'" size="10" />&nbsp;'.
-                          $fieldtitles{$fields[$i]}.'</span></td>';
-        }
-        my $colsleft = $numperrow - $rem;
-        if ($colsleft > 1 ) {
-            $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
-                         '&nbsp;</td>';
-        } elsif ($colsleft == 1) {
-            $datatable .= '<td class="LC_left_item">&nbsp;</td>';
-        }
-        $datatable .= '</tr></table></td></tr>';
-        $$rowtotal ++;
     } elsif ($position eq 'middle') {
         my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom);
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
@@ -4110,7 +4081,7 @@ sub print_selfcreation {
             foreach my $status (@{$types}) {
                 $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
                                                        $numinrow,$$rowtotal,$usertypes);
-                $$rowtotal ++;
+            $$rowtotal ++;
             }
         }
     } else {
@@ -4156,8 +4127,8 @@ sub print_selfcreation {
         $additional .= '</div>'."\n";
 
         ($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
-                                                     \%choices,$$rowtotal,$onclick,$additional);
-        $$rowtotal ++;
+                                                     \%choices,$itemcount,$onclick,$additional);
+        $$rowtotal += $itemcount;
         $datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal);
         $$rowtotal ++;
         my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
@@ -4775,49 +4746,6 @@ sub print_coursecategories {
     my ($position,$dom,$hdritem,$settings,$rowtotal) = @_;
     my $datatable;
     if ($position eq 'top') {
-        my (%checked);
-        my @catitems = ('unauth','auth');
-        my @cattypes = ('std','domonly','codesrch','none');
-        $checked{'unauth'} = 'std';
-        $checked{'auth'} = 'std';
-        if (ref($settings) eq 'HASH') {
-            foreach my $type (@cattypes) {
-                if ($type eq $settings->{'unauth'}) {
-                    $checked{'unauth'} = $type;
-                }
-                if ($type eq $settings->{'auth'}) {
-                    $checked{'auth'} = $type;
-                }
-            }
-        }
-        my %lt = &Apache::lonlocal::texthash (
-                                               unauth   => 'Catalog type for unauthenticated users',
-                                               auth     => 'Catalog type for authenticated users',
-                                               none     => 'No catalog',
-                                               std      => 'Standard catalog',
-                                               domonly  => 'Domain-only catalog',
-                                               codesrch => "Code search form",
-                                             );
-       my $itemcount = 0;
-       foreach my $item (@catitems) {
-           my $css_class = $itemcount%2? ' class="LC_odd_row"':'';
-           $datatable .= '<tr '.$css_class.'>'.
-                         '<td>'.$lt{$item}.'</td>'.
-                         '<td class="LC_right_item"><span class="LC_nobreak">';
-           foreach my $type (@cattypes) {
-               my $ischecked;
-               if ($checked{$item} eq $type) {
-                   $ischecked=' checked="checked"';
-               }
-               $datatable .= '<label>'.
-                             '<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked.
-                             ' />'.$lt{$type}.'</label>&nbsp;';
-           }
-           $datatable .= '</td></tr>';
-           $itemcount ++;
-        }
-        $$rowtotal += $itemcount;
-    } elsif ($position eq 'middle') {
         my $toggle_cats_crs = ' ';
         my $toggle_cats_dom = ' checked="checked" ';
         my $can_cat_crs = ' ';
@@ -5024,7 +4952,7 @@ sub print_coursecategories {
                 $datatable .= &initialize_categories($itemcount);
             }
         } else {
-            $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td>'
+            $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[0]->{'col2'}.'</td>'
                           .&initialize_categories($itemcount);
         }
         $$rowtotal += $itemcount;
@@ -5170,9 +5098,9 @@ sub coursecategories_javascript {
         $jstext  = '    var categories = Array(1);'."\n".
                    '    categories[0] = Array("instcode_pos");'."\n"; 
     }
-    my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"');
-    my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"');
-    my $choose_again = '\\n'.&mt('Please use a different name for the new top level category.'); 
+    my $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[
@@ -8355,7 +8283,7 @@ sub modify_selfcreation {
                         if (($item eq 'selfcreate') || ($item eq 'statustocreate') ||
                             ($item eq 'captcha') || ($item eq 'recaptchakeys') || 
                             ($item eq 'emailusername') || ($item eq 'notify') ||
-                            ($item eq 'selfcreateprocessing') || ($item eq 'shibenv')) {
+                            ($item eq 'selfcreateprocessing')) {
                             $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
                         } else {
                             $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -8387,7 +8315,6 @@ sub modify_selfcreation {
     %{$cancreate{'emailusername'}} = ();
     @{$cancreate{'statustocreate'}} = ();
     %{$cancreate{'selfcreateprocessing'}} = ();
-    %{$cancreate{'shibenv'}} = ();
     my %selfcreatetypes = (
                              sso   => 'users authenticated by institutional single sign on',
                              login => 'users authenticated by institutional log-in',
@@ -8505,7 +8432,6 @@ sub modify_selfcreation {
     }
     my @fields = ('lastname','firstname','middlename','generation',
                   'permanentemail','id');
-    my @shibfields = (@fields,'inststatus');
     my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
 #
 # Where usernames may created for institutional log-in and/or institutional single sign on:
@@ -8550,27 +8476,6 @@ sub modify_selfcreation {
                 }
             }
         }
-        foreach my $field (@shibfields) {
-            if ($env{'form.shibenv_'.$field} ne '') {
-                $cancreate{'shibenv'}{$field} = $env{'form.shibenv_'.$field};
-            }
-        }
-        if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {
-            if (ref($curr_usercreation{'cancreate'}{'shibenv'}) eq 'HASH') {
-                foreach my $field (@shibfields) {
-                    if ($env{'form.shibenv_'.$field} ne $curr_usercreation{'cancreate'}{'shibenv'}{$field}) {
-                        push(@{$changes{'cancreate'}},'shibenv');
-                    }
-                }
-            } else {
-                foreach my $field (@shibfields) {
-                    if ($env{'form.shibenv_'.$field}) {
-                        push(@{$changes{'cancreate'}},'shibenv');
-                        last;
-                    }
-                }
-            }
-        }
     }
     foreach my $item (@contexts) {
         if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') {
@@ -8693,9 +8598,6 @@ sub modify_selfcreation {
     if (ref($cancreate{'statustocreate'}) eq 'ARRAY') {
         $save_usercreate{'cancreate'}{'statustocreate'} = $cancreate{'statustocreate'};
     }
-    if (ref($cancreate{'shibenv'}) eq 'HASH') {
-        $save_usercreate{'cancreate'}{'shibenv'} = $cancreate{'shibenv'};
-    }
     $save_usercreate{'cancreate'}{'emailusername'} = $cancreate{'emailusername'};
     $save_usercreate{'emailrule'} = \@email_rule;
 
@@ -8738,22 +8640,6 @@ sub modify_selfcreation {
                                 }
                             }
                         }
-                    } elsif ($type eq 'shibenv') {
-                        if (keys(%{$cancreate{$type}}) == 0) {
-                            $chgtext .= &mt('Shibboleth-autheticated user does not use environment variables to set user information'); 
-                        } else {
-                            $chgtext .= &mt('Shibboleth-autheticated user information set from environment variables, as follows:').
-                                        '<ul>';
-                            foreach my $field (@shibfields) {
-                                next if ($cancreate{$type}{$field} eq '');
-                                if ($field eq 'inststatus') {
-                                    $chgtext .= '<li>'.&mt('Institutional status').' -- '.$cancreate{$type}{$field}.'</li>';
-                                } else {
-                                    $chgtext .= '<li>'.$fieldtitles{$field}.' -- '.$cancreate{$type}{$field}.'</li>';
-                                }
-                            }
-                            $chgtext .= '</ul>';
-                        }  
                     } elsif ($type eq 'statustocreate') {
                         if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') &&
                             (ref($cancreate{'statustocreate'}) eq 'ARRAY')) {
@@ -9425,12 +9311,10 @@ sub modify_scantron {
 }
 
 sub modify_coursecategories {
-    my ($dom,$lastactref,%domconfig) = @_;
+    my ($dom,%domconfig) = @_;
     my ($resulttext,%deletions,%reorderings,%needreordering,%adds,%changes,$errors,
         $cathash);
     my @deletecategory = &Apache::loncommon::get_env_multiple('form.deletecategory');
-    my @catitems = ('unauth','auth');
-    my @cattypes = ('std','domonly','codesrch','none');
     if (ref($domconfig{'coursecategories'}) eq 'HASH') {
         $cathash = $domconfig{'coursecategories'}{'cats'};
         if ($domconfig{'coursecategories'}{'togglecats'} ne $env{'form.togglecats'}) {
@@ -9449,14 +9333,6 @@ sub modify_coursecategories {
             $changes{'categorizecomm'} = 1;
             $domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'};
         }
-        foreach my $item (@catitems) {
-            if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) {
-                if ($domconfig{'coursecategories'}{$item} ne $env{'form.coursecat_'.$item}) {
-                    $changes{$item} = 1;
-                    $domconfig{'coursecategories'}{$item} = $env{'form.coursecat_'.$item};
-                }
-            }
-        }
     } else {
         $changes{'togglecats'} = 1;
         $changes{'categorize'} = 1;
@@ -9468,14 +9344,6 @@ sub modify_coursecategories {
                                              togglecatscomm => $env{'form.togglecatscomm'},
                                              categorizecomm => $env{'form.categorizecomm'},
                                          };
-        foreach my $item (@catitems) {
-            if ($env{'form.coursecat_'.$item} ne 'std') {
-                $changes{$item} = 1;
-            }
-            if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) {
-                $domconfig{'coursecategories'}{$item} = $env{'form.coursecat_'.$item};
-            }
-        }
     }
     if (ref($cathash) eq 'HASH') {
         if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '')  && ($env{'form.instcode'} == 0)) {
@@ -9598,10 +9466,6 @@ sub modify_coursecategories {
                          dom  => 'set in Domain ("Modify Course/Community")',
                          crs  => 'set in Course ("Course Configuration")',
                          comm => 'set in Community ("Community Configuration")',
-                         none     => 'No catalog',
-                         std      => 'Standard catalog',
-                         domonly  => 'Domain-only catalog',
-                         codesrch => 'Code search form',
                         );
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'togglecats'}) {
@@ -9616,12 +9480,6 @@ sub modify_coursecategories {
             if ($changes{'categorizecomm'}) {
                 $resulttext .= '<li>'.&mt("$title{'categorizecomm'} $level{$env{'form.categorizecomm'}}").'</li>';
             }
-            if ($changes{'unauth'}) {
-                $resulttext .= '<li>'.&mt('Catalog type for unauthenticated users set to "'.$level{$env{'form.coursecat_unauth'}}.'"').'</li>';
-            }
-            if ($changes{'auth'}) {
-                $resulttext .= '<li>'.&mt('Catalog type for authenticated users set to "'.$level{$env{'form.coursecat_auth'}}.'"').'</li>';
-            }
             if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) {
                 my $cathash;
                 if (ref($domconfig{'coursecategories'}) eq 'HASH') {
@@ -9666,12 +9524,6 @@ sub modify_coursecategories {
                 }
             }
             $resulttext .= '</ul>';
-            if ($changes{'unauth'} || $changes{'auth'}) {
-                &Apache::loncommon::devalidate_domconfig_cache($dom);
-                if (ref($lastactref) eq 'HASH') {
-                    $lastactref->{'domainconfig'} = 1;
-                }
-            }
         } else {
             $resulttext = '<span class="LC_error">'.
                           &mt('An error occurred: [_1]',$putresult).'</span>';