--- loncom/interface/domainprefs.pm 2014/04/16 13:33:14 1.160.6.39
+++ loncom/interface/domainprefs.pm 2014/03/17 02:36:56 1.229
@@ -1,8 +1,8 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.160.6.39 2014/04/16 13:33:14 raeburn Exp $
-##
+# $Id: domainprefs.pm,v 1.229 2014/03/17 02:36:56 raeburn Exp $
+#
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -164,8 +164,6 @@ use Apache::lonhtmlcommon();
use Apache::lonlocal;
use Apache::lonmsg();
use Apache::lonconfigsettings;
-use Apache::lonuserutils();
-use Apache::loncoursequeueadmin();
use LONCAPA qw(:DEFAULT :match);
use LONCAPA::Enrollment;
use LONCAPA::lonauthcgi();
@@ -213,15 +211,15 @@ sub handler {
'quotas','autoenroll','autoupdate','autocreate',
'directorysrch','usercreation','usermodification',
'contacts','defaults','scantron','coursecategories',
- 'serverstatuses','requestcourses','coursedefaults',
- 'usersessions','loadbalancing','requestauthor',
- 'selfenrollment'],$dom);
+ 'serverstatuses','requestcourses','helpsettings',
+ 'coursedefaults','usersessions','loadbalancing',
+ 'requestauthor'],$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','usersessions');
my %existing;
if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
%existing = %{$domconfig{'loadbalancing'}};
@@ -241,8 +239,6 @@ sub handler {
col2 => '',},
{col1 => 'Administrator Settings',
col2 => '',}],
- print => \&print_rolecolors,
- modify => \&modify_rolecolors,
},
'login' =>
{ text => 'Log-in page options',
@@ -251,16 +247,12 @@ sub handler {
col2 => '',},
{col1 => 'Log-in Help',
col2 => 'Value'}],
- print => \&print_login,
- modify => \&modify_login,
},
'defaults' =>
{ text => 'Default authentication/language/timezone/portal',
help => 'Domain_Configuration_LangTZAuth',
header => [{col1 => 'Setting',
col2 => 'Value'}],
- print => \&print_defaults,
- modify => \&modify_defaults,
},
'quotas' =>
{ text => 'Blogs, personal web pages, webDAV/quotas, portfolios',
@@ -268,16 +260,12 @@ sub handler {
header => [{col1 => 'User affiliation',
col2 => 'Available tools',
col3 => 'Quotas, MB; (Authoring requires role)',}],
- print => \&print_quotas,
- modify => \&modify_quotas,
},
'autoenroll' =>
{ text => 'Auto-enrollment settings',
help => 'Domain_Configuration_Auto_Enrollment',
header => [{col1 => 'Configuration setting',
col2 => 'Value(s)'}],
- print => \&print_autoenroll,
- modify => \&modify_autoenroll,
},
'autoupdate' =>
{ text => 'Auto-update settings',
@@ -288,32 +276,24 @@ sub handler {
col2 => 'Affiliation'},
{col1 => 'User population',
col2 => 'Updatable user data'}],
- print => \&print_autoupdate,
- modify => \&modify_autoupdate,
},
'autocreate' =>
{ text => 'Auto-course creation settings',
help => 'Domain_Configuration_Auto_Creation',
header => [{col1 => 'Configuration Setting',
col2 => 'Value',}],
- print => \&print_autocreate,
- modify => \&modify_autocreate,
},
'directorysrch' =>
{ text => 'Institutional directory searches',
help => 'Domain_Configuration_InstDirectory_Search',
header => [{col1 => 'Setting',
col2 => 'Value',}],
- print => \&print_directorysrch,
- modify => \&modify_directorysrch,
},
'contacts' =>
{ text => 'Contact Information',
help => 'Domain_Configuration_Contact_Info',
header => [{col1 => 'Setting',
col2 => 'Value',}],
- print => \&print_contacts,
- modify => \&modify_contacts,
},
'usercreation' =>
{ text => 'User creation',
@@ -324,8 +304,6 @@ sub handler {
col2 => 'Usernames which may be created',},
{col1 => 'Context',
col2 => 'Assignable authentication types'}],
- print => \&print_usercreation,
- modify => \&modify_usercreation,
},
'selfcreation' =>
{ text => 'Users self-creating accounts',
@@ -336,8 +314,6 @@ sub handler {
col2 => 'Information user can enter'},
{col1 => 'Self-creation with e-mail as username',
col2 => 'Settings'}],
- print => \&print_selfcreation,
- modify => \&modify_selfcreation,
},
'usermodification' =>
{ text => 'User modification',
@@ -346,8 +322,6 @@ sub handler {
col2 => 'User information updatable in author context'},
{col1 => 'Target user has role',
col2 => 'User information updatable in course context'}],
- print => \&print_usermodification,
- modify => \&modify_usermodification,
},
'scantron' =>
{ text => 'Bubblesheet format file',
@@ -355,8 +329,6 @@ sub handler {
header => [ {col1 => 'Item',
col2 => '',
}],
- print => \&print_scantron,
- modify => \&modify_scantron,
},
'requestcourses' =>
{text => 'Request creation of courses',
@@ -366,11 +338,7 @@ sub handler {
{col1 => 'Setting',
col2 => 'Value'},
{col1 => 'Available textbooks',
- col2 => ''},
- {col1 => 'Validation (not official courses)',
- col2 => 'Value'},],
- print => \&print_quotas,
- modify => \&modify_quotas,
+ col2 => ''}],
},
'requestauthor' =>
{text => 'Request Authoring Space',
@@ -379,8 +347,6 @@ sub handler {
col2 => 'Availability/Processing of requests',},
{col1 => 'Setting',
col2 => 'Value'}],
- print => \&print_quotas,
- modify => \&modify_quotas,
},
'coursecategories' =>
{ text => 'Cataloging of courses/communities',
@@ -390,8 +356,6 @@ sub handler {
{col1 => 'Categories',
col2 => '',
}],
- print => \&print_coursecategories,
- modify => \&modify_coursecategories,
},
'serverstatuses' =>
{text => 'Access to server status pages',
@@ -400,8 +364,12 @@ sub handler {
col2 => 'Other named users',
col3 => 'Specific IPs',
}],
- 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'}],
},
'coursedefaults' =>
{text => 'Course/Community defaults',
@@ -410,20 +378,12 @@ sub handler {
col2 => 'Value',},
{col1 => 'Defaults which can be overridden for each course by a DC',
col2 => 'Value',},],
- print => \&print_coursedefaults,
- modify => \&modify_coursedefaults,
},
- 'selfenrollment' =>
- {text => 'Self-enrollment in Course/Community',
- help => 'Domain_Configuration_Selfenrollment',
- header => [{col1 => 'Configuration Rights',
- col2 => 'Configured by Course Personnel or Domain Coordinator?'},
- {col1 => 'Defaults',
- col2 => 'Value'},
- {col1 => 'Self-enrollment validation (optional)',
- col2 => 'Value'},],
- print => \&print_selfenrollment,
- modify => \&modify_selfenrollment,
+ 'privacy' =>
+ {text => 'User Privacy',
+ help => 'Domain_Configuration_User_Privacy',
+ header => [{col1 => 'Setting',
+ col2 => 'Value',}],
},
'usersessions' =>
{text => 'User session hosting/offloading',
@@ -434,8 +394,6 @@ sub handler {
col2 => 'Rules'},
{col1 => "Hosting domain's own users elsewhere",
col2 => 'Rules'}],
- print => \&print_usersessions,
- modify => \&modify_usersessions,
},
'loadbalancing' =>
{text => 'Dedicated Load Balancer(s)',
@@ -445,8 +403,6 @@ sub handler {
col3 => 'User affiliation',
col4 => 'Overrides'},
],
- print => \&print_loadbalancing,
- modify => \&modify_loadbalancing,
},
);
if (keys(%servers) > 1) {
@@ -458,8 +414,6 @@ sub handler {
col2 => ''},
{col1 => 'Log-in Help',
col2 => 'Value'}],
- print => \&print_login,
- modify => \&modify_login,
};
}
@@ -609,10 +563,10 @@ sub process_changes {
$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') {
- $output = &modify_selfenrollment($dom,$lastactref,%domconfig)
} elsif ($action eq 'usersessions') {
$output = &modify_usersessions($dom,$lastactref,%domconfig);
} elsif ($action eq 'loadbalancing') {
@@ -659,12 +613,16 @@ sub print_config_box {
'.&mt($item->{'header'}->[0]->{'col2'}).' |
';
$rowtotal ++;
- if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') ||
- ($action eq 'usermodification') || ($action eq 'selfenrollment') ||
- ($action eq 'usersessions')) {
- $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
+ if ($action eq 'autoupdate') {
+ $output .= &print_autoupdate('top',$dom,$settings,\$rowtotal);
+ } elsif ($action eq 'usercreation') {
+ $output .= &print_usercreation('top',$dom,$settings,\$rowtotal);
+ } elsif ($action eq 'selfcreation') {
+ $output .= &print_selfcreation('top',$dom,$settings,\$rowtotal);
+ } elsif ($action eq 'usermodification') {
+ $output .= &print_usermodification('top',$dom,$settings,\$rowtotal);
} elsif ($action eq 'coursecategories') {
- $output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal);
+ $output .= &print_coursecategories('top',$dom,$item,$settings,\$rowtotal);
} elsif ($action eq 'login') {
if ($numheaders == 3) {
$colspan = ' colspan="2"';
@@ -672,10 +630,16 @@ sub print_config_box {
} else {
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal);
}
- } elsif (($action eq 'requestcourses') || ($action eq 'requestauthor')) {
+ } 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 'usersessions') {
+ $output .= &print_usersessions('top',$dom,$settings,\$rowtotal);
} elsif ($action eq 'rolecolors') {
$output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal);
+ } elsif ($action eq 'coursedefaults') {
+ $output .= &print_coursedefaults('top',$dom,$settings,\$rowtotal);
}
$output .= '
@@ -685,14 +649,39 @@ sub print_config_box {
- '.&mt($item->{'header'}->[1]->{'col1'}).' |
+ '.&mt($item->{'header'}->[1]->{'col1'}).' | ';
+ $output .= '
'.&mt($item->{'header'}->[1]->{'col2'}).' |
';
$rowtotal ++;
- if (($action eq 'autoupdate') || ($action eq 'usercreation') ||
- ($action eq 'selfcreation') || ($action eq 'selfenrollment') ||
- ($action eq 'usersessions')) {
- $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal).'
+ if ($action eq 'autoupdate') {
+ $output .= &print_autoupdate('middle',$dom,$settings,\$rowtotal).'
+
+ |
+
+
+
+
+
+ '.&mt($item->{'header'}->[2]->{'col1'}).' |
+ '.&mt($item->{'header'}->[2]->{'col2'}).' | '.
+ &print_autoupdate('bottom',$dom,$settings,\$rowtotal);
+ $rowtotal ++;
+ } elsif ($action eq 'usercreation') {
+ $output .= &print_usercreation('middle',$dom,$settings,\$rowtotal).'
+
+ |
+
+
+
+
+
+ '.&mt($item->{'header'}->[2]->{'col1'}).' |
+ '.&mt($item->{'header'}->[2]->{'col2'}).' | '.
+ &print_usercreation('bottom',$dom,$settings,\$rowtotal);
+ $rowtotal ++;
+ } elsif ($action eq 'selfcreation') {
+ $output .= &print_selfcreation('middle',$dom,$settings,\$rowtotal).'
|
@@ -702,11 +691,11 @@ sub print_config_box {
'.&mt($item->{'header'}->[2]->{'col1'}).' |
'.&mt($item->{'header'}->[2]->{'col2'}).' |
-
'."\n".
- $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
+ '.
+ &print_selfcreation('bottom',$dom,$settings,\$rowtotal);
$rowtotal ++;
- } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults')) {
- $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
+ } elsif ($action eq 'usermodification') {
+ $output .= &print_usermodification('middle',$dom,$settings,\$rowtotal);
} elsif ($action eq 'coursecategories') {
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
} elsif ($action eq 'login') {
@@ -738,20 +727,24 @@ sub print_config_box {
'.&mt($item->{'header'}->[2]->{'col1'}).' |
'.&mt($item->{'header'}->[2]->{'col2'}).' |
'.
- &print_textbookcourses($dom,$settings,\$rowtotal).'
-
-
-
-
+ &print_textbookcourses($dom,$settings,\$rowtotal);
+ } elsif ($action eq 'requestauthor') {
+ $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+ } elsif ($action eq 'usersessions') {
+ $output .= &print_usersessions('middle',$dom,$settings,\$rowtotal).'
+
+
+
+
- '.&mt($item->{'header'}->[3]->{'col1'}).' |
- '.&mt($item->{'header'}->[3]->{'col2'}).' |
- '.
- &print_validation_rows('requestcourses',$dom,$settings,\$rowtotal);
- } elsif ($action eq 'requestauthor') {
- $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+ '.&mt($item->{'header'}->[2]->{'col1'}).' |
+ '.&mt($item->{'header'}->[2]->{'col2'}).' | '.
+ &print_usersessions('bottom',$dom,$settings,\$rowtotal);
+ $rowtotal ++;
+ } elsif ($action eq 'coursedefaults') {
+ $output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal);
} elsif ($action eq 'rolecolors') {
$output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
@@ -830,14 +823,24 @@ sub print_config_box {
$rowtotal ++;
if ($action eq 'quotas') {
$output .= &print_quotas($dom,$settings,\$rowtotal,$action);
- } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || ($action eq 'directorysrch') ||
- ($action eq 'contacts') || ($action eq 'defaults') || ($action eq 'serverstatuses') ||
- ($action eq 'loadbalancing')) {
- $output .= $item->{'print'}->($dom,$settings,\$rowtotal);
+ } elsif ($action eq 'autoenroll') {
+ $output .= &print_autoenroll($dom,$settings,\$rowtotal);
+ } elsif ($action eq 'autocreate') {
+ $output .= &print_autocreate($dom,$settings,\$rowtotal);
+ } elsif ($action eq 'directorysrch') {
+ $output .= &print_directorysrch($dom,$settings,\$rowtotal);
+ } elsif ($action eq 'contacts') {
+ $output .= &print_contacts($dom,$settings,\$rowtotal);
+ } elsif ($action eq 'defaults') {
+ $output .= &print_defaults($dom,$settings,\$rowtotal);
} elsif ($action eq 'scantron') {
$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($dom,$confname,$settings,\$rowtotal);
+ } elsif ($action eq 'loadbalancing') {
+ $output .= &print_loadbalancing($dom,$settings,\$rowtotal);
}
}
$output .= '
@@ -1468,7 +1471,7 @@ sub display_color_options {
$datatable .= ' | '.
'';
foreach my $item (@{$links}) {
- my $color = $designs->{'links'}{$item} ? $designs->{'links'}{$item} : $defaults->{'links'}{$item};
+ my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item};
$datatable .= ''.$choices->{$item}."\n";
if ($designs->{'links'}{$item}) {
$datatable.=' ';
@@ -2779,21 +2782,19 @@ sub print_coursedefaults {
' | '.
''.
- ' | '."\n";
- $itemcount ++;
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= ''.
- $choices{'uploadquota'}.
- ' | '.
- ''.
- '';
+ ' '."\n".
+ ''.
+ $choices{'uploadquota'}.
+ ' | '.
+ ''.
+ ' | '."\n";
- $itemcount ++;
+ $itemcount += 2;
my $onclick = 'toggleCredits(this.form);';
my $display = 'none';
if ($currusecredits) {
@@ -2824,234 +2825,11 @@ sub print_coursedefaults {
&radiobutton_prefs($current,\@toggles,\%defaultchecked,
\%choices,$itemcount,$onclick,$additional);
$datatable .= $table;
- $itemcount ++;
- }
- $$rowtotal += $itemcount;
- return $datatable;
-}
-
-sub print_selfenrollment {
- my ($position,$dom,$settings,$rowtotal) = @_;
- my ($css_class,$datatable);
- my $itemcount = 1;
- my @types = ('official','unofficial','community','textbook');
- if (($position eq 'top') || ($position eq 'middle')) {
- my ($rowsref,$titlesref) = &Apache::lonuserutils::get_selfenroll_titles();
- my %descs = &Apache::lonuserutils::selfenroll_default_descs();
- my @rows;
- my $key;
- if ($position eq 'top') {
- $key = 'admin';
- if (ref($rowsref) eq 'ARRAY') {
- @rows = @{$rowsref};
- }
- } elsif ($position eq 'middle') {
- $key = 'default';
- @rows = ('types','registered','approval','limit');
- }
- foreach my $row (@rows) {
- if (defined($titlesref->{$row})) {
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.
- ''.$titlesref->{$row}.' | '.
- ''.
- ' | ';
- }
- } elsif ($position eq 'bottom') {
- $datatable .= &print_validation_rows('selfenroll',$dom,$settings,\$itemcount);
}
$$rowtotal += $itemcount;
return $datatable;
}
-sub print_validation_rows {
- my ($caller,$dom,$settings,$rowtotal) = @_;
- my ($itemsref,$namesref,$fieldsref);
- if ($caller eq 'selfenroll') {
- ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types();
- } elsif ($caller eq 'requestcourses') {
- ($itemsref,$namesref,$fieldsref) = &Apache::loncoursequeueadmin::requestcourses_validation_types();
- }
- my %currvalidation;
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{'validation'}) eq 'HASH') {
- %currvalidation = %{$settings->{'validation'}};
- }
- }
- my $datatable;
- my $itemcount = 0;
- foreach my $item (@{$itemsref}) {
- my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= ''.
- $namesref->{$item}.
- ' | '.
- '';
- if (($item eq 'url') || ($item eq 'button')) {
- $datatable .= ''.
- '';
- } elsif ($item eq 'fields') {
- my @currfields;
- if (ref($currvalidation{$item}) eq 'ARRAY') {
- @currfields = @{$currvalidation{$item}};
- }
- foreach my $field (@{$fieldsref}) {
- my $check = '';
- if (grep(/^\Q$field\E$/,@currfields)) {
- $check = ' checked="checked"';
- }
- $datatable .= ' ';
- }
- } elsif ($item eq 'markup') {
- $datatable .= '';
- }
- $datatable .= ' | '."\n";
- if (ref($rowtotal)) {
- $itemcount ++;
- }
- }
- if ($caller eq 'requestcourses') {
- my %currhash;
- if (ref($settings->{'validation'}) eq 'HASH') {
- if ($settings->{'validation'}{'dc'} ne '') {
- $currhash{$settings->{'validation'}{'dc'}} = 1;
- }
- }
- my $numinrow = 2;
- my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
- 'validationdc',%currhash);
- if ($numdc > 1) {
- $datatable .= ''.
- &mt('Course creation processed as: (choose Dom. Coord.)').
- ' | '.$dctable.' | ';
- } else {
- $datatable .= $dctable.'';
- }
- $itemcount ++;
- }
- if (ref($rowtotal)) {
- $$rowtotal += $itemcount;
- }
- return $datatable;
-}
-
sub print_usersessions {
my ($position,$dom,$settings,$rowtotal) = @_;
my ($css_class,$datatable,%checked,%choices);
@@ -4293,7 +4071,7 @@ sub print_usermodification {
$$rowtotal ++;
$rowcount ++;
}
- } elsif ($position eq 'bottom') {
+ } elsif ($position eq 'middle') {
$context = 'course';
$rowcount = 0;
foreach my $role ('st','ep','ta','in','cr') {
@@ -5802,38 +5580,22 @@ sub modify_colors {
}
if ($role eq 'login') {
foreach my $item (@logintext) {
- $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item});
- if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) {
- $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item};
- }
- unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'logintext'}{$item})) {
+ unless ($env{'form.'.$role.'_'.$item} eq $defaults{'logintext'}{$item}) {
$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
}
}
} else {
- $env{'form.'.$role.'_fontmenu'} = lc($env{'form.'.$role.'_fontmenu'});
- if ($env{'form.'.$role.'_fontmenu'} =~ /^\w+/) {
- $env{'form.'.$role.'_fontmenu'} = '#'.$env{'form.'.$role.'_fontmenu'};
- }
- unless($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) {
+ unless($env{'form.'.$role.'_fontmenu'} eq $defaults{'fontmenu'}) {
$confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
}
}
foreach my $item (@bgs) {
- $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item});
- if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) {
- $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item};
- }
- unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'bgs'}{$item})) {
+ unless ($env{'form.'.$role.'_'.$item} eq $defaults{'bgs'}{$item} ) {
$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
}
}
foreach my $item (@links) {
- $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item});
- if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) {
- $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item};
- }
- unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'links'}{$item})) {
+ unless ($env{'form.'.$role.'_'.$item} eq $defaults{'links'}{$item}) {
$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
}
}
@@ -6455,8 +6217,7 @@ sub modify_quotas {
my ($r,$dom,$action,$lastactref,%domconfig) = @_;
my ($context,@usertools,@options,%validations,%titles,%confhash,%toolshash,
%limithash,$toolregexp,%conditions,$resulttext,%changes,$confname,$configuserok,
- $author_ok,$switchserver,$errors,$validationitemsref,$validationnamesref,
- $validationfieldsref);
+ $author_ok,$switchserver,$errors);
if ($action eq 'quotas') {
$context = 'tools';
} else {
@@ -6472,8 +6233,6 @@ sub modify_quotas {
$confname = $dom.'-domainconfig';
my $servadm = $r->dir_config('lonAdmEMail');
($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
- ($validationitemsref,$validationnamesref,$validationfieldsref) =
- &Apache::loncoursequeueadmin::requestcourses_validation_types();
} elsif ($context eq 'requestauthor') {
@usertools = ('author');
%titles = &authorrequest_titles();
@@ -6541,7 +6300,6 @@ sub modify_quotas {
'';
}
}
-
}
if (ref($domconfig{$action}) eq 'HASH') {
if (ref($domconfig{$action}{'notify'}) eq 'HASH') {
@@ -6648,7 +6406,7 @@ sub modify_quotas {
}
if ($env{'form.addbook_image.filename'} ne '') {
my ($cdom,$cnum) = split(/_/,$newbook);
- my ($imageurl,$error) =
+ my ($imageurl,$error) =
&process_textbook_image($r,$dom,$confname,'addbook_image',$cdom,$cnum,$configuserok,
$switchserver,$author_ok);
if ($imageurl) {
@@ -6678,78 +6436,6 @@ sub modify_quotas {
}
}
}
- if (ref($validationitemsref) eq 'ARRAY') {
- foreach my $item (@{$validationitemsref}) {
- if ($item eq 'fields') {
- my @changed;
- @{$confhash{'validation'}{$item}} = &Apache::loncommon::get_env_multiple('form.requestcourses_validation_'.$item);
- if (@{$confhash{'validation'}{$item}} > 0) {
- @{$confhash{'validation'}{$item}} = sort(@{$confhash{'validation'}{$item}});
- }
- if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
- if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') {
- @changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item},
- $domconfig{'requestcourses'}{'validation'}{$item});
- } else {
- @changed = @{$confhash{'validation'}{$item}};
- }
- } else {
- @changed = @{$confhash{'validation'}{$item}};
- }
- if (@changed) {
- if ($confhash{'validation'}{$item}) {
- $changes{'validation'}{$item} = join(', ',@{$confhash{'validation'}{$item}});
- } else {
- $changes{'validation'}{$item} = &mt('None');
- }
- }
- } else {
- $confhash{'validation'}{$item} = $env{'form.requestcourses_validation_'.$item};
- if ($item eq 'markup') {
- if ($env{'form.requestcourses_validation_'.$item}) {
- $env{'form.requestcourses_validation_'.$item} =~ s/[\n\r\f]+/\s/gs;
- }
- }
- if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
- if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) {
- $changes{'validation'}{$item} = $confhash{'validation'}{$item};
- }
- } else {
- if ($confhash{'validation'}{$item} ne '') {
- $changes{'validation'}{$item} = $confhash{'validation'}{$item};
- }
- }
- }
- }
- }
- if ($env{'form.validationdc'}) {
- my $newval = $env{'form.validationdc'};
- my %domcoords = &get_active_dcs($dom);
- if (exists($domcoords{$newval})) {
- $confhash{'validation'}{'dc'} = $newval;
- }
- }
- if (ref($confhash{'validation'}) eq 'HASH') {
- if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
- if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
- unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) {
- if ($confhash{'validation'}{'dc'} eq '') {
- $changes{'validation'}{'dc'} = &mt('None');
- } else {
- $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
- }
- }
- } elsif ($confhash{'validation'}{'dc'} ne '') {
- $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
- }
- } elsif ($confhash{'validation'}{'dc'} ne '') {
- $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
- }
- } elsif (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
- if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
- $changes{'validation'}{'dc'} = &mt('None');
- }
- }
}
} else {
$confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'};
@@ -7065,26 +6751,6 @@ sub modify_quotas {
}
$resulttext .= '';
}
- if (ref($changes{'validation'}) eq 'HASH') {
- if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) {
- $resulttext .= ''.&mt('Validation of courses/communities updated').'';
if (keys(%newenv)) {
@@ -9390,7 +9056,6 @@ sub modify_coursedefaults {
}
}
}
-
my $officialcreds = $env{'form.official_credits'};
$officialcreds =~ s/[^\d.]+//g;
my $unofficialcreds = $env{'form.unofficial_credits'};
@@ -9418,8 +9083,7 @@ sub modify_coursedefaults {
if ($putresult eq 'ok') {
if (keys(%changes) > 0) {
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
- if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) ||
- ($changes{'uploadquota'})) {
+ if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || ($changes{'uploadquota'})) {
if ($changes{'canuse_pdfforms'}) {
$domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};
}
@@ -9499,245 +9163,6 @@ sub modify_coursedefaults {
return $resulttext;
}
-sub modify_selfenrollment {
- my ($dom,$lastactref,%domconfig) = @_;
- my ($resulttext,$errors,%changes,%selfenrollhash,%ordered);
- my @types = ('official','unofficial','community','textbook');
- my %titles = &tool_titles();
- my %descs = &Apache::lonuserutils::selfenroll_default_descs();
- ($ordered{'admin'},my $titlesref) = &Apache::lonuserutils::get_selfenroll_titles();
- $ordered{'default'} = ['types','registered','approval','limit'];
-
- my (%roles,%shown,%toplevel);
- $roles{'0'} = &Apache::lonnet::plaintext('dc');
-
- if (ref($domconfig{'selfenrollment'}) ne 'HASH') {
- if ($domconfig{'selfenrollment'} eq '') {
- $domconfig{'selfenrollment'} = {};
- }
- }
- %toplevel = (
- admin => 'Configuration Rights',
- default => 'Default settings',
- validation => 'Validation of self-enrollment requests',
- );
- my ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types();
-
- if (ref($ordered{'admin'}) eq 'ARRAY') {
- foreach my $item (@{$ordered{'admin'}}) {
- foreach my $type (@types) {
- if ($env{'form.selfenrolladmin_'.$item.'_'.$type}) {
- $selfenrollhash{'admin'}{$type}{$item} = 1;
- } else {
- $selfenrollhash{'admin'}{$type}{$item} = 0;
- }
- if (ref($domconfig{'selfenrollment'}{'admin'}) eq 'HASH') {
- if (ref($domconfig{'selfenrollment'}{'admin'}{$type}) eq 'HASH') {
- if ($selfenrollhash{'admin'}{$type}{$item} ne
- $domconfig{'selfenrollment'}{'admin'}{$type}{$item}) {
- push(@{$changes{'admin'}{$type}},$item);
- }
- } else {
- if (!$selfenrollhash{'admin'}{$type}{$item}) {
- push(@{$changes{'admin'}{$type}},$item);
- }
- }
- } elsif (!$selfenrollhash{'admin'}{$type}{$item}) {
- push(@{$changes{'admin'}{$type}},$item);
- }
- }
- }
- }
-
- foreach my $item (@{$ordered{'default'}}) {
- foreach my $type (@types) {
- my $value = $env{'form.selfenrolldefault_'.$item.'_'.$type};
- if ($item eq 'types') {
- unless (($value eq 'all') || ($value eq 'dom')) {
- $value = '';
- }
- } elsif ($item eq 'registered') {
- unless ($value eq '1') {
- $value = 0;
- }
- } elsif ($item eq 'approval') {
- unless ($value =~ /^[012]$/) {
- $value = 0;
- }
- } else {
- unless (($value eq 'allstudents') || ($value eq 'selfenrolled')) {
- $value = 'none';
- }
- }
- $selfenrollhash{'default'}{$type}{$item} = $value;
- if (ref($domconfig{'selfenrollment'}{'default'}) eq 'HASH') {
- if (ref($domconfig{'selfenrollment'}{'default'}{$type}) eq 'HASH') {
- if ($selfenrollhash{'default'}{$type}{$item} ne
- $domconfig{'selfenrollment'}{'default'}{$type}{$item}) {
- push(@{$changes{'default'}{$type}},$item);
- }
- } else {
- push(@{$changes{'default'}{$type}},$item);
- }
- } else {
- push(@{$changes{'default'}{$type}},$item);
- }
- if ($item eq 'limit') {
- if (($value eq 'allstudents') || ($value eq 'selfenrolled')) {
- $env{'form.selfenrolldefault_cap_'.$type} =~ s/\D//g;
- if ($env{'form.selfenrolldefault_cap_'.$type} ne '') {
- $selfenrollhash{'default'}{$type}{'cap'} = $env{'form.selfenrolldefault_cap_'.$type};
- }
- } else {
- $selfenrollhash{'default'}{$type}{'cap'} = '';
- }
- if (ref($domconfig{'selfenrollment'}{'default'}{$type}) eq 'HASH') {
- if ($selfenrollhash{'default'}{$type}{'cap'} ne
- $domconfig{'selfenrollment'}{'admin'}{$type}{'cap'}) {
- push(@{$changes{'default'}{$type}},'cap');
- }
- } elsif ($selfenrollhash{'default'}{$type}{'cap'} ne '') {
- push(@{$changes{'default'}{$type}},'cap');
- }
- }
- }
- }
-
- foreach my $item (@{$itemsref}) {
- if ($item eq 'fields') {
- my @changed;
- @{$selfenrollhash{'validation'}{$item}} = &Apache::loncommon::get_env_multiple('form.selfenroll_validation_'.$item);
- if (@{$selfenrollhash{'validation'}{$item}} > 0) {
- @{$selfenrollhash{'validation'}{$item}} = sort(@{$selfenrollhash{'validation'}{$item}});
- }
- if (ref($domconfig{'selfenrollment'}{'validation'}) eq 'HASH') {
- if (ref($domconfig{'selfenrollment'}{'validation'}{$item}) eq 'ARRAY') {
- @changed = &Apache::loncommon::compare_arrays($selfenrollhash{'validation'}{$item},
- $domconfig{'selfenrollment'}{'validation'}{$item});
- } else {
- @changed = @{$selfenrollhash{'validation'}{$item}};
- }
- } else {
- @changed = @{$selfenrollhash{'validation'}{$item}};
- }
- if (@changed) {
- if ($selfenrollhash{'validation'}{$item}) {
- $changes{'validation'}{$item} = join(', ',@{$selfenrollhash{'validation'}{$item}});
- } else {
- $changes{'validation'}{$item} = &mt('None');
- }
- }
- } else {
- $selfenrollhash{'validation'}{$item} = $env{'form.selfenroll_validation_'.$item};
- if ($item eq 'markup') {
- if ($env{'form.selfenroll_validation_'.$item}) {
- $env{'form.selfenroll_validation_'.$item} =~ s/[\n\r\f]+/\s/gs;
- }
- }
- if (ref($domconfig{'selfenrollment'}{'validation'}) eq 'HASH') {
- if ($domconfig{'selfenrollment'}{'validation'}{$item} ne $selfenrollhash{'validation'}{$item}) {
- $changes{'validation'}{$item} = $selfenrollhash{'validation'}{$item};
- }
- }
- }
- }
-
- my $putresult = &Apache::lonnet::put_dom('configuration',{'selfenrollment' => \%selfenrollhash},
- $dom);
- if ($putresult eq 'ok') {
- if (keys(%changes) > 0) {
- my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
- $resulttext = &mt('Changes made:').'';
- foreach my $key ('admin','default','validation') {
- if (ref($changes{$key}) eq 'HASH') {
- $resulttext .= '- '.$toplevel{$key}.'
';
- }
- }
- if ((exists($changes{'admin'})) || (exists($changes{'default'}))) {
- my $cachetime = 24*60*60;
- &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'domdefaults'} = 1;
- }
- }
- }
- $resulttext .= ' ';
- } else {
- $resulttext = &mt('No changes made to self-enrollment settings');
- }
- } else {
- $resulttext = ''.
- &mt('An error occurred: [_1]',$putresult).'';
- }
- return $resulttext;
-}
-
sub modify_usersessions {
my ($dom,$lastactref,%domconfig) = @_;
my @hostingtypes = ('version','excludedomain','includedomain');
@@ -10270,7 +9695,7 @@ sub get_active_dcs {
sub active_dc_picker {
my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;
- my %domcoords = &get_active_dcs($dom);
+ my %domcoords = &get_active_dcs($dom);
my @domcoord = keys(%domcoords);
if (keys(%currhash)) {
foreach my $dc (keys(%currhash)) {
|
|