-
-
-
- | '.&mt($item->{'header'}->[3]->{'col1'}).' |
- '.&mt($item->{'header'}->[3]->{'col2'}).' |
- '.
- &print_validation_rows('requestcourses',$dom,$settings,\$rowtotal);
+ &print_textbookcourses($dom,$settings,\$rowtotal);
} elsif ($action eq 'requestauthor') {
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
} elsif ($action eq 'rolecolors') {
@@ -836,7 +834,8 @@ sub print_config_box {
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 'serverstatuses') || ($action eq 'loadbalancing')) {
+ ($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);
@@ -1472,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.=' ';
@@ -2085,7 +2084,7 @@ sub print_textbookcourses {
}
my $confname = $dom.'-domainconfig';
my $switchserver = &check_switchserver($dom,$confname);
- $maxnum = scalar(keys(%ordered));
+ my $maxnum = scalar(keys(%ordered));
my $datatable = &textbookcourses_javascript(\%ordered);
if (keys(%ordered)) {
my @items = sort { $a <=> $b } keys(%ordered);
@@ -2204,6 +2203,7 @@ $jstext
var newpos = 'addbook_pos';
var current = new Array;
var maxh = 1 + $num;
+ var current = new Array;
var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
if (item == newpos) {
changedVal = newitemVal;
@@ -2797,7 +2797,7 @@ sub print_coursedefaults {
}
$datatable .= ' |
| '."\n";
$itemcount ++;
- my $onclick = "toggleDisplay(this.form,'credits');";
+ my $onclick = 'toggleCredits(this.form);';
my $display = 'none';
if ($currusecredits) {
$display = 'block';
@@ -2839,8 +2839,8 @@ sub print_selfenrollment {
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 ($rowsref,$titlesref) = &get_selfenroll_titles();
+ my %descs = &selfenroll_default_descs();
my @rows;
my $key;
if ($position eq 'top') {
@@ -2973,88 +2973,103 @@ sub print_selfenrollment {
$datatable .= ' |
';
}
} 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 ($itemsref,$namesref,$fieldsref) = &selfenroll_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)) {
+ }
+ $datatable .= ''."\n";
$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;
- }
+ $$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);
@@ -4005,22 +4020,17 @@ sub print_usercreation {
sub print_selfcreation {
my ($position,$dom,$settings,$rowtotal) = @_;
- my (@selfcreate,$createsettings,$processing,$datatable);
+ my (@selfcreate,$createsettings,$datatable);
if (ref($settings) eq 'HASH') {
if (ref($settings->{'cancreate'}) eq 'HASH') {
$createsettings = $settings->{'cancreate'};
- if (ref($createsettings) eq 'HASH') {
- if (ref($createsettings->{'selfcreate'}) eq 'ARRAY') {
- @selfcreate = @{$createsettings->{'selfcreate'}};
- } elsif ($createsettings->{'selfcreate'} ne '') {
- if ($settings->{'cancreate'}{'selfcreate'} eq 'any') {
- @selfcreate = ('email','login','sso');
- } elsif ($createsettings->{'selfcreate'} ne 'none') {
- @selfcreate = ($createsettings->{'selfcreate'});
- }
- }
- if (ref($createsettings->{'selfcreateprocessing'}) eq 'HASH') {
- $processing = $createsettings->{'selfcreateprocessing'};
+ 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'});
}
}
}
@@ -4063,60 +4073,53 @@ sub print_selfcreation {
foreach my $status (@{$types}) {
$datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
$numinrow,$$rowtotal,$usertypes);
- $$rowtotal ++;
+ $$rowtotal ++;
}
}
} else {
- my %choices = &Apache::lonlocal::texthash (
- cancreate_email => 'E-mail address as username',
- );
- my @toggles = sort(keys(%choices));
- my %defaultchecked = (
- 'cancreate_email' => 'off',
- );
- my $itemcount = 0;
- my $display = 'none';
- if (grep(/^\Qemail\E$/,@selfcreate)) {
- $display = 'block';
- }
- my $onclick = "toggleDisplay(this.form,'emailoptions');";
- my $additional = '';
- my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
- my $usertypes = {};
- my $order = [];
- if ((ref($domdefaults{'inststatustypes'}) eq 'HASH') && (ref($domdefaults{'inststatusguest'}) eq 'ARRAY')) {
- $usertypes = $domdefaults{'inststatustypes'};
- $order = $domdefaults{'inststatusguest'};
- }
- if (ref($order) eq 'ARRAY') {
- push(@{$order},'default');
- if (@{$order} > 1) {
- $usertypes->{'default'} = &mt('Other users');
- $additional .= '
';
- foreach my $status (@{$order}) {
- $additional .= '| '.$usertypes->{$status}.' | ';
- }
- $additional .= '
';
- foreach my $status (@{$order}) {
- $additional .= '| '.&email_as_username($rowtotal,$processing,$status).' | ';
+ my $css_class = $$rowtotal%2?' class="LC_odd_row"':'';
+ my %choices =
+ &Apache::lonlocal::texthash(
+ email => 'Approved automatically',
+ emailapproval => 'Queued for approval by DC',
+ off => 'Not enabled',
+ );
+ $datatable .= ''.
+ ''.&mt('E-mail address as username').
+ ' | '.
+ '';
+ foreach my $option ('email','emailapproval','off') {
+ my $checked;
+ if ($option eq 'email') {
+ if ($radiohash{'cancreate_email'}) {
+ $checked = 'checked="checked"';
+ }
+ } elsif ($option eq 'emailapproval') {
+ if ($radiohash{'cancreate_emailapproval'}) {
+ $checked = 'checked="checked"';
}
- $additional .= ' |
';
} else {
- $usertypes->{'default'} = &mt('All users');
- $additional .= &email_as_username($rowtotal,$processing);
+ if ((!$radiohash{'cancreate_email'}) && (!$radiohash{'cancreate_emailapproval'})) {
+ $checked = 'checked="checked"';
+ }
}
+ $datatable .= '
';
}
- $additional .= '
';
- }
- }
- $$rowtotal ++;
- return $output;
-}
-
sub captcha_choice {
my ($context,$settings,$itemcount) = @_;
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
@@ -4375,143 +4325,70 @@ sub print_usermodification {
}
sub print_defaults {
- my ($position,$dom,$settings,$rowtotal) = @_;
+ my ($dom,$settings,$rowtotal) = @_;
+ my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
+ 'datelocale_def','portal_def');
+ my %defaults;
+ if (ref($settings) eq 'HASH') {
+ %defaults = %{$settings};
+ } else {
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+ foreach my $item (@items) {
+ $defaults{$item} = $domdefaults{$item};
+ }
+ }
+ my $titles = &defaults_titles($dom);
my $rownum = 0;
my ($datatable,$css_class);
- if ($position eq 'top') {
- my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
- 'datelocale_def','portal_def');
- my %defaults;
- if (ref($settings) eq 'HASH') {
- %defaults = %{$settings};
+ foreach my $item (@items) {
+ if ($rownum%2) {
+ $css_class = '';
} else {
- my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
- foreach my $item (@items) {
- $defaults{$item} = $domdefaults{$item};
- }
+ $css_class = ' class="LC_odd_row" ';
}
- my $titles = &defaults_titles($dom);
- foreach my $item (@items) {
- if ($rownum%2) {
- $css_class = '';
- } else {
- $css_class = ' class="LC_odd_row" ';
- }
- $datatable .= ''.
- ''.$titles->{$item}.
- ' | ';
- if ($item eq 'auth_def') {
- my @authtypes = ('internal','krb4','krb5','localauth');
- my %shortauth = (
- internal => 'int',
- krb4 => 'krb4',
- krb5 => 'krb5',
- localauth => 'loc'
- );
- my %authnames = &authtype_names();
- foreach my $auth (@authtypes) {
- my $checked = ' ';
- if ($defaults{$item} eq $auth) {
- $checked = ' checked="checked" ';
- }
- $datatable .= ' ';
- }
- } elsif ($item eq 'timezone_def') {
- my $includeempty = 1;
- $datatable .= &Apache::loncommon::select_timezone($item,$defaults{$item},undef,$includeempty);
- } elsif ($item eq 'datelocale_def') {
- my $includeempty = 1;
- $datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty);
- } elsif ($item eq 'lang_def') {
- my %langchoices = &get_languages_hash();
- $langchoices{''} = 'No language preference';
- %langchoices = &Apache::lonlocal::texthash(%langchoices);
- $datatable .= &Apache::loncommon::select_form($defaults{$item},$item,
- \%langchoices);
- } else {
- my $size;
- if ($item eq 'portal_def') {
- $size = ' size="25"';
- }
- $datatable .= '';
+ $datatable .= ''.
+ '| '.$titles->{$item}.
+ ' | ';
+ if ($item eq 'auth_def') {
+ my @authtypes = ('internal','krb4','krb5','localauth');
+ my %shortauth = (
+ internal => 'int',
+ krb4 => 'krb4',
+ krb5 => 'krb5',
+ localauth => 'loc'
+ );
+ my %authnames = &authtype_names();
+ foreach my $auth (@authtypes) {
+ my $checked = ' ';
+ if ($defaults{$item} eq $auth) {
+ $checked = ' checked="checked" ';
+ }
+ $datatable .= ' ';
}
- $datatable .= ' | ';
- $rownum ++;
- }
- } else {
- my (%defaults);
- if (ref($settings) eq 'HASH') {
- if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') &&
- (ref($settings->{'inststatusguest'}) eq 'ARRAY')) {
- my $maxnum = @{$settings->{'inststatusorder'}};
- for (my $i=0; $i<$maxnum; $i++) {
- $css_class = $rownum%2?' class="LC_odd_row"':'';
- my $item = $settings->{'inststatusorder'}->[$i];
- my $title = $settings->{'inststatustypes'}->{$item};
- my $guestok;
- if (grep(/^\Q$item\E$/,@{$settings->{'inststatusguest'}})) {
- $guestok = 1;
- }
- my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'$item'".');"';
- $datatable .= ''.
- ''.
- ' '.&mt('Internal ID:').' '.$item.' '.
- ''.
- &mt('delete').' | '.
- ''.&mt('Name displayed:').
- ''.
- ' | '.
- ''.
- ''.(' 'x2).
- ' | ';
- }
- $css_class = $rownum%2?' class="LC_odd_row"':'';
- my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'addinststatus_pos'".');"';
- $datatable .= ''.
- '| '.&mt('Internal ID:').
- ''.
- ' '.&mt('(new)').
- ' | '.
- &mt('Name displayed:').
- ' | '.
- ''.
- ''.(' 'x2).
- ' | ';
- ''."\n";
- $rownum ++;
+ } elsif ($item eq 'timezone_def') {
+ my $includeempty = 1;
+ $datatable .= &Apache::loncommon::select_timezone($item,$defaults{$item},undef,$includeempty);
+ } elsif ($item eq 'datelocale_def') {
+ my $includeempty = 1;
+ $datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty);
+ } elsif ($item eq 'lang_def') {
+ my %langchoices = &get_languages_hash();
+ $langchoices{''} = 'No language preference';
+ %langchoices = &Apache::lonlocal::texthash(%langchoices);
+ $datatable .= &Apache::loncommon::select_form($defaults{$item},$item,
+ \%langchoices);
+ } else {
+ my $size;
+ if ($item eq 'portal_def') {
+ $size = ' size="25"';
}
+ $datatable .= '';
}
+ $datatable .= ' | ';
+ $rownum ++;
}
$$rowtotal += $rownum;
return $datatable;
@@ -4995,69 +4872,6 @@ sub serverstatus_pages {
'uniquecodes','diskusage');
}
-sub defaults_javascript {
- my ($settings) = @_;
- my ($output,$jstext);
- if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
- my $maxnum = scalar(@{$settings->{'inststatusorder'}});
- if ($maxnum eq '') {
- $maxnum = 0;
- }
- $maxnum ++;
- $jstext = ' var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');';
- return <<"ENDSCRIPT";
-
-
-ENDSCRIPT
- }
-}
-
sub coursecategories_javascript {
my ($settings) = @_;
my ($output,$jstext,$cathash);
@@ -5090,6 +4904,7 @@ function reorderCats(form,parent,item,id
var changedVal;
$jstext
var newpos = 'addcategory_pos';
+ var current = new Array;
if (parent == '') {
var has_instcode = 0;
var maxtop = categories[idx].length;
@@ -6005,38 +5820,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};
}
}
@@ -6658,8 +6457,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 {
@@ -6675,8 +6473,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();
@@ -6744,7 +6540,6 @@ sub modify_quotas {
'';
}
}
-
}
if (ref($domconfig{$action}) eq 'HASH') {
if (ref($domconfig{$action}{'notify'}) eq 'HASH') {
@@ -6851,7 +6646,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) {
@@ -6881,78 +6676,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'};
@@ -7268,26 +6991,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)) {
@@ -8264,8 +7967,7 @@ sub modify_selfcreation {
foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) {
if (($item eq 'selfcreate') || ($item eq 'statustocreate') ||
($item eq 'captcha') || ($item eq 'recaptchakeys') ||
- ($item eq 'emailusername') || ($item eq 'notify') ||
- ($item eq 'selfcreateprocessing')) {
+ ($item eq 'emailusername') || ($item eq 'notify')) {
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
} else {
$save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -8296,37 +7998,22 @@ sub modify_selfcreation {
@{$cancreate{'selfcreate'}} = ();
%{$cancreate{'emailusername'}} = ();
@{$cancreate{'statustocreate'}} = ();
- %{$cancreate{'selfcreateprocessing'}} = ();
my %selfcreatetypes = (
sso => 'users authenticated by institutional single sign on',
login => 'users authenticated by institutional log-in',
- email => 'users who provide a valid e-mail address for use as username',
+ email => 'users who provide a valid e-mail address for use as username (automatic creation)',
+ emailapproval => 'users who provide a valid e-mail address for use as username (queued for Domain Coordinator review)',
);
#
# Populate $cancreate{'selfcreate'} array reference with types of user, for which self-creation of user accounts
# is permitted.
#
-
- my @statuses;
- if (ref($domconfig{'inststatus'}) eq 'HASH') {
- if (ref($domconfig{'inststatus'}{'inststatusguest'}) eq 'ARRAY') {
- @statuses = @{$domconfig{'inststatus'}{'inststatusguest'}};
- }
- }
- push(@statuses,'default');
-
foreach my $item ('login','sso','email') {
if ($item eq 'email') {
- if ($env{'form.cancreate_email'}) {
+ if ($env{'form.cancreate_email'} eq 'email') {
push(@{$cancreate{'selfcreate'}},'email');
- push(@contexts,'selfcreateprocessing');
- foreach my $type (@statuses) {
- if ($type eq 'default') {
- $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess'};
- } else {
- $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess_'.$type};
- }
- }
+ } elsif ($env{'form.cancreate_email'} eq 'emailapproval') {
+ push(@{$cancreate{'selfcreate'}},'emailapproval');
}
} else {
if ($env{'form.cancreate_'.$item}) {
@@ -8340,8 +8027,7 @@ sub modify_selfcreation {
# Populate $cancreate{'emailusername'}{$type} hash ref with information fields (if new user will provide data
# value set to one), if self-creation with e-mail address permitted, where $type is user type: faculty, staff, student etc.
#
-
- if ($env{'form.cancreate_email'} eq 'email') {
+ if (($env{'form.cancreate_email'} eq 'email') || ($env{'form.cancreate_email'} eq 'emailapproval')) {
push(@contexts,'emailusername');
if (ref($types) eq 'ARRAY') {
foreach my $type (@{$types}) {
@@ -8401,7 +8087,7 @@ sub modify_selfcreation {
}
}
#
-# Check if domain default is set appropriately, if self-creation of accounts is to be available for
+# Check if domain default is set appropriately, if selef-creation of accounts is to be available for
# institutional log-in.
#
if (grep(/^login$/,@{$cancreate{'selfcreate'}})) {
@@ -8490,12 +8176,6 @@ sub modify_selfcreation {
}
}
}
- } elsif ($item eq 'selfcreateprocessing') {
- if ($cancreate{$item}{$curr} ne $curr_usercreation{'cancreate'}{$item}{$curr}) {
- if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
- push(@{$changes{'cancreate'}},$item);
- }
- }
} else {
if (!$cancreate{$item}{$curr}) {
if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
@@ -8519,12 +8199,6 @@ sub modify_selfcreation {
}
}
}
- } elsif ($item eq 'selfcreateprocessing') {
- if ($cancreate{$item}{$field} ne $curr_usercreation{'cancreate'}{$item}{$field}) {
- if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
- push(@{$changes{'cancreate'}},$item);
- }
- }
} else {
if (!$curr_usercreation{'cancreate'}{$item}{$field}) {
if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
@@ -8574,9 +8248,6 @@ sub modify_selfcreation {
if (ref($cancreate{'notify'}) eq 'HASH') {
$save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'};
}
- if (ref($cancreate{'selfcreateprocessing'}) eq 'HASH') {
- $save_usercreate{'cancreate'}{'selfcreateprocessing'} = $cancreate{'selfcreateprocessing'};
- }
if (ref($cancreate{'statustocreate'}) eq 'ARRAY') {
$save_usercreate{'cancreate'}{'statustocreate'} = $cancreate{'statustocreate'};
}
@@ -8663,26 +8334,6 @@ sub modify_selfcreation {
}
}
}
- } elsif ($type eq 'selfcreateprocessing') {
- my %choices = &Apache::lonlocal::texthash (
- automatic => 'Automatic approval',
- approval => 'Queued for approval',
- );
- if (@statuses > 1) {
- $chgtext .= &mt('Processing of requests to create account with e-mail address as username set as follows:').
- '';
- foreach my $type (@statuses) {
- if ($type eq 'default') {
- $chgtext .= '- '.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'
';
- } else {
- $chgtext .= '- '.$usertypes->{$type}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'
';
- }
- }
- $chgtext .= '
';
- } else {
- $chgtext .= &mt('Processing of requests to create account with e-mail address as username set to: "[_1]"',
- $choices{$cancreate{'selfcreateprocessing'}{'default'}});
- }
} elsif ($type eq 'captcha') {
if ($savecaptcha{$type} eq 'notused') {
$chgtext .= &mt('No CAPTCHA validation in use for self-creation screen.');
@@ -9026,103 +8677,6 @@ sub modify_defaults {
defaults => \%newvalues,
);
my $title = &defaults_titles();
-
- my $currinststatus;
- if (ref($domconfig{'inststatus'}) eq 'HASH') {
- $currinststatus = $domconfig{'inststatus'};
- } else {
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- $currinststatus = {
- inststatustypes => $usertypes,
- inststatusorder => $types,
- inststatusguest => [],
- };
- }
- my @todelete = &Apache::loncommon::get_env_multiple('form.inststatus_delete');
- my @allpos;
- my %guests;
- my %alltypes;
- my ($currtitles,$currguests,$currorder);
- if (ref($currinststatus) eq 'HASH') {
- if (ref($currinststatus->{'inststatusorder'}) eq 'ARRAY') {
- foreach my $type (@{$currinststatus->{'inststatusorder'}}) {
- if (ref($currinststatus->{inststatustypes}) eq 'HASH') {
- if ($currinststatus->{inststatustypes}->{$type} ne '') {
- $currtitles .= $currinststatus->{inststatustypes}->{$type}.',';
- }
- }
- unless (grep(/^\Q$type\E$/,@todelete)) {
- my $position = $env{'form.inststatus_pos_'.$type};
- $position =~ s/\D+//g;
- $allpos[$position] = $type;
- $alltypes{$type} = $env{'form.inststatus_title_'.$type};
- $alltypes{$type} =~ s/`//g;
- if ($env{'form.inststatus_guest_'.$type}) {
- $guests{$type} = 1;
- }
- }
- }
- if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') {
- $currguests = join(',',@{$currinststatus->{'inststatusguest'}});
- }
- $currorder = join(',',@{$currinststatus->{'inststatusorder'}});
- $currtitles =~ s/,$//;
- }
- }
- if ($env{'form.addinststatus'}) {
- my $newtype = $env{'form.addinststatus'};
- $newtype =~ s/\W//g;
- unless (exists($alltypes{$newtype})) {
- if ($env{'form.addinststatus_guest'}) {
- $guests{$newtype} = 1;
- }
- $alltypes{$newtype} = $env{'form.addinststatus_title'};
- $alltypes{$newtype} =~ s/`//g;
- my $position = $env{'form.addinststatus_pos'};
- $position =~ s/\D+//g;
- if ($position ne '') {
- $allpos[$position] = $newtype;
- }
- }
- }
- my (@orderedstatus,@orderedguests);
- foreach my $type (@allpos) {
- unless (($type eq '') || (grep(/^\Q$type\E$/,@orderedstatus))) {
- push(@orderedstatus,$type);
- if ($guests{$type}) {
- push(@orderedguests,$type);
- }
- }
- }
- foreach my $type (keys(%alltypes)) {
- unless (grep(/^\Q$type\E$/,@orderedstatus)) {
- delete($alltypes{$type});
- }
- }
- $defaults_hash{'inststatus'} = {
- inststatustypes => \%alltypes,
- inststatusorder => \@orderedstatus,
- inststatusguest => \@orderedguests,
- };
- if (ref($defaults_hash{'inststatus'}) eq 'HASH') {
- foreach my $item ('inststatustypes','inststatusorder','inststatusguest') {
- $domdefaults{$item} = $defaults_hash{'inststatus'}{$item};
- }
- }
- if ($currorder ne join(',',@orderedstatus)) {
- $changes{'inststatus'}{'inststatusorder'} = 1;
- }
- if ($currguests ne join(',',@orderedguests)) {
- $changes{'inststatus'}{'inststatusguest'} = 1;
- }
- my $newtitles;
- foreach my $item (@orderedstatus) {
- $newtitles .= $alltypes{$item}.',';
- }
- $newtitles =~ s/,$//;
- if ($currtitles ne $newtitles) {
- $changes{'inststatus'}{'inststatustypes'} = 1;
- }
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaults_hash,
$dom);
if ($putresult eq 'ok') {
@@ -9131,47 +8685,21 @@ sub modify_defaults {
my $version = &Apache::lonnet::get_server_loncaparev($dom);
my $mailmsgtext = "Changes made to domain settings in a LON-CAPA installation - domain: $dom (running version: $version) - dns_domain.tab needs to be updated with the following changes, to support legacy 2.4, 2.5 and 2.6 versions of LON-CAPA.\n\n";
foreach my $item (sort(keys(%changes))) {
- if ($item eq 'inststatus') {
- if (ref($changes{'inststatus'}) eq 'HASH') {
- if (($changes{'inststatus'}{'inststatustypes'}) || $changes{'inststatus'}{'inststatusorder'}) {
- $resulttext .= ''.&mt('Institutional user status types set to:').' ';
- foreach my $type (@orderedstatus) {
- $resulttext .= $alltypes{$type}.', ';
- }
- $resulttext =~ s/, $//;
- $resulttext .= '';
- }
- if ($changes{'inststatus'}{'inststatusguest'}) {
- $resulttext .= '';
- if (@orderedguests) {
- $resulttext .= &mt('Types assignable to "non-institutional" usernames set to:').' ';
- foreach my $type (@orderedguests) {
- $resulttext .= $alltypes{$type}.', ';
- }
- $resulttext =~ s/, $//;
- } else {
- $resulttext .= &mt('Types assignable to "non-institutional" usernames set to none.');
- }
- $resulttext .= '';
- }
- }
- } else {
- my $value = $env{'form.'.$item};
- if ($value eq '') {
- $value = &mt('none');
- } elsif ($item eq 'auth_def') {
- my %authnames = &authtype_names();
- my %shortauth = (
- internal => 'int',
- krb4 => 'krb4',
- krb5 => 'krb5',
- localauth => 'loc',
- );
- $value = $authnames{$shortauth{$value}};
- }
- $resulttext .= ''.&mt('[_1] set to "[_2]"',$title->{$item},$value).'';
- $mailmsgtext .= "$title->{$item} set to $value\n";
+ my $value = $env{'form.'.$item};
+ if ($value eq '') {
+ $value = &mt('none');
+ } elsif ($item eq 'auth_def') {
+ my %authnames = &authtype_names();
+ my %shortauth = (
+ internal => 'int',
+ krb4 => 'krb4',
+ krb5 => 'krb5',
+ localauth => 'loc',
+ );
+ $value = $authnames{$shortauth{$value}};
}
+ $resulttext .= ''.&mt('[_1] set to "[_2]"',$title->{$item},$value).'';
+ $mailmsgtext .= "$title->{$item} set to $value\n";
}
$resulttext .= '';
$mailmsgtext .= "\n";
@@ -9882,8 +9410,8 @@ sub modify_selfenrollment {
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();
+ my %descs = &selfenroll_default_descs();
+ ($ordered{'admin'},my $titlesref) = &get_selfenroll_titles();
$ordered{'default'} = ['types','registered','approval','limit'];
my (%roles,%shown,%toplevel);
@@ -9899,7 +9427,7 @@ sub modify_selfenrollment {
default => 'Default settings',
validation => 'Validation of self-enrollment requests',
);
- my ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types();
+ my ($itemsref,$namesref,$fieldsref) = &selfenroll_validation_types();
if (ref($ordered{'admin'}) eq 'ARRAY') {
foreach my $item (@{$ordered{'admin'}}) {
@@ -10049,34 +9577,6 @@ sub modify_selfenrollment {
$roles{'1'} = &mt('Course personnel');
}
if (ref($changes{$key}{$type}) eq 'ARRAY') {
- if (ref($selfenrollhash{$key}{$type}) eq 'HASH') {
- if ($key eq 'admin') {
- my @mgrdc = ();
- if (ref($ordered{$key}) eq 'ARRAY') {
- foreach my $item (@{$ordered{'admin'}}) {
- if (ref($selfenrollhash{$key}{$type}) eq 'HASH') {
- if ($selfenrollhash{$key}{$type}{$item} eq '0') {
- push(@mgrdc,$item);
- }
- }
- }
- if (@mgrdc) {
- $domdefaults{$type.'selfenrolladmdc'} = join(',',@mgrdc);
- } else {
- delete($domdefaults{$type.'selfenrolladmdc'});
- }
- }
- } else {
- if (ref($ordered{$key}) eq 'ARRAY') {
- foreach my $item (@{$ordered{$key}}) {
- if (grep(/^\Q$item\E$/,@{$changes{$key}{$type}})) {
- $domdefaults{$type.'selfenroll'.$item} =
- $selfenrollhash{$key}{$type}{$item};
- }
- }
- }
- }
- }
$resulttext .= ''.$titles{$type}.'';
foreach my $item (@{$ordered{$key}}) {
if (grep(/^\Q$item\E$/,@{$changes{$key}{$type}})) {
@@ -10097,13 +9597,6 @@ sub modify_selfenrollment {
$resulttext .= '
';
}
}
- 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 {
@@ -10648,7 +10141,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)) {
@@ -11257,30 +10750,27 @@ END
}
-sub toggle_display_js {
+sub credits_js {
return <<"END";