--- loncom/interface/domainprefs.pm	2012/06/01 11:39:24	1.162
+++ loncom/interface/domainprefs.pm	2012/08/14 15:45:06	1.163
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.162 2012/06/01 11:39:24 raeburn Exp $
+# $Id: domainprefs.pm,v 1.163 2012/08/14 15:45:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,8 +86,8 @@ $dom,$settings,$rowtotal,$action.
 
 $dom is the domain, $settings is a reference to a hash of current settings for
 the current context, $rowtotal is a reference to the scalar used to record the 
-number of rows displayed on the page, and $action is the context (either quotas 
-or requestcourses).
+number of rows displayed on the page, and $action is the context (quotas,  
+requestcourses or requestauthor).
 
 The print_quotas routine was orginally created to display/store information
 about default quota sizes for portfolio spaces for the different types of 
@@ -211,11 +211,13 @@ sub handler {
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
                 'serverstatuses','requestcourses','helpsettings',
-                'coursedefaults','usersessions','loadbalancing'],$dom);
+                'coursedefaults','usersessions','loadbalancing',
+                'requestauthor'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
-                       'requestcourses','coursecategories','serverstatuses','helpsettings',
+                       'requestcourses','requestauthor','coursecategories',
+                       'serverstatuses','helpsettings',
                        'coursedefaults','usersessions');
     if (keys(%servers) > 1) {
         push(@prefs_order,'loadbalancing');
@@ -323,6 +325,14 @@ sub handler {
                              {col1 => 'Setting',
                               col2 => 'Value'}],
                  },
