--- loncom/interface/domainprefs.pm 2013/12/24 21:59:36 1.217
+++ loncom/interface/domainprefs.pm 2014/03/29 20:35:21 1.231
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.217 2013/12/24 21:59:36 raeburn Exp $
+# $Id: domainprefs.pm,v 1.231 2014/03/29 20:35:21 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -95,7 +95,7 @@ institutional affiliation in the domain
but is now also used to manage availability of user tools:
i.e., blogs, aboutme page, and portfolios, and the course request tool,
used by course owners to request creation of a course, and to display/store
-default quota sizes for authoring spaces.
+default quota sizes for Authoring Spaces.
Outputs: 1
@@ -213,13 +213,13 @@ sub handler {
'contacts','defaults','scantron','coursecategories',
'serverstatuses','requestcourses','helpsettings',
'coursedefaults','usersessions','loadbalancing',
- 'requestauthor'],$dom);
+ 'requestauthor','selfenrollment'],$dom);
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
'autoupdate','autocreate','directorysrch','contacts',
- 'usercreation','usermodification','scantron',
+ 'usercreation','selfcreation','usermodification','scantron',
'requestcourses','requestauthor','coursecategories',
'serverstatuses','helpsettings',
- 'coursedefaults','usersessions');
+ 'coursedefaults','selfenrollment','usersessions');
my %existing;
if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
%existing = %{$domconfig{'loadbalancing'}};
@@ -239,6 +239,8 @@ sub handler {
col2 => '',},
{col1 => 'Administrator Settings',
col2 => '',}],
+ print => \&print_rolecolors,
+ modify => \&modify_rolecolors,
},
'login' =>
{ text => 'Log-in page options',
@@ -247,12 +249,16 @@ 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',
@@ -260,12 +266,16 @@ 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',
@@ -275,27 +285,34 @@ sub handler {
{col1 => 'Setting',
col2 => 'Affiliation'},
{col1 => 'User population',
- col2 => 'Updateable user data'}],
+ 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',
help => 'Domain_Configuration_User_Creation',
@@ -305,16 +322,30 @@ 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',
+ help => 'Domain_Configuration_Self_Creation',
+ header => [{col1 => 'Self-creation with institutional username',
+ col2 => 'Enabled?'},
+ {col1 => 'Institutional user type (login/SSO self-creation)',
+ 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',
help => 'Domain_Configuration_User_Modification',
header => [{col1 => 'Target user has role',
- col2 => 'User information updateable in author context'},
+ col2 => 'User information updatable in author context'},
{col1 => 'Target user has role',
- col2 => 'User information updateable in course context'},
- {col1 => "Status of user",
- col2 => 'Information settable when self-creating account (if directory data blank)'}],
+ col2 => 'User information updatable in course context'}],
+ print => \&print_usermodification,
+ modify => \&modify_usermodification,
},
'scantron' =>
{ text => 'Bubblesheet format file',
@@ -322,6 +353,8 @@ sub handler {
header => [ {col1 => 'Item',
col2 => '',
}],
+ print => \&print_scantron,
+ modify => \&modify_scantron,
},
'requestcourses' =>
{text => 'Request creation of courses',
@@ -332,14 +365,18 @@ sub handler {
col2 => 'Value'},
{col1 => 'Available textbooks',
col2 => ''}],
+ print => \&print_quotas,
+ modify => \&modify_quotas,
},
'requestauthor' =>
- {text => 'Request authoring space',
+ {text => 'Request Authoring Space',
help => 'Domain_Configuration_Request_Author',
header => [{col1 => 'User affiliation',
col2 => 'Availability/Processing of requests',},
{col1 => 'Setting',
col2 => 'Value'}],
+ print => \&print_quotas,
+ modify => \&modify_quotas,
},
'coursecategories' =>
{ text => 'Cataloging of courses/communities',
@@ -349,6 +386,8 @@ sub handler {
{col1 => 'Categories',
col2 => '',
}],
+ print => \&print_coursecategories,
+ modify => \&modify_coursecategories,
},
'serverstatuses' =>
{text => 'Access to server status pages',
@@ -357,12 +396,16 @@ 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'}],
+ print => \&print_helpsettings,
+ modify => \&modify_helpsettings,
},
'coursedefaults' =>
{text => 'Course/Community defaults',
@@ -371,12 +414,28 @@ 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',}],
+ print => \&print_privacy,
+ modify => \&modify_privacy,
},
'usersessions' =>
{text => 'User session hosting/offloading',
@@ -387,6 +446,8 @@ 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)',
@@ -396,6 +457,8 @@ sub handler {
col3 => 'User affiliation',
col4 => 'Overrides'},
],
+ print => \&print_loadbalancing,
+ modify => \&modify_loadbalancing,
},
);
if (keys(%servers) > 1) {
@@ -407,6 +470,8 @@ sub handler {
col2 => ''},
{col1 => 'Log-in Help',
col2 => 'Value'}],
+ print => \&print_login,
+ modify => \&modify_login,
};
}
@@ -420,7 +485,7 @@ sub handler {
if ($phase eq 'process') {
my $result = &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,
\%prefs,\%domconfig,$confname,\@roles);
- if (ref($result) eq 'HASH') {
+ if ((ref($result) eq 'HASH') && (keys(%{$result}))) {
$r->rflush();
&devalidate_remote_domconfs($dom,$result);
}
@@ -538,6 +603,8 @@ sub process_changes {
$output = &modify_directorysrch($dom,%domconfig);
} elsif ($action eq 'usercreation') {
$output = &modify_usercreation($dom,%domconfig);
+ } elsif ($action eq 'selfcreation') {
+ $output = &modify_selfcreation($dom,%domconfig);
} elsif ($action eq 'usermodification') {
$output = &modify_usermodification($dom,%domconfig);
} elsif ($action eq 'contacts') {
@@ -558,6 +625,8 @@ sub process_changes {
$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') {
@@ -604,14 +673,12 @@ sub print_config_box {
'.&mt($item->{'header'}->[0]->{'col2'}).' |
';
$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 'usermodification') {
- $output .= &print_usermodification('top',$dom,$settings,\$rowtotal);
+ if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') ||
+ ($action eq 'usermodification') || ($action eq 'coursedefaults') ||
+ ($action eq 'selfenrollment') || ($action eq 'usersessions')) {
+ $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
} elsif ($action eq 'coursecategories') {
- $output .= &print_coursecategories('top',$dom,$item,$settings,\$rowtotal);
+ $output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal);
} elsif ($action eq 'login') {
if ($numheaders == 3) {
$colspan = ' colspan="2"';
@@ -619,16 +686,10 @@ sub print_config_box {
} else {
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal);
}
- } elsif ($action eq 'requestcourses') {
- $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
- } elsif ($action eq 'requestauthor') {
+ } elsif (($action eq 'requestcourses') || ($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 .= '
@@ -638,26 +699,14 @@ sub print_config_box {
- '.&mt($item->{'header'}->[1]->{'col1'}).' | ';
- $output .= '
+ '.&mt($item->{'header'}->[1]->{'col1'}).' |
'.&mt($item->{'header'}->[1]->{'col2'}).' |
';
$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).'
+ if (($action eq 'autoupdate') || ($action eq 'usercreation') ||
+ ($action eq 'selfcreation') || ($action eq 'selfenrollment') ||
+ ($action eq 'usersessions')) {
+ $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal).'
|
@@ -666,22 +715,12 @@ sub print_config_box {
'.&mt($item->{'header'}->[2]->{'col1'}).' |
- '.&mt($item->{'header'}->[2]->{'col2'}).' |
'.
- &print_usercreation('bottom',$dom,$settings,\$rowtotal);
- $rowtotal ++;
- } elsif ($action eq 'usermodification') {
- $output .= &print_usermodification('middle',$dom,$settings,\$rowtotal).'
-
-
-
-
-
-
-
- '.&mt($item->{'header'}->[2]->{'col1'}).' |
- '.&mt($item->{'header'}->[2]->{'col2'}).' | '.
- &print_usermodification('bottom',$dom,$settings,\$rowtotal);
+ '.&mt($item->{'header'}->[2]->{'col2'}).' |
+ '."\n".
+ $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
$rowtotal ++;
+ } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults')) {
+ $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
} elsif ($action eq 'coursecategories') {
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
} elsif ($action eq 'login') {
@@ -716,21 +755,6 @@ sub print_config_box {
&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'}->[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).'
@@ -809,24 +833,14 @@ sub print_config_box {
$rowtotal ++;
if ($action eq 'quotas') {
$output .= &print_quotas($dom,$settings,\$rowtotal,$action);
- } 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 '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 '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 .= '
@@ -1992,23 +2006,26 @@ sub print_requestmail {
if (ref($settings) eq 'HASH') {
if (ref($settings->{'notify'}) eq 'HASH') {
if ($settings->{'notify'}{'approval'} ne '') {
- map {$currapp{$_}=1;} split(/,/,$settings->{'notify'}{'approval'});
+ map {$currapp{$_}=1;} split(/,/,$settings->{'notify'}{'approval'});
}
}
}
my $numinrow = 2;
- my $css_class = 'class="LC_odd_row"';
+ my $css_class;
+ $css_class = ($$rowtotal%2? ' class="LC_odd_row"':'');
my $text;
if ($action eq 'requestcourses') {
$text = &mt('Receive notification of course requests requiring approval');
+ } elsif ($action eq 'requestauthor') {
+ $text = &mt('Receive notification of Authoring Space requests requiring approval');
} else {
- $text = &mt('Receive notification of authoring space requests requiring approval')
+ $text = &mt('Receive notification of queued requests for self-created user accounts requiring approval');
}
- $datatable = ' |
'.
+ $datatable = '
'.
' '.$text.' | '.
' ';
my ($numdc,$table,$rows) = &active_dc_picker($dom,$numinrow,'checkbox',
- 'reqapprovalnotify',%currapp);
+ $action.'notifyapproval',%currapp);
if ($numdc > 0) {
$datatable .= $table;
} else {
@@ -2022,14 +2039,28 @@ sub print_requestmail {
sub print_studentcode {
my ($settings,$rowtotal) = @_;
my $rownum = 0;
- my %choices;
- $choices{'uniquecode'} = &mt('Generate unique six character code as course identifier?');
- my @toggles = ('uniquecode');
- my %defaultchecked = ('uniquecode' => 'off');
- (my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
- \%choices,$rownum);
- $$rowtotal += $rownum;
- return $reports;
+ my ($output,%current);
+ my @crstypes = ('official','unofficial','community','textbook');
+ if (ref($settings->{'uniquecode'}) eq 'HASH') {
+ foreach my $type (@crstypes) {
+ $current{$type} = $settings->{'uniquecode'}{$type};
+ }
+ }
+ $output .= ' |
'.
+ ''.&mt('Generate unique six character code as course identifier?').' | '.
+ '';
+ foreach my $type (@crstypes) {
+ my $check = ' ';
+ if ($current{$type}) {
+ $check = ' checked="checked" ';
+ }
+ $output .= ''.(' 'x2).' ';
+ }
+ $output .= ' |
';
+ $$rowtotal ++;
+ return $output;
}
sub print_textbookcourses {
@@ -2751,19 +2782,21 @@ sub print_coursedefaults {
''.
''.
- ' | '."\n".
- ''.
- $choices{'uploadquota'}.
- ' | '.
- ''.
- '';
+ ' '."\n";
+ $itemcount ++;
+ $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+ $datatable .= ''.
+ $choices{'uploadquota'}.
+ ' | '.
+ ''.
+ ' | '."\n";
- $itemcount += 2;
+ $itemcount ++;
my $onclick = 'toggleCredits(this.form);';
my $display = 'none';
if ($currusecredits) {
@@ -2794,11 +2827,249 @@ 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) = &get_selfenroll_titles();
+ my %descs = &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') {
+ my ($itemsref,$namesref,$fieldsref) = &selfenroll_validation_types();
+ my %currvalidation;
+ if (ref($settings) eq 'HASH') {
+ if (ref($settings->{'validation'}) eq 'HASH') {
+ %currvalidation = %{$settings->{'validation'}};
+ }
+ }
+ foreach my $item (@{$itemsref}) {
+ $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";
+ $itemcount ++;
+ }
+ }
+ $$rowtotal += $itemcount;
+ return $datatable;
+}
+
+sub get_selfenroll_titles {
+ my @row = ('types','registered','enroll_dates','access_dates','section',
+ 'approval','limit');
+ my %lt = &Apache::lonlocal::texthash (
+ types => 'Users allowed to self-enroll',
+ registered => 'Registration status (official courses)' ,
+ enroll_dates => 'Dates self-enrollment available',
+ access_dates => 'Access dates for self-enrolling users',
+ section => 'Self-enrolling users section',
+ approval => 'Processing of requests',
+ limit => 'Enrollment limit',
+ );
+ return (\@row,\%lt);
+}
+
+sub selfenroll_default_descs {
+ my %desc = (
+ types => {
+ dom => &mt('Course domain'),
+ all => &mt('Any domain'),
+ '' => &mt('None'),
+ },
+ limit => {
+ none => &mt('No limit'),
+ allstudents => &mt('Limit by total students'),
+ selfenrolled => &mt('Limit by total self-enrolled'),
+ },
+ approval => {
+ '0' => &mt('Processed automatically'),
+ '1' => &mt('Queued for approval'),
+ '2' => &mt('Queued, pending validation'),
+ },
+ registered => {
+ 0 => 'No registration required',
+ 1 => 'Registered students only',
+ },
+ );
+ return %desc;
+}
+
+sub selfenroll_validation_types {
+ my @items = ('url','fields','button','markup');
+ my %names = &Apache::lonlocal::texthash (
+ url => 'Web address of validation server/script',
+ fields => 'Form fields to send to validator',
+ button => 'Text for validation button',
+ markup => 'Validation description (HTML)',
+ );
+ my @fields = ('username','domain','uniquecode','course','token');
+ return (\@items,\%names,\@fields);
+}
+
sub print_usersessions {
my ($position,$dom,$settings,$rowtotal) = @_;
my ($css_class,$datatable,%checked,%choices);
@@ -3637,42 +3908,22 @@ sub print_usercreation {
$rowcount ++;
}
}
- my ($emailrules,$emailruleorder) =
- &Apache::lonnet::inst_userrules($dom,'email');
- if (ref($emailrules) eq 'HASH') {
- if (keys(%{$emailrules}) > 0) {
- $datatable .= &user_formats_row('email',$settings,$emailrules,
- $emailruleorder,$numinrow,$rowcount);
- $$rowtotal ++;
- $rowcount ++;
- }
- }
if ($rowcount == 0) {
$datatable .= ''.&mt('No format rules have been defined for usernames or IDs in this domain.').' | ';
$$rowtotal ++;
$rowcount ++;
}
} elsif ($position eq 'middle') {
- my @creators = ('author','course','requestcrs','selfcreate');
+ my @creators = ('author','course','requestcrs');
my ($rules,$ruleorder) =
&Apache::lonnet::inst_userrules($dom,'username');
my %lt = &usercreation_types();
my %checked;
- my @selfcreate;
if (ref($settings) eq 'HASH') {
if (ref($settings->{'cancreate'}) eq 'HASH') {
foreach my $item (@creators) {
$checked{$item} = $settings->{'cancreate'}{$item};
}
- if (ref($settings->{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
- @selfcreate = @{$settings->{'cancreate'}{'selfcreate'}};
- } elsif ($settings->{'cancreate'}{'selfcreate'} ne '') {
- if ($settings->{'cancreate'}{'selfcreate'} eq 'any') {
- @selfcreate = ('email','login','sso');
- } elsif ($settings->{'cancreate'}{'selfcreate'} ne 'none') {
- @selfcreate = ($settings->{'cancreate'}{'selfcreate'});
- }
- }
} elsif (ref($settings->{'cancreate'}) eq 'ARRAY') {
foreach my $item (@creators) {
if (grep(/^\Q$item\E$/,@{$settings->{'cancreate'}})) {
@@ -3684,10 +3935,8 @@ sub print_usercreation {
my $rownum = 0;
foreach my $item (@creators) {
$rownum ++;
- if ($item ne 'selfcreate') {
- if ($checked{$item} eq '') {
- $checked{$item} = 'any';
- }
+ if ($checked{$item} eq '') {
+ $checked{$item} = 'any';
}
my $css_class;
if ($rownum%2) {
@@ -3698,30 +3947,18 @@ sub print_usercreation {
$datatable .= ''.
''.$lt{$item}.
' | ';
- my @options;
- if ($item eq 'selfcreate') {
- push(@options,('email','login','sso'));
- } else {
- @options = ('any');
- if (ref($rules) eq 'HASH') {
- if (keys(%{$rules}) > 0) {
- push(@options,('official','unofficial'));
- }
+ my @options = ('any');
+ if (ref($rules) eq 'HASH') {
+ if (keys(%{$rules}) > 0) {
+ push(@options,('official','unofficial'));
}
- push(@options,'none');
}
+ push(@options,'none');
foreach my $option (@options) {
my $type = 'radio';
my $check = ' ';
- if ($item eq 'selfcreate') {
- $type = 'checkbox';
- if (grep(/^\Q$option\E$/,@selfcreate)) {
- $check = ' checked="checked" ';
- }
- } else {
- if ($checked{$item} eq $option) {
- $check = ' checked="checked" ';
- }
+ if ($checked{$item} eq $option) {
+ $check = ' checked="checked" ';
}
$datatable .= ' |
|