- | '.
+ | '.
&mt($item->{'header'}->[2]->{'col1'}).' |
- '.
+ | '.
&mt($item->{'header'}->[2]->{'col2'}).' |
'.
&print_rolecolors($phase,'author',$dom,$confname,$settings,\$rowtotal).'
@@ -1125,30 +1078,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') {
@@ -1157,7 +1110,7 @@ sub print_config_box {
$output .= ' | ';
}
if ($item->{'header'}->[0]->{'col4'}) {
- $output .= ''.
+ $output .= ' | '.
&mt($item->{'header'}->[0]->{'col4'});
}
$output .= '';
@@ -1165,8 +1118,8 @@ sub print_config_box {
if ($action eq 'quotas') {
$output .= &print_quotas($dom,$settings,\$rowtotal,$action);
} elsif (($action eq 'autoenroll') || ($action eq 'autocreate') ||
- ($action eq '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);
}
}
@@ -1180,18 +1133,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'}.' | '.
@@ -1272,7 +1222,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');
@@ -1314,13 +1263,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};
@@ -1387,10 +1329,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') {
@@ -1472,7 +1422,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";
@@ -1487,6 +1437,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}.' | ';
@@ -1510,101 +1468,6 @@ sub print_login {
$datatable .= ' | ';
}
$datatable .= '
|
|---|
';
- } elsif ($caller eq 'saml') {
- my %domservers = &Apache::lonnet::get_servers($dom);
- $datatable .= '| '.
- ' | ';
}
return $datatable;
}
@@ -1641,205 +1504,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();
@@ -1989,7 +1657,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 =
@@ -1997,13 +1665,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 .= ' | ';
@@ -2095,11 +1758,6 @@ sub display_color_options {
$datatable .=' ';
}
}
- if (($role eq 'login') && ($img ne 'login')) {
- $datatable .= (' ' x2).' ';
- }
$datatable .= '';
}
$itemcount ++;
@@ -2121,7 +1779,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 .= ' ';
@@ -2149,7 +1807,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.=' ';
}
@@ -2210,7 +1868,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 .= '
| ';
@@ -2243,7 +1901,7 @@ sub image_changes {
$role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
' '.&mt('Replace:').'
';
} else {
- $output .= ''.$logincolors.&mt('Upload:').'
';
+ $output .= ' | '.$logincolors.&mt('Upload:').'
';
}
}
return $output;
@@ -2262,7 +1920,7 @@ sub print_quotas {
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();
@@ -2271,7 +1929,7 @@ sub print_quotas {
@options = ('norequest','approval','automatic');
%titles = &authorrequest_titles();
} else {
- @usertools = ('aboutme','blog','webdav','portfolio','timezone');
+ @usertools = ('aboutme','blog','webdav','portfolio');
%titles = &tool_titles();
}
if (ref($types) eq 'ARRAY') {
@@ -2375,12 +2033,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" ';
@@ -2729,7 +2384,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) {
@@ -3105,147 +2760,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});
@@ -3295,9 +2824,6 @@ $jstext
}
return;
}
-
-$linkprot_js
-
// ]]>
@@ -3307,77 +2833,40 @@ 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";
-
@@ -3709,12 +3014,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') {
@@ -3748,24 +3048,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) {
@@ -3804,84 +3088,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;
@@ -4132,7 +3383,7 @@ sub print_contacts {
}
} elsif ($position eq 'middle') {
@mailings = ('errormail','packagesmail','lonstatusmail','requestsmail',
- 'updatesmail','idconflictsmail','hostipmail');
+ 'updatesmail','idconflictsmail');
foreach my $type (@mailings) {
$otheremails{$type} = '';
}
@@ -4215,7 +3466,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" ';
@@ -4347,17 +3597,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') {
@@ -4377,16 +3628,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 .= ''.
''.
@@ -4432,6 +3680,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);
@@ -4459,7 +3715,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});
}
@@ -4471,6 +3727,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);
@@ -4537,7 +3794,7 @@ sub overridden_helpdesk {
}
my $title;
if (ref($short_titles) eq 'HASH') {
- $title = $short_titles->{$item};
+ $title = $short_titles->{$item};
}
$output .= '
'.
- ''.
- ' | '."\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'".');"';
@@ -9917,31 +8626,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 '') {
@@ -9995,112 +8715,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 {
@@ -10127,9 +8750,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";
|
| |