+        'requestauthor' =>
+                 {text => 'Request authoring space',
+                  help => 'Domain_Configuration_Request_Author',
+                  header => [{col1 => 'User affiliation',
+                              col2 => 'Availability/Processing of requests',},
+                             {col1 => 'Setting',
+                              col2 => 'Value'}],
+                 },
         'coursecategories' =>
                   { text => 'Cataloging of courses/communities',
                     help => 'Domain_Configuration_Cataloging_Courses',
@@ -487,6 +497,8 @@ sub process_changes {
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
         $output = &modify_quotas($dom,$action,%domconfig);
+    } elsif ($action eq 'requestauthor') {
+        $output = &modify_quotas($dom,$action,%domconfig);
     } elsif ($action eq 'helpsettings') {
         $output = &modify_helpsettings($r,$dom,$confname,%domconfig);
     } elsif ($action eq 'coursedefaults') {
@@ -549,6 +561,8 @@ sub print_config_box {
             $colspan = ' colspan="2"';
         } elsif ($action eq 'requestcourses') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
+        } elsif ($action eq 'requestauthor') {
+            $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif ($action eq 'helpsettings') {
             $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'usersessions') {
@@ -615,7 +629,9 @@ sub print_config_box {
         } elsif ($action eq 'login') {
             $output .= &print_login('bottom',$dom,$confname,$phase,$settings,\$rowtotal);
         } elsif ($action eq 'requestcourses') {
-            $output .= &print_courserequestmail($dom,$settings,\$rowtotal);
+            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+        } elsif ($action eq 'requestauthor') {
+            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
         } elsif ($action eq 'helpsettings') {
             $output .= &print_helpsettings('bottom',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'usersessions') {
@@ -1376,6 +1392,10 @@ sub print_quotas {
         @options =('norequest','approval','validate','autolimit');
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
+    } elsif ($context eq 'requestauthor') {
+        @usertools = ('author');
+        @options = ('norequest','approval','automatic');
+        %titles = &authorrequest_titles(); 
     } else {
         @usertools = ('aboutme','blog','webdav','portfolio');
         %titles = &tool_titles();
@@ -1383,7 +1403,8 @@ sub print_quotas {
     if (ref($types) eq 'ARRAY') {
         foreach my $type (@{$types}) {
             my $currdefquota;
-            unless ($context eq 'requestcourses') {
+            unless (($context eq 'requestcourses') ||
+                    ($context eq 'requestauthor')) {
                 if (ref($settings) eq 'HASH') {
                     if (ref($settings->{defaultquota}) eq 'HASH') {
                         $currdefquota = $settings->{defaultquota}->{$type}; 
@@ -1453,6 +1474,28 @@ sub print_quotas {
                                 $cell{$item} .= $titles{'unlimited'};
                             }
                         }
+                    } elsif ($context eq 'requestauthor') {
+                        my $curroption;
+                        if (ref($settings) eq 'HASH') {
+                            $curroption = $settings->{$type};
+                        }
+                        if (!$curroption) {
+                            $curroption = 'norequest';
+                        }
+                        foreach my $option (@options) {
+                            my $val = $option;
+                            if ($option eq 'norequest') {
+                                $val = 0;
+                            }
+                            my $checked = '';
+                            if ($option eq $curroption) {
+                                $checked = ' checked="checked"';
+                            }
+                            $datatable .= '<span class="LC_nobreak"><label>'.
+                                  '<input type="radio" name="authorreq_'.$type.
+                                  '" value="'.$val.'"'.$checked.' />'.
+                                  $titles{$option}.'</label></span>&nbsp; ';
+                        }
                     } else {
                         my $checked = 'checked="checked" ';
                         if (ref($settings) eq 'HASH') {
@@ -1478,7 +1521,8 @@ sub print_quotas {
                     $datatable .= '</tr></table>';
                 }
                 $datatable .= '</td>';
-                unless ($context eq 'requestcourses') {
+                unless (($context eq 'requestcourses') ||
+                        ($context eq 'requestauthor')) {
                     $datatable .= 
                               '<td class="LC_right_item"><span class="LC_nobreak">'.
                               '<input type="text" name="quota_'.$type.
@@ -1489,7 +1533,7 @@ sub print_quotas {
             }
         }
     }
-    unless ($context eq 'requestcourses') {
+    unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
         $defaultquota = '20';
         if (ref($settings) eq 'HASH') {
             if (ref($settings->{'defaultquota'}) eq 'HASH') {
@@ -1559,6 +1603,30 @@ sub print_quotas {
                     $defcell{$item} .= $titles{'unlimited'};
                 }
             }
+        } elsif ($context eq 'requestauthor') {
+            my $curroption;
+            if (ref($settings) eq 'HASH') {
+                if (ref($settings->{'requestauthor'}) eq 'HASH') {
+                    $curroption = $settings->{'requestauthor'};
+                }
+            }
+            if (!$curroption) {
+                $curroption = 'norequest';
+            }
+            foreach my $option (@options) {
+                my $val = $option;
+                if ($option eq 'norequest') {
+                    $val = 0;
+                }
+                my $checked = '';
+                if ($option eq $curroption) {
+                    $checked = ' checked="checked"';
+                }
+                $datatable .= '<span class="LC_nobreak"><label>'.
+                              '<input type="radio" name="authorreq_default"'.
+                              ' value="'.$val.'"'.$checked.' />'.
+                              $titles{$option}.'</label></span>&nbsp; ';
+            }
         } else {
             my $checked = 'checked="checked" ';
             if (ref($settings) eq 'HASH') {
@@ -1584,7 +1652,7 @@ sub print_quotas {
         $datatable .= '</tr></table>';
     }
     $datatable .= '</td>';
-    unless ($context eq 'requestcourses') {
+    unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
         $datatable .= '<td class="LC_right_item"><span class="LC_nobreak">'.
                       '<input type="text" name="defaultquota" value="'.
                       $defaultquota.'" size="5" /> Mb</span></td>';
@@ -1662,6 +1730,33 @@ sub print_quotas {
                     $advcell{$item} .= $titles{'unlimited'};
                 }
             }
+        } elsif ($context eq 'requestauthor') {
+            my $curroption;
+            if (ref($settings) eq 'HASH') {
+                $curroption = $settings->{'_LC_adv'};
+            }
+            my $checked = '';
+            if ($curroption eq '') {
+                $checked = ' checked="checked"';
+            }
+            $datatable .= '<span class="LC_nobreak"><label>'.
+                          '<input type="radio" name="authorreq__LC_adv"'.
+                          ' value=""'.$checked.' />'.
+                          &mt('No override set').'</label></span>&nbsp; ';
+            foreach my $option (@options) {
+                my $val = $option;
+                if ($option eq 'norequest') {
+                    $val = 0;
+                }
+                my $checked = '';
+                if ($val eq $curroption) {
+                    $checked = ' checked="checked"';
+                }
+                $datatable .= '<span class="LC_nobreak"><label>'.
+                              '<input type="radio" name="crsreq_'.$item.
+                              '__LC_adv" value="'.$val.'"'.$checked.' />'.
+                              $titles{$option}.'</label></span>&nbsp; ';
+            }
         } else {
             my $checked = 'checked="checked" ';
             if (ref($settings) eq 'HASH') {
@@ -1691,8 +1786,8 @@ sub print_quotas {
     return $datatable;
 }
 
-sub print_courserequestmail {
-    my ($dom,$settings,$rowtotal) = @_;
+sub print_requestmail {
+    my ($dom,$action,$settings,$rowtotal) = @_;
     my ($now,$datatable,%dompersonnel,@domcoord,@currapproval,$rows);
     $now = time;
     $rows = 0;
@@ -1723,9 +1818,14 @@ sub print_courserequestmail {
     my $numinrow = 4;
     my $numdc = @domcoord;
     my $css_class = 'class="LC_odd_row"';
-    $datatable = '<tr'.$css_class.'>'.
-                 ' <td>'.&mt('Receive notification of course requests requiring approval.').
-                 ' </td>'.
+    my $text;
+    if ($action eq 'requestcourses') {
+        $text = &mt('Receive notification of course requests requiring approval');
+    } else {
+        $text = &mt('Receive notification of authoring space requests requiring approval')
+    }
+    $datatable = '<tr '.$css_class.'>'.
+                 ' <td>'.$text.'</td>'.
                  ' <td class="LC_left_item">';
     if (@domcoord > 0) {
         $datatable .= '<table>';
@@ -3028,6 +3128,15 @@ sub courserequest_titles {
     return %titles;
 }
 
+sub authorrequest_titles {
+    my %titles = &Apache::lonlocal::texthash (
+                                   norequest  => 'Not allowed',
+                                   approval   => 'Approval by Dom. Coord.',
+                                   automatic  => 'Automatic approval',
+                 );
+    return %titles;
+} 
+
 sub courserequest_conditions {
     my %conditions = &Apache::lonlocal::texthash (
        approval    => '(Processing of request subject to approval by Domain Coordinator).',
@@ -5211,7 +5320,7 @@ sub modify_quotas {
         %limithash,$toolregexp,%conditions,$resulttext,%changes);
     if ($action eq 'quotas') {
         $context = 'tools'; 
-    } else { 
+    } else {
         $context = $action;
     }
     if ($context eq 'requestcourses') {
@@ -5221,6 +5330,9 @@ sub modify_quotas {
         %titles = &courserequest_titles();
         $toolregexp = join('|',@usertools);
         %conditions = &courserequest_conditions();
+    } elsif ($context eq 'requestauthor') {
+        @usertools = ('author');
+        %titles = &authorrequest_titles();
     } else {
         @usertools = ('aboutme','blog','webdav','portfolio');
         %titles = &tool_titles();
@@ -5238,6 +5350,10 @@ sub modify_quotas {
                     $confhash{$item}{$type} = $env{$key};
                 }
             }
+        } elsif ($context eq 'requestauthor') {
+            if ($key =~ /^\Qform.authorreq_\E(.+)$/) {
+                $confhash{$1} = $env{$key};
+            }
         } else {
             if ($key =~ /^form\.quota_(.+)$/) {
                 $confhash{'defaultquota'}{$1} = $env{$key};
@@ -5247,7 +5363,7 @@ sub modify_quotas {
             }
         }
     }
-    if ($context eq 'requestcourses') {
+    if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
         my @approvalnotify = &Apache::loncommon::get_env_multiple('form.reqapprovalnotify');
         @approvalnotify = sort(@approvalnotify);
         $confhash{'notify'}{'approval'} = join(',',@approvalnotify);
@@ -5283,6 +5399,11 @@ sub modify_quotas {
                         $confhash{$item}{$type} .= $limithash{$item}{$type};
                     }
                 }
+            } elsif ($context eq 'requestauthor') {
+                $unset = '0';
+                if ($type eq '_LC_adv') {
+                    $unset = '';
+                }
             } else {
                 if (grep(/^\Q$type\E$/,@{$toolshash{$item}})) {
                     $confhash{$item}{$type} = 1;
@@ -5291,7 +5412,11 @@ sub modify_quotas {
                 }
             }
             if (ref($domconfig{$action}) eq 'HASH') {
-                if (ref($domconfig{$action}{$item}) eq 'HASH') {
+                if ($action eq 'requestauthor') {
+                    if ($domconfig{$action}{$type} ne $confhash{$type}) {
+                        $changes{$type} = 1;
+                    }
+                } elsif (ref($domconfig{$action}{$item}) eq 'HASH') {
                     if ($domconfig{$action}{$item}{$type} ne $confhash{$item}{$type}) {
                         $changes{$item}{$type} = 1;
                     }
@@ -5311,6 +5436,10 @@ sub modify_quotas {
                     if ($confhash{$item}{$type} ne $unset) {
                         $changes{$item}{$type} = 1;
                     }
+                } elsif ($context eq 'requestauthor') {
+                    if ($confhash{$type} ne $unset) {
+                        $changes{$type} = 1;
+                    }
                 } else {
                     if (!$confhash{$item}{$type}) {
                         $changes{$item}{$type} = 1;
@@ -5319,7 +5448,7 @@ sub modify_quotas {
             }
         }
     }
-    unless ($context eq 'requestcourses') {
+    unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
         if (ref($domconfig{'quotas'}) eq 'HASH') {
             if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {
                 foreach my $key (keys(%{$domconfig{'quotas'}{'defaultquota'}})) {
@@ -5362,10 +5491,14 @@ sub modify_quotas {
         }
     }
 
-    foreach my $key (keys(%confhash)) {
-        $domdefaults{$key} = $confhash{$key};
+    if ($context eq 'requestauthor') {
+        $domdefaults{'requestauthor'} = \%confhash;
+    } else {
+        foreach my $key (keys(%confhash)) {
+            $domdefaults{$key} = $confhash{$key};
+        }
     }
-   
+
     my %quotahash = (
                       $action => { %confhash }
                     );
@@ -5377,7 +5510,8 @@ sub modify_quotas {
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
 
             $resulttext = &mt('Changes made:').'<ul>';
-            unless ($context eq 'requestcourses') {
+            unless (($context eq 'requestcourses') || 
+                    ($context eq 'requestauthor')) {
                 if (ref($changes{'defaultquota'}) eq 'HASH') {
                     $resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>';
                     foreach my $type (@{$types},'default') {
@@ -5394,12 +5528,25 @@ sub modify_quotas {
             }
             my %newenv;
             foreach my $item (@usertools) {
-                if (ref($changes{$item}) eq 'HASH') {
+                my (%haschgs,%inconf);
+                if ($context eq 'requestauthor') {
+                    %haschgs = %changes;
+                    %inconf = %confhash; 
+                } else {
+                    if (ref($changes{$item}) eq 'HASH') {
+                        %haschgs = %{$changes{$item}};
+                    }
+                    if (ref($confhash{$item}) eq 'HASH') {
+                        %inconf = %{$confhash{$item}};
+                    }
+                }
+                if (keys(%haschgs) > 0) {
                     my $newacc = 
                         &Apache::lonnet::usertools_access($env{'user.name'},
                                                           $env{'user.domain'},
                                                           $item,'reload',$context);
-                    if ($context eq 'requestcourses') {
+                    if (($context eq 'requestcourses') || 
+                        ($context eq 'requestauthor')) {
                         if ($env{'environment.canrequest.'.$item} ne $newacc) {
                             $newenv{'environment.canrequest.'.$item} = $newacc;
                         }
@@ -5408,26 +5555,28 @@ sub modify_quotas {
                             $newenv{'environment.availabletools.'.$item} = $newacc;
                         }
                     }
-                    $resulttext .= '<li>'.$titles{$item}.'<ul>';
+                    unless ($context eq 'requestauthor') {
+                        $resulttext .= '<li>'.$titles{$item}.'<ul>';
+                    }
                     foreach my $type (@{$types},'default','_LC_adv') {
-                        if ($changes{$item}{$type}) {
+                        if ($haschgs{$type}) {
                             my $typetitle = $usertypes->{$type};
                             if ($type eq 'default') {
                                 $typetitle = $othertitle;
                             } elsif ($type eq '_LC_adv') {
                                 $typetitle = 'LON-CAPA Advanced Users'; 
                             }
-                            if ($confhash{$item}{$type}) {
+                            if ($inconf{$type}) {
                                 if ($context eq 'requestcourses') {
                                     my $cond;
-                                    if ($confhash{$item}{$type} =~ /^autolimit=(\d*)$/) {
+                                    if ($inconf{$type} =~ /^autolimit=(\d*)$/) {
                                         if ($1 eq '') {
                                             $cond = &mt('(Automatic processing of any request).');
                                         } else {
                                             $cond = &mt('(Automatic processing of requests up to limit of [quant,_1,request] per user).',$1);
                                         }
                                     } else { 
-                                        $cond = $conditions{$confhash{$item}{$type}};
+                                        $cond = $conditions{$inconf{$type}};
                                     }
                                     $resulttext .= '<li>'.&mt('Set to be available to [_1].',$typetitle).' '.$cond.'</li>';
                                 } else {
@@ -5435,7 +5584,7 @@ sub modify_quotas {
                                 }
                             } else {
                                 if ($type eq '_LC_adv') {
-                                    if ($confhash{$item}{$type} eq '0') {
+                                    if ($inconf{$type} eq '0') {
                                         $resulttext .= '<li>'.&mt('Set to be unavailable to [_1]',$typetitle).'</li>';
                                     } else { 
                                         $resulttext .= '<li>'.&mt('No override set for [_1]',$typetitle).'</li>';
@@ -5446,17 +5595,19 @@ sub modify_quotas {
                             }
                         }
                     }
-                    $resulttext .= '</ul></li>';
+                    unless ($context eq 'requestauthor') {
+                        $resulttext .= '</ul></li>';
+                    }
                 }
             }
-            if ($action eq 'requestcourses') {
+            if (($action eq 'requestcourses') || ($action eq 'requestauthor')) {
                 if (ref($changes{'notify'}) eq 'HASH') {
                     if ($changes{'notify'}{'approval'}) {
                         if (ref($confhash{'notify'}) eq 'HASH') {
                             if ($confhash{'notify'}{'approval'}) {
                                 $resulttext .= '<li>'.&mt('Notification of requests requiring approval will be sent to: ').$confhash{'notify'}{'approval'}.'</li>';
                             } else {
-                                $resulttext .= '<li>'.&mt('No Domain Coordinators will receive notification of course requests requiring approval.').'</li>';
+                                $resulttext .= '<li>'.&mt('No Domain Coordinators will receive notification of requests requiring approval.').'</li>';
                             }
                         }
                     }
@@ -5469,6 +5620,8 @@ sub modify_quotas {
         } else {
             if ($context eq 'requestcourses') {
                 $resulttext = &mt('No changes made to rights to request creation of courses.');
+            } elsif ($context eq 'requestauthor') {
+                $resulttext = &mt('No changes made to rights to request author space.');
             } else {
                 $resulttext = &mt('No changes made to availability of personal information pages, blogs, portfolios or default quotas');
             }