';
+ $datatable .= '';
if ($numdc > 1) {
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)');
} else {
@@ -5006,8 +4991,7 @@ sub print_usercreation {
sub print_selfcreation {
my ($position,$dom,$settings,$rowtotal) = @_;
- my (@selfcreate,$createsettings,$processing,$emailoptions,$emailverified,
- $emaildomain,$datatable);
+ my (@selfcreate,$createsettings,$processing,$datatable);
if (ref($settings) eq 'HASH') {
if (ref($settings->{'cancreate'}) eq 'HASH') {
$createsettings = $settings->{'cancreate'};
@@ -5024,15 +5008,6 @@ sub print_selfcreation {
if (ref($createsettings->{'selfcreateprocessing'}) eq 'HASH') {
$processing = $createsettings->{'selfcreateprocessing'};
}
- if (ref($createsettings->{'emailoptions'}) eq 'HASH') {
- $emailoptions = $createsettings->{'emailoptions'};
- }
- if (ref($createsettings->{'emailverified'}) eq 'HASH') {
- $emailverified = $createsettings->{'emailverified'};
- }
- if (ref($createsettings->{'emaildomain'}) eq 'HASH') {
- $emaildomain = $createsettings->{'emaildomain'};
- }
}
}
}
@@ -5054,7 +5029,7 @@ sub print_selfcreation {
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
\%choices,$itemcount,$onclick);
$$rowtotal += $itemcount;
-
+
if (ref($usertypes) eq 'HASH') {
if (keys(%{$usertypes}) > 0) {
$datatable .= &insttypes_row($createsettings,$types,$usertypes,
@@ -5072,7 +5047,7 @@ sub print_selfcreation {
$datatable .= ''.
''.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').' '.
''."\n".
- ''."\n";
+ ''."\n";
for (my $i=0; $i<@fields; $i++) {
$rem = $i%($numperrow);
if ($rem == 0) {
@@ -5123,399 +5098,128 @@ sub print_selfcreation {
}
} else {
my %choices = &Apache::lonlocal::texthash (
- 'cancreate_email' => 'Non-institutional username (via e-mail verification)',
+ cancreate_email => 'E-mail address as username',
);
my @toggles = sort(keys(%choices));
my %defaultchecked = (
'cancreate_email' => 'off',
);
- my $customclass = 'LC_selfcreate_email';
- my $classprefix = 'LC_canmodify_emailusername_';
- my $optionsprefix = 'LC_options_emailusername_';
+ my $itemcount = 0;
my $display = 'none';
- my $rowstyle = 'display:none';
if (grep(/^\Qemail\E$/,@selfcreate)) {
$display = 'block';
- $rowstyle = 'display:table-row';
}
- my $onclick = "toggleRows(this.form,'cancreate_email','selfassign','$customclass','$classprefix','$optionsprefix');";
- ($datatable,$$rowtotal) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
- \%choices,$$rowtotal,$onclick);
- $datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal,$customclass,
- $rowstyle);
- $$rowtotal ++;
- $datatable .= &captcha_choice('cancreate',$createsettings,$$rowtotal,$customclass,
- $rowstyle);
- $$rowtotal ++;
- my (@ordered,@posstypes,%usertypeshash);
+ my $onclick = "toggleDisplay(this.form,'emailoptions');";
+ my $additional = '';
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
- my ($emailrules,$emailruleorder) =
- &Apache::lonnet::inst_userrules($dom,'email');
- my $primary_id = &Apache::lonnet::domain($dom,'primary');
- my $intdom = &Apache::lonnet::internet_dom($primary_id);
- if (ref($types) eq 'ARRAY') {
- @posstypes = @{$types};
- }
- if (@posstypes) {
- unless (grep(/^default$/,@posstypes)) {
- push(@posstypes,'default');
+ my (@ordered,%usertypeshash);
+ if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') {
+ @ordered = @{$domdefaults{'inststatusguest'}};
+ }
+ if (@ordered) {
+ unless (grep(/^default$/,@ordered)) {
+ push(@ordered,'default');
}
if (ref($usertypes) eq 'HASH') {
%usertypeshash = %{$usertypes};
}
- my $currassign;
- if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') {
- $currassign = {
- selfassign => $domdefaults{'inststatusguest'},
- };
- @ordered = @{$domdefaults{'inststatusguest'}};
- } else {
- $currassign = { selfassign => [] };
- }
- my $onclicktypes = "toggleDataRow(this.form,'selfassign','$customclass','$optionsprefix',);".
- "toggleDataRow(this.form,'selfassign','$customclass','$classprefix',1);";
- $datatable .= &insttypes_row($currassign,$types,$usertypes,$dom,
- $numinrow,$othertitle,'selfassign',
- $rowtotal,$onclicktypes,$customclass,
- $rowstyle);
- $$rowtotal ++;
$usertypeshash{'default'} = $othertitle;
- foreach my $status (@posstypes) {
- my $css_class;
- if ($$rowtotal%2) {
- $css_class = 'LC_odd_row ';
- }
- $css_class .= $customclass;
- my $rowid = $optionsprefix.$status;
- my $hidden = 1;
- my $currstyle = 'display:none';
- if (grep(/^\Q$status\E$/,@ordered)) {
- $currstyle = $rowstyle;
- $hidden = 0;
- }
- $datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain,
- $emailrules,$emailruleorder,$settings,$status,$rowid,
- $usertypeshash{$status},$css_class,$currstyle,$intdom);
- unless ($hidden) {
- $$rowtotal ++;
- }
+ $additional .= '
';
+ foreach my $status (@ordered) {
+ $additional .= ''.$usertypeshash{$status}.' ';
+ }
+ $additional .= ' ';
+ foreach my $status (@ordered) {
+ $additional .= ''.&email_as_username($rowtotal,$processing,$status).' ';
}
+ $additional .= '
';
} else {
- my $css_class;
- if ($$rowtotal%2) {
- $css_class = 'LC_odd_row ';
- }
- $css_class .= $customclass;
$usertypeshash{'default'} = $othertitle;
- $datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain,
- $emailrules,$emailruleorder,$settings,'default','',
- $othertitle,$css_class,$rowstyle,$intdom);
- $$rowtotal ++;
+ $additional .= &email_as_username($rowtotal,$processing);
}
+ $additional .= '
'.
- "$description \n".
- ''.
- '';
- my %headers = &Apache::lonlocal::texthash(
- approve => 'Processing',
- email => 'E-mail',
- username => 'Username',
- );
- foreach my $item ('approve','email','username') {
- $output .= ''.$headers{$item}.' ';
- }
- $output .= ' ';
- foreach my $item ('approve','email','username') {
- $output .= '';
- my (%choices,@options,$hashref,$defoption,$name,$onclick,$hascustom);
- if ($item eq 'approve') {
- %choices = &Apache::lonlocal::texthash (
- automatic => 'Automatically approved',
- approval => 'Queued for approval',
- );
- @options = ('automatic','approval');
- $hashref = $processing;
- $defoption = 'automatic';
- $name = 'cancreate_emailprocess_'.$type;
- } elsif ($item eq 'email') {
- %choices = &Apache::lonlocal::texthash (
- any => 'Any e-mail',
- inst => 'Institutional only',
- noninst => 'Non-institutional only',
- custom => 'Custom restrictions',
- );
- @options = ('any','inst','noninst');
- my $showcustom;
- if (ref($emailrules) eq 'HASH') {
- if (keys(%{$emailrules}) > 0) {
- push(@options,'custom');
- $showcustom = 'cancreate_emailrule';
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{'email_rule'}) eq 'ARRAY') {
- foreach my $rule (@{$settings->{'email_rule'}}) {
- if (exists($emailrules->{$rule})) {
- $hascustom ++;
- }
- }
- } elsif (ref($settings->{'email_rule'}) eq 'HASH') {
- if (ref($settings->{'email_rule'}{$type}) eq 'ARRAY') {
- foreach my $rule (@{$settings->{'email_rule'}{$type}}) {
- if (exists($emailrules->{$rule})) {
- $hascustom ++;
- }
- }
- }
- }
+ if ($processing->{'default'} eq $option) {
+ $checked = ' checked="checked"';
}
}
- }
- $onclick = ' onclick="toggleEmailOptions(this.form,'."'cancreate_emailoptions','$showcustom',".
- "'cancreate_emaildomain','$type'".');"';
- $hashref = $emailoptions;
- $defoption = 'any';
- $name = 'cancreate_emailoptions_'.$type;
- } elsif ($item eq 'username') {
- %choices = &Apache::lonlocal::texthash (
- all => 'Same as e-mail',
- first => 'Omit @domain',
- free => 'Free to choose',
- );
- @options = ('all','first','free');
- $hashref = $emailverified;
- $defoption = 'all';
- $name = 'cancreate_usernameoptions_'.$type;
- }
- foreach my $option (@options) {
- my $checked;
- if (ref($hashref) eq 'HASH') {
- if ($type eq '') {
- if (!exists($hashref->{'default'})) {
- if ($option eq $defoption) {
- $checked = ' checked="checked"';
- }
- } else {
- if ($hashref->{'default'} eq $option) {
- $checked = ' checked="checked"';
- }
+ } else {
+ if (!exists($processing->{$type})) {
+ if ($option eq 'automatic') {
+ $checked = ' checked="checked"';
}
} else {
- if (!exists($hashref->{$type})) {
- if ($option eq $defoption) {
- $checked = ' checked="checked"';
- }
- } else {
- if ($hashref->{$type} eq $option) {
- $checked = ' checked="checked"';
- }
- }
- }
- } elsif (($item eq 'email') && ($hascustom)) {
- if ($option eq 'custom') {
- $checked = ' checked="checked"';
- }
- } elsif ($option eq $defoption) {
- $checked = ' checked="checked"';
- }
- $output .= ''.
- ' '.
- ''.&mt('Disallow').' '.
- &user_formats_row('email',$settings,$emailrules,
- $emailruleorder,$numinrow,'',$type);
- '
';
- } elsif (($option eq 'inst') || ($option eq 'noninst')) {
- my %text = &Apache::lonlocal::texthash (
- inst => 'must end:',
- noninst => 'cannot end:',
- );
- my $value;
- if (ref($emaildomain) eq 'HASH') {
- if (ref($emaildomain->{$type}) eq 'HASH') {
- $value = $emaildomain->{$type}->{$option};
- }
- }
- if ($value eq '') {
- $value = '@'.$intdom;
- }
- my $condition = 'cancreate_emaildomain_'.$option.'_'.$type;
- my $display = 'none';
- if ($checked) {
- $display = 'inline';
+ if ($processing->{$type} eq $option) {
+ $checked = ' checked="checked"';
}
- $output .= ''.
- ''.$text{$option}.' '.
- '
';
}
}
+ } elsif ($option eq 'automatic') {
+ $checked = ' checked="checked"';
+ }
+ my $name = 'cancreate_emailprocess';
+ if (($type ne '') && ($type ne 'default')) {
+ $name .= '_'.$type;
+ }
+ $output .= ''.
+ ' '."\n";
}
- $output .= "
\n";
+ $$rowtotal ++;
return $output;
}
sub captcha_choice {
- my ($context,$settings,$itemcount,$customcss,$rowstyle) = @_;
+ my ($context,$settings,$itemcount) = @_;
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext,
$vertext,$currver);
my %lt = &captcha_phrases();
@@ -5548,20 +5252,7 @@ sub captcha_choice {
} else {
$checked{'original'} = ' checked="checked"';
}
- my $css_class;
- if ($itemcount%2) {
- $css_class = 'LC_odd_row';
- }
- if ($customcss) {
- $css_class .= " $customcss";
- }
- $css_class =~ s/^\s+//;
- if ($css_class) {
- $css_class = ' class="'.$css_class.'"';
- }
- if ($rowstyle) {
- $css_class .= ' style="'.$rowstyle.'"';
- }
+ my $css_class = $itemcount%2?' class="LC_odd_row"':'';
my $output = ''.
''.$rowname.' '."\n".
''."\n";
@@ -5580,7 +5271,7 @@ sub captcha_choice {
# specified for use with the key should be broad enough to accommodate all servers in the LON-CAPA domain.
#
$output .= ' '."\n".
+ ' '."\n".
''.$pubtext.' '."\n".
' '.
- ''.
- &mt("Format rules to check for $text{$type}: ").
- ' ';
+ my $css_class = $rowcount%2?' class="LC_odd_row"':'';
+ $output = ''.
+ '';
+ if ($type eq 'email') {
+ $output .= &mt("Formats disallowed for $text{$type}: ");
+ } else {
+ $output .= &mt("Format rules to check for $text{$type}: ");
}
+ $output .= ' ';
- unless ($type eq 'email') {
- $output .= ' ';
- }
+ $output .= '
';
return $output;
}
@@ -5856,7 +5535,7 @@ sub print_defaults {
1 => 'Yes, allow login then update passwd file using default cost (if higher)',
2 => 'Yes, disallow login if stored cost is less than domain default',
);
- $datatable .= '';
+ $datatable .= '';
foreach my $option (@options) {
my $checked = ' ';
my $onclick;
@@ -5882,12 +5561,17 @@ sub print_defaults {
} else {
my %defaults;
if (ref($settings) eq 'HASH') {
- if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) 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 .= ''.
''.
@@ -5900,12 +5584,23 @@ sub print_defaults {
}
$datatable .= ''.$vpos.' ';
}
+ my ($checkedon,$checkedoff);
+ $checkedoff = ' checked="checked"';
+ if ($guestok) {
+ $checkedon = $checkedoff;
+ $checkedoff = '';
+ }
$datatable .= ' '.&mt('Internal ID:').' '.$item.' '.
' '.&mt('Name displayed:').
+ ' '.&mt('Name displayed:').
' '.
+ ' '.
+ ' '.
&mt('Name displayed:').
' '.
+ ' '.$hdritem->{'header'}->[1]->{'col2'}.' '
+ $datatable .= ''.$hdritem->{'header'}->[1]->{'col2'}.' '.
' '."\n";
}
$$rowtotal += $rownum;
return $datatable;
@@ -6670,7 +6370,7 @@ sub initialize_categories {
my $select1 = '';
foreach my $default ('instcode','communities') {
$css_class = $itemcount%2?' class="LC_odd_row"':'';
- $chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"';
+ $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','0'".');"';
if ($default eq 'communities') {
$select1 = $select0;
$select0 = '';
@@ -6695,8 +6395,9 @@ sub initialize_categories {
.'1 '
.'2 '
.'3 '
- .&mt('Add category').''.&mt('Name:')
- .' ';
+ .&mt('Add category').'>'.&mt('Name:')
+ .' '.&mt('Add subcategory:').' ';
}
}
}
@@ -6783,14 +6484,13 @@ sub build_category_rows {
}
sub modifiable_userdata_row {
- my ($context,$item,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref,
- $rowid,$customcss,$rowstyle) = @_;
+ my ($context,$item,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref) = @_;
my ($role,$rolename,$statustype);
$role = $item;
if ($context eq 'cancreate') {
- if ($item =~ /^(emailusername)_(.+)$/) {
- $role = $1;
- $statustype = $2;
+ if ($item =~ /^emailusername_(.+)$/) {
+ $statustype = $1;
+ $role = 'emailusername';
if (ref($usertypes) eq 'HASH') {
if ($usertypes->{$statustype}) {
$rolename = &mt('Data provided by [_1]',$usertypes->{$statustype});
@@ -6825,25 +6525,8 @@ sub modifiable_userdata_row {
%fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
}
my $output;
- my $css_class;
- if ($rowcount%2) {
- $css_class = 'LC_odd_row';
- }
- if ($customcss) {
- $css_class .= " $customcss";
- }
- $css_class =~ s/^\s+//;
- if ($css_class) {
- $css_class = ' class="'.$css_class.'"';
- }
- if ($rowstyle) {
- $css_class .= ' style="'.$rowstyle.'"';
- }
- if ($rowid) {
- $rowid = ' id="'.$rowid.'"';
- }
-
- $output = ''.
+ my $css_class = $rowcount%2?' class="LC_odd_row"':'';
+ $output = ' '.
''.$rolename.' ';
my $rem;
@@ -6877,10 +6560,9 @@ sub modifiable_userdata_row {
}
}
}
-
- my $total = scalar(@fields);
- for (my $i=0; $i<$total; $i++) {
- $rem = $i%($numinrow);
+
+ for (my $i=0; $i<@fields; $i++) {
+ my $rem = $i%($numinrow);
if ($rem == 0) {
if ($i > 0) {
$output .= '';
@@ -6922,13 +6604,10 @@ sub modifiable_userdata_row {
'';
}
$output .= '';
+ $rem = @fields%($numinrow);
}
- $rem = $total%$numinrow;
- my $colsleft;
- if ($rem) {
- $colsleft = $numinrow - $rem;
- }
- if ($colsleft > 1) {
+ my $colsleft = $numinrow - $rem;
+ if ($colsleft > 1 ) {
$output .= ''.
' ';
} elsif ($colsleft == 1) {
@@ -6939,13 +6618,11 @@ sub modifiable_userdata_row {
}
sub insttypes_row {
- my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rowtotal,$onclick,
- $customcss,$rowstyle) = @_;
+ my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rownum) = @_;
my %lt = &Apache::lonlocal::texthash (
cansearch => 'Users allowed to search',
statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)',
lockablenames => 'User preference to lock name',
- selfassign => 'Self-reportable affiliations',
);
my $showdom;
if ($context eq 'cansearch') {
@@ -6955,22 +6632,9 @@ sub insttypes_row {
if ($context eq 'statustocreate') {
$class = 'LC_right_item';
}
- my $css_class;
- if ($$rowtotal%2) {
- $css_class = 'LC_odd_row';
- }
- if ($customcss) {
- $css_class .= ' '.$customcss;
- }
- $css_class =~ s/^\s+//;
- if ($css_class) {
- $css_class = ' class="'.$css_class.'"';
- }
- if ($rowstyle) {
- $css_class .= ' style="'.$rowstyle.'"';
- }
- if ($onclick) {
- $onclick = 'onclick="'.$onclick.'" ';
+ my $css_class = ' class="LC_odd_row"';
+ if ($rownum ne '') {
+ $css_class = ($rownum%2? ' class="LC_odd_row"':'');
}
my $output = ''.
''.$lt{$context}.$showdom.
@@ -6999,14 +6663,14 @@ sub insttypes_row {
$output .= ' '.
''.
' ';
}
}
$rem = @{$types}%($numinrow);
}
my $colsleft = $numinrow - $rem;
- if (($rem == 0) && (@{$types} > 0)) {
+ if ($rem == 0) {
$output .= '';
}
if ($colsleft > 1) {
@@ -7026,7 +6690,7 @@ sub insttypes_row {
}
$output .= ''.
'
';
return $output;
@@ -8062,14 +7726,14 @@ sub publishlogo {
} else {
my $source = $filepath.'/'.$file;
my $logfile;
- if (!open($logfile,">>$source".'.log')) {
+ if (!open($logfile,">>",$source.'.log')) {
return (&mt('No write permission to Authoring Space'));
}
print $logfile
"\n================= Publish ".localtime()." ================\n".
$env{'user.name'}.':'.$env{'user.domain'}."\n";
# Save the file
- if (!open(FH,'>'.$source)) {
+ if (!open(FH,">",$source)) {
&Apache::lonnet::logthis('Failed to create '.$source);
return (&mt('Failed to create file'));
}
@@ -8130,7 +7794,8 @@ $env{'user.name'}.':'.$env{'user.domain'
if ($fullwidth ne '' && $fullheight ne '') {
if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) {
my $thumbsize = $thumbwidth.'x'.$thumbheight;
- system("convert -sample $thumbsize $inputfile $outfile");
+ my @args = ('convert','-sample',$thumbsize,$inputfile,$outfile);
+ system({$args[0]} @args);
chmod(0660, $filepath.'/tn-'.$file);
if (-e $outfile) {
my $copyfile=$targetdir.'/tn-'.$file;
@@ -8209,7 +7874,7 @@ sub write_metadata {
{
print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file;
my $mfh;
- if (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) {
+ if (open($mfh,">",$targetdir.'/'.$file.'.meta')) {
foreach (sort(keys(%metadatafields))) {
unless ($_=~/\./) {
my $unikey=$_;
@@ -8243,7 +7908,7 @@ sub notifysubscribed {
next unless (ref($targetsource) eq 'ARRAY');
my ($target,$source)=@{$targetsource};
if ($source ne '') {
- if (open(my $logfh,'>>'.$source.'.log')) {
+ if (open(my $logfh,">>",$source.'.log')) {
print $logfh "\nCleanup phase: Notifications\n";
my @subscribed=&subscribed_hosts($target);
foreach my $subhost (@subscribed) {
@@ -8269,7 +7934,7 @@ sub notifysubscribed {
sub subscribed_hosts {
my ($target) = @_;
my @subscribed;
- if (open(my $fh,"<$target.subscription")) {
+ if (open(my $fh,"<","$target.subscription")) {
while (my $subline=<$fh>) {
if ($subline =~ /^($match_lonid):/) {
my $host = $1;
@@ -8468,16 +8133,20 @@ sub modify_quotas {
#FIXME need to obsolete item in RES space
} elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) {
my ($cdom,$cnum) = split(/_/,$key);
- my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i,
- $cdom,$cnum,$type,$configuserok,
- $switchserver,$author_ok);
- if ($imgurl) {
- $confhash{$type}{$key}{'image'} = $imgurl;
- $changes{$type}{$key} = 1;
- }
- if ($error) {
- &Apache::lonnet::logthis($error);
- $errors .= ''.$error.' '.&mt('Image not saved: could not find textbook course').' '.$error.' '.$error.' '.&mt('Image not saved: could not find textbook course').' '.$error.' '.
- &mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts via log-in or single sign-on.").
- ' '.
+ &mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.").
+ ' ';
}
}
}
- if (grep(/^email$/,@{$cancreate{$type}})) {
- if (!@statuses) {
- $chgtext .= ''.
- &mt("However, e-mail verification is currently set to 'unavailable' for all user types (including 'other'), so self-creation of accounts is not possible for non-institutional log-in.").
- ' ';
@@ -10637,7 +10208,7 @@ sub modify_selfcreation {
}
}
$chgtext .= ' ';
- }
+ }
} elsif ($type eq 'statustocreate') {
if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') &&
(ref($cancreate{'statustocreate'}) eq 'ARRAY')) {
@@ -10650,7 +10221,7 @@ sub modify_selfcreation {
&mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.").
'';
}
- } elsif (keys(%usertypes) > 0) {
+ } elsif (ref($usertypes) eq 'HASH') {
if (grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) {
$chgtext .= &mt('Creation of a new account for an institutional user is restricted to the following institutional affiliation(s):');
} else {
@@ -10661,12 +10232,12 @@ sub modify_selfcreation {
if ($case eq 'default') {
$chgtext .= ''.$othertitle.' ';
} else {
- $chgtext .= ''.$usertypes{$case}.' ';
+ $chgtext .= ''.$usertypes->{$case}.' ';
}
}
$chgtext .= '';
if (!grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) {
- $chgtext .= ''.
+ $chgtext .= ''.
&mt('However, users authenticated by institutional login/single sign on are not currently permitted to create accounts.').
' ';
}
@@ -10678,129 +10249,26 @@ sub modify_selfcreation {
$chgtext .= &mt('Although institutional affiliations permitted to create accounts were changed, self creation of accounts is not currently permitted for any authentication types.');
}
}
- $chgtext .= '';
- foreach my $status (@statuses) {
- if ($status eq 'default') {
- $chgtext .= ''.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.' ';
- } else {
- $chgtext .= ''.$usertypes{$status}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}.' ';
- }
- }
- $chgtext .= ' ';
- }
- } else {
- $chgtext .= &mt('Processing of requests to create account with e-mail verification set to: "[_1]"',
- $choices{$cancreate{'selfcreateprocessing'}{'default'}});
- }
- } elsif ($type eq 'emailverified') {
- my %options = &Apache::lonlocal::texthash (
- all => 'Same as e-mail',
- first => 'Omit @domain',
- free => 'Free to choose',
- );
- if (@types) {
- if (@statuses) {
- $chgtext .= &mt('For self-created accounts verified by e-mail address, username is set as follows:').
- '';
- foreach my $status (@statuses) {
- if ($type eq 'default') {
- $chgtext .= ''.$othertitle.' -- '.$options{$cancreate{'emailverified'}{$status}}.' ';
- } else {
- $chgtext .= ''.$usertypes{$status}.' -- '.$options{$cancreate{'emailverified'}{$status}}.' ';
- }
- }
- $chgtext .= ' ';
- }
- } else {
- $chgtext .= &mt("For self-created accounts verified by e-mail address, user's username is: '[_1]'",
- $options{$cancreate{'emailverified'}{'default'}});
- }
- } elsif ($type eq 'emailoptions') {
- my %options = &Apache::lonlocal::texthash (
- any => 'Any e-mail',
- inst => 'Institutional only',
- noninst => 'Non-institutional only',
- custom => 'Custom restrictions',
- );
- if (@types) {
- if (@statuses) {
- $chgtext .= &mt('For self-created accounts verified by e-mail address, requirements for e-mail address are as follows:').
- '';
- foreach my $status (@statuses) {
- if ($type eq 'default') {
- $chgtext .= ''.$othertitle.' -- '.$options{$cancreate{'emailoptions'}{$status}}.' ';
- } else {
- $chgtext .= ''.$usertypes{$status}.' -- '.$options{$cancreate{'emailoptions'}{$status}}.' ';
- }
- }
- $chgtext .= ' ';
- }
+ 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 {
- if ($cancreate{'emailoptions'}{'default'} eq 'any') {
- $chgtext .= &mt('For self-created accounts verified by e-mail address, any e-mail may be used');
- } else {
- $chgtext .= &mt('For self-created accounts verified by e-mail address, e-mail restricted to: "[_1]"',
- $options{$cancreate{'emailoptions'}{'default'}});
- }
- }
- } elsif ($type eq 'emaildomain') {
- my $output;
- if (@statuses) {
- foreach my $type (@statuses) {
- if (ref($cancreate{'emaildomain'}{$type}) eq 'HASH') {
- if ($cancreate{'emailoptions'}{$type} eq 'inst') {
- if ($type eq 'default') {
- if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') ||
- ($cancreate{'emaildomain'}{$type}{'inst'} eq '')) {
- $output = ''.$othertitle.' -- '.&mt('No restriction on e-mail domain').' ';
- } else {
- $output = ''.$othertitle.' -- '.&mt("User's e-mail address needs to end: [_1]",
- $cancreate{'emaildomain'}{$type}{'inst'}).' ';
- }
- } else {
- if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') ||
- ($cancreate{'emaildomain'}{$type}{'inst'} eq '')) {
- $output = ''.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').' ';
- } else {
- $output = ''.$usertypes{$type}.' -- '.&mt("User's e-mail address needs to end: [_1]",
- $cancreate{'emaildomain'}{$type}{'inst'}).' ';
- }
- }
- } elsif ($cancreate{'emailoptions'}{$type} eq 'noninst') {
- if ($type eq 'default') {
- if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') ||
- ($cancreate{'emaildomain'}{$type}{'noninst'} eq '')) {
- $output = ''.$othertitle.' -- '.&mt('No restriction on e-mail domain').' ';
- } else {
- $output = ''.$othertitle.' -- '.&mt("User's e-mail address must not end: [_1]",
- $cancreate{'emaildomain'}{$type}{'noninst'}).' ';
- }
- } else {
- if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') ||
- ($cancreate{'emaildomain'}{$type}{'noninst'} eq '')) {
- $output = ''.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').' ';
- } else {
- $output = ''.$usertypes{$type}.' -- '.&mt("User's e-mail address must not end: [_1]",
- $cancreate{'emaildomain'}{$type}{'noninst'}).' ';
- }
- }
- }
- }
- }
- }
- if ($output ne '') {
- $chgtext .= &mt('For self-created accounts verified by e-mail address:').
- '';
+ $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') {
@@ -10837,11 +10305,11 @@ sub modify_selfcreation {
}
} elsif ($type eq 'emailusername') {
if (ref($cancreate{'emailusername'}) eq 'HASH') {
- if (@statuses) {
- foreach my $type (@statuses) {
+ if (ref($types) eq 'ARRAY') {
+ foreach my $type (@{$types}) {
if (ref($cancreate{'emailusername'}{$type}) eq 'HASH') {
if (keys(%{$cancreate{'emailusername'}{$type}}) > 0) {
- $chgtext .= &mt('When self-creating account with e-mail verification, the following information will be provided by [_1]:',"'$usertypes{$type}'").
+ $chgtext .= &mt('When self-creating account with e-mail as username, the following information will be provided by [_1]:',"'$usertypes->{$type}'").
'';
foreach my $field (@{$infofields}) {
if ($cancreate{'emailusername'}{$type}{$field}) {
@@ -10850,86 +10318,48 @@ sub modify_selfcreation {
}
$chgtext .= ' ';
} else {
- $chgtext .= &mt('When self creating account with e-mail verification, no information besides e-mail address will be provided by [_1].',"'$usertypes{$type}'").''.$chgtext.' ';
}
}
}
- if ((ref($changes{'email_rule'}) eq 'ARRAY') && (@{$changes{'email_rule'}} > 0)) {
+ if (ref($changes{'email_rule'}) eq 'ARRAY') {
my ($emailrules,$emailruleorder) =
&Apache::lonnet::inst_userrules($dom,'email');
- foreach my $type (@{$changes{'email_rule'}}) {
- if (ref($email_rule{$type}) eq 'ARRAY') {
- my $chgtext = '';
- foreach my $rule (@{$email_rule{$type}}) {
- if (ref($emailrules->{$rule}) eq 'HASH') {
- $chgtext .= ''.$emailrules->{$rule}{'name'}.' ';
- }
- }
- $chgtext .= ' ';
- my $typename;
- if (@types) {
- if ($type eq 'default') {
- $typename = $othertitle;
- } else {
- $typename = $usertypes{$type};
- }
- $chgtext .= &mt('(Affiliation: [_1])',$typename);
- }
- if (@{$email_rule{$type}} > 0) {
- $resulttext .= ''.
- &mt('Accounts may not be created by users verified by e-mail, for e-mail addresses of the following types: ',
- $usertypes{$type}).
- $chgtext.
- ' ';
- } else {
- $resulttext .= ''.
- &mt('There are now no restrictions on e-mail addresses which may be used for verification when a user requests an account.').
- ' '.
- &mt('(Affiliation: [_1])',$typename);
- }
+ my $chgtext = '';
+ foreach my $type (@email_rule) {
+ if (ref($emailrules->{$type}) eq 'HASH') {
+ $chgtext .= ''.$emailrules->{$type}{'name'}.' ';
}
}
- }
- if (ref($changes{'inststatus'}) eq 'ARRAY') {
- if (ref($save_inststatus{'inststatusguest'}) eq 'ARRAY') {
- if (@{$save_inststatus{'inststatusguest'}} > 0) {
- my $chgtext = '';
- foreach my $type (@{$save_inststatus{'inststatusguest'}}) {
- $chgtext .= ''.$usertypes{$type}.' ';
- }
- $chgtext .= ' ';
- $resulttext .= ''.
- &mt('A user will self-report one of the following affiliations when requesting an account verified by e-mail: ').
- $chgtext.
- ' ';
- } else {
- $resulttext .= ''.
- &mt('No affiliations available for self-reporting when requesting an account verified by e-mail.').
- ' ';
- }
+ $chgtext .= ' ';
+ if (@email_rule > 0) {
+ $resulttext .= ''.
+ &mt('Accounts may not be created by users self-enrolling with e-mail addresses of the following types: ').
+ $chgtext.
+ ' ';
+ } else {
+ $resulttext .= ''.
+ &mt('There are now no restrictions on e-mail addresses which may be used as a username when self-enrolling.').
+ ' ';
}
}
if (ref($changes{'selfcreate'}) eq 'ARRAY') {
@@ -10937,9 +10367,9 @@ sub modify_selfcreation {
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
foreach my $type (@{$changes{'selfcreate'}}) {
my $typename = $type;
- if (keys(%usertypes) > 0) {
- if ($usertypes{$type} ne '') {
- $typename = $usertypes{$type};
+ if (ref($usertypes) eq 'HASH') {
+ if ($usertypes->{$type} ne '') {
+ $typename = $usertypes->{$type};
}
}
my @modifiable;
@@ -10962,12 +10392,6 @@ sub modify_selfcreation {
$resulttext .= '';
}
$resulttext .= '';
- my $cachetime = 24*60*60;
- $domdefaults{'inststatusguest'} = $save_inststatus{'inststatusguest'};
- &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
- if (ref($lastactref) eq 'HASH') {
- $lastactref->{'domdefaults'} = 1;
- }
} else {
$resulttext = &mt('No changes made to self-creation settings');
}
@@ -11251,18 +10675,9 @@ sub modify_defaults {
}
my @todelete = &Apache::loncommon::get_env_multiple('form.inststatus_delete');
my @allpos;
+ my %guests;
my %alltypes;
- my @inststatusguest;
- if (ref($currinststatus) eq 'HASH') {
- if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') {
- foreach my $type (@{$currinststatus->{'inststatusguest'}}) {
- unless (grep(/^\Q$type\E$/,@todelete)) {
- push(@inststatusguest,$type);
- }
- }
- }
- }
- my ($currtitles,$currorder);
+ my ($currtitles,$currguests,$currorder);
if (ref($currinststatus) eq 'HASH') {
if (ref($currinststatus->{'inststatusorder'}) eq 'ARRAY') {
foreach my $type (@{$currinststatus->{'inststatusorder'}}) {
@@ -11277,8 +10692,14 @@ sub modify_defaults {
$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/,$//;
}
@@ -11287,6 +10708,9 @@ sub modify_defaults {
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'};
@@ -11296,10 +10720,13 @@ sub modify_defaults {
}
}
}
- my @orderedstatus;
+ 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)) {
@@ -11310,7 +10737,7 @@ sub modify_defaults {
$defaults_hash{'inststatus'} = {
inststatustypes => \%alltypes,
inststatusorder => \@orderedstatus,
- inststatusguest => \@inststatusguest,
+ inststatusguest => \@orderedguests,
};
if (ref($defaults_hash{'inststatus'}) eq 'HASH') {
foreach my $item ('inststatustypes','inststatusorder','inststatusguest') {
@@ -11320,6 +10747,9 @@ sub modify_defaults {
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}.',';
@@ -11338,15 +10768,26 @@ sub modify_defaults {
foreach my $item (sort(keys(%changes))) {
if ($item eq 'inststatus') {
if (ref($changes{'inststatus'}) eq 'HASH') {
- if (@orderedstatus) {
+ 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 .= ' ';
- } else {
- $resulttext .= ''.&mt('Institutional user status types deleted').' ';
+ }
+ 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 {
@@ -12809,12 +12250,12 @@ 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;
+ 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 .= '';
@@ -14096,7 +13537,6 @@ function toggleDisplay(domForm,caller) {
var optionsElement = domForm.coursecredits;
var checkval = 1;
var dispval = 'block';
- var selfcreateRegExp = /^cancreate_emailverified/;
if (caller == 'emailoptions') {
optionsElement = domForm.cancreate_email;
}
@@ -14107,11 +13547,6 @@ function toggleDisplay(domForm,caller) {
optionsElement = domForm.canclone;
checkval = 'instcode';
}
- if (selfcreateRegExp.test(caller)) {
- optionsElement = domForm.elements[caller];
- checkval = 'other';
- dispval = 'inline'
- }
if (optionsElement.length) {
var currval;
for (var i=0; i