- | '.
+ | '.
&mt($item->{'header'}->[2]->{'col1'}).' |
- '.
+ | '.
&mt($item->{'header'}->[2]->{'col2'}).' |
'.
&print_rolecolors($phase,'author',$dom,$confname,$settings,\$rowtotal).'
@@ -1158,30 +1070,30 @@ sub print_config_box {
'.&mt($item->{'header'}->[0]->{'col1'}).' | ';
} elsif ($action eq 'serverstatuses') {
$output .= '
- '.&mt($item->{'header'}->[0]->{'col1'}).
+ | '.&mt($item->{'header'}->[0]->{'col1'}).
'
('.&mt('Automatic access for Dom. Coords.').') | ';
} else {
$output .= '
- '.&mt($item->{'header'}->[0]->{'col1'}).' | ';
+ '.&mt($item->{'header'}->[0]->{'col1'}).' | ';
}
if (defined($item->{'header'}->[0]->{'col3'})) {
- $output .= ''.
+ $output .= ' | '.
&mt($item->{'header'}->[0]->{'col2'});
if ($action eq 'serverstatuses') {
$output .= '
('.&mt('user1:domain1,user2:domain2 etc.').')';
}
} else {
- $output .= ' | '.
+ $output .= ' | '.
&mt($item->{'header'}->[0]->{'col2'});
}
$output .= ' | ';
if ($item->{'header'}->[0]->{'col3'}) {
if (defined($item->{'header'}->[0]->{'col4'})) {
- $output .= ''.
+ $output .= ' | '.
&mt($item->{'header'}->[0]->{'col3'});
} else {
- $output .= ' | '.
+ $output .= ' | '.
&mt($item->{'header'}->[0]->{'col3'});
}
if ($action eq 'serverstatuses') {
@@ -1190,7 +1102,7 @@ sub print_config_box {
$output .= ' | ';
}
if ($item->{'header'}->[0]->{'col4'}) {
- $output .= ''.
+ $output .= ' | '.
&mt($item->{'header'}->[0]->{'col4'});
}
$output .= '';
@@ -1198,9 +1110,11 @@ sub print_config_box {
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 'ipaccess')) {
+ ($action eq 'serverstatuses') || ($action eq 'loadbalancing') ||
+ ($action eq 'ltitools') || ($action eq 'lti')) {
$output .= $item->{'print'}->($dom,$settings,\$rowtotal);
+ } elsif ($action eq 'scantron') {
+ $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
}
}
$output .= '
@@ -1213,18 +1127,15 @@ sub print_config_box {
sub print_login {
my ($caller,$dom,$confname,$phase,$settings,$rowtotal) = @_;
- my ($css_class,$datatable,$switchserver,%lt);
+ my ($css_class,$datatable);
my %choices = &login_choices();
- if (($caller eq 'help') || ($caller eq 'headtag') || ($caller eq 'saml')) {
- %lt = &login_file_options();
- $switchserver = &check_switchserver($dom,$confname);
- }
+
if ($caller eq 'service') {
my %servers = &Apache::lonnet::internet_dom_servers($dom);
my $choice = $choices{'disallowlogin'};
$css_class = ' class="LC_odd_row"';
$datatable .= '| '.$choice.' | '.
- '| '.$choices{'hostid'}.' | '.
+ '| '.$choices{'hostid'}.' | '.
''.$choices{'server'}.' | '.
''.$choices{'serverpath'}.' | '.
''.$choices{'custompath'}.' | '.
@@ -1305,7 +1216,6 @@ sub print_login {
}
}
my @images = ('img','logo','domlogo','login');
- my @alttext = ('img','logo','domlogo');
my @logintext = ('textcol','bgcol');
my @bgs = ('pgbg','mainbg','sidebg');
my @links = ('link','alink','vlink');
@@ -1347,13 +1257,6 @@ sub print_login {
$designs{'showlogo'}{$item} = $settings->{'showlogo'}{$item};
}
}
- foreach my $item (@alttext) {
- if (ref($settings->{'alttext'}) eq 'HASH') {
- if ($settings->{'alttext'}->{$item} ne '') {
- $designs{'alttext'}{$item} = $settings->{'alttext'}{$item};
- }
- }
- }
foreach my $item (@logintext) {
if ($settings->{$item} ne '') {
$designs{'logintext'}{$item} = $settings->{$item};
@@ -1420,10 +1323,18 @@ sub print_login {
$datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext);
$datatable .= '
|---|
|
|---|
';
} elsif ($caller eq 'help') {
- my ($defaulturl,$defaulttype,%url,%type,%langchoices);
+ my ($defaulturl,$defaulttype,%url,%type,%lt,%langchoices);
+ my $switchserver = &check_switchserver($dom,$confname);
my $itemcount = 1;
$defaulturl = '/adm/loginproblems.html';
$defaulttype = 'default';
+ %lt = &Apache::lonlocal::texthash (
+ del => 'Delete?',
+ rep => 'Replace:',
+ upl => 'Upload:',
+ default => 'Default',
+ custom => 'Custom',
+ );
%langchoices = &Apache::lonlocal::texthash(&get_languages_hash());
my @currlangs;
if (ref($settings) eq 'HASH') {
@@ -1505,7 +1416,7 @@ sub print_login {
my $choice = $choices{'headtag'};
$css_class = ' class="LC_odd_row"';
$datatable .= ''.$choice.' | '.
- '| '.$choices{'hostid'}.' | '.
+ '| '.$choices{'hostid'}.' | '.
''.$choices{'current'}.' | '.
''.$choices{'action'}.' | '.
''.$choices{'exempt'}.' |
|---|
'."\n";
@@ -1520,6 +1431,14 @@ sub print_login {
}
}
}
+ my %lt = &Apache::lonlocal::texthash(
+ del => 'Delete?',
+ rep => 'Replace:',
+ upl => 'Upload:',
+ curr => 'View contents',
+ none => 'None',
+ );
+ my $switchserver = &check_switchserver($dom,$confname);
foreach my $lonhost (sort(keys(%domservers))) {
my $exempt = &check_exempt_addresses($currexempt{$lonhost});
$datatable .= '| '.$domservers{$lonhost}.' | ';
@@ -1543,101 +1462,6 @@ sub print_login {
$datatable .= ' | ';
}
$datatable .= '
|
|---|
';
- } elsif ($caller eq 'saml') {
- my %domservers = &Apache::lonnet::get_servers($dom);
- $datatable .= '| '.
- ' | ';
}
return $datatable;
}
@@ -1674,205 +1498,10 @@ sub login_choices {
headtag => "Custom markup",
action => "Action",
current => "Current",
- samllanding => "Dual login?",
- samloptions => "Options",
- alttext => "Alt text",
);
return %choices;
}
-sub login_file_options {
- return &Apache::lonlocal::texthash(
- del => 'Delete?',
- rep => 'Replace:',
- upl => 'Upload:',
- curr => 'View contents',
- default => 'Default',
- custom => 'Custom',
- none => 'None',
- );
-}
-
-sub print_ipaccess {
- my ($dom,$settings,$rowtotal) = @_;
- my $css_class;
- my $itemcount = 0;
- my $datatable;
- my %ordered;
- if (ref($settings) eq 'HASH') {
- foreach my $item (keys(%{$settings})) {
- if (ref($settings->{$item}) eq 'HASH') {
- my $num = $settings->{$item}{'order'};
- if ($num eq '') {
- $num = scalar(keys(%{$settings}));
- }
- $ordered{$num} = $item;
- }
- }
- }
- my $maxnum = scalar(keys(%ordered));
- if (keys(%ordered)) {
- my @items = sort { $a <=> $b } keys(%ordered);
- for (my $i=0; $i<@items; $i++) {
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my $item = $ordered{$items[$i]};
- my ($name,$ipranges,%commblocks,%courses);
- if (ref($settings->{$item}) eq 'HASH') {
- $name = $settings->{$item}->{'name'};
- $ipranges = $settings->{$item}->{'ip'};
- if (ref($settings->{$item}->{'commblocks'}) eq 'HASH') {
- %commblocks = %{$settings->{$item}->{'commblocks'}};
- }
- if (ref($settings->{$item}->{'courses'}) eq 'HASH') {
- %courses = %{$settings->{$item}->{'courses'}};
- }
- }
- my $chgstr = ' onchange="javascript:reorderIPaccess(this.form,'."'ipaccess_pos_".$item."'".');"';
- $datatable .= '| '
- .''.(' 'x2).
- ' | '.
- ''.
- &ipaccess_options($i,$itemcount,$dom,$name,$ipranges,\%commblocks,\%courses).
- ' | ';
- $itemcount ++;
- }
- }
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my $chgstr = ' onchange="javascript:reorderIPaccess(this.form,'."'ipaccess_pos_add'".');"';
- $datatable .= '| '."\n".
- ''."\n".
- ' '."\n".
- ''.&mt('Add').' | '."\n".
- ''.
- &ipaccess_options('add',$itemcount,$dom).
- ' | '."\n".
- ' '."\n";
- $$rowtotal ++;
- return $datatable;
-}
-
-sub ipaccess_options {
- my ($num,$itemcount,$dom,$name,$ipranges,$blocksref,$coursesref) = @_;
- my (%currblocks,%currcourses,$output);
- if (ref($blocksref) eq 'HASH') {
- %currblocks = %{$blocksref};
- }
- if (ref($coursesref) eq 'HASH') {
- %currcourses = %{$coursesref};
- }
- $output = ''.
- ''.
- ''.
- '';
- return $output;
-}
-
-sub blocker_checkboxes {
- my ($num,$blocks) = @_;
- my ($typeorder,$types) = &commblocktype_text();
- my $numinrow = 6;
- my $output = '';
- return $output;
-}
-
-sub commblocktype_text {
- my %types = &Apache::lonlocal::texthash(
- 'com' => 'Messaging',
- 'chat' => 'Chat Room',
- 'boards' => 'Discussion',
- 'port' => 'Portfolio',
- 'groups' => 'Groups',
- 'blogs' => 'Blogs',
- 'about' => 'User Information',
- 'printout' => 'Printouts',
- 'passwd' => 'Change Password',
- 'grades' => 'Gradebook',
- 'search' => 'Course search',
- 'wishlist' => 'Stored links',
- 'annotate' => 'Annotations',
- );
- my $typeorder = ['com','chat','boards','port','groups','blogs','about','wishlist','printout','grades','search','annotate','passwd'];
- return ($typeorder,\%types);
-}
-
sub print_rolecolors {
my ($phase,$role,$dom,$confname,$settings,$rowtotal) = @_;
my %choices = &color_font_choices();
@@ -2022,7 +1651,7 @@ sub display_color_options {
$css_class = $itemcount%2?' class="LC_odd_row"':'';
$datatable .= ''.
''.$choices->{$img};
- my ($imgfile,$img_import,$login_hdr_pick,$logincolors,$alttext);
+ my ($imgfile,$img_import,$login_hdr_pick,$logincolors);
if ($role eq 'login') {
if ($img eq 'login') {
$login_hdr_pick =
@@ -2030,13 +1659,8 @@ sub display_color_options {
$logincolors =
&login_text_colors($img,$role,$logintext,$phase,$choices,
$designs,$defaults);
- } else {
- if ($img ne 'domlogo') {
- $datatable.= &logo_display_options($img,$defaults,$designs);
- }
- if (ref($designs->{'alttext'}) eq 'HASH') {
- $alttext = $designs->{'alttext'}{$img};
- }
+ } elsif ($img ne 'domlogo') {
+ $datatable.= &logo_display_options($img,$defaults,$designs);
}
}
$datatable .= ' | ';
@@ -2128,11 +1752,6 @@ sub display_color_options {
$datatable .=' ';
}
}
- if (($role eq 'login') && ($img ne 'login')) {
- $datatable .= (' ' x2).' ';
- }
$datatable .= '';
}
$itemcount ++;
@@ -2154,7 +1773,7 @@ sub display_color_options {
'';
foreach my $item (@{$bgs}) {
- $datatable .= '| '.$choices->{$item};
+ $datatable .= ' | '.$choices->{$item};
my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item};
if ($designs->{'bgs'}{$item}) {
$datatable .= ' ';
@@ -2182,7 +1801,7 @@ sub display_color_options {
'';
foreach my $item (@{$links}) {
my $color = $designs->{'links'}{$item} ? $designs->{'links'}{$item} : $defaults->{'links'}{$item};
- $datatable .= '| '.$choices->{$item}."\n";
+ $datatable .= ' | '.$choices->{$item}."\n";
if ($designs->{'links'}{$item}) {
$datatable.=' ';
}
@@ -2243,7 +1862,7 @@ sub login_text_colors {
my ($img,$role,$logintext,$phase,$choices,$designs,$defaults) = @_;
my $color_menu = '';
foreach my $item (@{$logintext}) {
- $color_menu .= '| '.$choices->{$item};
+ $color_menu .= ' | '.$choices->{$item};
my $color = $designs->{'logintext'}{$item} ? $designs->{'logintext'}{$item} : $defaults->{'logintext'}{$item};
$color_menu .= '
| ';
@@ -2276,7 +1895,7 @@ sub image_changes {
$role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
' '.&mt('Replace:').'
';
} else {
- $output .= ''.$logincolors.&mt('Upload:').'
';
+ $output .= ' | '.$logincolors.&mt('Upload:').'
';
}
}
return $output;
@@ -2290,12 +1909,12 @@ sub print_quotas {
} else {
$context = $action;
}
- my ($datatable,$defaultquota,@usertools,@options,%validations);
+ my ($datatable,$defaultquota,$authorquota,@usertools,@options,%validations);
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
my $typecount = 0;
my ($css_class,%titles);
if ($context eq 'requestcourses') {
- @usertools = ('official','unofficial','community','textbook','lti');
+ @usertools = ('official','unofficial','community','textbook','placement','lti');
@options =('norequest','approval','validate','autolimit');
%validations = &Apache::lonnet::auto_courserequest_checks($dom);
%titles = &courserequest_titles();
@@ -2304,12 +1923,12 @@ sub print_quotas {
@options = ('norequest','approval','automatic');
%titles = &authorrequest_titles();
} else {
- @usertools = ('aboutme','blog','portfolio','timezone');
+ @usertools = ('aboutme','blog','webdav','portfolio');
%titles = &tool_titles();
}
if (ref($types) eq 'ARRAY') {
foreach my $type (@{$types}) {
- my $currdefquota;
+ my ($currdefquota,$currauthorquota);
unless (($context eq 'requestcourses') ||
($context eq 'requestauthor')) {
if (ref($settings) eq 'HASH') {
@@ -2318,6 +1937,9 @@ sub print_quotas {
} else {
$currdefquota = $settings->{$type};
}
+ if (ref($settings->{authorquota}) eq 'HASH') {
+ $currauthorquota = $settings->{authorquota}->{$type};
+ }
}
}
if (defined($usertypes->{$type})) {
@@ -2405,12 +2027,9 @@ sub print_quotas {
}
} else {
my $checked = 'checked="checked" ';
- if ($item eq 'timezone') {
- $checked = '';
- }
if (ref($settings) eq 'HASH') {
if (ref($settings->{$item}) eq 'HASH') {
- if (!$settings->{$item}->{$type}) {
+ if ($settings->{$item}->{$type} == 0) {
$checked = '';
} elsif ($settings->{$item}->{$type} == 1) {
$checked = 'checked="checked" ';
@@ -2435,9 +2054,13 @@ sub print_quotas {
($context eq 'requestauthor')) {
$datatable .=
' | '.
- ''.
+ ''.&mt('Portfolio').': '.
''.(' ' x 2).
+ ''.&mt('Authoring').': '.
+ ' | ';
}
$datatable .= ' ';
@@ -2446,12 +2069,16 @@ sub print_quotas {
}
unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
$defaultquota = '20';
+ $authorquota = '500';
if (ref($settings) eq 'HASH') {
if (ref($settings->{'defaultquota'}) eq 'HASH') {
$defaultquota = $settings->{'defaultquota'}->{'default'};
} elsif (defined($settings->{'default'})) {
$defaultquota = $settings->{'default'};
}
+ if (ref($settings->{'authorquota'}) eq 'HASH') {
+ $authorquota = $settings->{'authorquota'}->{'default'};
+ }
}
}
$typecount ++;
@@ -2563,9 +2190,12 @@ sub print_quotas {
$datatable .= '';
unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
$datatable .= ''.
- ''.
+ ''.&mt('Portfolio').': '.
' | ';
+ $defaultquota.'" size="5" />'.(' ' x2).
+ ''.&mt('Authoring').': '.
+ '';
}
$datatable .= '';
$typecount ++;
@@ -2748,7 +2378,7 @@ sub print_studentcode {
my ($settings,$rowtotal) = @_;
my $rownum = 0;
my ($output,%current);
- my @crstypes = ('official','unofficial','community','textbook','lti');
+ my @crstypes = ('official','unofficial','community','textbook','placement','lti');
if (ref($settings) eq 'HASH') {
if (ref($settings->{'uniquecode'}) eq 'HASH') {
foreach my $type (@crstypes) {
@@ -3124,147 +2754,21 @@ function toggleLTITools(form,setting,ite
ENDSCRIPT
}
-sub wafproxy_javascript {
- my ($dom) = @_;
- return <<"ENDSCRIPT";
-
-
-ENDSCRIPT
-}
-
sub lti_javascript {
- my ($dom,$settings) = @_;
- my $togglejs = <i_toggle_js($dom);
- my $linkprot_js = &Apache::courseprefs::linkprot_javascript();
+ my ($settings) = @_;
+ my $togglejs = <i_toggle_js();
unless (ref($settings) eq 'HASH') {
- return $togglejs.'
-
-';
+ return $togglejs;
}
my (%ordered,$total,%jstext);
- $total = scalar(keys(%{$settings}));
+ $total = 0;
foreach my $item (keys(%{$settings})) {
if (ref($settings->{$item}) eq 'HASH') {
my $num = $settings->{$item}{'order'};
- if ($num eq '') {
- $num = $total - 1;
- }
$ordered{$num} = $item;
}
}
+ $total = scalar(keys(%{$settings}));
my @jsarray = ();
foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
push(@jsarray,$ordered{$item});
@@ -3314,9 +2818,6 @@ $jstext
}
return;
}
-
-$linkprot_js
-
// ]]>
@@ -3326,77 +2827,16 @@ ENDSCRIPT
}
sub lti_toggle_js {
- my ($dom) = @_;
my %lcauthparmtext = &Apache::lonlocal::texthash (
localauth => 'Local auth argument',
krb => 'Kerberos domain',
);
- my $crsincalert = &mt('"User\'s identity sent" needs to be set to "Yes" first,[_1] before setting "Course\'s identity sent" to "Yes"',"\n");
- &js_escape(\$crsincalert);
- my %servers = &Apache::lonnet::get_servers($dom,'library');
- my $primary = &Apache::lonnet::domain($dom,'primary');
- my $course_servers = "'".join("','",keys(%servers))."'";
return <<"ENDSCRIPT";
-
-ENDSCRIPT
-}
-
-sub autoupdate_javascript {
- return <<"ENDSCRIPT";
-
-
-ENDSCRIPT
-}
-
-sub autoenroll_javascript {
- return <<"ENDSCRIPT";
-
-
-ENDSCRIPT
-}
-
-sub saml_javascript {
- return <<"ENDSCRIPT";
-
-
-ENDSCRIPT
-}
-
-sub ipaccess_javascript {
- my ($settings) = @_;
- my (%ordered,$total,%jstext);
- $total = 0;
- if (ref($settings) eq 'HASH') {
- 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 ipaccess = Array('."'".join("','",@jsarray)."'".');'."\n";
- return <<"ENDSCRIPT";
-
-
-ENDSCRIPT
-}
-
-sub authordefaults_javascript {
- my %alert = &Apache::lonlocal::texthash (
- reqd => 'Warning: at least one editor needs to be available.',
- rest => 'Unchecking this editor disallowed while others unchecked.',
- );
- &js_escape(\%alert);
- return <<"ENDSCRIPT";
-
@@ -3761,12 +2984,7 @@ ENDSCRIPT
sub print_autoenroll {
my ($dom,$settings,$rowtotal) = @_;
my $autorun = &Apache::lonnet::auto_run(undef,$dom),
- my ($defdom,$runon,$runoff,$coownerson,$coownersoff,
- $failsafe,$autofailsafe,$failsafesty,%failsafechecked);
- $failsafesty = 'none';
- %failsafechecked = (
- off => ' checked="checked"',
- );
+ my ($defdom,$runon,$runoff,$coownerson,$coownersoff,$failsafe);
if (ref($settings) eq 'HASH') {
if (exists($settings->{'run'})) {
if ($settings->{'run'} eq '0') {
@@ -3800,24 +3018,8 @@ sub print_autoenroll {
if (exists($settings->{'sender_domain'})) {
$defdom = $settings->{'sender_domain'};
}
- if (exists($settings->{'failsafe'})) {
- $failsafe = $settings->{'failsafe'};
- if ($failsafe eq 'zero') {
- $failsafechecked{'zero'} = ' checked="checked"';
- $failsafechecked{'off'} = '';
- $failsafesty = 'inline-block';
- } elsif ($failsafe eq 'any') {
- $failsafechecked{'any'} = ' checked="checked"';
- $failsafechecked{'off'} = '';
- }
- $autofailsafe = $settings->{'autofailsafe'};
- } elsif (exists($settings->{'autofailsafe'})) {
- $autofailsafe = $settings->{'autofailsafe'};
- if ($autofailsafe ne '') {
- $failsafechecked{'zero'} = ' checked="checked"';
- $failsafe = 'zero';
- $failsafechecked{'off'} = '';
- }
+ if (exists($settings->{'autofailsafe'})) {
+ $failsafe = $settings->{'autofailsafe'};
}
} else {
if ($autorun) {
@@ -3856,84 +3058,51 @@ sub print_autoenroll {
$coownersoff.' value="0" />'.&mt('No').''.
''.
'| '.&mt('Failsafe for no drops when institutional data missing').' | '.
- ''.
- ' '.
- '
'.
- ''.
- ''.
- ''.
- &mt('Threshold for number of students in section to drop: [_1]',
- '').
- ' | ';
+ ''.
+ ' | ';
$$rowtotal += 4;
return $datatable;
}
sub print_autoupdate {
my ($position,$dom,$settings,$rowtotal) = @_;
- my ($enable,$datatable);
+ my $datatable;
if ($position eq 'top') {
- my %choices = &Apache::lonlocal::texthash (
- run => 'Auto-update active?',
- classlists => 'Update information in classlists?',
- unexpired => 'Skip updates for users without active or future roles?',
- lastactive => 'Skip updates for inactive users?',
- );
- my $itemcount = 0;
my $updateon = ' ';
my $updateoff = ' checked="checked" ';
+ my $classlistson = ' ';
+ my $classlistsoff = ' checked="checked" ';
if (ref($settings) eq 'HASH') {
if ($settings->{'run'} eq '1') {
$updateon = $updateoff;
$updateoff = ' ';
}
+ if ($settings->{'classlists'} eq '1') {
+ $classlistson = $classlistsoff;
+ $classlistsoff = ' ';
+ }
}
- $enable = ''.
- '| '.$choices{'run'}.' | '.
- ' | ';
- $$rowtotal ++;
+ $$rowtotal += 2;
} elsif ($position eq 'middle') {
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
my $numinrow = 3;
@@ -4184,7 +3353,7 @@ sub print_contacts {
}
} elsif ($position eq 'middle') {
@mailings = ('errormail','packagesmail','lonstatusmail','requestsmail',
- 'updatesmail','idconflictsmail','hostipmail');
+ 'updatesmail','idconflictsmail');
foreach my $type (@mailings) {
$otheremails{$type} = '';
}
@@ -4267,7 +3436,6 @@ sub print_contacts {
$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" ';
@@ -4399,17 +3567,18 @@ sub print_contacts {
\%choices,$rownum);
$datatable .= $reports;
} elsif ($position eq 'lower') {
- my (%current,%excluded,%weights);
+ $css_class = $rownum%2?' class="LC_odd_row"':'';
+ my ($threshold,$sysmail,%excluded,%weights);
my ($defaults,$names) = &Apache::loncommon::lon_status_items();
if ($lonstatus{'threshold'} =~ /^\d+$/) {
- $current{'errorthreshold'} = $lonstatus{'threshold'};
+ $threshold = $lonstatus{'threshold'};
} else {
- $current{'errorthreshold'} = $defaults->{'threshold'};
+ $threshold = $defaults->{'threshold'};
}
if ($lonstatus{'sysmail'} =~ /^\d+$/) {
- $current{'errorsysmail'} = $lonstatus{'sysmail'};
+ $sysmail = $lonstatus{'sysmail'};
} else {
- $current{'errorsysmail'} = $defaults->{'sysmail'};
+ $sysmail = $defaults->{'sysmail'};
}
if (ref($lonstatus{'weights'}) eq 'HASH') {
foreach my $type ('E','W','N','U') {
@@ -4429,16 +3598,13 @@ sub print_contacts {
map {$excluded{$_} = 1; } @{$lonstatus{'excluded'}};
}
}
- foreach my $item ('errorthreshold','errorsysmail') {
- $css_class = $rownum%2?' class="LC_odd_row"':'';
- $datatable .= ''.
- ''.
- $titles->{$item}.
- ' | '.
- ' | ';
- $rownum ++;
- }
+ $datatable .= ''.
+ ''.
+ $titles->{'errorthreshold'}.
+ ' | '.
+ ' | ';
+ $rownum ++;
$css_class = $rownum%2?' class="LC_odd_row"':'';
$datatable .= ''.
''.
@@ -4484,6 +3650,14 @@ sub print_contacts {
}
$datatable .= ' |
| ';
$rownum ++;
+ $css_class = $rownum%2?' class="LC_odd_row"':'';
+ $datatable .= ''.
+ ''.
+ $titles->{'errorsysmail'}.
+ ' | '.
+ ' | ';
+ $rownum ++;
} elsif ($position eq 'bottom') {
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
my (@posstypes,%usertypeshash);
@@ -4511,7 +3685,7 @@ sub print_contacts {
$includeloc{'override_'.$key} = '';
$includestr{'override_'.$key} = '';
if ($settings->{'overrides'}{$key}{'include'} ne '') {
- ($includeloc{'override_'.$key},$includestr{'override_'.$key}) =
+ ($includeloc{'override_'.$key},$includestr{'override_'.$key}) =
split(/:/,$settings->{'overrides'}{$key}{'include'},2);
$includestr{'override_'.$key} = &unescape($includestr{'override_'.$key});
}
@@ -4523,6 +3697,7 @@ sub print_contacts {
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);
@@ -4589,7 +3764,7 @@ sub overridden_helpdesk {
}
my $title;
if (ref($short_titles) eq 'HASH') {
- $title = $short_titles->{$item};
+ $title = $short_titles->{$item};
}
$output .= '
'.
- ''.
- ' | '."\n";
- $itemcount ++;
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= ''.
- $choices{'coursequota'}.
- ' | '.
''.
' | '."\n";
$itemcount ++;
@@ -6314,7 +5435,7 @@ sub print_coursedefaults {
''.&mt('Default credits').'
';
foreach my $type (@types) {
next if ($type eq 'community');
- $additional .= ''.&mt($type).'
'.
+ $additional .= ' | '.&mt($type).'
'.
' | ';
}
@@ -6338,7 +5459,7 @@ sub print_coursedefaults {
''.&mt('Enter 0 to remain disabled until page reload.').'
'.
'';
foreach my $type (@types) {
- $additional .= ''.&mt($type).'
'.
+ $additional .= ' | '.&mt($type).'
'.
' | ';
}
@@ -6356,271 +5477,26 @@ sub print_coursedefaults {
$datatable .= ''.
$choices{'mysqltables'}.
' | '.
- ''.
+ ' | '.
' | '."\n";
$itemcount ++;
- %defaultchecked = ('ltiauth' => 'off');
- @toggles = ('ltiauth');
- $current = {
- 'ltiauth' => $ltiauth,
- };
- ($table,$itemcount) =
- &radiobutton_prefs($current,\@toggles,\%defaultchecked,
- \%choices,$itemcount,undef,undef,'left');
- $datatable .= $table;
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= ''.
- $choices{'domexttool'}.
- ' | '.
- ''.
- ' | '."\n";
- $itemcount ++;
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= ''.
- $choices{'exttool'}.
- ' | '.
- ''.
- ' | '."\n";
- }
- $$rowtotal += $itemcount;
- return $datatable;
-}
-sub print_authordefaults {
- my ($position,$dom,$settings,$rowtotal) = @_;
- my ($css_class,$datatable,%checkedon,%checkedoff);
- my $itemcount = 1;
- my %titles = &authordefaults_titles();
- if ($position eq 'top') {
- my %defaultchecked = (
- 'nocodemirror' => 'off',
- 'domcoordacc' => 'on',
- );
- my @toggles = ('nocodemirror','domcoordacc');
- ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
- \%titles,$itemcount);
- my %staticdefaults = (
- 'copyright' => 'default',
- 'sourceavail' => 'closed',
- );
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my %currrights;
- foreach my $item ('copyright','sourceavail') {
- $currrights{$item} = $staticdefaults{$item};
- if (ref($settings) eq 'HASH') {
- if (exists($settings->{$item})) {
- $currrights{$item} = $settings->{$item};
- }
- }
- }
- $datatable .= ''.
- ''.$titles{'copyright'}.
- ' | '.
- &selectbox('copyright',$currrights{'copyright'},'',
- \&Apache::loncommon::copyrightdescription,
- (grep !/^priv|custom$/,(&Apache::loncommon::copyrightids))).
- ' | '."\n";
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.
- ''.$titles{'sourceavail'}.
- ' | '.
- &selectbox('sourceavail',$currrights{'sourceavail'},'',
- \&Apache::loncommon::source_copyrightdescription,
- (&Apache::loncommon::source_copyrightids)).
- ' | '."\n";
- } else {
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- my $curreditors;
- my %staticdefaults = (
- editors => ['edit','xml'],
- authorquota => 500,
- webdav => 0,
- );
- my $curreditors = $staticdefaults{'editors'};
- if ((ref($settings) eq 'HASH') &&
- (ref($settings->{'editors'}) eq 'ARRAY')) {
- $curreditors = $settings->{'editors'};
- } else {
- $curreditors = $staticdefaults{'editors'};
- }
- my @editors = ('edit','xml','daxe');
- $datatable = ''."\n".
- ''.$titles{'editors'}.' | '."\n".
- ''."\n".
- '';
- foreach my $editor (@editors) {
- my $checked;
- if (grep(/^\Q$editor\E$/,@{$curreditors})) {
- $checked = ' checked="checked"';
- }
- $datatable .= ' ';
- }
- $datatable .= ''."\n".' | '."\n".''."\n";
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- my @insttypes;
- if (ref($types) eq 'ARRAY') {
- @insttypes = @{$types};
- }
- my $typecount = 0;
- my %domconf = &Apache::lonnet::get_dom('configuration',['quotas'],$dom);
- my @items = ('webdav','authorquota');
- my %quotas;
- if (ref($domconf{'quotas'}) eq 'HASH') {
- %quotas = %{$domconf{'quotas'}};
- foreach my $item (@items) {
- if (ref($quotas{$item}) eq 'HASH') {
- foreach my $type (@insttypes,'default') {
- if ($item eq 'authorquota') {
- if ($quotas{$item}{$type} !~ /^\d+$/) {
- $quotas{$item}{$type} = $staticdefaults{$item};
- }
- } elsif ($item eq 'webdav') {
- if ($quotas{$item}{$type} !~ /^(0|1)$/) {
- $quotas{$item}{$type} = $staticdefaults{$item};
- }
- }
- }
- } else {
- foreach my $type (@insttypes,'default') {
- $quotas{$item}{$type} = $staticdefaults{$item};
- }
- }
- }
- } else {
- foreach my $item (@items) {
- foreach my $type (@insttypes,'default') {
- $quotas{$item}{$type} = $staticdefaults{$item};
- }
- }
- }
- if (ref($usertypes) eq 'HASH') {
- my $numinrow = 4;
- my $onclick = '';
- $datatable .= &insttypes_row(\%quotas,$types,$usertypes,$dom,
- $numinrow,$othertitle,'authorquota',
- \$itemcount,$onclick);
- $itemcount ++;
- $datatable .= &insttypes_row(\%quotas,$types,$usertypes,$dom,
- $numinrow,$othertitle,'webdav',
- \$itemcount);
- $itemcount ++;
- }
- my $checkedno = ' checked="checked"';
- my ($checkedon,$checkedoff);
- if (ref($quotas{'webdav'}) eq 'HASH') {
- if ($quotas{'webdav'}{'_LC_adv'} =~ /^0|1$/) {
- if ($quotas{'webdav'}{'_LC_adv'}) {
- $checkedon = $checkedno;
- } else {
- $checkedoff = $checkedno;
- }
- undef($checkedno);
- }
- }
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.
- ''.$titles{'webdav_LC_adv'}.'
'.
- $titles{'webdav_LC_adv_over'}.
- ' | '.
- '';
- foreach my $option ('none','off','on') {
- my ($text,$val,$checked);
- if ($option eq 'none') {
- $text = $titles{'none'};
- $val = '';
- $checked = $checkedno;
- } elsif ($option eq 'off') {
- $text = $titles{'overoff'};
- $val = 0;
- $checked = $checkedoff;
- } elsif ($option eq 'on') {
- $text = $titles{'overon'};
- $val = 1;
- $checked = $checkedon;
- }
- $datatable .= ' ';
- }
- $datatable .= ' | ';
- $itemcount ++;
}
$$rowtotal += $itemcount;
return $datatable;
}
-sub authordefaults_titles {
- return &Apache::lonlocal::texthash(
- copyright => 'Copyright/Distribution',
- sourceavail => ' Source Available',
- editors => 'Available Editors',
- webdav => 'WebDAV',
- authorquota => 'Authoring Space quotas (MB)',
- nocodemirror => 'Deactivate CodeMirror for EditXML editor',
- domcoordacc => 'Dom. Coords. can enter Authoring Spaces in domain',
- edit => 'Standard editor (Edit)',
- xml => 'Text editor (EditXML)',
- daxe => 'Daxe editor (Daxe)',
- webdav_LC_adv => 'WebDAV access for LON-CAPA "advanced" users',
- webdav_LC_adv_over => '(overrides access based on affiliation, if set)',
- none => 'No override set',
- overon => 'Override -- webDAV on',
- overoff => 'Override -- webDAV off',
- );
-}
-
-sub selectbox {
- my ($name,$value,$readonly,$functionref,@idlist)=@_;
- my $selout = '';
- return $selout;
-}
-
sub print_selfenrollment {
my ($position,$dom,$settings,$rowtotal) = @_;
my ($css_class,$datatable);
my $itemcount = 1;
- my @types = ('official','unofficial','community','textbook');
+ my @types = ('official','unofficial','community','textbook','placement');
if (($position eq 'top') || ($position eq 'middle')) {
my ($rowsref,$titlesref) = &Apache::lonuserutils::get_selfenroll_titles();
my %descs = &Apache::lonuserutils::selfenroll_default_descs();
@@ -6841,912 +5717,278 @@ 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',
- );
+sub print_usersessions {
+ my ($position,$dom,$settings,$rowtotal) = @_;
+ my ($css_class,$datatable,$itemcount,%checked,%choices);
+ my (%by_ip,%by_location,@intdoms,@instdoms);
+ &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
+
+ my @alldoms = &Apache::lonnet::all_domains();
+ my %serverhomes = %Apache::lonnet::serverhomeIDs;
+ my %servers = &Apache::lonnet::internet_dom_servers($dom);
+ my %altids = &id_for_thisdom(%servers);
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 .= ''.
- ' ';
- }
- }
- my $checkedcase;
- if ($casesens{'default'}) {
- $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'}.' | '.
- ''.
- ' '.
- ' | ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'postlink'}.' | '.
- '';
- my %postlinked;
- if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
- foreach my $item (@{$types}) {
- undef(%postlinked);
- $datatable .= '';
- }
- }
- if (ref($postlink{'default'}) eq 'ARRAY') {
- map { $postlinked{$_} = 1; } (@{$postlink{'default'}});
- }
- $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.)').'
'.
- &mt('Include custom text:');
- if ($customurl) {
- my $link = &Apache::loncommon::modal_link($customurl,&mt('custom text'),600,500,
- undef,undef,undef,undef,'background-color:#ffffff');
- $datatable .= ' '.$link.
- ''.
- ' '.&mt('Replace:').'';
- }
- if ($switchserver) {
- $datatable .= ' '.&mt('Upload to library server: [_1]',$switchserver).'';
- } else {
- $datatable .=' '.
- '';
- }
- $datatable .= ' | ';
- } elsif ($position eq 'middle') {
- my %domconf = &Apache::lonnet::get_dom('configuration',['defaults'],$dom);
- my @items = ('intauth_cost','intauth_check','intauth_switch');
- my %defaults;
- if (ref($domconf{'defaults'}) eq 'HASH') {
- %defaults = %{$domconf{'defaults'}};
- if ($defaults{'intauth_cost'} !~ /^\d+$/) {
- $defaults{'intauth_cost'} = 10;
- }
- if ($defaults{'intauth_check'} !~ /^(0|1|2)$/) {
- $defaults{'intauth_check'} = 0;
- }
- if ($defaults{'intauth_switch'} !~ /^(0|1|2)$/) {
- $defaults{'intauth_switch'} = 0;
}
+ $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal);
} else {
- %defaults = (
- 'intauth_cost' => 10,
- 'intauth_check' => 0,
- 'intauth_switch' => 0,
- );
- }
- foreach my $item (@items) {
- if ($itemcount%2) {
- $css_class = '';
- } else {
- $css_class = ' class="LC_odd_row" ';
- }
- $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 .= '';
- }
- $datatable .= ' | ';
- $itemcount ++;
+ $datatable .= ''.
+ &mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.').
+ ' | ';
}
- } elsif ($position eq 'lower') {
- $datatable .= &password_rules('passwords',\$itemcount,$settings);
} else {
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- my %ownerchg = (
- by => {},
- for => {},
- );
- my %ownertitles = &Apache::lonlocal::texthash (
- by => 'Course owner status(es) allowed',
- for => 'Student status(es) allowed',
- );
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{crsownerchg}) eq 'HASH') {
- if (ref($settings->{crsownerchg}{'by'}) eq 'ARRAY') {
- map { $ownerchg{by}{$_} = 1; } (@{$settings->{crsownerchg}{'by'}});
- }
- if (ref($settings->{crsownerchg}{'for'}) eq 'ARRAY') {
- map { $ownerchg{for}{$_} = 1; } (@{$settings->{crsownerchg}{'for'}});
- }
- }
- }
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.
- ''.
- &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 .= '';
- }
- $datatable .= ' | ';
- }
- return $datatable;
-}
-
-sub password_rules {
- my ($prefix,$itemcountref,$settings) = @_;
- my ($min,$max,%chars,$numsaved,$numinrow);
- my %titles;
- if ($prefix eq 'passwords') {
- %titles = &Apache::lonlocal::texthash (
- min => 'Minimum password length',
- max => 'Maximum password length',
- chars => 'Required characters',
- );
- } elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) {
- %titles = &Apache::lonlocal::texthash (
- min => 'Minimum secret length',
- max => 'Maximum secret length',
- chars => 'Required characters',
- );
- }
- $min = $Apache::lonnet::passwdmin;
- my $datatable;
- my $itemcount;
- if (ref($itemcountref)) {
- $itemcount = $$itemcountref;
- }
- 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 ($prefix eq 'passwords') {
- 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',
- );
- my $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'min'}.' | '.
- ''.
- ''.
- ' '.&mt('(Enter an integer: 7 or larger)').''.
- ' | ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'max'}.' | '.
- ''.
- ''.
- ' '.&mt('(Leave blank for no maximum)').''.
- ' | ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'chars'}.'
'.
- ''.&mt('(Leave unchecked if not required)').
- ' | ';
- my $numinrow = 2;
- my @possrules = ('uc','lc','num','spec');
- $datatable .= ' | ';
- $itemcount ++;
- if ($prefix eq 'passwords') {
- $titles{'numsaved'} = &mt('Number of previous passwords to save and disallow reuse');
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'numsaved'}.' | '.
- ''.
- ''.
- ' '.&mt('(Leave blank to not save previous passwords)').''.
- ' | ';
- $itemcount ++;
- }
- if (ref($itemcountref)) {
- $$itemcountref += $itemcount;
+ ($datatable,$itemcount) = &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles);
}
+ $$rowtotal += $itemcount;
return $datatable;
}
-sub print_wafproxy {
- my ($position,$dom,$settings,$rowtotal) = @_;
- my $css_class;
- my $itemcount = 0;
- my $datatable;
- my %servers = &Apache::lonnet::internet_dom_servers($dom);
- my (%othercontrol,%otherdoms,%aliases,%saml,%values,$setdom,$showdom);
- my %lt = &wafproxy_titles();
- foreach my $server (sort(keys(%servers))) {
- my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server});
- next if ($serverhome eq '');
- my $serverdom;
- if ($serverhome ne $server) {
- $serverdom = &Apache::lonnet::host_domain($serverhome);
- if (($serverdom ne '') && (&Apache::lonnet::domain($serverdom) ne '')) {
- $othercontrol{$server} = $serverdom;
- }
- } else {
- $serverdom = &Apache::lonnet::host_domain($server);
- next if (($serverdom eq '') || (&Apache::lonnet::domain($serverdom) eq ''));
- if ($serverdom ne $dom) {
- $othercontrol{$server} = $serverdom;
- } else {
- $setdom = 1;
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{'alias'}) eq 'HASH') {
- $aliases{$dom} = $settings->{'alias'};
- if ($aliases{$dom} ne '') {
- $showdom = 1;
- }
- }
- if (ref($settings->{'saml'}) eq 'HASH') {
- $saml{$dom} = $settings->{'saml'};
- }
- }
- }
+sub rules_by_location {
+ my ($settings,$prefix,$by_location,$by_ip,$types,$titles) = @_;
+ my ($datatable,$itemcount,$css_class);
+ if (keys(%{$by_location}) == 0) {
+ $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+ $datatable = ''.
+ &mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.').
+ ' | ';
+ $itemcount = 1;
+ } else {
+ $itemcount = 0;
+ my $numinrow = 5;
+ my (%current,%checkedon,%checkedoff);
+ my @locations = sort(keys(%{$by_location}));
+ foreach my $type (@{$types}) {
+ $checkedon{$type} = '';
+ $checkedoff{$type} = ' checked="checked"';
}
- }
- if ($setdom) {
- %{$values{$dom}} = ();
if (ref($settings) eq 'HASH') {
- foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') {
- $values{$dom}{$item} = $settings->{$item};
- }
- }
- }
- if (keys(%othercontrol)) {
- %otherdoms = reverse(%othercontrol);
- foreach my $domain (keys(%otherdoms)) {
- %{$values{$domain}} = ();
- my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain);
- if (ref($config{'wafproxy'}) eq 'HASH') {
- $aliases{$domain} = $config{'wafproxy'}{'alias'};
- if (exists($config{'wafproxy'}{'saml'})) {
- $saml{$domain} = $config{'wafproxy'}{'saml'};
- }
- foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') {
- $values{$domain}{$item} = $config{'wafproxy'}{$item};
- }
- }
- }
- }
- if ($position eq 'top') {
- my %servers = &Apache::lonnet::internet_dom_servers($dom);
- my %aliasinfo;
- foreach my $server (sort(keys(%servers))) {
- $itemcount ++;
- my $dom_in_effect;
- my $aliasrows = ''.
- '| '.
- &mt('Hostname').': '.
- ''.
- &Apache::lonnet::hostname($server).' | | ';
- if ($othercontrol{$server}) {
- $dom_in_effect = $othercontrol{$server};
- my ($current,$forsaml);
- if (ref($aliases{$dom_in_effect}) eq 'HASH') {
- $current = $aliases{$dom_in_effect}{$server};
- }
- if (ref($saml{$dom_in_effect}) eq 'HASH') {
- if ($saml{$dom_in_effect}{$server}) {
- $forsaml = 1;
- }
- }
- $aliasrows .= ''.
- &mt('Alias').': ';
- if ($current) {
- $aliasrows .= $current;
- if ($forsaml) {
- $aliasrows .= ' ('.&mt('also for SSO Auth').')';
+ if (ref($settings->{$prefix}) eq 'HASH') {
+ foreach my $key (keys(%{$settings->{$prefix}})) {
+ $current{$key} = $settings->{$prefix}{$key};
+ if ($key eq 'version') {
+ if ($current{$key} ne '') {
+ $checkedon{$key} = ' checked="checked"';
+ $checkedoff{$key} = '';
+ }
+ } elsif (ref($current{$key}) eq 'ARRAY') {
+ $checkedon{$key} = ' checked="checked"';
+ $checkedoff{$key} = '';
}
- } else {
- $aliasrows .= &mt('None');
}
- $aliasrows .= ' ('.
- &mt('controlled by domain: [_1]',
- ''.$dom_in_effect.'').') | ';
- } else {
- $dom_in_effect = $dom;
- my ($current,$samlon,$samloff);
- $samloff = ' checked="checked"';
- if (ref($aliases{$dom}) eq 'HASH') {
- if ($aliases{$dom}{$server}) {
- $current = $aliases{$dom}{$server};
- }
- }
- if (ref($saml{$dom}) eq 'HASH') {
- if ($saml{$dom}{$server}) {
- $samlon = $samloff;
- undef($samloff);
- }
- }
- $aliasrows .= ''.
- &mt('Alias').': '.
- ''.
- (' 'x2).''.
- &mt('Alias used for SSO Auth').': '.
- ' | ';
- }
- $aliasrows .= ' ';
- $aliasinfo{$dom_in_effect} .= $aliasrows;
- }
- if ($aliasinfo{$dom}) {
- my ($onclick,$wafon,$wafoff,$showtable);
- $onclick = ' onclick="javascript:toggleWAF();"';
- $wafoff = ' checked="checked"';
- $showtable = ' style="display:none";';
- if ($showdom) {
- $wafon = $wafoff;
- $wafoff = '';
- $showtable = ' style="display:inline;"';
- }
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable = ''.
- ''.&mt('Domain: [_1]',''.$dom.'').'
'.
- ''.&mt('WAF in use?').' '.(' 'x2).' | '.
- ''.
- ' | ';
- $itemcount++;
- }
- if (keys(%otherdoms)) {
- foreach my $key (sort(keys(%otherdoms))) {
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= ''.
- ''.&mt('Domain: [_1]',''.$key.'').' | '.
- ' | ';
- $itemcount++;
}
}
- } else {
- my %ip_methods = &remoteip_methods();
- if ($setdom) {
- $itemcount ++;
+ foreach my $type (@{$types}) {
+ next if ($type ne 'version' && !@locations);
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- my ($nowafstyle,$wafstyle,$curr_remotip,$currwafdisplay,$vpndircheck,$vpnaliascheck,
- $currwafvpn,$wafrangestyle,$alltossl,$ssltossl);
- $wafstyle = ' style="display:none;"';
- $nowafstyle = ' style="display:table-row;"';
- $currwafdisplay = ' style="display: none"';
- $wafrangestyle = ' style="display: none"';
- $curr_remotip = 'n';
- $ssltossl = ' checked="checked"';
- if ($showdom) {
- $wafstyle = ' style="display:table-row;"';
- $nowafstyle = ' style="display:none;"';
- if (keys(%{$values{$dom}})) {
- if ($values{$dom}{remoteip} =~ /^[nmh]$/) {
- $curr_remotip = $values{$dom}{remoteip};
- }
- if ($curr_remotip eq 'h') {
- $currwafdisplay = ' style="display:table-row"';
- $wafrangestyle = ' style="display:inline-block;"';
- }
- if ($values{$dom}{'sslopt'}) {
- $alltossl = ' checked="checked"';
- $ssltossl = '';
- }
- }
- if (($values{$dom}{'vpnint'} ne '') || ($values{$dom}{'vpnext'} ne '')) {
- $vpndircheck = ' checked="checked"';
- $currwafvpn = ' style="display:table-row;"';
- $wafrangestyle = ' style="display:inline-block;"';
- } else {
- $vpnaliascheck = ' checked="checked"';
- $currwafvpn = ' style="display:none;"';
+ $datatable .= '
+ '.$titles->{$type}.'
+
+
+ | ';
+ if ($type eq 'version') {
+ my @lcversions = &Apache::lonnet::all_loncaparevs();
+ my $selector = ' '.&mt('Internal ID:').
''.
' '.&mt('(new)').
- ' | '.
- &mt('Name displayed').':'.
+ ' | '.
+ &mt('Name displayed:').
' | '.
''."\n";
$rownum ++;
}
}
- } else {
- my ($unamemaprules,$ruleorder) =
- &Apache::lonnet::inst_userrules($dom,'unamemap');
- $css_class = $rownum%2?' class="LC_odd_row"':'';
- if ((ref($unamemaprules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) {
- my $numinrow = 2;
- $datatable .= ''.&mt('Available conversions').' | '.
- &user_formats_row('unamemap',$settings,$unamemaprules,
- $ruleorder,$numinrow).
- ' | ';
- }
- if ($datatable eq '') {
- $datatable .= ''.
- &mt('No rules set for domain in customized localenroll.pm').
- ' | ';
- }
}
$$rowtotal += $rownum;
return $datatable;
@@ -9581,8 +7910,6 @@ sub defaults_titles {
'timezone_def' => 'Default timezone',
'datelocale_def' => 'Default locale for dates',
'portal_def' => 'Portal/Default URL',
- 'email' => 'Email links use portal URL',
- 'web' => 'Public web links use portal URL',
'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',
@@ -9600,58 +7927,6 @@ sub defaults_titles {
return (\%titles);
}
-sub print_scantron {
- my ($r,$position,$dom,$confname,$settings,$rowtotal) = @_;
- if ($position eq 'top') {
- return &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
- } else {
- return &print_scantronconfig($dom,$settings,\$rowtotal);
- }
-}
-
-sub scantron_javascript {
- return <<"ENDSCRIPT";
-
-
-
-ENDSCRIPT
-
-}
-
sub print_scantronformat {
my ($r,$dom,$confname,$settings,$rowtotal) = @_;
my $itemcount = 1;
@@ -9678,8 +7953,8 @@ sub print_scantronformat {
if ($configuserok eq 'ok') {
if ($author_ok eq 'ok') {
my %legacyfile = (
- default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab',
- custom => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab',
+ default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab',
+ custom => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab',
);
my %md5chk;
foreach my $type (keys(%legacyfile)) {
@@ -9688,7 +7963,7 @@ sub print_scantronformat {
}
if ($md5chk{'default'} ne $md5chk{'custom'}) {
foreach my $type (keys(%legacyfile)) {
- ($scantronurls{$type},my $error) =
+ ($scantronurls{$type},my $error) =
&legacy_scantronformat($r,$dom,$confname,
$type,$legacyfile{$type},
$scantronurls{$type},
@@ -9699,13 +7974,13 @@ sub print_scantronformat {
}
if (keys(%error) == 0) {
$is_custom = 1;
- $confhash{'scantron'}{'scantronformat'} =
+ $confhash{'scantron'}{'scantronformat'} =
$scantronurls{'custom'};
- my $putresult =
+ my $putresult =
&Apache::lonnet::put_dom('configuration',
\%confhash,$dom);
if ($putresult ne 'ok') {
- $error{'custom'} =
+ $error{'custom'} =
''.
&mt('An error occurred updating the domain configuration: [_1]',$putresult).'';
}
@@ -9768,7 +8043,7 @@ sub print_scantronformat {
}
$datatable .= '';
if (keys(%error) == 0) {
- $datatable .= '';
+ $datatable .= ' | ';
if (!$switchserver) {
$datatable .= &mt('Upload:').'
';
}
@@ -9815,142 +8090,16 @@ sub legacy_scantronformat {
my ($url,$error);
my @statinfo = &Apache::lonnet::stat_file($newurl);
if ((!@statinfo) || ($statinfo[0] eq 'no_such_dir')) {
- my $modified = [];
(my $result,$url) =
- &Apache::lonconfigsettings::publishlogo($r,'copy',$legacyfile,$dom,$confname,
- 'scantron','','',$newfile,$modified);
- if ($result eq 'ok') {
- &update_modify_urls($r,$modified);
- } else {
+ &publishlogo($r,'copy',$legacyfile,$dom,$confname,'scantron',
+ '','',$newfile);
+ if ($result ne 'ok') {
$error = &mt("An error occurred publishing the [_1] bubblesheet format file in RES space. Error was: [_2].",$newfile,$result);
}
}
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 .= ''.(' 'x3);
- if ($item eq 'csv') {
- $datatable .= ''.
- '';
- $itemcount ++;
- }
- }
- $datatable .= ' | ';
- $$rowtotal ++;
- return $datatable;
-}
-
-sub scantronconfig_titles {
- return &Apache::lonlocal::texthash(
- dat => 'Standard format (.dat)',
- csv => 'Comma separated values (.csv)',
- hdr => 'Remove first line in file (contains column titles)',
- pad => 'Prepend 0s to PaperID',
- rem => 'Remove leading spaces (except Question Response columns)',
- CODE => 'CODE',
- ID => 'Student ID',
- PaperID => 'Paper ID',
- FirstName => 'First Name',
- LastName => 'Last Name',
- FirstQuestion => 'First Question Response',
- Section => 'Section',
- );
-}
-
-sub scantroncsv_fields {
- return ('PaperID','LastName','FirstName','ID','Section','CODE','FirstQuestion');
-}
-
sub print_coursecategories {
my ($position,$dom,$hdritem,$settings,$rowtotal) = @_;
my $datatable;
@@ -10006,6 +8155,10 @@ sub print_coursecategories {
my $toggle_catscomm_dom = ' checked="checked" ';
my $can_catcomm_comm = ' ';
my $can_catcomm_dom = ' checked="checked" ';
+ my $toggle_catsplace_place = ' ';
+ my $toggle_catsplace_dom = ' checked="checked" ';
+ my $can_catplace_place = ' ';
+ my $can_catplace_dom = ' checked="checked" ';
if (ref($settings) eq 'HASH') {
if ($settings->{'togglecats'} eq 'crs') {
@@ -10024,17 +8177,28 @@ sub print_coursecategories {
$can_catcomm_comm = $can_catcomm_dom;
$can_catcomm_dom = ' ';
}
+ if ($settings->{'togglecatsplace'} eq 'place') {
+ $toggle_catsplace_place = $toggle_catsplace_dom;
+ $toggle_catsplace_dom = ' ';
+ }
+ if ($settings->{'categorizeplace'} eq 'place') {
+ $can_catplace_place = $can_catplace_dom;
+ $can_catplace_dom = ' ';
+ }
}
my %title = &Apache::lonlocal::texthash (
- togglecats => 'Show/Hide a course in catalog',
- togglecatscomm => 'Show/Hide a community in catalog',
- categorize => 'Assign a category to a course',
- categorizecomm => 'Assign a category to a community',
+ togglecats => 'Show/Hide a course in catalog',
+ togglecatscomm => 'Show/Hide a community in catalog',
+ togglecatsplace => 'Show/Hide a placement test in catalog',
+ categorize => 'Assign a category to a course',
+ categorizecomm => 'Assign a category to a community',
+ categorizeplace => 'Assign a category to a placement test',
);
my %level = &Apache::lonlocal::texthash (
- dom => 'Set in Domain',
- crs => 'Set in Course',
- comm => 'Set in Community',
+ dom => 'Set in Domain',
+ crs => 'Set in Course',
+ comm => 'Set in Community',
+ place => 'Set in Placement Test',
);
$datatable = ''.
'| '.$title{'togglecats'}.' | '.
@@ -10064,8 +8228,22 @@ sub print_coursecategories {
$can_catcomm_dom.' value="dom" />'.$level{'dom'}.' '.
''.
+ ' '.
+ '| '.$title{'togglecatsplace'}.' | '.
+ ' '.
+ ' | '.
+ ' '.
+ '| '.$title{'categorizeplace'}.' | '.
+ ''.
+ ' '.
+ ' | '.
' ';
- $$rowtotal += 4;
+ $$rowtotal += 6;
} else {
my $css_class;
my $itemcount = 1;
@@ -10090,12 +8268,15 @@ sub print_coursecategories {
my %default_names = (
instcode => &mt('Official courses'),
communities => &mt('Communities'),
+ placement => &mt('Placement Tests'),
);
if ((!grep(/^instcode$/,@{$cats[0]})) ||
($cathash->{'instcode::0'} eq '') ||
(!grep(/^communities$/,@{$cats[0]})) ||
- ($cathash->{'communities::0'} eq '')) {
+ ($cathash->{'communities::0'} eq '') ||
+ (!grep(/^placement$/,@{$cats[0]})) ||
+ ($cathash->{'placement::0'} eq '')) {
$maxnum ++;
}
my $lastidx;
@@ -10116,7 +8297,7 @@ sub print_coursecategories {
$datatable .= '';
}
$datatable .= '';
- if ($parent eq 'instcode' || $parent eq 'communities') {
+ if ($parent eq 'instcode' || $parent eq 'communities' || $parent eq 'placement') {
$datatable .= ''
.$default_names{$parent}.'';
if ($parent eq 'instcode') {
@@ -10139,7 +8320,7 @@ sub print_coursecategories {
$datatable .= '';
- if ($parent eq 'communities') {
+ if (($parent eq 'communities') || ($parent eq 'placement')) {
$datatable .= ' |
';
}
$datatable .= '';
@@ -10171,7 +8352,7 @@ sub print_coursecategories {
.''
.' '."\n";
$itemcount ++;
- foreach my $default ('instcode','communities') {
+ foreach my $default ('instcode','communities','placement') {
if ((!grep(/^\Q$default\E$/,@{$cats[0]})) || ($cathash->{$default.'::0'} eq '')) {
$css_class = $itemcount%2?' class="LC_odd_row"':'';
my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','$lastidx'".');"';
@@ -10260,31 +8441,42 @@ sub print_serverstatuses {
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');
+ 'checksums','clusterstatus','certstatus','metadata_keywords',
+ 'metadata_harvest','takeoffline','takeonline','showenv','toggledebug',
+ 'ping','domconf','uniquecodes','diskusage','coursecatalog');
}
sub defaults_javascript {
my ($settings) = @_;
- return unless (ref($settings) eq 'HASH');
- my $portal_js = <<"ENDPORTAL";
+ my $intauthcheck = &mt('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.');
+ my $intauthcost = &mt('Warning: bcrypt encryption cost for internal authentication must be an integer.');
+ &js_escape(\$intauthcheck);
+ &js_escape(\$intauthcost);
+ my $intauthjs = <<"ENDSCRIPT";
-function portalExtras(caller) {
- var x = caller.value;
- var y = new Array('email','web');
- for (var i=0; i 0) {
- z.style.display = 'block';
- } else {
- z.style.display = 'none';
+function warnIntAuth(field) {
+ if (field.name == 'intauth_check') {
+ if (field.value == '2') {
+ alert('$intauthcheck');
+ }
+ }
+ if (field.name == 'intauth_cost') {
+ field.value.replace(/\s/g,'');
+ if (field.value != '') {
+ var regexdigit=/^\\d+\$/;
+ if (!regexdigit.test(field.value)) {
+ alert('$intauthcost');
}
}
}
+ return;
}
-ENDPORTAL
+
+ENDSCRIPT
+
+ if (ref($settings) ne 'HASH') {
+ return &Apache::lonhtmlcommon::scripttag($intauthjs);
+ }
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
my $maxnum = scalar(@{$settings->{'inststatusorder'}});
if ($maxnum eq '') {
@@ -10338,112 +8530,15 @@ $jstext
return;
}
-$portal_js
-
-// ]]>
-
+$intauthjs
-ENDSCRIPT
- } else {
-return <<"ENDSCRIPT";
-
ENDSCRIPT
- }
- return;
-}
-
-sub passwords_javascript {
- my ($prefix) = @_;
- my %intalert;
- if ($prefix eq 'passwords') {
- %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).',
- passnum => 'Warning: number of previous passwords to save must be a positive integer (or blank).',
- );
- } elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) {
- %intalert = &Apache::lonlocal::texthash (
- passmin => 'Warning: minimum secret length must be a positive integer greater than 6.',
- passmax => 'Warning: maximum secret length must be a positive integer (or blank).',
- );
- }
- &js_escape(\%intalert);
- my $defmin = $Apache::lonnet::passwdmin;
- my $intauthjs;
- if ($prefix eq 'passwords') { $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;
-}
-
-ENDSCRIPT
-
- }
-
- $intauthjs .= <<"ENDSCRIPT";
-
-function warnInt$prefix(field) {
- field.value.replace(/^\s+/,'');
- field.value.replace(/\s+\$/,'');
- var regexdigit=/^\\d+\$/;
- if (field.name == '${prefix}_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 (!regexdigit.test(field.value)) {
- if (field.name == '${prefix}_max') {
- alert('$intalert{passmax}');
- } else {
- if (field.name == '${prefix}_numsaved') {
- alert('$intalert{passnum}');
- }
- }
- field.value = '';
- }
- }
+ return &Apache::lonhtmlcommon::scripttag($intauthjs);
}
- return;
-}
-
-ENDSCRIPT
- return &Apache::lonhtmlcommon::scripttag($intauthjs);
}
sub coursecategories_javascript {
@@ -10470,9 +8565,11 @@ 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 $placement_reserved = &mt('The name: [_1] is a reserved category.','"placement"');
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(\$placement_reserved);
&js_escape(\$choose_again);
$output = <<"ENDSCRIPT";
|
| |