-
-
- ';
- if ($numheaders == 4) {
- $output .= '
- '.&mt($item->{'header'}->[3]->{'col1'}).'
- '.&mt($item->{'header'}->[3]->{'col2'}).'
- ';
- } else {
- $output .= '
- '.&mt($item->{'header'}->[2]->{'col1'}).'
- '.&mt($item->{'header'}->[2]->{'col2'}).'
- ';
- }
- $rowtotal ++;
- $output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal);
} elsif ($action eq 'requestcourses') {
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
$rowtotal ++;
@@ -961,7 +834,7 @@ sub print_config_box {
';
- if ($action eq 'login') {
+ if (($action eq 'login') || ($action eq 'directorysrch')) {
$output .= '
'.&mt($item->{'header'}->[0]->{'col1'}).' ';
} elsif ($action eq 'serverstatuses') {
@@ -1005,10 +878,13 @@ sub print_config_box {
$rowtotal ++;
if ($action eq 'quotas') {
$output .= &print_quotas($dom,$settings,\$rowtotal,$action);
- } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') ||
- ($action eq 'serverstatuses') || ($action eq 'loadbalancing') ||
- ($action eq 'ltitools')) {
+ } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || ($action eq 'directorysrch') ||
+ ($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);
+ } elsif ($action eq 'helpsettings') {
+ $output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal);
}
}
$output .= '
@@ -1305,57 +1181,6 @@ sub print_login {
$itemcount ++;
}
$datatable .= &captcha_choice('login',$settings,$itemcount);
- } elsif ($caller eq 'headtag') {
- my %domservers = &Apache::lonnet::get_servers($dom);
- my $choice = $choices{'headtag'};
- $css_class = ' class="LC_odd_row"';
- $datatable .= ''.$choice.' '.
- ' ';
}
return $datatable;
}
@@ -1389,9 +1214,6 @@ sub login_choices {
link => "Link",
alink => "Active link",
vlink => "Visited link",
- headtag => "Custom markup",
- action => "Action",
- current => "Current",
);
return %choices;
}
@@ -1513,7 +1335,7 @@ sub display_color_options {
my $datatable = ''.
''.$choices->{'font'}.' ';
if (!$is_custom->{'font'}) {
- $datatable .= ''.&mt('Default in use:').' '.$defaults->{'font'}.' ';
+ $datatable .= ''.&mt('Default in use:').' '.$defaults->{'font'}.' ';
} else {
$datatable .= ' ';
}
@@ -1522,12 +1344,12 @@ sub display_color_options {
$datatable .= ''.
' '.
''.$choices->{'fontmenu'}.' ';
if (!$is_custom->{'fontmenu'}) {
- $datatable .= ''.&mt('Default in use:').' '.$defaults->{'fontmenu'}.' ';
+ $datatable .= ''.&mt('Default in use:').' '.$defaults->{'fontmenu'}.' ';
} else {
$datatable .= ' ';
}
@@ -1537,7 +1359,7 @@ sub display_color_options {
''.$choices->{$item}.' '.$choices->{$item}.' '.$choices->{$item}.''.$defaults->{'links'}{$item}.' ';
+ $links_def .= ''.$choices->{$item}.''.$defaults->{'links'}{$item}.' ';
}
}
if ($links_def) {
@@ -1769,15 +1590,17 @@ sub image_changes {
my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_;
my $output;
if ($img eq 'login') {
- $output = ''.$logincolors; # suppress image for Log-in header
+ # suppress image for Log-in header
} elsif (!$is_custom) {
if ($img ne 'domlogo') {
- $output = &mt('Default image:').' '.$logincolors;
+ } else {
if ($img_import) {
$output .= ''.$vpos.' ';
}
$datatable .= ' '."\n".
- ' '."\n".
+ ''.
''.&mt('Subject:').' '."\n".
(' 'x2).
@@ -2417,13 +2228,13 @@ sub print_textbookcourses {
} else {
$datatable .= ''.&mt('LON-CAPA course:').' '.
+ $datatable .= ' '."\n".
+ ''.&mt('LON-CAPA course:').' '.
&Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom').
' '."\n".
''."\n";
$itemcount ++;
@@ -2523,78 +2334,10 @@ $jstext{'templates'};
ENDSCRIPT
}
-sub ltitools_javascript {
- my ($settings) = @_;
- return unless(ref($settings) eq 'HASH');
- my (%ordered,$total,%jstext);
- $total = 0;
- foreach my $item (keys(%{$settings})) {
- if (ref($settings->{$item}) eq 'HASH') {
- my $num = $settings->{$item}{'order'};
- $ordered{$num} = $item;
- }
- }
- $total = scalar(keys(%{$settings}));
- my @jsarray = ();
- foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
- push(@jsarray,$ordered{$item});
- }
- my $jstext = ' var ltitools = Array('."'".join("','",@jsarray)."'".');'."\n";
- return <<"ENDSCRIPT";
-
-
-ENDSCRIPT
-}
-
sub print_autoenroll {
my ($dom,$settings,$rowtotal) = @_;
my $autorun = &Apache::lonnet::auto_run(undef,$dom),
- my ($defdom,$runon,$runoff,$coownerson,$coownersoff,$failsafe);
+ my ($defdom,$runon,$runoff,$coownerson,$coownersoff);
if (ref($settings) eq 'HASH') {
if (exists($settings->{'run'})) {
if ($settings->{'run'} eq '0') {
@@ -2628,9 +2371,6 @@ sub print_autoenroll {
if (exists($settings->{'sender_domain'})) {
$defdom = $settings->{'sender_domain'};
}
- if (exists($settings->{'autofailsafe'})) {
- $failsafe = $settings->{'autofailsafe'};
- }
} else {
if ($autorun) {
$runon = ' checked="checked" ';
@@ -2666,12 +2406,8 @@ sub print_autoenroll {
$coownerson.' value="1" />'.&mt('Yes').' '.
''.
- ''.&mt('Failsafe for no drops when institutional data missing').' '.
- ''.
- ' ';
- $$rowtotal += 4;
+ '';
+ $$rowtotal += 3;
return $datatable;
}
@@ -2719,7 +2455,7 @@ sub print_autoupdate {
my $locknamesettings;
$datatable .= &insttypes_row($settings,$types,$usertypes,
$dom,$numinrow,$othertitle,
- 'lockablenames',$rowtotal);
+ 'lockablenames');
$$rowtotal ++;
} else {
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
@@ -2800,951 +2536,236 @@ sub print_autocreate {
}
sub print_directorysrch {
- my ($position,$dom,$settings,$rowtotal) = @_;
- my $datatable;
- if ($position eq 'top') {
- my $instsrchon = ' ';
- my $instsrchoff = ' checked="checked" ';
- my ($exacton,$containson,$beginson);
- my $instlocalon = ' ';
- my $instlocaloff = ' checked="checked" ';
- if (ref($settings) eq 'HASH') {
- if ($settings->{'available'} eq '1') {
- $instsrchon = $instsrchoff;
- $instsrchoff = ' ';
- }
- if ($settings->{'localonly'} eq '1') {
- $instlocalon = $instlocaloff;
- $instlocaloff = ' ';
- }
- if (ref($settings->{'searchtypes'}) eq 'ARRAY') {
- foreach my $type (@{$settings->{'searchtypes'}}) {
- if ($type eq 'exact') {
- $exacton = ' checked="checked" ';
- } elsif ($type eq 'contains') {
- $containson = ' checked="checked" ';
- } elsif ($type eq 'begins') {
- $beginson = ' checked="checked" ';
- }
- }
- } else {
- if ($settings->{'searchtypes'} eq 'exact') {
- $exacton = ' checked="checked" ';
- } elsif ($settings->{'searchtypes'} eq 'contains') {
- $containson = ' checked="checked" ';
- } elsif ($settings->{'searchtypes'} eq 'specify') {
+ my ($dom,$settings,$rowtotal) = @_;
+ my $srchon = ' ';
+ my $srchoff = ' checked="checked" ';
+ my ($exacton,$containson,$beginson);
+ my $localon = ' ';
+ my $localoff = ' checked="checked" ';
+ if (ref($settings) eq 'HASH') {
+ if ($settings->{'available'} eq '1') {
+ $srchon = $srchoff;
+ $srchoff = ' ';
+ }
+ if ($settings->{'localonly'} eq '1') {
+ $localon = $localoff;
+ $localoff = ' ';
+ }
+ if (ref($settings->{'searchtypes'}) eq 'ARRAY') {
+ foreach my $type (@{$settings->{'searchtypes'}}) {
+ if ($type eq 'exact') {
$exacton = ' checked="checked" ';
+ } elsif ($type eq 'contains') {
$containson = ' checked="checked" ';
+ } elsif ($type eq 'begins') {
+ $beginson = ' checked="checked" ';
}
}
- }
- my ($searchtitles,$titleorder) = &sorted_searchtitles();
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-
- my $numinrow = 4;
- my $cansrchrow = 0;
- $datatable=''.
- ''.&mt('Institutional directory search available?').' '.
- ' '.
- ' '.
- ''.&mt('Other domains can search institution?').' '.
- ' '.
- ' ';
- $$rowtotal += 2;
- if (ref($usertypes) eq 'HASH') {
- if (keys(%{$usertypes}) > 0) {
- $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
- $numinrow,$othertitle,'cansearch',
- $rowtotal);
- $cansrchrow = 1;
+ } else {
+ if ($settings->{'searchtypes'} eq 'exact') {
+ $exacton = ' checked="checked" ';
+ } elsif ($settings->{'searchtypes'} eq 'contains') {
+ $containson = ' checked="checked" ';
+ } elsif ($settings->{'searchtypes'} eq 'specify') {
+ $exacton = ' checked="checked" ';
+ $containson = ' checked="checked" ';
}
}
- if ($cansrchrow) {
- $$rowtotal ++;
- $datatable .= '';
- } else {
- $datatable .= ' ';
+ }
+ my ($searchtitles,$titleorder) = &sorted_searchtitles();
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+
+ my $numinrow = 4;
+ my $cansrchrow = 0;
+ my $datatable=' '.
+ ''.&mt('Directory search available?').' '.
+ ' '.
+ ' '.
+ ''.&mt('Other domains can search?').' '.
+ ' '.
+ ' ';
+ $$rowtotal += 2;
+ if (ref($usertypes) eq 'HASH') {
+ if (keys(%{$usertypes}) > 0) {
+ $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
+ $numinrow,$othertitle,'cansearch');
+ $cansrchrow = 1;
}
- $datatable .= ''.&mt('Supported search methods').
- ' ';
} else {
- my $domsrchon = ' checked="checked" ';
- my $domsrchoff = ' ';
- my $domlocalon = ' ';
- my $domlocaloff = ' checked="checked" ';
- if (ref($settings) eq 'HASH') {
- if ($settings->{'lclocalonly'} eq '1') {
- $domlocalon = $domlocaloff;
- $domlocaloff = ' ';
- }
- if ($settings->{'lcavailable'} eq '0') {
- $domsrchoff = $domsrchon;
- $domsrchon = ' ';
- }
- }
- $datatable=' '.
- ''.&mt('LON-CAPA directory search available?').' '.
- ' '.
- ' '.
- ''.&mt('Other domains can search LON-CAPA domain?').' '.
- ' '.
- ' ';
- $$rowtotal += 2;
+ $datatable .= '';
}
+ $datatable .= ''.&mt('Search latitude').' '.
+ ''.
+ ' '.
+ ' ';
+ $$rowtotal ++;
return $datatable;
}
sub print_contacts {
- my ($position,$dom,$settings,$rowtotal) = @_;
+ my ($dom,$settings,$rowtotal) = @_;
my $datatable;
my @contacts = ('adminemail','supportemail');
- my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield,
- $maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings);
- if ($position eq 'top') {
- if (ref($settings) eq 'HASH') {
- foreach my $item (@contacts) {
- if (exists($settings->{$item})) {
- $to{$item} = $settings->{$item};
- }
- }
- }
- } elsif ($position eq 'middle') {
- @mailings = ('errormail','packagesmail','lonstatusmail','requestsmail',
- 'updatesmail','idconflictsmail','hostipmail');
- foreach my $type (@mailings) {
- $otheremails{$type} = '';
- }
- } else {
- @mailings = ('helpdeskmail','otherdomsmail');
- foreach my $type (@mailings) {
- $otheremails{$type} = '';
- }
- $bccemails{'helpdeskmail'} = '';
- $bccemails{'otherdomsmail'} = '';
- $includestr{'helpdeskmail'} = '';
- $includestr{'otherdomsmail'} = '';
- ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields();
+ my (%checked,%to,%otheremails,%bccemails);
+ my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail',
+ 'requestsmail','updatesmail','idconflictsmail');
+ foreach my $type (@mailings) {
+ $otheremails{$type} = '';
}
+ $bccemails{'helpdeskmail'} = '';
if (ref($settings) eq 'HASH') {
- unless ($position eq 'top') {
- foreach my $type (@mailings) {
- if (exists($settings->{$type})) {
- if (ref($settings->{$type}) eq 'HASH') {
- foreach my $item (@contacts) {
- if ($settings->{$type}{$item}) {
- $checked{$type}{$item} = ' checked="checked" ';
- }
- }
- $otheremails{$type} = $settings->{$type}{'others'};
- if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
- $bccemails{$type} = $settings->{$type}{'bcc'};
- if ($settings->{$type}{'include'} ne '') {
- ($includeloc{$type},$includestr{$type}) = split(/:/,$settings->{$type}{'include'},2);
- $includestr{$type} = &unescape($includestr{$type});
- }
- }
- }
- } elsif ($type eq 'lonstatusmail') {
- $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
- }
+ foreach my $item (@contacts) {
+ if (exists($settings->{$item})) {
+ $to{$item} = $settings->{$item};
}
}
- if ($position eq 'bottom') {
- foreach my $type (@mailings) {
- $bccemails{$type} = $settings->{$type}{'bcc'};
- if ($settings->{$type}{'include'} ne '') {
- ($includeloc{$type},$includestr{$type}) = split(/:/,$settings->{$type}{'include'},2);
- $includestr{$type} = &unescape($includestr{$type});
- }
- }
- if (ref($settings->{'helpform'}) eq 'HASH') {
- if (ref($fields) eq 'ARRAY') {
- foreach my $field (@{$fields}) {
- $currfield{$field} = $settings->{'helpform'}{$field};
+ foreach my $type (@mailings) {
+ if (exists($settings->{$type})) {
+ if (ref($settings->{$type}) eq 'HASH') {
+ foreach my $item (@contacts) {
+ if ($settings->{$type}{$item}) {
+ $checked{$type}{$item} = ' checked="checked" ';
+ }
}
- }
- if (exists($settings->{'helpform'}{'maxsize'})) {
- $maxsize = $settings->{'helpform'}{'maxsize'};
- } else {
- $maxsize = '1.0';
- }
- } else {
- if (ref($fields) eq 'ARRAY') {
- foreach my $field (@{$fields}) {
- $currfield{$field} = 'yes';
+ $otheremails{$type} = $settings->{$type}{'others'};
+ if ($type eq 'helpdeskmail') {
+ $bccemails{$type} = $settings->{$type}{'bcc'};
}
}
- $maxsize = '1.0';
+ } elsif ($type eq 'lonstatusmail') {
+ $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
}
}
} else {
- if ($position eq 'top') {
- $to{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'};
- $to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};
- $checked{'errormail'}{'adminemail'} = ' checked="checked" ';
- $checked{'packagesmail'}{'adminemail'} = ' checked="checked" ';
- $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
- $checked{'requestsmail'}{'adminemail'} = ' checked="checked" ';
- $checked{'updatesmail'}{'adminemail'} = ' checked="checked" ';
- $checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" ';
- $checked{'hostipmail'}{'adminemail'} = ' checked="checked" ';
- } elsif ($position eq 'bottom') {
- $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';
- $checked{'otherdomsmail'}{'supportemail'} = ' checked="checked" ';
- if (ref($fields) eq 'ARRAY') {
- foreach my $field (@{$fields}) {
- $currfield{$field} = 'yes';
- }
- }
- $maxsize = '1.0';
- }
+ $to{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'};
+ $to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};
+ $checked{'errormail'}{'adminemail'} = ' checked="checked" ';
+ $checked{'packagesmail'}{'adminemail'} = ' checked="checked" ';
+ $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';
+ $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
+ $checked{'requestsmail'}{'adminemail'} = ' checked="checked" ';
+ $checked{'updatesmail'}{'adminemail'} = ' checked="checked" ';
+ $checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" ';
}
my ($titles,$short_titles) = &contact_titles();
my $rownum = 0;
my $css_class;
- if ($position eq 'top') {
- foreach my $item (@contacts) {
- $css_class = $rownum%2?' class="LC_odd_row"':'';
- $datatable .= ''.
- ''.$titles->{$item}.
- ' '.
- ' ';
- $rownum ++;
- }
- } elsif ($position eq 'bottom') {
+ foreach my $item (@contacts) {
+ $css_class = $rownum%2?' class="LC_odd_row"':'';
+ $datatable .= ''.
+ ''.$titles->{$item}.
+ ' '.
+ ' ';
+ $rownum ++;
+ }
+ foreach my $type (@mailings) {
$css_class = $rownum%2?' class="LC_odd_row"':'';
$datatable .= ''.
- ''.&mt('Extra helpdesk form fields:').' ';
- if ((ref($fields) eq 'ARRAY') && (ref($fieldtitles) eq 'HASH') &&
- (ref($fieldoptions) eq 'HASH') && (ref($possoptions) eq 'HASH')) {
- $datatable .= '';
+ ' '.
+ $titles->{$type}.': '.
+ '';
+ foreach my $item (@contacts) {
+ $datatable .= ''.
+ ' ';
+ }
+ $datatable .= ' '."\n";
$rownum ++;
}
- unless ($position eq 'top') {
- foreach my $type (@mailings) {
- $css_class = $rownum%2?' class="LC_odd_row"':'';
- $datatable .= ''.
- ''.
- $titles->{$type}.': ';
- if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
- $datatable .= ''.&mt('E-mail recipient(s)').' ';
- }
- $datatable .= '';
- foreach my $item (@contacts) {
- $datatable .= ''.
- ' ';
- }
- $datatable .= ' '.&mt('Optional added text').' '.
- &mt('Text automatically added to e-mail:').' '.
- ''.&mt('Location:').' '.
- ' '."\n";
- $rownum ++;
- }
- }
- if ($position eq 'middle') {
- my %choices;
- $choices{'reporterrors'} = &mt('E-mail error reports to [_1]',
- &Apache::loncommon::modal_link('http://loncapa.org/core.html',
- &mt('LON-CAPA core group - MSU'),600,500));
- $choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]',
- &Apache::loncommon::modal_link('http://loncapa.org/core.html',
- &mt('LON-CAPA core group - MSU'),600,500));
- my @toggles = ('reporterrors','reportupdates');
- my %defaultchecked = ('reporterrors' => 'on',
- 'reportupdates' => 'on');
- (my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
- \%choices,$rownum);
- $datatable .= $reports;
- } elsif ($position eq 'bottom') {
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- my (@posstypes,%usertypeshash);
- if (ref($types) eq 'ARRAY') {
- @posstypes = @{$types};
- }
- if (@posstypes) {
- if (ref($usertypes) eq 'HASH') {
- %usertypeshash = %{$usertypes};
- }
- my @overridden;
- my $numinrow = 4;
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{'overrides'}) eq 'HASH') {
- foreach my $key (sort(keys(%{$settings->{'overrides'}}))) {
- if (ref($settings->{'overrides'}{$key}) eq 'HASH') {
- push(@overridden,$key);
- foreach my $item (@contacts) {
- if ($settings->{'overrides'}{$key}{$item}) {
- $checked{'override_'.$key}{$item} = ' checked="checked" ';
- }
- }
- $otheremails{'override_'.$key} = $settings->{'overrides'}{$key}{'others'};
- $bccemails{'override_'.$key} = $settings->{'overrides'}{$key}{'bcc'};
- $includeloc{'override_'.$key} = '';
- $includestr{'override_'.$key} = '';
- if ($settings->{'overrides'}{$key}{'include'} ne '') {
- ($includeloc{'override_'.$key},$includestr{'override_'.$key}) =
- split(/:/,$settings->{'overrides'}{$key}{'include'},2);
- $includestr{'override_'.$key} = &unescape($includestr{'override_'.$key});
- }
- }
- }
- }
- }
- my $customclass = 'LC_helpdesk_override';
- my $optionsprefix = 'LC_options_helpdesk_';
-
- my $onclicktypes = "toggleHelpdeskRow(this.form,'overrides','$customclass','$optionsprefix');";
-
- $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
- $numinrow,$othertitle,'overrides',
- \$rownum,$onclicktypes,$customclass);
- $rownum ++;
- $usertypeshash{'default'} = $othertitle;
- foreach my $status (@posstypes) {
- my $css_class;
- if ($rownum%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$/,@overridden)) {
- $currstyle = 'display:table-row';
- $hidden = 0;
- }
- my $key = 'override_'.$status;
- $datatable .= &overridden_helpdesk($checked{$key},$otheremails{$key},$bccemails{$key},
- $includeloc{$key},$includestr{$key},$status,$rowid,
- $usertypeshash{$status},$css_class,$currstyle,
- \@contacts,$short_titles);
- unless ($hidden) {
- $rownum ++;
- }
- }
- }
- }
+ my %choices;
+ $choices{'reporterrors'} = &mt('E-mail error reports to [_1]',
+ &Apache::loncommon::modal_link('http://loncapa.org/core.html',
+ &mt('LON-CAPA core group - MSU'),600,500));
+ $choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]',
+ &Apache::loncommon::modal_link('http://loncapa.org/core.html',
+ &mt('LON-CAPA core group - MSU'),600,500));
+ my @toggles = ('reporterrors','reportupdates');
+ my %defaultchecked = ('reporterrors' => 'on',
+ 'reportupdates' => 'on');
+ (my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
+ \%choices,$rownum);
+ $datatable .= $reports;
$$rowtotal += $rownum;
return $datatable;
}
-sub overridden_helpdesk {
- my ($checked,$otheremails,$bccemails,$includeloc,$includestr,$type,$rowid,
- $typetitle,$css_class,$rowstyle,$contacts,$short_titles) = @_;
- my $class = 'LC_left_item';
- if ($css_class) {
- $css_class = ' class="'.$css_class.'"';
- }
- if ($rowid) {
- $rowid = ' id="'.$rowid.'"';
- }
- if ($rowstyle) {
- $rowstyle = ' style="'.$rowstyle.'"';
- }
- my ($output,$description);
- $description = &mt('Helpdesk requests from: [_1] in this domain (overrides default)',"$typetitle ");
- $output = ''.
- "$description \n".
- ''.
- ''.&mt('E-mail recipient(s)').' '.
- '';
- if (ref($contacts) eq 'ARRAY') {
- foreach my $item (@{$contacts}) {
- my $check;
- if (ref($checked) eq 'HASH') {
- $check = $checked->{$item};
- }
- my $title;
- if (ref($short_titles) eq 'HASH') {
- $title = $short_titles->{$item};
- }
- $output .= ''.
- ' ';
- }
- }
- $output .= ' '.&mt('Optional added text').' '.
- &mt('Text automatically added to e-mail:').' '.
- ''.&mt('Location:').' '.
- ' '."\n";
- return $output;
-}
-
-sub contacts_javascript {
- return <<"ENDSCRIPT";
-
-
-
-ENDSCRIPT
-}
-
sub print_helpsettings {
- my ($position,$dom,$settings,$rowtotal) = @_;
- my $confname = $dom.'-domainconfig';
- my $formname = 'display';
+ my ($dom,$confname,$settings,$rowtotal) = @_;
my ($datatable,$itemcount);
- if ($position eq 'top') {
- $itemcount = 1;
- my (%choices,%defaultchecked,@toggles);
- $choices{'submitbugs'} = &mt('Display link to: [_1]?',
- &Apache::loncommon::modal_link('http://bugs.loncapa.org',
- &mt('LON-CAPA bug tracker'),600,500));
- %defaultchecked = ('submitbugs' => 'on');
- @toggles = ('submitbugs');
- ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
- \%choices,$itemcount);
- $$rowtotal ++;
- } else {
- my $css_class;
- my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_');
- my (%customroles,%ordered,%current);
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{'adhoc'}) eq 'HASH') {
- %current = %{$settings->{'adhoc'}};
- }
- }
- my $count = 0;
- foreach my $key (sort(keys(%existing))) {
- if ($key=~/^rolesdef\_(\w+)$/) {
- my $rolename = $1;
- my (%privs,$order);
- ($privs{'system'},$privs{'domain'},$privs{'course'}) = split(/\_/,$existing{$key});
- $customroles{$rolename} = \%privs;
- if (ref($current{$rolename}) eq 'HASH') {
- $order = $current{$rolename}{'order'};
- }
- if ($order eq '') {
- $order = $count;
- }
- $ordered{$order} = $rolename;
- $count++;
- }
- }
- my $maxnum = scalar(keys(%ordered));
- my @roles_by_num = ();
- foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
- push(@roles_by_num,$item);
- }
- my $context = 'domprefs';
- my $crstype = 'Course';
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- my @accesstypes = ('all','dh','da','none');
- my ($numstatustypes,@jsarray);
- if (ref($types) eq 'ARRAY') {
- if (@{$types} > 0) {
- $numstatustypes = scalar(@{$types});
- push(@accesstypes,'status');
- @jsarray = ('bystatus');
- }
- }
- my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']);
- if (keys(%domhelpdesk)) {
- push(@accesstypes,('inc','exc'));
- push(@jsarray,('notinc','notexc'));
- }
- my $hiddenstr = join("','",@jsarray);
- $datatable .= &helpsettings_javascript(\@roles_by_num,$maxnum,$hiddenstr,$formname);
- my $context = 'domprefs';
- my $crstype = 'Course';
- my $prefix = 'helproles_';
- my $add_class = 'LC_hidden';
- foreach my $num (@roles_by_num) {
- my $role = $ordered{$num};
- my ($desc,$access,@statuses);
- if (ref($current{$role}) eq 'HASH') {
- $desc = $current{$role}{'desc'};
- $access = $current{$role}{'access'};
- if (ref($current{$role}{'insttypes'}) eq 'ARRAY') {
- @statuses = @{$current{$role}{'insttypes'}};
- }
- }
- if ($desc eq '') {
- $desc = $role;
- }
- my $identifier = 'custhelp'.$num;
- my %full=();
- my %levels= (
- course => {},
- domain => {},
- system => {},
- );
- my %levelscurrent=(
- course => {},
- domain => {},
- system => {},
- );
- &Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent);
- my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my $chgstr = ' onchange="javascript:reorderHelpRoles(this.form,'."'helproles_".$num."_pos'".');"';
- $datatable .= ''.$role.' ';
- for (my $k=0; $k<=$maxnum; $k++) {
- my $vpos = $k+1;
- my $selstr;
- if ($k == $num) {
- $selstr = ' selected="selected" ';
- }
- $datatable .= ''.$vpos.' ';
- }
- $datatable .= ' '.(' 'x2).
- ''.&mt('Role name').' '.
- &mt('Name shown to users:').
- ''.
- ''.&mt('Role privileges').&adhocbutton($prefix,$num,'privs','show').' '.
- &Apache::lonuserutils::custom_role_table($crstype,\%full,\%levels,
- \%levelscurrent,$identifier,
- 'LC_hidden',$prefix.$num.'_privs').
- ' '.
- '';
- for (my $k=0; $k<$maxnum+1; $k++) {
- my $vpos = $k+1;
- my $selstr;
- if ($k == $maxnum) {
- $selstr = ' selected="selected" ';
- }
- $datatable .= ''.$vpos.' ';
- }
- $datatable .= ' '."\n".
- ' '.&mt('Role name').' '.
- ''.
- &mt('Internal name:').
- ' '.(' 'x4).
- ''.
- &mt('Name shown to users:').
- ' '.&mt('Role privileges').' '.
- &Apache::lonuserutils::custom_role_header($context,$crstype,
- \@templateroles,$newcust).
- &Apache::lonuserutils::custom_role_table('Course',\%full,\%levels,
- \%levelscurrent,$newcust).
- ''.(' 'x10).
- ' '.(' 'x2).''.$lt{'rou'}.' '.
- ''.$lt{'whi'}.'
';
- foreach my $access (@{$accesstypes}) {
- $output .= '
'.
- &Apache::lonuserutils::adhoc_status_types($dom,$prefix,$num,$current->{$access},
- $othertitle,$usertypes,$types).
- '
';
- } elsif (($access eq 'inc') && (keys(%{$domhelpdesk}) > 0)) {
- $output .= ''.
- &Apache::lonuserutils::adhoc_staff($access,$prefix,$num,$current->{$access},$domhelpdesk).
- '
';
- } elsif (($access eq 'exc') && (keys(%{$domhelpdesk}) > 0)) {
- $output .= ''.
- &Apache::lonuserutils::adhoc_staff($access,$prefix,$num,$current->{$access},$domhelpdesk).
- '
';
- }
- $output .= '';
- }
- $output .= ''.
''.$choices->{$item}.
- ' ';
- if ($align eq 'left') {
- $datatable .= '';
- } else {
- $datatable .= ' ';
- }
- $datatable .=
- ''.
+ ' '.
+ ''.
''
- .'';
- for (my $k=0; $k<=$maxnum; $k++) {
- my $vpos = $k+1;
- my $selstr;
- if ($k == $i) {
- $selstr = ' selected="selected" ';
- }
- $datatable .= ''.$vpos.' ';
- }
- $datatable .= ' '.(' 'x2).
- ' '.
- ''.&mt('Required settings').' '.
- ''.$lt{'title'}.': '.
- (' 'x2).
- ''.$lt{'version'}.':'.
- '1.1 '.
- (' 'x2).
- ''.$lt{'msgtype'}.':'.
- 'Launch '.
- ''.$lt{'url'}.': '.
- (' 'x2).
- ''.$lt{'key'}.
- ' '.
- (' 'x2).
- ''.$lt{'secret'}.':'.
- ' '.
- ''.&mt('Optional settings').' '.
- ''.&mt('Display target:');
- my %currdisp;
- if (ref($settings->{$item}->{'display'}) eq 'HASH') {
- if ($settings->{$item}->{'display'}->{'target'} eq 'window') {
- $currdisp{'window'} = ' checked="checked"';
- } elsif ($settings->{$item}->{'display'}->{'target'} eq 'tab') {
- $currdisp{'tab'} = ' checked="checked"';
- } else {
- $currdisp{'iframe'} = ' checked="checked"';
- }
- if ($settings->{$item}->{'display'}->{'width'} =~ /^(\d+)$/) {
- $currdisp{'width'} = $1;
- }
- if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) {
- $currdisp{'height'} = $1;
- }
- $currdisp{'linktext'} = $settings->{$item}->{'display'}->{'linktext'};
- $currdisp{'explanation'} = $settings->{$item}->{'display'}->{'explanation'};
- } else {
- $currdisp{'iframe'} = ' checked="checked"';
- }
- foreach my $disp ('iframe','tab','window') {
- $datatable .= ''.$lt{$dimen}.' '.
- ' '.
- (' 'x2);
- }
- $datatable .= ''.$lt{'linktext'}.'
'.
- ''.$lt{'explanation'}.'
'.$lt{'icon'}.': ';
- if ($imgsrc) {
- $datatable .= $imgsrc.
- ' '.
- ' '.&mt('Replace:').' ';
- } else {
- $datatable .= '('.&mt('if larger than 21x21 pixels, image will be scaled').') ';
- }
- if ($switchserver) {
- $datatable .= &mt('Upload to library server: [_1]',$switchserver);
- } else {
- $datatable .= ' '.&mt('User data sent on launch').' '.
- '';
- foreach my $field (@fields) {
- my $checked;
- if ($checkedfields{$field}) {
- $checked = ' checked="checked"';
- }
- $datatable .= ''.
- ' '.(' ' x2);
- }
- $datatable .= ' '.&mt('Role mapping').' ';
- foreach my $role (@courseroles) {
- my ($selected,$selectnone);
- if (!$rolemaps{$role}) {
- $selectnone = ' selected="selected"';
- }
- $datatable .= ''.
- &Apache::lonnet::plaintext($role,'Course').''.
- ''.&mt('Select').' ';
- foreach my $ltirole (@ltiroles) {
- unless ($selectnone) {
- if ($rolemaps{$role} eq $ltirole) {
- $selected = ' selected="selected"';
- } else {
- $selected = '';
- }
- }
- $datatable .= ''.$ltirole.' ';
- }
- $datatable .= ' ';
- }
- $datatable .= '
'.&mt('Configurable in course').' ';
- foreach my $item ('label','title','target','linktext','explanation') {
- my $checked;
- if ($courseconfig{$item}) {
- $checked = ' checked="checked"';
- }
- $datatable .= ''.
- ' '.(' ' x2)."\n";
- }
- $datatable .= ' '.&mt('Custom items sent on launch').' '.
- ' '."\n".
- '';
- for (my $k=0; $k<$maxnum+1; $k++) {
- my $vpos = $k+1;
- my $selstr;
- if ($k == $maxnum) {
- $selstr = ' selected="selected" ';
- }
- $datatable .= ''.$vpos.' ';
- }
- $datatable .= ' '."\n".
- ' '.
- ''.&mt('Required settings').' '.
- ''.$lt{'title'}.': '."\n".
- (' 'x2).
- ''.$lt{'version'}.':'.
- '1.1 '."\n".
- (' 'x2).
- ''.$lt{'msgtype'}.':'.
- 'Launch '.
- ''.$lt{'url'}.': '."\n".
- (' 'x2).
- ''.$lt{'key'}.': '."\n".
- (' 'x2).
- ''.$lt{'secret'}.': '."\n".
- ''.&mt('Optional settings').' '.
- ''.&mt('Display target:');
- my %defaultdisp;
- $defaultdisp{'iframe'} = ' checked="checked"';
- foreach my $disp ('iframe','tab','window') {
- $datatable .= ''.$lt{$dimen}.' '.
- ' '.
- (' 'x2);
- }
- $datatable .= ''.$lt{'linktext'}.'
'.
- ''.$lt{'explanation'}.'
'.$lt{'icon'}.': '.
- '('.&mt('if larger than 21x21 pixels, image will be scaled').') ';
- if ($switchserver) {
- $datatable .= &mt('Upload to library server: [_1]',$switchserver);
- } else {
- $datatable .= ' '.&mt('User data sent on launch').' '.
- '';
- foreach my $field (@fields) {
- $datatable .= ''.
- ' '.(' ' x2);
- }
- $datatable .= ' '.&mt('Role mapping').' ';
- foreach my $role (@courseroles) {
- my ($checked,$checkednone);
- $datatable .= ''.
- &Apache::lonnet::plaintext($role,'Course').''.
- ''.&mt('Select').' ';
- foreach my $ltirole (@ltiroles) {
- $datatable .= ''.$ltirole.' ';
- }
- $datatable .= ' ';
- }
- $datatable .= '
'.&mt('Configurable in course').' ';
- foreach my $item ('label','title','target','linktext','explanation') {
- $datatable .= ''.
- ' '.(' ' x2)."\n";
- }
- $datatable .= ' '.&mt('Custom items sent on launch').' '.
- ' '.
- ''.$choices{'texengine'}.
- ' '.
- ''."\n";
- my %texoptions = (
- MathJax => 'MathJax',
- mimetex => &mt('Convert to Images'),
- tth => &mt('TeX to HTML'),
- );
- foreach my $renderer ('MathJax','mimetex','tth') {
- my $selected = '';
- if ($renderer eq $deftex) {
- $selected = ' selected="selected"';
- }
- $mathdisp .= ''.$texoptions{$renderer}.' '."\n";
- }
- $mathdisp .= ' '."\n";
- $itemcount ++;
+ %defaultchecked = ('canuse_pdfforms' => 'off');
+ @toggles = ('canuse_pdfforms');
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
- \%choices,$itemcount);
- $datatable = $mathdisp.$datatable;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .=
- ''.
- ''.$choices{'canclone'}.
- ' ';
- my $currcanclone = 'none';
- my $onclick;
- my @cloneoptions = ('none','domain');
- my %clonetitles = (
- none => 'No additional course requesters',
- domain => "Any course requester in course's domain",
- instcode => 'Course requests for official courses ...',
- );
- my (%codedefaults,@code_order,@posscodes);
- if (&Apache::lonnet::auto_instcode_defaults($dom,\%codedefaults,
- \@code_order) eq 'ok') {
- if (@code_order > 0) {
- push(@cloneoptions,'instcode');
- $onclick = ' onclick="toggleDisplay(this.form,'."'cloneinstcode'".');"';
- }
- }
- if (ref($settings) eq 'HASH') {
- if ($settings->{'canclone'}) {
- if (ref($settings->{'canclone'}) eq 'HASH') {
- if (ref($settings->{'canclone'}{'instcode'}) eq 'ARRAY') {
- if (@code_order > 0) {
- $currcanclone = 'instcode';
- @posscodes = @{$settings->{'canclone'}{'instcode'}};
- }
- }
- } elsif ($settings->{'canclone'} eq 'domain') {
- $currcanclone = $settings->{'canclone'};
- }
- }
- }
- foreach my $option (@cloneoptions) {
- my ($checked,$additional);
- if ($currcanclone eq $option) {
- $checked = ' checked="checked"';
- }
- if ($option eq 'instcode') {
- if (@code_order) {
- my $show = 'none';
- if ($checked) {
- $show = 'block';
- }
- $additional = '
'.
- &mt('Institutional codes for new and cloned course have identical:').
- ''.
- ' ';
- }
- $additional .= (' 'x2).'('.&mt('check as many as needed').')';
- }
- }
- $datatable .=
- ' '.
- '';
- $itemcount ++;
+ \%choices,$itemcount);
} else {
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql);
+ my ($currdefresponder,$def_official_credits,$def_unofficial_credits,$def_textbook_credits,
+ %curruploadquota);
my $currusecredits = 0;
- my $postsubmitclient = 1;
my @types = ('official','unofficial','community','textbook');
if (ref($settings) eq 'HASH') {
$currdefresponder = $settings->{'anonsurvey_threshold'};
@@ -4308,51 +2846,14 @@ sub print_coursedefaults {
}
}
if (ref($settings->{'coursecredits'}) eq 'HASH') {
- foreach my $type (@types) {
- next if ($type eq 'community');
- $defcredits{$type} = $settings->{'coursecredits'}->{$type};
- if ($defcredits{$type} ne '') {
- $currusecredits = 1;
- }
- }
- }
- if (ref($settings->{'postsubmit'}) eq 'HASH') {
- if ($settings->{'postsubmit'}->{'client'} eq 'off') {
- $postsubmitclient = 0;
- foreach my $type (@types) {
- $deftimeout{$type} = $staticdefaults{'postsubmit'};
- }
- } else {
- foreach my $type (@types) {
- if (ref($settings->{'postsubmit'}->{'timeout'}) eq 'HASH') {
- if ($settings->{'postsubmit'}->{'timeout'}->{$type} =~ /^\d+$/) {
- $deftimeout{$type} = $settings->{'postsubmit'}->{'timeout'}->{$type};
- } else {
- $deftimeout{$type} = $staticdefaults{'postsubmit'};
- }
- } else {
- $deftimeout{$type} = $staticdefaults{'postsubmit'};
- }
- }
- }
- } else {
- foreach my $type (@types) {
- $deftimeout{$type} = $staticdefaults{'postsubmit'};
+ $def_official_credits = $settings->{'coursecredits'}->{'official'};
+ $def_unofficial_credits = $settings->{'coursecredits'}->{'unofficial'};
+ $def_textbook_credits = $settings->{'coursecredits'}->{'textbook'};
+ if (($def_official_credits ne '') || ($def_unofficial_credits ne '') ||
+ ($def_textbook_credits ne '')) {
+ $currusecredits = 1;
}
}
- if (ref($settings->{'mysqltables'}) eq 'HASH') {
- foreach my $type (keys(%{$settings->{'mysqltables'}})) {
- $currmysql{$type} = $settings->{'mysqltables'}{$type};
- }
- } else {
- foreach my $type (@types) {
- $currmysql{$type} = $staticdefaults{'mysqltables'};
- }
- }
- } else {
- foreach my $type (@types) {
- $deftimeout{$type} = $staticdefaults{'postsubmit'};
- }
}
if (!$currdefresponder) {
$currdefresponder = $staticdefaults{'anonsurvey_threshold'};
@@ -4392,14 +2893,21 @@ sub print_coursedefaults {
$display = 'block';
}
my $additional = ''.
- '
'.&mt('Default credits').' '.
+ &mt('Default credits for official courses [_1]',
+ ' '.
+ &mt('Default credits for unofficial courses [_1]',
+ ' '.
+ &mt('Default credits for textbook courses [_1]',
+ ' '."\n";
%defaultchecked = ('coursecredits' => 'off');
@toggles = ('coursecredits');
my $current = {
@@ -4407,46 +2915,9 @@ sub print_coursedefaults {
};
(my $table,$itemcount) =
&radiobutton_prefs($current,\@toggles,\%defaultchecked,
- \%choices,$itemcount,$onclick,$additional,'left');
+ \%choices,$itemcount,$onclick,$additional);
$datatable .= $table;
- $onclick = "toggleDisplay(this.form,'studentsubmission');";
- my $display = 'none';
- if ($postsubmitclient) {
- $display = 'block';
- }
- $additional = ''.
- &mt('Number of seconds submit is disabled').'
'.
- '
'.&mt('Enter 0 to remain disabled until page reload.').' '.
- '
'.
- $choices{'mysqltables'}.
- ' '.
- ' '."\n";
$itemcount ++;
-
}
$$rowtotal += $itemcount;
return $datatable;
@@ -4640,7 +3111,7 @@ sub print_validation_rows {
' ';
}
} elsif ($item eq 'markup') {
- $datatable .= '';
}
@@ -4662,7 +3133,7 @@ sub print_validation_rows {
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
'validationdc',%currhash);
my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= '';
+ $datatable .= ' ';
if ($numdc > 1) {
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)');
} else {
@@ -4677,428 +3148,6 @@ sub print_validation_rows {
return $datatable;
}
-sub print_passwords {
- my ($position,$dom,$confname,$settings,$rowtotal) = @_;
- my ($datatable,$css_class);
- my $itemcount = 0;
- my %titles = &Apache::lonlocal::texthash (
- captcha => '"Forgot Password" CAPTCHA validation',
- link => 'Reset link expiration (hours)',
- case => 'Case-sensitive usernames/e-mail',
- prelink => 'Information required (form 1)',
- postlink => 'Information required (form 2)',
- emailsrc => 'LON-CAPA e-mail address type(s)',
- customtext => 'Domain specific text (HTML)',
- intauth_cost => 'Encryption cost for bcrypt (positive integer)',
- intauth_check => 'Check bcrypt cost if authenticated',
- intauth_switch => 'Existing crypt-based switched to bcrypt on authentication',
- permanent => 'Permanent e-mail address',
- critical => 'Critical notification address',
- notify => 'Notification address',
- min => 'Minimum password length',
- max => 'Maximum password length',
- chars => 'Required characters',
- numsaved => 'Number of previous passwords to save and disallow reuse',
- );
- if ($position eq 'top') {
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- my $shownlinklife = 2;
- my $prelink = 'both';
- my (%casesens,%postlink,%emailsrc,$nostdtext,$customurl);
- if (ref($settings) eq 'HASH') {
- if ($settings->{resetlink} =~ /^\d+(|\.\d*)$/) {
- $shownlinklife = $settings->{resetlink};
- }
- if (ref($settings->{resetcase}) eq 'ARRAY') {
- map { $casesens{$_} = 1; } (@{$settings->{resetcase}});
- }
- if ($settings->{resetprelink} =~ /^(both|either)$/) {
- $prelink = $settings->{resetprelink};
- }
- if (ref($settings->{resetpostlink}) eq 'HASH') {
- %postlink = %{$settings->{resetpostlink}};
- }
- if (ref($settings->{resetemail}) eq 'ARRAY') {
- map { $emailsrc{$_} = 1; } (@{$settings->{resetemail}});
- }
- if ($settings->{resetremove}) {
- $nostdtext = 1;
- }
- if ($settings->{resetcustom}) {
- $customurl = $settings->{resetcustom};
- }
- } else {
- if (ref($types) eq 'ARRAY') {
- foreach my $item (@{$types}) {
- $casesens{$item} = 1;
- $postlink{$item} = ['username','email'];
- }
- }
- $casesens{'default'} = 1;
- $postlink{'default'} = ['username','email'];
- $prelink = 'both';
- %emailsrc = (
- permanent => 1,
- critical => 1,
- notify => 1,
- );
- }
- $datatable = &captcha_choice('passwords',$settings,$$rowtotal);
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'link'}.' '.
- ''.
- ' ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'case'}.' '.
- '';
- if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
- foreach my $item (@{$types}) {
- my $checkedcase;
- if ($casesens{$item}) {
- $checkedcase = ' checked="checked"';
- }
- $datatable .= ''.
- ' '.
- ' ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my %checkedpre = (
- both => ' checked="checked"',
- either => '',
- );
- if ($prelink eq 'either') {
- $checkedpre{either} = ' checked="checked"';
- $checkedpre{both} = '';
- }
- $datatable .= ''.$titles{'prelink'}.' '.
- ''.
- ' '.
- ''.
- ' '.$titles{'postlink'}.' '.
- '';
- my %postlinked;
- if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
- foreach my $item (@{$types}) {
- undef(%postlinked);
- $datatable .= ''.
- ''.$usertypes->{$item}.' ';
- if (ref($postlink{$item}) eq 'ARRAY') {
- map { $postlinked{$_} = 1; } (@{$postlink{$item}});
- }
- foreach my $field ('email','username') {
- my $checked;
- if ($postlinked{$field}) {
- $checked = ' checked="checked"';
- }
- $datatable .= ''.
- ' '.
- ' ';
- }
- $datatable .= ' ';
- }
- }
- if (ref($postlink{'default'}) eq 'ARRAY') {
- map { $postlinked{$_} = 1; } (@{$postlink{'default'}});
- }
- $datatable .= ''.
- ''.$othertitle.' ';
- foreach my $field ('email','username') {
- my $checked;
- if ($postlinked{$field}) {
- $checked = ' checked="checked"';
- }
- $datatable .= ''.
- ' '.
- ' ';
- }
- $datatable .= ' ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'emailsrc'}.' '.
- '';
- foreach my $type ('permanent','critical','notify') {
- my $checkedemail;
- if ($emailsrc{$type}) {
- $checkedemail = ' checked="checked"';
- }
- $datatable .= ''.
- ' '.
- ' ';
- }
- $datatable .= ' ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my $switchserver = &check_switchserver($dom,$confname);
- my ($showstd,$noshowstd);
- if ($nostdtext) {
- $noshowstd = ' checked="checked"';
- } else {
- $showstd = ' checked="checked"';
- }
- $datatable .= ''.$titles{'customtext'}.' '.
- ''.
- &mt('Retain standard text:').
- ' '.
- &mt('(If you use the same account ... reset a password from this page.)').' '.$link.
- ' '.
- ' '.&mt('Replace:').' ';
- }
- if ($switchserver) {
- $datatable .= ' '.&mt('Upload to library server: [_1]',$switchserver).' ';
- } else {
- $datatable .=' '.
- ' ';
- }
- $datatable .= ''.
- ''.$titles{$item}.
- ' ';
- if ($item eq 'intauth_switch') {
- my @options = (0,1,2);
- my %optiondesc = &Apache::lonlocal::texthash (
- 0 => 'No',
- 1 => 'Yes',
- 2 => 'Yes, and copy existing passwd file to passwd.bak file',
- );
- $datatable .= '';
- } elsif ($item eq 'intauth_check') {
- my @options = (0,1,2);
- my %optiondesc = &Apache::lonlocal::texthash (
- 0 => 'No',
- 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 .= '';
- } else {
- $datatable .= ' ';
- $itemcount ++;
- }
- } elsif ($position eq 'lower') {
- my ($min,$max,%chars,$numsaved);
- $min = $Apache::lonnet::passwdmin;
- if (ref($settings) eq 'HASH') {
- if ($settings->{min}) {
- $min = $settings->{min};
- }
- if ($settings->{max}) {
- $max = $settings->{max};
- }
- if (ref($settings->{chars}) eq 'ARRAY') {
- map { $chars{$_} = 1; } (@{$settings->{chars}});
- }
- if ($settings->{numsaved}) {
- $numsaved = $settings->{numsaved};
- }
- }
- my %rulenames = &Apache::lonlocal::texthash(
- uc => 'At least one upper case letter',
- lc => 'At least one lower case letter',
- num => 'At least one number',
- spec => 'At least one non-alphanumeric',
- );
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'min'}.' '.
- ''.
- ' '.&mt('(Enter an integer: 7 or larger)').' '.
- ' '.$titles{'max'}.' '.
- ''.
- ' '.&mt('(Leave blank for no maximum)').' '.
- ' '.$titles{'chars'}.''.&mt('(Leave unchecked if not required)').
- ' ';
- my $numinrow = 2;
- my @possrules = ('uc','lc','num','spec');
- $datatable .= ''.$titles{'numsaved'}.' '.
- ''.
- ' '.&mt('(Leave blank to not save previous passwords)').' '.
- ' '.
- ''.
- &mt('Requirements').''.
- ''.&mt("Course 'type' is not a Community").' '.
- ''.&mt('User is Course Coordinator and also course owner').' '.
- ''.&mt("Student's only active roles are student role(s) in course(s) owned by this user").' '.
- ''.&mt('User, course, and student share same domain').' '.
- ' '.
- ' '.
- '';
- foreach my $item ('by','for') {
- $datatable .= ''.
- ''.$ownertitles{$item}.' ';
- if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
- foreach my $type (@{$types}) {
- my $checked;
- if ($ownerchg{$item}{$type}) {
- $checked = ' checked="checked"';
- }
- $datatable .= ''.
- ' '.
- ' ';
- }
- $datatable .= ' ';
- }
- return $datatable;
-}
-
sub print_usersessions {
my ($position,$dom,$settings,$rowtotal) = @_;
my ($css_class,$datatable,%checked,%choices);
@@ -5113,13 +3162,7 @@ sub print_usersessions {
if ($position eq 'top') {
if (keys(%serverhomes) > 1) {
my %spareid = ¤t_offloads_to($dom,$settings,\%servers);
- my $curroffloadnow;
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{'offloadnow'}) eq 'HASH') {
- $curroffloadnow = $settings->{'offloadnow'};
- }
- }
- $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal);
+ $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$rowtotal);
} else {
$datatable .= ''.
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.');
@@ -5369,7 +3412,7 @@ sub current_offloads_to {
}
sub spares_row {
- my ($dom,$servers,$spareid,$serverhomes,$altids,$curroffloadnow,$rowtotal) = @_;
+ my ($dom,$servers,$spareid,$serverhomes,$altids,$rowtotal) = @_;
my $css_class;
my $numinrow = 4;
my $itemcount = 1;
@@ -5389,21 +3432,12 @@ sub spares_row {
}
}
next unless (ref($spareid->{$server}) eq 'HASH');
- my $checkednow;
- if (ref($curroffloadnow) eq 'HASH') {
- if ($curroffloadnow->{$server}) {
- $checkednow = ' checked="checked"';
- }
- }
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
$datatable .= '
'.
&mt('[_1] when busy, offloads to:'
- ,''.$server.' ').' '."\n".
- ' '.
+ ,''.$server.' ').
"\n";
my (%current,%canselect);
my @choices =
@@ -5528,13 +3562,13 @@ sub print_loadbalancing {
my $numinrow = 1;
my $datatable;
my %servers = &Apache::lonnet::internet_dom_servers($dom);
- my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
+ my (%currbalancer,%currtargets,%currrules,%existing);
if (ref($settings) eq 'HASH') {
%existing = %{$settings};
}
if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer,
- \%currtargets,\%currrules,\%currcookies);
+ \%currtargets,\%currrules);
} else {
return;
}
@@ -5608,12 +3642,6 @@ sub print_loadbalancing {
my ($numspares,@spares) = &count_servers($lonhost,%servers);
my @sparestypes = ('primary','default');
my %typetitles = &sparestype_titles();
- my %hostherechecked = (
- no => ' checked="checked"',
- );
- my %balcookiechecked = (
- no => ' checked="checked"',
- );
foreach my $sparetype (@sparestypes) {
my $targettable;
for (my $i=0; $i<$numspares; $i++) {
@@ -5659,35 +3687,8 @@ sub print_loadbalancing {
$datatable .= ''.$typetitles{$sparetype}.' '.$typetitles{$sparetype}.
- ' '.
+ $datatable .= ' '.
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost},
$othertitle,$usertypes,$types,\%servers,
\%currbalancer,$lonhost,
@@ -5701,11 +3702,10 @@ sub print_loadbalancing {
}
sub get_loadbalancers_config {
- my ($servers,$existing,$currbalancer,$currtargets,$currrules,$currcookies) = @_;
+ my ($servers,$existing,$currbalancer,$currtargets,$currrules) = @_;
return unless ((ref($servers) eq 'HASH') &&
(ref($existing) eq 'HASH') && (ref($currbalancer) eq 'HASH') &&
- (ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH') &&
- (ref($currcookies) eq 'HASH'));
+ (ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH'));
if (keys(%{$existing}) > 0) {
my $oldlonhost;
foreach my $key (sort(keys(%{$existing}))) {
@@ -5724,9 +3724,6 @@ sub get_loadbalancers_config {
$currbalancer->{$key} = 1;
$currtargets->{$key} = $existing->{$key}{'targets'};
$currrules->{$key} = $existing->{$key}{'rules'};
- if ($existing->{$key}{'cookie'}) {
- $currcookies->{$key} = 1;
- }
}
}
} else {
@@ -5782,14 +3779,9 @@ sub loadbalancing_titles {
'_LC_ipchange' => &mt('Non-SSO users with IP mismatch'),
);
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange');
- my @available;
if (ref($types) eq 'ARRAY') {
- @available = @{$types};
- }
- unless (grep(/^default$/,@available)) {
- push(@available,'default');
+ unshift(@alltypes,@{$types},'default');
}
- unshift(@alltypes,@available);
my %titles;
foreach my $type (@alltypes) {
if ($type =~ /^_LC_/) {
@@ -5814,7 +3806,7 @@ sub loadbalance_rule_row {
my @rulenames;
my %ruletitles = &offloadtype_text();
if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) {
- @rulenames = ('balancer','offloadedto','specific');
+ @rulenames = ('balancer','offloadedto');
} else {
@rulenames = ('default','homeserver');
if ($type eq '_LC_external') {
@@ -5876,13 +3868,8 @@ sub loadbalance_rule_row {
' '."\n";
return $output;
@@ -5897,7 +3884,6 @@ sub offloadtype_text {
'none' => 'No offload',
'balancer' => 'Session hosted on Load Balancer, after re-authentication',
'offloadedto' => 'Session hosted on offload server, after re-authentication',
- 'particular' => 'Session hosted (after re-auth) on server:',
);
return %ruletitles;
}
@@ -5912,17 +3898,15 @@ sub sparestype_titles {
sub contact_titles {
my %titles = &Apache::lonlocal::texthash (
- 'supportemail' => 'Support E-mail address',
- 'adminemail' => 'Default Server Admin E-mail address',
- 'errormail' => 'Error reports to be e-mailed to',
- 'packagesmail' => 'Package update alerts to be e-mailed to',
- 'helpdeskmail' => "Helpdesk requests from all users in this domain",
- 'otherdomsmail' => 'Helpdesk requests from users in other (unconfigured) domains',
- 'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
- 'requestsmail' => 'E-mail from course requests requiring approval',
- 'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates',
+ 'supportemail' => 'Support E-mail address',
+ 'adminemail' => 'Default Server Admin E-mail address',
+ 'errormail' => 'Error reports to be e-mailed to',
+ 'packagesmail' => 'Package update alerts to be e-mailed to',
+ 'helpdeskmail' => 'Helpdesk requests to be e-mailed to',
+ 'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
+ 'requestsmail' => 'E-mail from course requests requiring approval',
+ 'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates',
'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID',
- 'hostipmail' => 'E-mail from nightly check of hostname/IP network changes',
);
my %short_titles = &Apache::lonlocal::texthash (
adminemail => 'Admin E-mail address',
@@ -5931,34 +3915,6 @@ sub contact_titles {
return (\%titles,\%short_titles);
}
-sub helpform_fields {
- my %titles = &Apache::lonlocal::texthash (
- 'username' => 'Name',
- 'user' => 'Username/domain',
- 'phone' => 'Phone',
- 'cc' => 'Cc e-mail',
- 'course' => 'Course Details',
- 'section' => 'Sections',
- 'screenshot' => 'File upload',
- );
- my @fields = ('username','phone','user','course','section','cc','screenshot');
- my %possoptions = (
- username => ['yes','no','req'],
- phone => ['yes','no','req'],
- user => ['yes','no'],
- cc => ['yes','no'],
- course => ['yes','no'],
- section => ['yes','no'],
- screenshot => ['yes','no'],
- );
- my %fieldoptions = &Apache::lonlocal::texthash (
- 'yes' => 'Optional',
- 'req' => 'Required',
- 'no' => "Not shown",
- );
- return (\@fields,\%titles,\%fieldoptions,\%possoptions);
-}
-
sub tool_titles {
my %titles = &Apache::lonlocal::texthash (
aboutme => 'Personal web page',
@@ -6143,8 +4099,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'};
@@ -6161,22 +4116,12 @@ 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'};
- }
}
}
}
my %radiohash;
my $numinrow = 4;
map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate;
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
if ($position eq 'top') {
my %choices = &Apache::lonlocal::texthash (
cancreate_login => 'Institutional Login',
@@ -6191,12 +4136,14 @@ sub print_selfcreation {
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
\%choices,$itemcount,$onclick);
$$rowtotal += $itemcount;
+
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
if (ref($usertypes) eq 'HASH') {
if (keys(%{$usertypes}) > 0) {
$datatable .= &insttypes_row($createsettings,$types,$usertypes,
$dom,$numinrow,$othertitle,
- 'statustocreate',$rowtotal);
+ 'statustocreate',$$rowtotal);
$$rowtotal ++;
}
}
@@ -6209,7 +4156,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) {
@@ -6241,430 +4188,149 @@ sub print_selfcreation {
$$rowtotal ++;
} elsif ($position eq 'middle') {
my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom);
- my @posstypes;
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+ $usertypes->{'default'} = $othertitle;
if (ref($types) eq 'ARRAY') {
- @posstypes = @{$types};
- }
- unless (grep(/^default$/,@posstypes)) {
- push(@posstypes,'default');
- }
- my %usertypeshash;
- if (ref($usertypes) eq 'HASH') {
- %usertypeshash = %{$usertypes};
- }
- $usertypeshash{'default'} = $othertitle;
- foreach my $status (@posstypes) {
- $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
- $numinrow,$$rowtotal,\%usertypeshash);
- $$rowtotal ++;
+ push(@{$types},'default');
+ $usertypes->{'default'} = $othertitle;
+ foreach my $status (@{$types}) {
+ $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
+ $numinrow,$$rowtotal,$usertypes);
+ $$rowtotal ++;
+ }
}
} 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');
- }
- 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 ++;
+ 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).' ';
}
+ $additional .= '
';
+ } else {
+ $usertypes->{'default'} = &mt('All users');
+ $additional .= &email_as_username($rowtotal,$processing);
}
- } 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 .= '
'.
- "$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 .= "
'.
- ''.$rowname.' '."\n".
+ ' '.$rowname.' '."\n".
''."\n".
+ $currpriv.'" size="40" />
'."\n".
'';
return $output;
}
sub user_formats_row {
- my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount,$status) = @_;
+ my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount) = @_;
my $output;
my %text = (
'username' => 'new usernames',
'id' => 'IDs',
+ 'email' => 'self-created accounts (e-mail)',
);
- unless ($type eq 'email') {
- my $css_class = $rowcount%2?' class="LC_odd_row"':'';
- $output = ''.
- ''.
- &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;
}
@@ -6878,10 +4510,7 @@ sub print_usermodification {
sub print_defaults {
my ($position,$dom,$settings,$rowtotal) = @_;
my $rownum = 0;
- my ($datatable,$css_class,$titles);
- unless ($position eq 'bottom') {
- $titles = &defaults_titles($dom);
- }
+ my ($datatable,$css_class);
if ($position eq 'top') {
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
'datelocale_def','portal_def');
@@ -6894,6 +4523,7 @@ sub print_defaults {
$defaults{$item} = $domdefaults{$item};
}
}
+ my $titles = &defaults_titles($dom);
foreach my $item (@items) {
if ($rownum%2) {
$css_class = '';
@@ -6928,8 +4558,11 @@ sub print_defaults {
my $includeempty = 1;
$datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty);
} elsif ($item eq 'lang_def') {
- my $includeempty = 1;
- $datatable .= &Apache::loncommon::select_language($item,$defaults{$item},$includeempty);
+ 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') {
@@ -6942,14 +4575,19 @@ sub print_defaults {
$rownum ++;
}
} else {
- my %defaults;
+ 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 .= ''.
''.
@@ -6962,12 +4600,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:').
' '.
+ ' '.$vpos.' ';
}
$datatable .= ' '.&mt('Internal ID:').
- ''.
&mt('Name displayed:').
' '.
+ ' '.
&mt('An error occurred updating the domain configuration: [_1]',$putresult).' ';
}
@@ -7258,129 +4857,6 @@ sub legacy_scantronformat {
return ($url,$error);
}
-sub print_scantronconfig {
- my ($dom,$settings,$rowtotal) = @_;
- my $itemcount = 2;
- my $is_checked = ' checked="checked"';
- my %optionson = (
- hdr => ' checked="checked"',
- pad => ' checked="checked"',
- rem => ' checked="checked"',
- );
- my %optionsoff = (
- hdr => '',
- pad => '',
- rem => '',
- );
- my $currcsvsty = 'none';
- my ($datatable,%csvfields,%checked,%onclick,%csvoptions);
- my @fields = &scantroncsv_fields();
- my %titles = &scantronconfig_titles();
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{config}) eq 'HASH') {
- if ($settings->{config}->{dat}) {
- $checked{'dat'} = $is_checked;
- }
- if (ref($settings->{config}->{csv}) eq 'HASH') {
- if (ref($settings->{config}->{csv}->{fields}) eq 'HASH') {
- %csvfields = %{$settings->{config}->{csv}->{fields}};
- if (keys(%csvfields) > 0) {
- $checked{'csv'} = $is_checked;
- $currcsvsty = 'block';
- }
- }
- if (ref($settings->{config}->{csv}->{options}) eq 'HASH') {
- %csvoptions = %{$settings->{config}->{csv}->{options}};
- foreach my $option (keys(%optionson)) {
- unless ($csvoptions{$option}) {
- $optionsoff{$option} = $optionson{$option};
- $optionson{$option} = '';
- }
- }
- }
- }
- } else {
- $checked{'dat'} = $is_checked;
- }
- } else {
- $checked{'dat'} = $is_checked;
- }
- $onclick{'csv'} = ' onclick="toggleScantron(this.form);"';
- my $css_class = $itemcount%2? ' class="LC_odd_row"':'';
- $datatable = ''.&mt('Supported formats').' '.
- '';
- foreach my $item ('dat','csv') {
- my $id;
- if ($item eq 'csv') {
- $id = 'id="scantronconfcsv" ';
- }
- $datatable .= ''.
- ''.&mt('CSV Column Mapping').' '.
- ''.&mt('Field').' '.&mt('Location').' '.$titles{$col}.' '.
- ''.
- ''.$shown.' ';
- }
- $datatable .= '
'.
- ''.
- ''.&mt('CSV Options').' ';
- foreach my $option ('hdr','pad','rem') {
- $datatable .= ''.$titles{$option}.':'.
- ' ';
- $itemcount ++;
- }
- }
- $datatable .= ' '.$hdritem->{'header'}->[1]->{'col2'}.' '.$hdritem->{'header'}->[1]->{'col2'}.' '
.&initialize_categories($itemcount);
}
$$rowtotal += $itemcount;
@@ -7682,7 +5158,7 @@ sub print_serverstatuses {
''.
' '."\n";
+ ''."\n";
}
$$rowtotal += $rownum;
return $datatable;
@@ -7692,12 +5168,12 @@ sub serverstatus_pages {
return ('userstatus','lonstatus','loncron','server-status','codeversions',
'checksums','clusterstatus','metadata_keywords','metadata_harvest',
'takeoffline','takeonline','showenv','toggledebug','ping','domconf',
- 'uniquecodes','diskusage','coursecatalog');
+ 'uniquecodes','diskusage');
}
sub defaults_javascript {
my ($settings) = @_;
- return unless (ref($settings) eq 'HASH');
+ return unless (ref($settings) eq 'HASH');
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
my $maxnum = scalar(@{$settings->{'inststatusorder'}});
if ($maxnum eq '') {
@@ -7758,94 +5234,6 @@ ENDSCRIPT
}
}
-sub passwords_javascript {
- my %intalert = &Apache::lonlocal::texthash (
- authcheck => 'Warning: disallowing login for an authenticated user if the stored cost is less than the default will require a password reset by/for the user.',
- authcost => 'Warning: bcrypt encryption cost for internal authentication must be an integer.',
- passmin => 'Warning: minimum password length must be a positive integer greater than 6.',
- passmax => 'Warning: maximum password length must be a positive integer (or blank).',
- passexp => 'Warning: days before password expiration must be a positive integer (or blank).',
- passnum => 'Warning: number of previous passwords to save must be a positive integer (or blank).',
- );
- &js_escape(\%intalert);
- my $defmin = $Apache::lonnet::passwdmin;
- my $intauthjs = <<"ENDSCRIPT";
-
-function warnIntAuth(field) {
- if (field.name == 'intauth_check') {
- if (field.value == '2') {
- alert('$intalert{authcheck}');
- }
- }
- if (field.name == 'intauth_cost') {
- field.value.replace(/\s/g,'');
- if (field.value != '') {
- var regexdigit=/^\\d+\$/;
- if (!regexdigit.test(field.value)) {
- alert('$intalert{authcost}');
- }
- }
- }
- return;
-}
-
-function warnIntPass(field) {
- field.value.replace(/^\s+/,'');
- field.value.replace(/\s+\$/,'');
- var regexdigit=/^\\d+\$/;
- if (field.name == 'passwords_min') {
- if (field.value == '') {
- alert('$intalert{passmin}');
- field.value = '$defmin';
- } else {
- if (!regexdigit.test(field.value)) {
- alert('$intalert{passmin}');
- field.value = '$defmin';
- }
- var minval = parseInt(field.value,10);
- if (minval < $defmin) {
- alert('$intalert{passmin}');
- field.value = '$defmin';
- }
- }
- } else {
- if (field.value == '0') {
- field.value = '';
- }
- if (field.value != '') {
- if (field.name == 'passwords_expire') {
- var regexpposnum=/^\\d+(|\\.\\d*)\$/;
- if (!regexpposnum.test(field.value)) {
- alert('$intalert{passexp}');
- field.value = '';
- } else {
- var expval = parseFloat(field.value);
- if (expval == 0) {
- alert('$intalert{passexp}');
- field.value = '';
- }
- }
- } else {
- if (!regexdigit.test(field.value)) {
- if (field.name == 'passwords_max') {
- alert('$intalert{passmax}');
- } else {
- if (field.name == 'passwords_numsaved') {
- alert('$intalert{passnum}');
- }
- }
- field.value = '';
- }
- }
- }
- }
- return;
-}
-
-ENDSCRIPT
- return &Apache::lonhtmlcommon::scripttag($intauthjs);
-}
-
sub coursecategories_javascript {
my ($settings) = @_;
my ($output,$jstext,$cathash);
@@ -7870,10 +5258,7 @@ sub coursecategories_javascript {
}
my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"');
my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"');
- my $choose_again = "\n".&mt('Please use a different name for the new top level category.');
- &js_escape(\$instcode_reserved);
- &js_escape(\$communities_reserved);
- &js_escape(\$choose_again);
+ my $choose_again = '\\n'.&mt('Please use a different name for the new top level category.');
$output = <<"ENDSCRIPT";