[LON-CAPA-cvs] cvs: loncom /interface createaccount.pm domainprefs.pm loncommon.pm lonconfigsettings.pm /lonnet/perl lonnet.pm
raeburn
raeburn at source.lon-capa.org
Wed Apr 23 06:11:35 EDT 2014
raeburn Wed Apr 23 10:11:35 2014 EDT
Modified files:
/loncom/interface domainprefs.pm lonconfigsettings.pm
createaccount.pm loncommon.pm
/loncom/lonnet/perl lonnet.pm
Log:
- Institutional ststus types can now be defined via domain configuration
web interface by Domain Coordinator -- will supercede use of customized
localenroll::inst_usertypes().
- Self-creation of account with e-mail address as username:
- Domain configuration to set which status types (faculty, staff , student
etc.) can apply to "non-institutional" usernames.
- Processing of username requests can be either automatic or queued for
approval depending on status type (self-reported).
-------------- next part --------------
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.235 loncom/interface/domainprefs.pm:1.236
--- loncom/interface/domainprefs.pm:1.235 Wed Apr 16 13:32:43 2014
+++ loncom/interface/domainprefs.pm Wed Apr 23 10:11:26 2014
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.235 2014/04/16 13:32:43 raeburn Exp $
+# $Id: domainprefs.pm,v 1.236 2014/04/23 10:11:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -215,7 +215,7 @@
'contacts','defaults','scantron','coursecategories',
'serverstatuses','requestcourses','helpsettings',
'coursedefaults','usersessions','loadbalancing',
- 'requestauthor','selfenrollment'],$dom);
+ 'requestauthor','selfenrollment','inststatus'],$dom);
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
'autoupdate','autocreate','directorysrch','contacts',
'usercreation','selfcreation','usermodification','scantron',
@@ -255,10 +255,12 @@
modify => \&modify_login,
},
'defaults' =>
- { text => 'Default authentication/language/timezone/portal',
+ { text => 'Default authentication/language/timezone/portal/types',
help => 'Domain_Configuration_LangTZAuth',
header => [{col1 => 'Setting',
- col2 => 'Value'}],
+ col2 => 'Value'},
+ {col1 => 'Institutional user types',
+ col2 => 'Assignable to e-mail usernames'}],
print => \&print_defaults,
modify => \&modify_defaults,
},
@@ -495,7 +497,7 @@
}
} elsif ($phase eq 'display') {
my $js = &recaptcha_js().
- &credits_js();
+ &toggle_display_js();
if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($dom);
@@ -645,8 +647,10 @@
my $output;
if ($action eq 'coursecategories') {
$output = &coursecategories_javascript($settings);
+ } elsif ($action eq 'defaults') {
+ $output = &defaults_javascript($settings);
}
- $output .=
+ $output .=
'<table class="LC_nested_outer">
<tr>
<th align="left" valign="middle"><span class="LC_nobreak">'.
@@ -661,7 +665,7 @@
if ($numheaders > 1) {
my $colspan = '';
my $rightcolspan = '';
- if (($action eq 'rolecolors') || ($action eq 'coursecategories') ||
+ if (($action eq 'rolecolors') || ($action eq 'coursecategories') || ($action eq 'defaults') ||
(($action eq 'login') && ($numheaders < 3))) {
$colspan = ' colspan="2"';
}
@@ -678,7 +682,7 @@
</tr>';
$rowtotal ++;
if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') ||
- ($action eq 'usermodification') || ($action eq 'coursedefaults') ||
+ ($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') ||
($action eq 'selfenrollment') || ($action eq 'usersessions')) {
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
} elsif ($action eq 'coursecategories') {
@@ -723,7 +727,8 @@
</tr>'."\n".
$item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
$rowtotal ++;
- } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults')) {
+ } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
+ ($action eq 'defaults')) {
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
} elsif ($action eq 'coursecategories') {
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
@@ -849,8 +854,7 @@
if ($action eq 'quotas') {
$output .= &print_quotas($dom,$settings,\$rowtotal,$action);
} elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || ($action eq 'directorysrch') ||
- ($action eq 'contacts') || ($action eq 'defaults') || ($action eq 'serverstatuses') ||
- ($action eq 'loadbalancing')) {
+ ($action eq 'contacts') || ($action eq 'serverstatuses') || ($action eq 'loadbalancing')) {
$output .= $item->{'print'}->($dom,$settings,\$rowtotal);
} elsif ($action eq 'scantron') {
$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
@@ -2099,7 +2103,7 @@
}
my $confname = $dom.'-domainconfig';
my $switchserver = &check_switchserver($dom,$confname);
- my $maxnum = scalar(keys(%ordered));
+ $maxnum = scalar(keys(%ordered));
my $datatable = &textbookcourses_javascript(\%ordered);
if (keys(%ordered)) {
my @items = sort { $a <=> $b } keys(%ordered);
@@ -2218,7 +2222,6 @@
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;
@@ -2812,7 +2815,7 @@
}
$datatable .= '</tr></table></td></tr>'."\n";
$itemcount ++;
- my $onclick = 'toggleCredits(this.form);';
+ my $onclick = "toggleDisplay(this.form,'credits');";
my $display = 'none';
if ($currusecredits) {
$display = 'block';
@@ -4020,17 +4023,22 @@
sub print_selfcreation {
my ($position,$dom,$settings,$rowtotal) = @_;
- my (@selfcreate,$createsettings,$datatable);
+ my (@selfcreate,$createsettings,$processing,$datatable);
if (ref($settings) eq 'HASH') {
if (ref($settings->{'cancreate'}) eq 'HASH') {
$createsettings = $settings->{'cancreate'};
- 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'});
+ 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'};
}
}
}
@@ -4073,53 +4081,60 @@
foreach my $status (@{$types}) {
$datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
$numinrow,$$rowtotal,$usertypes);
- $$rowtotal ++;
+ $$rowtotal ++;
}
}
} else {
- 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 .= '<tr'.$css_class.'>'.
- '<td>'.&mt('E-mail address as username').
- '</td><td class="LC_left_item">'.
- '<span class="LC_nobreak">';
- 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"';
+ 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$/, at selfcreate)) {
+ $display = 'block';
+ }
+ my $onclick = "toggleDisplay(this.form,'emailoptions');";
+ my $additional = '<div id="emailoptions" style="display: '.$display.'">';
+ 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 .= '<table><tr>';
+ foreach my $status (@{$order}) {
+ $additional .= '<th>'.$usertypes->{$status}.'</th>';
+ }
+ $additional .= '</tr><tr>';
+ foreach my $status (@{$order}) {
+ $additional .= '<td>'.&email_as_username($rowtotal,$processing,$status).'</td>';
}
+ $additional .= '</tr></table>';
} else {
- if ((!$radiohash{'cancreate_email'}) && (!$radiohash{'cancreate_emailapproval'})) {
- $checked = 'checked="checked"';
- }
+ $usertypes->{'default'} = &mt('All users');
+ $additional .= &email_as_username($rowtotal,$processing);
}
- $datatable .= '<label>'.
- '<input type="radio" name="cancreate_email" '.
- $checked.' value="'.$option.'" />'.
- $choices{$option}.'</label> ';
}
- $$rowtotal ++;
- $datatable .= '</span></td></tr>'.
- &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal);
+ $additional .= '</div>'."\n";
+
+ ($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
+ \%choices,$itemcount,$onclick,$additional);
+ $$rowtotal += $itemcount;
+ $datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal);
$$rowtotal ++;
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
$numinrow = 1;
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- $usertypes->{'default'} = $othertitle;
- if (ref($types) eq 'ARRAY') {
- push(@{$types},'default');
- $usertypes->{'default'} = $othertitle;
- foreach my $status (@{$types}) {
+ if (ref($order) eq 'ARRAY') {
+ foreach my $status (@{$order}) {
$datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings,
$numinrow,$$rowtotal,$usertypes,$infofields,$infotitles);
$$rowtotal ++;
@@ -4139,6 +4154,59 @@
return $datatable;
}
+sub email_as_username {
+ my ($rowtotal,$processing,$type) = @_;
+ my %choices =
+ &Apache::lonlocal::texthash (
+ automatic => 'Automatic approval',
+ approval => 'Queued for approval',
+ );
+ my $output;
+ foreach my $option ('automatic','approval') {
+ my $checked;
+ if (ref($processing) eq 'HASH') {
+ if ($type eq '') {
+ if (!exists($processing->{'default'})) {
+ if ($option eq 'automatic') {
+ $checked = ' checked="checked"';
+ }
+ } else {
+ if ($processing->{'default'} eq $option) {
+ $checked = ' checked="checked"';
+ }
+ }
+ } else {
+ if (!exists($processing->{$type})) {
+ if ($option eq 'automatic') {
+ $checked = ' checked="checked"';
+ }
+ } else {
+ if ($processing->{$type} eq $option) {
+ $checked = ' checked="checked"';
+ }
+ }
+ }
+ } elsif ($option eq 'automatic') {
+ $checked = ' checked="checked"';
+ }
+ my $name = 'cancreate_emailprocess';
+ if (($type ne '') && ($type ne 'default')) {
+ $name .= '_'.$type;
+ }
+ $output .= '<span class="LC_nobreak"><label>'.
+ '<input type="radio" name="'.$name.'"'.
+ $checked.' value="'.$option.'" />'.
+ $choices{$option}.'</label></span>';
+ if ($type eq '') {
+ $output .= ' ';
+ } else {
+ $output .= '<br />';
+ }
+ }
+ $$rowtotal ++;
+ return $output;
+}
+
sub captcha_choice {
my ($context,$settings,$itemcount) = @_;
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
@@ -4325,70 +4393,143 @@
}
sub print_defaults {
- 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 ($position,$dom,$settings,$rowtotal) = @_;
my $rownum = 0;
my ($datatable,$css_class);
- foreach my $item (@items) {
- if ($rownum%2) {
- $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};
} else {
- $css_class = ' class="LC_odd_row" ';
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+ foreach my $item (@items) {
+ $defaults{$item} = $domdefaults{$item};
+ }
}
- $datatable .= '<tr'.$css_class.'>'.
- '<td><span class="LC_nobreak">'.$titles->{$item}.
- '</span></td><td class="LC_right_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 .= '<label><input type="radio" name="'.$item.
- '" value="'.$auth.'"'.$checked.'/>'.
- $authnames{$shortauth{$auth}}.'</label> ';
+ my $titles = &defaults_titles($dom);
+ foreach my $item (@items) {
+ if ($rownum%2) {
+ $css_class = '';
+ } else {
+ $css_class = ' class="LC_odd_row" ';
}
- } 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 .= '<tr'.$css_class.'>'.
+ '<td><span class="LC_nobreak">'.$titles->{$item}.
+ '</span></td><td class="LC_right_item" colspan="3">';
+ 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 .= '<label><input type="radio" name="'.$item.
+ '" value="'.$auth.'"'.$checked.'/>'.
+ $authnames{$shortauth{$auth}}.'</label> ';
+ }
+ } 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 .= '<input type="text" name="'.$item.'" value="'.
+ $defaults{$item}.'"'.$size.' />';
+ }
+ $datatable .= '</td></tr>';
+ $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 .= '<tr'.$css_class.'>'.
+ '<td><span class="LC_nobreak">'.
+ '<select name="inststatus_pos_'.$item.'"'.$chgstr.'>';
+ for (my $k=0; $k<=$maxnum; $k++) {
+ my $vpos = $k+1;
+ my $selstr;
+ if ($k == $i) {
+ $selstr = ' selected="selected" ';
+ }
+ $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+ }
+ my ($checkedon,$checkedoff);
+ $checkedoff = ' checked="checked"';
+ if ($guestok) {
+ $checkedon = $checkedoff;
+ $checkedoff = '';
+ }
+ $datatable .= '</select> '.&mt('Internal ID:').' <b>'.$item.'</b> '.
+ '<input type="checkbox" name="inststatus_delete" value="'.$item.'" />'.
+ &mt('delete').'</span></td>'.
+ '<td class="LC_left_item"><span class="LC_nobreak">'.&mt('Name displayed:').
+ '<input type="text" size="20" name="inststatus_title_'.$item.'" value="'.$title.'" />'.
+ '</span></td>'.
+ '<td class="LC_right_item"><span class="LC_nobreak">'.
+ '<label><input type="radio" value="1" name="inststatus_guest_'.$item.'"'.$checkedon.' />'.
+ &mt('Yes').'</label>'.(' 'x2).
+ '<label><input type="radio" value="0" name="inststatus_guest_'.$item.'"'.$checkedoff.' />'.
+ &mt('No').'</label></span></td></tr>';
+ }
+ $css_class = $rownum%2?' class="LC_odd_row"':'';
+ my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'addinststatus_pos'".');"';
+ $datatable .= '<tr '.$css_class.'>'.
+ '<td><span class="LC_nobreak"><select name="addinststatus_pos"'.$chgstr.'>';
+ for (my $k=0; $k<=$maxnum; $k++) {
+ my $vpos = $k+1;
+ my $selstr;
+ if ($k == $maxnum) {
+ $selstr = ' selected="selected" ';
+ }
+ $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+ }
+ $datatable .= '</select> '.&mt('Internal ID:').
+ '<input type="text" size="10" name="addinststatus" value="" /></span>'.
+ ' '.&mt('(new)').
+ '</span></td><td class="LC_left_item"><span class="LC_nobreak">'.
+ &mt('Name displayed:').
+ '<input type="text" size="20" name="addinststatus_title" value="" /></span></td>'.
+ '<td class="LC_right_item"><span class="LC_nobreak">'.
+ '<label><input type="radio" value="1" name="addinststatus_guest" />'.
+ &mt('Yes').'</label>'.(' 'x2).
+ '<label><input type="radio" value="0" name="addinststatus_guest" />'.
+ &mt('No').'</label></span></td></tr>';
+ '</tr>'."\n";
+ $rownum ++;
}
- $datatable .= '<input type="text" name="'.$item.'" value="'.
- $defaults{$item}.'"'.$size.' />';
}
- $datatable .= '</td></tr>';
- $rownum ++;
}
$$rowtotal += $rownum;
return $datatable;
@@ -4872,6 +5013,69 @@
'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";
+<script type="text/javascript">
+// <![CDATA[
+function reorderTypes(form,caller) {
+ var changedVal;
+$jstext
+ var newpos = 'addinststatus_pos';
+ var current = new Array;
+ var maxh = $maxnum;
+ var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
+ var oldVal;
+ if (caller == newpos) {
+ changedVal = newitemVal;
+ } else {
+ var curritem = 'inststatus_pos_'+caller;
+ changedVal = form.elements[curritem].options[form.elements[curritem].selectedIndex].value;
+ current[newitemVal] = newpos;
+ }
+ for (var i=0; i<inststatuses.length; i++) {
+ if (inststatuses[i] != caller) {
+ var elementName = 'inststatus_pos_'+inststatuses[i];
+ if (form.elements[elementName]) {
+ var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
+ current[currVal] = elementName;
+ }
+ }
+ }
+ for (var j=0; j<maxh; j++) {
+ if (current[j] == undefined) {
+ oldVal = j;
+ }
+ }
+ if (oldVal < changedVal) {
+ for (var k=oldVal+1; k<=changedVal ; k++) {
+ var elementName = current[k];
+ form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1;
+ }
+ } else {
+ for (var k=changedVal; k<oldVal; k++) {
+ var elementName = current[k];
+ form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1;
+ }
+ }
+ return;
+}
+
+// ]]>
+</script>
+
+ENDSCRIPT
+ }
+}
+
sub coursecategories_javascript {
my ($settings) = @_;
my ($output,$jstext,$cathash);
@@ -4904,7 +5108,6 @@
var changedVal;
$jstext
var newpos = 'addcategory_pos';
- var current = new Array;
if (parent == '') {
var has_instcode = 0;
var maxtop = categories[idx].length;
@@ -8079,7 +8282,8 @@
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 'emailusername') || ($item eq 'notify') ||
+ ($item eq 'selfcreateprocessing')) {
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
} else {
$save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -8110,22 +8314,37 @@
@{$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 (automatic creation)',
- emailapproval => 'users who provide a valid e-mail address for use as username (queued for Domain Coordinator review)',
+ email => 'users who provide a valid e-mail address for use as username',
);
#
# 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'} eq 'email') {
+ if ($env{'form.cancreate_email'}) {
push(@{$cancreate{'selfcreate'}},'email');
- } elsif ($env{'form.cancreate_email'} eq 'emailapproval') {
- push(@{$cancreate{'selfcreate'}},'emailapproval');
+ 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};
+ }
+ }
}
} else {
if ($env{'form.cancreate_'.$item}) {
@@ -8139,7 +8358,8 @@
# 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') || ($env{'form.cancreate_email'} eq 'emailapproval')) {
+
+ if ($env{'form.cancreate_email'} eq 'email') {
push(@contexts,'emailusername');
if (ref($types) eq 'ARRAY') {
foreach my $type (@{$types}) {
@@ -8199,7 +8419,7 @@
}
}
#
-# Check if domain default is set appropriately, if selef-creation of accounts is to be available for
+# Check if domain default is set appropriately, if self-creation of accounts is to be available for
# institutional log-in.
#
if (grep(/^login$/,@{$cancreate{'selfcreate'}})) {
@@ -8288,6 +8508,12 @@
}
}
}
+ } 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'}})) {
@@ -8311,6 +8537,12 @@
}
}
}
+ } 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'}})) {
@@ -8360,6 +8592,9 @@
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'};
}
@@ -8446,6 +8681,26 @@
}
}
}
+ } 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:').
+ '<ul>';
+ foreach my $type (@statuses) {
+ if ($type eq 'default') {
+ $chgtext .= '<li>'.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'</li>';
+ } else {
+ $chgtext .= '<li>'.$usertypes->{$type}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'</li>';
+ }
+ }
+ $chgtext .= '</ul>';
+ } 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.');
@@ -8789,6 +9044,103 @@
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$/, at 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, at orderedguests);
+ foreach my $type (@allpos) {
+ unless (($type eq '') || (grep(/^\Q$type\E$/, at orderedstatus))) {
+ push(@orderedstatus,$type);
+ if ($guests{$type}) {
+ push(@orderedguests,$type);
+ }
+ }
+ }
+ foreach my $type (keys(%alltypes)) {
+ unless (grep(/^\Q$type\E$/, at 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(',', at orderedstatus)) {
+ $changes{'inststatus'}{'inststatusorder'} = 1;
+ }
+ if ($currguests ne join(',', at 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') {
@@ -8797,21 +9149,47 @@
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))) {
- 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}};
+ if ($item eq 'inststatus') {
+ if (ref($changes{'inststatus'}) eq 'HASH') {
+ if (($changes{'inststatus'}{'inststatustypes'}) || $changes{'inststatus'}{'inststatusorder'}) {
+ $resulttext .= '<li>'.&mt('Institutional user status types set to:').' ';
+ foreach my $type (@orderedstatus) {
+ $resulttext .= $alltypes{$type}.', ';
+ }
+ $resulttext =~ s/, $//;
+ $resulttext .= '</li>';
+ }
+ if ($changes{'inststatus'}{'inststatusguest'}) {
+ $resulttext .= '<li>';
+ 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 .= '</li>';
+ }
+ }
+ } 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 .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>';
+ $mailmsgtext .= "$title->{$item} set to $value\n";
}
- $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>';
- $mailmsgtext .= "$title->{$item} set to $value\n";
}
$resulttext .= '</ul>';
$mailmsgtext .= "\n";
@@ -10897,27 +11275,30 @@
}
-sub credits_js {
+sub toggle_display_js {
return <<"END";
<script type="text/javascript">
// <![CDATA[
-function toggleCredits(domForm) {
- if (document.getElementById('credits')) {
- creditsitem = document.getElementById('credits');
- var creditsLength = domForm.coursecredits.length;
- if (creditsLength) {
+function toggleDisplay(domForm,caller) {
+ if (document.getElementById(caller)) {
+ var divitem = document.getElementById(caller);
+ var optionsElement = domForm.coursecredits;
+ if (caller == 'emailoptions') {
+ optionsElement = domForm.cancreate_email;
+ }
+ if (optionsElement.length) {
var currval;
- for (var i=0; i<creditsLength; i++) {
- if (domForm.coursecredits[i].checked) {
- currval = domForm.coursecredits[i].value;
+ for (var i=0; i<optionsElement.length; i++) {
+ if (optionsElement[i].checked) {
+ currval = optionsElement[i].value;
}
}
if (currval == 1) {
- creditsitem.style.display = 'block';
+ divitem.style.display = 'block';
} else {
- creditsitem.style.display = 'none';
+ divitem.style.display = 'none';
}
}
}
Index: loncom/interface/lonconfigsettings.pm
diff -u loncom/interface/lonconfigsettings.pm:1.28 loncom/interface/lonconfigsettings.pm:1.29
--- loncom/interface/lonconfigsettings.pm:1.28 Wed Feb 12 20:37:42 2014
+++ loncom/interface/lonconfigsettings.pm Wed Apr 23 10:11:26 2014
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: lonconfigsettings.pm,v 1.28 2014/02/12 20:37:42 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.29 2014/04/23 10:11:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -265,7 +265,10 @@
if (grep(/^\Q$item\E$/, at actions)) {
push(@items,$item);
if ($context eq 'domain') {
- my $settings = $values->{$item};
+ my $settings;
+ if (ref($values) eq 'HASH') {
+ $settings = $values->{$item};
+ }
if ($item eq 'usersessions') {
$r->print('<script type="text/javascript">'."\n".
'// <![CDATA['."\n".
@@ -273,7 +276,29 @@
'// ]]>'."\n".
'</script>'."\n");
} elsif ($item eq 'selfcreation') {
- $settings = $values->{'usercreation'};
+ if (ref($values) eq 'HASH') {
+ $settings = $values->{'usercreation'};
+ }
+ } elsif ($item eq 'defaults') {
+ if (ref($values->{'inststatus'}) eq 'HASH') {
+ if (ref($values->{'defaults'}) eq 'HASH') {
+ $settings = {%{$values->{'inststatus'}},%{$values->{'defaults'}}};
+ } else {
+ $settings = $values->{'inststatus'};
+ }
+ } else {
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+ my $inststatus = {
+ inststatustypes => $usertypes,
+ inststatusorder => $types,
+ inststatusguest => [],
+ };
+ if (ref($values->{defaults}) eq 'HASH') {
+ $settings = {%{$inststatus},%{$values->{'defaults'}}};
+ } else {
+ $settings = $inststatus;
+ }
+ }
}
($output{$item},$rowtotal{$item}) =
&Apache::domainprefs::print_config_box($r,$dom,$confname,
Index: loncom/interface/createaccount.pm
diff -u loncom/interface/createaccount.pm:1.63 loncom/interface/createaccount.pm:1.64
--- loncom/interface/createaccount.pm:1.63 Sat Apr 19 20:48:43 2014
+++ loncom/interface/createaccount.pm Wed Apr 23 10:11:26 2014
@@ -4,7 +4,7 @@
# kerberos, or SSO) or an e-mail address. Requests to use an e-mail address as
# username may be processed automatically, or may be queued for approval.
#
-# $Id: createaccount.pm,v 1.63 2014/04/19 20:48:43 raeburn Exp $
+# $Id: createaccount.pm,v 1.64 2014/04/23 10:11:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -187,10 +187,11 @@
my ($output,$nostart,$noend,$redirect);
my $token = $env{'form.token'};
if ($token) {
+ my $usertype = &get_usertype($domain);
($output,$nostart,$noend,$redirect) =
&process_mailtoken($r,$token,$contact_name,$contact_email,$domain,
$domdesc,$lonhost,$include,$start_page,$cancreate,
- $domconfig{'usercreation'});
+ $domconfig{'usercreation'},$usertype);
if ($redirect) {
$r->internal_redirect('/adm/switchserver');
return OK;
@@ -259,7 +260,7 @@
$gotlondes = 1;
}
}
- if (grep(/^email(|approval)$/,@{$cancreate})) {
+ if (grep(/^email$/,@{$cancreate})) {
$r->print(&javascript_validmail());
}
my $usertype = &get_usertype($domain);
@@ -511,7 +512,7 @@
$domain,'createaccount').'</div>';
}
}
- if (grep(/^email(|approval)$/,@{$cancreate})) {
+ if (grep(/^email$/,@{$cancreate})) {
$output .= '<div class="LC_left_float"><h3>'.&mt('Create account with an e-mail address as your username').'</h3>';
my ($captchaform,$error,$captcha) = &Apache::loncommon::captcha_display('usercreation',$lonhost);
if ($error) {
@@ -612,7 +613,7 @@
$server,$settings,$emailusername,$courseid,$usertype) = @_;
my $output;
if (ref($cancreate) eq 'ARRAY') {
- if (!grep(/^email(|approval)$/,@{$cancreate})) {
+ if (!grep(/^email$/,@{$cancreate})) {
$output = &invalid_state('noemails',$domdesc,
$contact_name,$contact_email);
return $output;
@@ -755,7 +756,7 @@
sub process_mailtoken {
my ($r,$token,$contact_name,$contact_email,$domain,$domdesc,$lonhost,
- $include,$start_page,$cancreate,$settings) = @_;
+ $include,$start_page,$cancreate,$settings,$usertype) = @_;
my ($msg,$nostart,$noend,$redirect);
my %data = &Apache::lonnet::tmpget($token);
my $now = time;
@@ -772,36 +773,46 @@
if ($now - $data{'time'} < 7200) {
# Check if request should be queued.
if (ref($cancreate) eq 'ARRAY') {
+ my $disposition;
if (grep(/^email$/,@{$cancreate})) {
- my ($result,$output,$uhome) =
- &create_account($r,$domain,$domdesc,\%data);
- if ($result eq 'ok') {
- $msg = $output;
- my $shownow = &Apache::lonlocal::locallocaltime($now);
- my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3]. If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
- my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
- $mailmsg,$contact_name,
- $contact_email);
- if ($mailresult eq 'ok') {
- $msg .= &mt('An e-mail confirming creation of your new LON-CAPA account has been sent to [_1].',$data{'username'});
- } else {
- $msg .= &mt('An error occurred when sending e-mail to [_1] confirming creation of your LON-CAPA account.',$data{'username'});
+ if (ref($settings) eq 'HASH') {
+ if (ref($settings->{'cancreate'}) eq 'HASH') {
+ if (ref($settings->{'cancreate'}{'selfcreateprocessing'}) eq 'HASH') {
+ $disposition = $settings->{'cancreate'}{'selfcreateprocessing'}{$usertype};
+ }
}
- $redirect = &start_session($r,$data{'username'},$domain,$uhome,
- $data{'courseid'},$token);
- $nostart = 1;
- $noend = 1;
+ }
+ if ($disposition eq 'approval') {
+ $msg = &store_request($domain,$data{'username'},'approval',\%data,$settings);
+ my $delete = &Apache::lonnet::tmpdel($token);
} else {
- $msg .= &mt('A problem occurred when attempting to create your new LON-CAPA account.')
- .'<br />'.$output;
- if (($contact_name ne '') && ($contact_email ne '')) {
- $msg .= &mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+ my ($result,$output,$uhome) =
+ &create_account($r,$domain,$domdesc,\%data);
+ if ($result eq 'ok') {
+ $msg = $output;
+ my $shownow = &Apache::lonlocal::locallocaltime($now);
+ my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3]. If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
+ my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
+ $mailmsg,$contact_name,
+ $contact_email);
+ if ($mailresult eq 'ok') {
+ $msg .= &mt('An e-mail confirming creation of your new LON-CAPA account has been sent to [_1].',$data{'username'});
+ } else {
+ $msg .= &mt('An error occurred when sending e-mail to [_1] confirming creation of your LON-CAPA account.',$data{'username'});
+ }
+ $redirect = &start_session($r,$data{'username'},$domain,$uhome,
+ $data{'courseid'},$token);
+ $nostart = 1;
+ $noend = 1;
+ } else {
+ $msg .= &mt('A problem occurred when attempting to create your new LON-CAPA account.')
+ .'<br />'.$output;
+ if (($contact_name ne '') && ($contact_email ne '')) {
+ $msg .= &mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+ }
}
+ my $delete = &Apache::lonnet::tmpdel($token);
}
- my $delete = &Apache::lonnet::tmpdel($token);
- } elsif (grep(/^emailapproval$/,@{$cancreate})) {
- $msg = &store_request($domain,$data{'username'},'approval',\%data,$settings);
- my $delete = &Apache::lonnet::tmpdel($token);
} else {
$msg = &invalid_state('noemails',$domdesc,$contact_name,$contact_email);
}
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1184 loncom/interface/loncommon.pm:1.1185
--- loncom/interface/loncommon.pm:1.1184 Tue Mar 18 01:29:49 2014
+++ loncom/interface/loncommon.pm Wed Apr 23 10:11:26 2014
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1184 2014/03/18 01:29:49 raeburn Exp $
+# $Id: loncommon.pm,v 1.1185 2014/04/23 10:11:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -9427,7 +9427,14 @@
sub sorted_inst_types {
my ($dom) = @_;
- my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
+ my ($usertypes,$order);
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+ if (ref($domdefaults{'inststatus'}) eq 'HASH') {
+ $usertypes = $domdefaults{'inststatus'}{'inststatustypes'};
+ $order = $domdefaults{'inststatus'}{'inststatusorder'};
+ } else {
+ ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
+ }
my $othertitle = &mt('All users');
if ($env{'request.course.id'}) {
$othertitle = &mt('Any users');
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1255 loncom/lonnet/perl/lonnet.pm:1.1256
--- loncom/lonnet/perl/lonnet.pm:1.1255 Wed Apr 16 14:40:05 2014
+++ loncom/lonnet/perl/lonnet.pm Wed Apr 23 10:11:34 2014
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.1255 2014/04/16 14:40:05 raeburn Exp $
+# $Id: lonnet.pm,v 1.1256 2014/04/23 10:11:34 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1745,14 +1745,13 @@
my %domdefs = &Apache::lonnet::get_domain_defaults($udom);
if ((ref($domdefs{'inststatustypes'}) eq 'HASH') &&
(ref($domdefs{'inststatusorder'}) eq 'ARRAY')) {
- %returnhash = %{$domdefs{'inststatustypes'}};
- @order = @{$domdefs{'inststatusorder'}};
+ return ($domdefs{'inststatustypes'},$domdefs{'inststatusorder'});
} else {
if (defined(&domain($udom,'primary'))) {
my $uhome=&domain($udom,'primary');
my $rep=&reply("inst_usertypes:$udom",$uhome);
if ($rep =~ /^(con_lost|error|no_such_host|refused)/) {
- &logthis("get_dom failed - $rep returned from $uhome in domain: $udom");
+ &logthis("retrieve_inst_usertypes failed - $rep returned from $uhome in domain: $udom");
return (\%returnhash,\@order);
}
my ($hashitems,$orderitems) = split(/:/,$rep);
@@ -1768,10 +1767,10 @@
push(@order,&unescape($item));
}
} else {
- &logthis("get_dom failed - no primary domain server for $udom");
+ &logthis("retrieve_inst_usertypes failed - no primary domain server for $udom");
}
+ return (\%returnhash,\@order);
}
- return (\%returnhash,\@order);
}
sub is_domainimage {
@@ -2051,7 +2050,7 @@
$domdefaults{'requestauthor'} = $domconfig{'requestauthor'};
}
if (ref($domconfig{'inststatus'}) eq 'HASH') {
- foreach my $item ('inststatustypes','inststatusorder') {
+ foreach my $item ('inststatustypes','inststatusorder','inststatusguest') {
$domdefaults{$item} = $domconfig{'inststatus'}{$item};
}
}
@@ -13348,7 +13347,7 @@
=over
=item
-inststatustypes, inststatusorder
+inststatustypes, inststatusorder, inststatusguest
=back
More information about the LON-CAPA-cvs
mailing list