- '.
+ '.
&mt($item->{'header'}->[2]->{'col1'}).'
- '.
+ '.
&mt($item->{'header'}->[2]->{'col2'}).'
'.
&print_rolecolors($phase,'author',$dom,$confname,$settings,\$rowtotal).'
@@ -1145,30 +1209,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'}).
' ';
} 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') {
@@ -1177,7 +1241,7 @@ sub print_config_box {
$output .= ' ';
}
if ($item->{'header'}->[0]->{'col4'}) {
- $output .= ''.
+ $output .= ' '.
&mt($item->{'header'}->[0]->{'col4'});
}
$output .= '';
@@ -1185,8 +1249,9 @@ 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') ||
+ ($action eq 'proctoring') || ($action eq 'ipaccess')) {
$output .= $item->{'print'}->($dom,$settings,\$rowtotal);
}
}
@@ -1211,7 +1276,7 @@ sub print_login {
my $choice = $choices{'disallowlogin'};
$css_class = ' class="LC_odd_row"';
$datatable .= ''.$choice.' '.
- ''.$choices{'hostid'}.' '.
+ ''.$choices{'hostid'}.' '.
''.$choices{'server'}.' '.
''.$choices{'serverpath'}.' '.
''.$choices{'custompath'}.' '.
@@ -1292,7 +1357,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');
@@ -1334,13 +1398,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};
@@ -1492,7 +1549,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'}.' '.$choices{'hostid'}.' '.
''.$choices{'samllanding'}.' '.
''.$choices{'samloptions'}.' '.$domservers{$lonhost}.' '.
- ''.&mt('SSO').' ';
@@ -1663,7 +1707,6 @@ sub login_choices {
current => "Current",
samllanding => "Dual login?",
samloptions => "Options",
- alttext => "Alt text",
);
return %choices;
}
@@ -2009,7 +2052,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 =
@@ -2017,13 +2060,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 .= ' ';
@@ -2115,11 +2153,6 @@ sub display_color_options {
$datatable .=' '.$choices->{'alttext'}.':'.
- ' ';
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 .= ' ';
@@ -2169,7 +2202,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.=' ';
}
@@ -2230,7 +2263,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 .= ' ';
@@ -2263,7 +2296,7 @@ sub image_changes {
$role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
' '.&mt('Replace:').''.$logincolors.&mt('Upload:').' '.$logincolors.&mt('Upload:').' '.$role.' '.$role.' ';
for (my $k=0; $k<=$maxnum; $k++) {
my $vpos = $k+1;
@@ -4779,7 +4890,7 @@ sub print_helpsettings {
&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent);
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
my $chgstr = ' onchange="javascript:reorderHelpRoles(this.form,'."'helproles_".$count."_pos'".');"';
- $datatable .= ''.
+ $datatable .= ''.
'';
for (my $k=0; $k<$maxnum+1; $k++) {
@@ -5060,7 +5171,7 @@ sub radiobutton_prefs {
foreach my $item (@{$toggles}) {
$css_class = $itemcount%2?' class="LC_odd_row"':'';
$datatable .=
- ''.
+ ''.
''.$choices->{$item}.
' ';
if ($align eq 'left') {
@@ -5089,50 +5200,421 @@ sub radiobutton_prefs {
}
sub print_ltitools {
- my ($position,$dom,$settings,$rowtotal) = @_;
- my (%rules,%encrypt,%privkeys,%linkprot);
+ my ($dom,$settings,$rowtotal) = @_;
+ my $rownum = 0;
+ my $css_class;
+ my $itemcount = 1;
+ my $maxnum = 0;
+ my %ordered;
if (ref($settings) eq 'HASH') {
- if ($position eq 'top') {
- if (exists($settings->{'encrypt'})) {
- if (ref($settings->{'encrypt'}) eq 'HASH') {
- foreach my $key (keys(%{$settings->{'encrypt'}})) {
- $encrypt{'toolsec_'.$key} = $settings->{'encrypt'}{$key};
+ foreach my $item (keys(%{$settings})) {
+ if (ref($settings->{$item}) eq 'HASH') {
+ my $num = $settings->{$item}{'order'};
+ $ordered{$num} = $item;
+ }
+ }
+ }
+ my $confname = $dom.'-domainconfig';
+ my $switchserver = &check_switchserver($dom,$confname);
+ my $maxnum = scalar(keys(%ordered));
+ my $datatable;
+ my %lt = <itools_names();
+ my @courseroles = ('cc','in','ta','ep','st');
+ my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
+ my @fields = ('fullname','firstname','lastname','email','roles','user');
+ 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 ($title,$key,$secret,$url,$lifetime,$imgsrc,%sigsel);
+ if (ref($settings->{$item}) eq 'HASH') {
+ $title = $settings->{$item}->{'title'};
+ $url = $settings->{$item}->{'url'};
+ $key = $settings->{$item}->{'key'};
+ $secret = $settings->{$item}->{'secret'};
+ $lifetime = $settings->{$item}->{'lifetime'};
+ my $image = $settings->{$item}->{'image'};
+ if ($image ne '') {
+ $imgsrc = ''
+ .'';
+ 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 '.
+ (' 'x2).
+ ''.$lt{'sigmethod'}.':'.
+ 'HMAC-SHA1 '.
+ 'HMAC-SHA256 '.
+ ''.$lt{'url'}.': '.
+ (' 'x2).
+ ''.$lt{'key'}.':'.
+ ' '.
+ (' 'x2).
+ ''.$lt{'lifetime'}.':'.
+ ' '.
+ (' '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{$extra}.' '.
+ '
'.
+ '
';
+ }
+ $datatable .= ''.$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').' '.
+ '';
+ my $userfieldstyle = 'display:none;';
+ my $seluserdom = '';
+ my $unseluserdom = ' selected="selected"';
+ foreach my $field (@fields) {
+ my ($checked,$onclick,$id,$spacer);
+ if ($checkedfields{$field}) {
+ $checked = ' checked="checked"';
+ }
+ if ($field eq 'user') {
+ $id = ' id="ltitools_user_field_'.$i.'"';
+ $onclick = ' onclick="toggleLTITools(this.form,'."'$field','$i'".')"';
+ if ($checked) {
+ $userfieldstyle = 'display:inline-block';
+ if ($userincdom) {
+ $seluserdom = $unseluserdom;
+ $unseluserdom = '';
+ }
}
+ } else {
+ $spacer = (' ' x2);
}
+ $datatable .= ''.
+ ' '.$spacer;
}
- if (exists($settings->{'private'})) {
- if (ref($settings->{'private'}) eq 'HASH') {
- if (ref($settings->{'private'}) eq 'HASH') {
- if (ref($settings->{'private'}{'keys'}) eq 'ARRAY') {
- map { $privkeys{$_} = 1; } (@{$settings->{'private'}{'keys'}});
+ $datatable .= ' ';
+ $datatable .= ''.
+ ' : '.
+ ''.
+ ''.&mt('Select').' '.
+ ''.&mt('username').' '.
+ ''.&mt('username:domain').' '.
+ '
';
+ $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 .= ' ';
}
- } elsif ($position eq 'middle') {
- if (exists($settings->{'rules'})) {
- if (ref($settings->{'rules'}) eq 'HASH') {
- %rules = %{$settings->{'rules'}};
+ $datatable .= '
'.&mt('Configurable in course').' ';
+ foreach my $item ('label','title','target','linktext','explanation','append') {
+ my $checked;
+ if ($courseconfig{$item}) {
+ $checked = ' checked="checked"';
+ }
+ $datatable .= ''.
+ ' '."\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{'sigmethod'}.':'.
+ 'HMAC-SHA1 '.
+ 'HMAC-SHA256 '.
+ ''.$lt{'url'}.': '."\n".
+ (' 'x2).
+ ''.$lt{'key'}.': '."\n".
+ (' 'x2).
+ ''.$lt{'lifetime'}.': '."\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{$extra}.' '.
+ ' '.(' 'x2).''.
+ '
'.
+ '
';
+ }
+ $datatable .= ''.$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) {
+ my ($id,$onclick,$spacer);
+ if ($field eq 'user') {
+ $id = ' id="ltitools_user_field_add"';
+ $onclick = ' onclick="toggleLTITools(this.form,'."'$field','add'".')"';
+ } else {
+ $spacer = (' ' x2);
+ }
+ $datatable .= ''.
+ ' '.$spacer;
+ }
+ $datatable .= ' '.
+ ''.
+ ' : '.
+ ''.
+ ''.&mt('Select').' '.
+ ''.&mt('username').' '.
+ ''.&mt('username:domain').' '.
+ '
'.&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','append') {
+ $datatable .= ''.
+ ' '.(' ' x2)."\n";
+ }
+ $datatable .= ' '.&mt('Custom items sent on launch').' '.
+ ' '."\n".
+ ''.
- ''.$hostid.' ';
- if ($switch) {
- my $switchserver = ''.&mt('Switch Server').' ';
- if (exists($privkeys->{$hostid})) {
- $extra .= '
'.
- ''.
- &mt('Encryption Key').': ['.&mt('not shown').'] '.(' 'x2).' '.
- ''.&mt('Change?').
- '
'.
- ' - '.&mt('submit from server ([_1]): [_2].',$hostid,$switchserver).
- ' ';
- } else {
- $extra .= ''.
- &mt('Key required').' - '.&mt('submit from server ([_1]): [_2].',$hostid,$switchserver).
- ' '."\n";
- }
- } elsif (exists($privkeys->{$hostid})) {
- $extra .= '
'.
- &mt('Encryption Key').': ['.&mt('not shown').'] '.(' 'x2).' '.
- ''.&mt('Change?').
- '
'.
- ''.&mt('New Key').':'.
- ' ';
- } else {
- $extra .= ''.&mt('Encryption Key').':'.
- ' ';
- }
- }
- my (%choices,@toggles,%defaultchecked);
- if ($context eq 'ltisec') {
- %choices = &Apache::lonlocal::texthash (
- ltisec_crslinkprot => 'Encrypt stored link protection secrets defined in courses',
- ltisec_domlinkprot => 'Encrypt stored link protection secrets defined in domain',
- ltisec_consumers => 'Encrypt stored consumer secrets defined in domain',
- );
- @toggles = qw(ltisec_crslinkprot ltisec_domlinkprot ltisec_consumers);
- %defaultchecked = (
- 'ltisec_crslinkprot' => 'off',
- 'ltisec_domlinkprot' => 'off',
- 'ltisec_consumers' => 'off',
- );
- } else {
- %choices = &Apache::lonlocal::texthash (
- toolsec_crs => 'Encrypt stored external tool secrets defined in courses',
- toolsec_dom => 'Encrypt stored external tool secrets defined in domain',
- );
- @toggles = qw(toolsec_crs toolsec_dom);
- %defaultchecked = (
- 'toolsec_crs' => 'off',
- 'toolsec_dom' => 'off',
- );
- }
- my ($onclick,$itemcount);
- $onclick = 'javascript:toggleLTIEncKey(this.form,'."'$context'".');';
- ($output,$itemcount) = &radiobutton_prefs($encrypt,\@toggles,\%defaultchecked,
- \%choices,$itemcount,$onclick,'','left','no');
-
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my $noprivkeysty = 'display:inline-block';
- if ($numshown) {
- $noprivkeysty = 'display:none';
- }
- $output .= ''.&mt('Encryption Key(s)').' '.
- ''.&mt('Not in use').'
'.
- $extra.
- ''
+ .'';
+ for (my $k=0; $k<$maxnum; $k++) {
+ my $vpos = $k+1;
+ my $selstr;
+ if ($k == $i) {
+ $selstr = ' selected="selected" ';
}
+ $datatable .= ''.$vpos.' ';
}
- } elsif ($position eq 'upper') {
- if (exists($settings->{'rules'})) {
- if (ref($settings->{'rules'}) eq 'HASH') {
- %rules = %{$settings->{'rules'}};
+ if ($version eq '') {
+ if ($provider eq 'proctorio') {
+ $version = '1.0';
+ } elsif ($provider eq 'examity') {
+ $version = '1.1';
}
}
- } elsif ($position eq 'middle') {
- if (exists($settings->{'suggested'})) {
- if (ref($settings->{'suggested'}) eq 'HASH') {
- %suggestions = %{$settings->{'suggested'}};
+ if ($lifetime eq '') {
+ $lifetime = '300';
+ }
+ $datatable .=
+ ' '.(' 'x2).''.$providernames{$provider}.' '.$lt{'avai'}.' '.
+ ' '."\n".
+ ''.
+ ''.$lt{'base'}.' '.
+ ''.$lt{'version'}.':'.
+ ''.$version.' '."\n".
+ (' 'x2).
+ ''.$lt{'sigmethod'}.':'.
+ 'HMAC-SHA1 '.
+ 'HMAC-SHA256 '.
+ (' 'x2).
+ ''.$lt{'lifetime'}.': '."\n".
+ ''.$lt{'url'}.': '."\n".
+ ''.$lt{'key'}.': '."\n".
+ (' 'x2).
+ ''.$lt{'secret'}.': '.$lt{'icon'}.': ';
+ if ($imgsrc) {
+ $datatable .= $imgsrc.
+ ' '.
+ ' '.&mt('Replace:');
+ }
+ $datatable .= ' ';
+ if ($switchserver) {
+ $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+ } else {
+ $datatable .= ' '.$lt{'requ'}.' ';
+ foreach my $field (@{$requserfields{$provider}}) {
+ $datatable .= ''.
+ ''.
+ ''.$lt{'username'}.' '.
+ ''.$lt{'uname:dom'}.' '.
+ ' ';
+ } else {
+ $datatable .= ' ';
+ if ($field eq 'roles') {
+ $showroles = 1;
+ }
+ }
+ $datatable .= ' ';
+ }
}
+ $datatable .= ''.$lt{'optu'}.' ';
+ foreach my $field (@{$optuserfields{$provider}}) {
+ my $checked;
+ if ($checkedfields{$field}) {
+ $checked = ' checked="checked"';
+ }
+ $datatable .= ''.
+ ' ';
}
+ $datatable .= ''.$lt{'defa'}.' ';
+ my ($rem,$numinrow,$dropdowns);
+ if ($provider eq 'proctorio') {
+ $datatable .= '';
+ if (@selectboxes) {
+ $datatable .= '';
+ $numinrow = 2;
+ for (my $i=0; $i<@selectboxes; $i++) {
+ $rem = $i%($numinrow);
+ if ($rem == 0) {
+ if ($i > 0) {
+ $datatable .= '';
+ }
+ $datatable .= '';
+ }
+ $datatable .= ''.
+ $selectboxes[$i].' ';
+ }
+ if ($numinrow) {
+ $rem = $i%$numinrow;
+ }
+ $colsleft = $numinrow - $rem;
+ if ($colsleft > 1) {
+ $datatable .= '';
+ } else {
+ $datatable .= ' ';
+ }
+ $datatable .= ' '.
+ '
';
+ }
+ }
+ $datatable .= ''.
+ ''.&mt('Configurable in course').' ';
+ my ($rem,$numinrow);
+ if ($provider eq 'proctorio') {
+ $datatable .= '';
+ $numinrow = 4;
+ }
+ my $i = 0;
+ foreach my $item (@{$crsconf{$provider}}) {
+ my $name;
+ if ($provider eq 'examity') {
+ $name = $lt{'crs'.$item};
+ } elsif ($provider eq 'proctorio') {
+ $name = $fieldtitles{$item};
+ $rem = $i%($numinrow);
+ if ($rem == 0) {
+ if ($i > 0) {
+ $datatable .= '';
+ }
+ $datatable .= '';
+ }
+ $datatable .= '';
+ } else {
+ $datatable .= ' ';
+ }
+ $datatable .= ' '.
+ '
';
+ }
+ $datatable .= ' ';
+ }
+ if ($showroles) {
+ $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('Custom items sent on launch').' '.
+ ' '
- .'';
- 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{'consumer'}.
- ': '.
- (' 'x2).
- ''.$lt{'version'}.':'.
- '1.1 '.
- (' 'x2).
- ''.$lt{'lifetime'}.': '.$lt{'key'};
- if ($switchserver) {
- $datatable .= ': ['.&mt('[_1] to view/edit',$switchserver).']';
- } else {
- $datatable .= ': '.(' 'x2);
- } elsif (!$switchserver) {
- $datatable .= ''.$lt{'key'}.':'.
- ' '.(' 'x2);
+ );
+ if (!$crsinc) {
+ $checkedcrsinc{'no'} = $checkedcrsinc{'yes'};
+ $checkedcrsinc{'yes'} = '';
+ }
+ my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'lti_pos_".$item."'".');"';
+ $datatable .= ''
+ .'';
+ for (my $k=0; $k<=$maxnum; $k++) {
+ my $vpos = $k+1;
+ my $selstr;
+ if ($k == $i) {
+ $selstr = ' selected="selected" ';
}
- if ($switchserver) {
- if ($usable ne '') {
- $datatable .= '
'.
- $lt{'secret'}.': ['.&mt('not shown').'] '.(' 'x2).' '.
- ''.&mt('Change secret?').
- '
'.
- ' - '.$switchmessage.' '.
- '';
- } elsif ($key eq '') {
- $datatable .= ''.&mt('Key and Secret are required').' - '.$switchmessage.' '."\n";
- } else {
- $datatable .= ''.&mt('Secret required').' - '.$switchmessage.' '."\n";
- }
- } else {
- if ($usable ne '') {
- $datatable .= '
'.
- $lt{'secret'}.': ['.&mt('not shown').'] '.(' 'x2).' '.
- ''.&mt('Change?').
- '
'.
- ''.&mt('New Secret').':'.
- ' ';
- } else {
- $datatable .=
- ''.$lt{'secret'}.':'.
- ''.$lt{'requser'}.':'.
- ' '."\n".
- ''.$lt{'crsinc'}.':'.
- ' '."\n".
- (' 'x4).
- ' '.
- ''.<i_options($i,$current,$itemcount,%lt).' '.$vpos.' ';
}
+ $datatable .= ''.(' 'x2).
+ ' '.
+ ''.
+ ''.&mt('Required settings').' '.
+ ''.$lt{'consumer'}.
+ ': '.
+ (' 'x2).
+ ''.$lt{'version'}.':'.
+ '1.1 '.
+ (' 'x2).
+ ''.$lt{'lifetime'}.': '.
+ (' 'x2).
+ ''.$lt{'requser'}.':'.
+ ' '."\n".
+ ''.$lt{'crsinc'}.':'.
+ ' '."\n".
+ (' 'x4).
+ ''.$lt{'key'}.
+ ': '.
+ (' 'x2).
+ ''.$lt{'secret'}.':'.
+ ' '.
+ ' '."\n".
- '';
- for (my $k=0; $k<$maxnum+1; $k++) {
- my $vpos = $k+1;
- my $selstr;
- if ($k == $maxnum) {
- $selstr = ' selected="selected" ';
- }
- $datatable .= ''.$vpos.' ';
+ }
+ $css_class = $itemcount%2?' class="LC_odd_row"':'';
+ my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'lti_pos_add'".');"';
+ $datatable .= ''."\n".
+ '';
+ for (my $k=0; $k<$maxnum+1; $k++) {
+ my $vpos = $k+1;
+ my $selstr;
+ if ($k == $maxnum) {
+ $selstr = ' selected="selected" ';
}
- $datatable .= ' '."\n".
- ' '.
- ''.&mt('Required settings').' '.
- ''.$lt{'consumer'}.
- ': '."\n".
- (' 'x2).
- ''.$lt{'version'}.':'.
- '1.1 '."\n".
- (' 'x2).
- ''.$lt{'lifetime'}.': '.&mt('Key and Secret are required').' - '.$switchmessage.' '."\n";
- } else {
- $datatable .= ''.$lt{'key'}.': '."\n".
- (' 'x2).
- ''.$lt{'secret'}.': '."\n";
- }
- $datatable .= ''.$lt{'requser'}.':'.
- ' '."\n".
- ''.$lt{'crsinc'}.':'.
- ' '."\n".
- ' '."\n".
- ''.$vpos.' ';
}
- $$rowtotal += $itemcount;
- return $datatable;
+ $datatable .= ' '."\n".
+ ' '.
+ ''.&mt('Required settings').' '.
+ ''.$lt{'consumer'}.
+ ': '."\n".
+ (' 'x2).
+ ''.$lt{'version'}.':'.
+ '1.1 '."\n".
+ (' 'x2).
+ ''.$lt{'lifetime'}.': '."\n".
+ (' 'x2).
+ ''.$lt{'requser'}.':'.
+ ' '."\n".
+ ''.$lt{'crsinc'}.':'.
+ ' '."\n".
+ (' 'x4).
+ ''.$lt{'key'}.': '."\n".
+ (' 'x2).
+ ''.$lt{'secret'}.': '."\n".
+ ' '."\n".
+ ''.&mt('Roles which may create user accounts').' ';
foreach my $ltirole (@ltiroles) {
$output .= ' '.&mt('New user accounts created for LTI users').' '.
@@ -5892,9 +6780,9 @@ sub lti_options {
if ($extra eq 'passback') {
$pb1p1chk = ' checked="checked"';
$pb1p0chk = '';
- $onclickpb = ' onclick="toggleLTI(this.form,'."'passback','$num'".');"';
+ $onclickpb = ' onclick="toggleLTI(this.form,'."'passback','$num'".');"';
} else {
- $onclickpb = '';
+ $onclickpb = '';
}
if (ref($current) eq 'HASH') {
if (($current->{$extra})) {
@@ -5940,65 +6828,13 @@ sub ltimenu_titles {
);
}
-sub linkprot_suggestions {
- my ($suggested,$itemcount) = @_;
- my $count = 0;
- my $next = 1;
- my %lt = &Apache::lonlocal::texthash(
- 'name' => 'Suggested Launcher',
- 'info' => 'Recommendations',
- );
- my ($datatable,$css_class,$dest);
- if (ref($suggested) eq 'HASH') {
- my @current = sort { $a <=> $b } keys(%{$suggested});
- $next += $current[-1];
- for (my $i=0; $i<@current; $i++) {
- my $num = $current[$i];
- my %values;
- if (ref($suggested->{$num}) eq 'HASH') {
- %values = %{$suggested->{$num}};
- } else {
- next;
- }
- $css_class = $$itemcount%2?' class="LC_odd_row"':'';
- $datatable .=
- ''."\n".
- ' '."\n".
- '
'.$lt{'name'}.' '."\n".
- '
'.$lt{'info'}.' '."\n".
- ''.
- '
'."\n".
- ' '."\n".
- ' '."\n".
- '
'.$lt{'name'}.' '."\n".
- '
'.$lt{'info'}.' '."\n".
- ''.
- '
'."\n".
- ' '.
+ ''.
''.$choices{'canclone'}.
' ';
my $currcanclone = 'none';
@@ -6132,49 +6963,17 @@ sub print_coursedefaults {
$itemcount ++;
} else {
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- my ($currdefresponder,%defcredits,%curruploadquota,%currcoursequota,
- %deftimeout,%currmysql);
+ my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql);
my $currusecredits = 0;
my $postsubmitclient = 1;
- my $ltiauth = 0;
- my %domexttool;
- my %exttool;
- my @types = ('official','unofficial','community','textbook');
+ my @types = ('official','unofficial','community','textbook','placement');
if (ref($settings) eq 'HASH') {
- if ($settings->{'ltiauth'}) {
- $ltiauth = 1;
- }
- if (ref($settings->{'domexttool'}) eq 'HASH') {
- foreach my $type (@types) {
- if ($settings->{'domexttool'}->{$type}) {
- $domexttool{$type} = ' checked="checked"';
- }
- }
- } else {
- foreach my $type (@types) {
- if ($staticdefaults{'domexttool'}) {
- $domexttool{$type} = ' checked="checked"';
- }
- }
- }
- if (ref($settings->{'exttool'}) eq 'HASH') {
- foreach my $type (@types) {
- if ($settings->{'exttool'}->{$type}) {
- $exttool{$type} = ' checked="checked"';
- }
- }
- }
$currdefresponder = $settings->{'anonsurvey_threshold'};
if (ref($settings->{'uploadquota'}) eq 'HASH') {
foreach my $type (keys(%{$settings->{'uploadquota'}})) {
$curruploadquota{$type} = $settings->{'uploadquota'}{$type};
}
}
- if (ref($settings->{'coursequota'}) eq 'HASH') {
- foreach my $type (keys(%{$settings->{'coursequota'}})) {
- $currcoursequota{$type} = $settings->{'coursequota'}{$type};
- }
- }
if (ref($settings->{'coursecredits'}) eq 'HASH') {
foreach my $type (@types) {
next if ($type eq 'community');
@@ -6220,9 +7019,6 @@ sub print_coursedefaults {
} else {
foreach my $type (@types) {
$deftimeout{$type} = $staticdefaults{'postsubmit'};
- if ($staticdefaults{'domexttool'}) {
- $domexttool{$type} = ' checked="checked"';
- }
}
}
if (!$currdefresponder) {
@@ -6234,9 +7030,6 @@ sub print_coursedefaults {
if ($curruploadquota{$type} eq '') {
$curruploadquota{$type} = $staticdefaults{'uploadquota'};
}
- if ($currcoursequota{$type} eq '') {
- $currcoursequota{$type} = $staticdefaults{'coursequota'};
- }
}
$datatable .=
''.
@@ -6251,25 +7044,12 @@ sub print_coursedefaults {
$datatable .= ''.
$choices{'uploadquota'}.
' '.
- ' '.
- $choices{'coursequota'}.
- ' '.
' '.&mt('Default credits').' ';
foreach my $type (@types) {
next if ($type eq 'community');
- $additional .= ''.&mt($type).' '.&mt($type).' ';
}
@@ -6306,7 +7086,7 @@ sub print_coursedefaults {
''.&mt('Enter 0 to remain disabled until page reload.').' ';
foreach my $type (@types) {
- $additional .= ''.&mt($type).' '.&mt($type).' ';
}
@@ -6324,53 +7104,16 @@ 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;
@@ -6380,7 +7123,7 @@ 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();
@@ -6601,6 +7344,143 @@ sub print_validation_rows {
return $datatable;
}
+sub print_privacy {
+ my ($position,$dom,$settings,$rowtotal) = @_;
+ my ($datatable,$css_class,$numinrow,@items,%names,$othertitle,$usertypes,$types);
+ my $itemcount = 0;
+ unless ($position eq 'top') {
+ @items = ('domain','author','course','community');
+ %names = &Apache::lonlocal::texthash (
+ domain => 'Assigned domain role(s)',
+ author => 'Assigned co-author role(s)',
+ course => 'Assigned course role(s)',
+ community => 'Assigned community role',
+ );
+ $numinrow = 4;
+ ($othertitle,$usertypes,$types) =
+ &Apache::loncommon::sorted_inst_types($dom);
+ }
+ if (($position eq 'top') || ($position eq 'middle')) {
+ my (%by_ip,%by_location,@intdoms,@instdoms);
+ &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
+ if ($position eq 'top') {
+ my %curr;
+ my @options = ('none','user','domain','auto');
+ my %titles = &Apache::lonlocal::texthash (
+ none => 'Not allowed',
+ user => 'User authorizes',
+ domain => 'DC authorizes',
+ auto => 'Unrestricted',
+ instdom => 'Other domain shares institution/provider',
+ extdom => 'Other domain has different institution/provider',
+ );
+ my %names = &Apache::lonlocal::texthash (
+ domain => 'Domain role',
+ author => 'Co-author role',
+ course => 'Course role',
+ community => 'Community role',
+ );
+ my $primary_id = &Apache::lonnet::domain($dom,'primary');
+ my $intdom = &Apache::lonnet::internet_dom($primary_id);
+ foreach my $domtype ('instdom','extdom') {
+ my (%checked,$skip);
+ $css_class = $itemcount%2?' class="LC_odd_row"':'';
+ $datatable .= ''.$titles{$domtype}.' '.
+ '';
+ if ($domtype eq 'instdom') {
+ unless (@instdoms > 1) {
+ $datatable .= &mt('Nothing to set, as no domains besides [_1] are hosted by [_2]',$dom,$intdom);
+ $skip = 1;
+ }
+ } elsif ($domtype eq 'extdom') {
+ if (keys(%by_location) == 0) {
+ $datatable .= &mt('Nothing to set, as no other hosts besides [_1]',$intdom);
+ $skip = 1;
+ }
+ }
+ unless ($skip) {
+ foreach my $roletype ('domain','author','course','community') {
+ $checked{'auto'} = ' checked="checked"';
+ if (ref($settings) eq 'HASH') {
+ if (ref($settings->{approval}) eq 'HASH') {
+ if (ref($settings->{approval}->{$domtype}) eq 'HASH') {
+ if ($settings->{approval}->{$domtype}->{$roletype}=~ /^(none|user|domain)$/) {
+ $checked{$1} = ' checked="checked"';
+ $checked{'auto'} = '';
+ }
+ }
+ }
+ }
+ $datatable .= ''.$names{$roletype}.' ';
+ foreach my $option (@options) {
+ $datatable .= ''.
+ ' ';
+ $itemcount ++;
+ }
+ } elsif ($position eq 'middle') {
+ if ((@instdoms > 1) || (keys(%by_location) > 0)) {
+ if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
+ foreach my $item (@{$types}) {
+ $datatable .= &modifiable_userdata_row('privacy','othdom_'.$item,$settings,
+ $numinrow,$itemcount,'','','','','',
+ '',$usertypes->{$item});
+ $itemcount ++;
+ }
+ }
+ $datatable .= &modifiable_userdata_row('privacy','othdom_default',$settings,
+ $numinrow,$itemcount,'','','','','',
+ '',$othertitle);
+ $itemcount ++;
+ } else {
+ my (@insttypes,%insttitles);
+ if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
+ @insttypes = @{$types};
+ %insttitles = %{$usertypes};
+ }
+ foreach my $item (@insttypes,'default') {
+ my $title;
+ if ($item eq 'default') {
+ $title = $othertitle;
+ } else {
+ $title = $insttitles{$item};
+ }
+ $css_class = $itemcount%2?' class="LC_odd_row"':'';
+ $datatable .= ''.
+ ''.$title.' '.
+ ''.
+ &mt('Nothing to set here, as there are no other domains').
+ ' ';
+ $itemcount ++;
+ }
+ }
+ }
+ } else {
+ my $prefix;
+ if ($position eq 'lower') {
+ $prefix = 'priv';
+ } else {
+ $prefix = 'unpriv';
+ }
+ foreach my $item (@items) {
+ $datatable .= &modifiable_userdata_row('privacy',$prefix.'_'.$item,$settings,
+ $numinrow,$itemcount,'','','','','',
+ '',$names{$item});
+ $itemcount ++;
+ }
+ }
+ if (ref($rowtotal)) {
+ $$rowtotal += $itemcount;
+ }
+ return $datatable;
+}
+
sub print_passwords {
my ($position,$dom,$confname,$settings,$rowtotal) = @_;
my ($datatable,$css_class);
@@ -6622,6 +7502,7 @@ sub print_passwords {
min => 'Minimum password length',
max => 'Maximum password length',
chars => 'Required characters',
+ expire => 'Password expiration (days)',
numsaved => 'Number of previous passwords to save and disallow reuse',
);
if ($position eq 'top') {
@@ -6886,7 +7767,95 @@ sub print_passwords {
$itemcount ++;
}
} elsif ($position eq 'lower') {
- $datatable .= &password_rules('passwords',\$itemcount,$settings);
+ my ($min,$max,%chars,$expire,$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->{expire}) {
+ $expire = $settings->{expire};
+ }
+ 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{'expire'}.' '.
+ ''.
+ ' '.&mt('(Leave blank for no expiration)').' '.
+ ' '.$titles{'numsaved'}.' '.
+ ''.
+ ' '.&mt('(Leave blank to not save previous passwords)').' '.
+ ' '.
''.
&mt('Requirements').' ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$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('Hostname').': '.
- ''.
- &Apache::lonnet::hostname($server).' ';
+ &mt('Hostname').': '.
+ ''.&Apache::lonnet::hostname($server).' ';
if ($othercontrol{$server}) {
$dom_in_effect = $othercontrol{$server};
my ($current,$forsaml);
@@ -7176,10 +8033,10 @@ sub print_wafproxy {
(' 'x2).''.
&mt('Alias used for SSO Auth').': '.
' '.
+ &mt('No').' '.
' '.
- '';
+ '';
}
$aliasrows .= ' ';
$aliasinfo{$dom_in_effect} .= $aliasrows;
@@ -7367,15 +8224,14 @@ sub remoteip_methods {
sub print_usersessions {
my ($position,$dom,$settings,$rowtotal) = @_;
- my ($css_class,$datatable,%checked,%choices);
- my (%by_ip,%by_location,@intdoms);
- &build_location_hashes(\@intdoms,\%by_ip,\%by_location);
+ 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);
- my $itemcount = 1;
if ($position eq 'top') {
if (keys(%serverhomes) > 1) {
my %spareid = ¤t_offloads_to($dom,$settings,\%servers);
@@ -7397,116 +8253,252 @@ sub print_usersessions {
'';
}
} else {
- if (keys(%by_location) == 0) {
- $datatable .= ''.
- &mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.').
- ' ';
+ my %titles = &usersession_titles();
+ my ($prefix,@types);
+ if ($position eq 'bottom') {
+ $prefix = 'remote';
+ @types = ('version','excludedomain','includedomain');
} else {
- my %lt = &usersession_titles();
- my $numinrow = 5;
- my $prefix;
- my @types;
- if ($position eq 'bottom') {
- $prefix = 'remote';
- @types = ('version','excludedomain','includedomain');
- } else {
- $prefix = 'hosted';
- @types = ('excludedomain','includedomain');
- }
- my (%current,%checkedon,%checkedoff);
- my @lcversions = &Apache::lonnet::all_loncaparevs();
- my @locations = sort(keys(%by_location));
- foreach my $type (@types) {
- $checkedon{$type} = '';
- $checkedoff{$type} = ' checked="checked"';
- }
- if (ref($settings) eq 'HASH') {
- 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') {
+ $prefix = 'hosted';
+ @types = ('excludedomain','includedomain');
+ }
+ ($datatable,$itemcount) = &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles);
+ }
+ $$rowtotal += $itemcount;
+ return $datatable;
+}
+
+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 (ref($settings) eq 'HASH') {
+ 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} = '';
}
}
}
- foreach my $type (@types) {
- next if ($type ne 'version' && !@locations);
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= '
- '.$lt{$type}.'
- ';
- if ($type eq 'version') {
- my $selector = '';
- foreach my $version (@lcversions) {
- my $selected = '';
- if ($current{'version'} eq $version) {
- $selected = ' selected="selected"';
- }
- $selector .= ' '.$version.' ';
+ }
+ foreach my $type (@{$types}) {
+ next if ($type ne 'version' && !@locations);
+ $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+ $datatable .= '
+ '.$titles->{$type}.'
+ ';
+ if ($type eq 'version') {
+ my @lcversions = &Apache::lonnet::all_loncaparevs();
+ my $selector = '';
+ foreach my $version (@lcversions) {
+ my $selected = '';
+ if ($current{'version'} eq $version) {
+ $selected = ' selected="selected"';
}
- $selector .= ' ';
- $datatable .= &mt('remote server must be version: [_1] or later',$selector);
- } else {
- $datatable.= '
';
- my $rem;
- for (my $i=0; $i<@locations; $i++) {
- my ($showloc,$value,$checkedtype);
- if (ref($by_location{$locations[$i]}) eq 'ARRAY') {
- my $ip = $by_location{$locations[$i]}->[0];
- if (ref($by_ip{$ip}) eq 'ARRAY') {
- $value = join(':',@{$by_ip{$ip}});
- $showloc = join(', ',@{$by_ip{$ip}});
- if (ref($current{$type}) eq 'ARRAY') {
- foreach my $loc (@{$by_ip{$ip}}) {
- if (grep(/^\Q$loc\E$/,@{$current{$type}})) {
- $checkedtype = ' checked="checked"';
- last;
- }
+ $selector .= ' '.$version.' ';
+ }
+ $selector .= ' ';
+ $datatable .= &mt('remote server must be version: [_1] or later',$selector);
+ } else {
+ $datatable.= '
';
+ }
+ $datatable .= '';
+ $itemcount ++;
+ }
+ }
+ return ($datatable,$itemcount);
+}
+
+sub print_ssl {
+ my ($position,$dom,$settings,$rowtotal) = @_;
+ my ($css_class,$datatable);
+ my $itemcount = 1;
+ if ($position eq 'top') {
+ my $primary_id = &Apache::lonnet::domain($dom,'primary');
+ my $intdom = &Apache::lonnet::internet_dom($primary_id);
+ my $same_institution;
+ if ($intdom ne '') {
+ my $internet_names = &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'});
+ if (ref($internet_names) eq 'ARRAY') {
+ if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
+ $same_institution = 1;
+ }
+ }
+ }
+ $css_class = $itemcount%2?' class="LC_odd_row"':'';
+ $datatable = '
';
+ if ($same_institution) {
+ my %domservers = &Apache::lonnet::get_servers($dom);
+ $datatable .= &LONCAPA::SSL::print_certstatus(\%domservers,'web','domprefs');
+ } else {
+ $datatable .= &mt("You need to be logged into one of your own domain's servers to display information about the status of LON-CAPA SSL certificates.");
+ }
+ $datatable .= ' ';
+ $itemcount ++;
+ } else {
+ my %titles = &ssl_titles();
+ 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 @domservers = &Apache::lonnet::get_servers($dom);
+ my %servers = &Apache::lonnet::internet_dom_servers($dom);
+ my %altids = &id_for_thisdom(%servers);
+ if (($position eq 'connto') || ($position eq 'connfrom')) {
+ my $legacy;
+ unless (ref($settings) eq 'HASH') {
+ my $name;
+ if ($position eq 'connto') {
+ $name = 'loncAllowInsecure';
+ } else {
+ $name = 'londAllowInsecure';
+ }
+ my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
+ my @ids=&Apache::lonnet::current_machine_ids();
+ if (($primarylibserv ne '') && (!grep(/^\Q$primarylibserv\E$/,@ids))) {
+ my %what = (
+ $name => 1,
+ );
+ my ($result,$returnhash) =
+ &Apache::lonnet::get_remote_globals($primarylibserv,\%what);
+ if ($result eq 'ok') {
+ if (ref($returnhash) eq 'HASH') {
+ $legacy = $returnhash->{$name};
+ }
+ }
+ } else {
+ $legacy = $Apache::lonnet::perlvar{$name};
+ }
+ }
+ foreach my $type ('dom','intdom','other') {
+ my %checked;
+ $css_class = $itemcount%2?' class="LC_odd_row"':'';
+ $datatable .= ''.$titles{$type}.' '.
+ '';
+ my $skip;
+ if ($type eq 'dom') {
+ unless (keys(%servers) > 1) {
+ $datatable .= &mt('Nothing to set here, as there are no other servers/VMs');
+ $skip = 1;
+ }
+ }
+ if ($type eq 'intdom') {
+ unless (@instdoms > 1) {
+ $datatable .= &mt('Nothing to set here, as there are no other domains for this institution');
+ $skip = 1;
+ }
+ } elsif ($type eq 'other') {
+ if (keys(%by_location) == 0) {
+ $datatable .= &mt('Nothing to set here, as there are no other institutions');
+ $skip = 1;
+ }
+ }
+ unless ($skip) {
+ $checked{'yes'} = ' checked="checked"';
+ if (ref($settings) eq 'HASH') {
+ if (ref($settings->{$position}) eq 'HASH') {
+ if ($settings->{$position}->{$type} =~ /^(no|req)$/) {
+ $checked{$1} = $checked{'yes'};
+ delete($checked{'yes'});
+ }
+ }
+ } else {
+ if ($legacy == 0) {
+ $checked{'req'} = $checked{'yes'};
+ delete($checked{'yes'});
+ }
+ }
+ foreach my $option ('no','yes','req') {
+ $datatable .= ''.
+ '
';
}
$datatable .= '
';
+ $itemcount ++;
+ }
+ } else {
+ my $prefix = 'replication';
+ my @types = ('certreq','nocertreq');
+ if (keys(%by_location) == 0) {
+ $datatable .= ''.
+ &mt('Nothing to set here, as there are no other institutions').
+ ' ';
$itemcount ++;
+ } else {
+ ($datatable,$itemcount) =
+ &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles);
}
}
}
@@ -7514,10 +8506,60 @@ sub print_usersessions {
return $datatable;
}
+sub ssl_titles {
+ return &Apache::lonlocal::texthash (
+ dom => 'LON-CAPA servers/VMs from same domain',
+ intdom => 'LON-CAPA servers/VMs from same "internet" domain',
+ other => 'External LON-CAPA servers/VMs',
+ connto => 'Connections to other servers',
+ connfrom => 'Connections from other servers',
+ replication => 'Replicating content to other institutions',
+ certreq => 'Client certificate required, but specific domains exempt',
+ nocertreq => 'No client certificate required, except for specific domains',
+ no => 'SSL not used',
+ yes => 'SSL Optional (used if available)',
+ req => 'SSL Required',
+ );
+}
+
+sub print_trust {
+ my ($prefix,$dom,$settings,$rowtotal) = @_;
+ my ($css_class,$datatable,%checked,%choices);
+ my (%by_ip,%by_location,@intdoms,@instdoms);
+ &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
+ my $itemcount = 1;
+ my %titles = &trust_titles();
+ my @types = ('exc','inc');
+ if ($prefix eq 'top') {
+ $prefix = 'content';
+ } elsif ($prefix eq 'bottom') {
+ $prefix = 'msg';
+ }
+ ($datatable,$itemcount) = &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles);
+ $$rowtotal += $itemcount;
+ return $datatable;
+}
+
+sub trust_titles {
+ return &Apache::lonlocal::texthash(
+ content => "Access to this domain's content by others",
+ shared => "Access to other domain's content by this domain",
+ enroll => "Enrollment in this domain's courses by others",
+ othcoau => "Co-author roles in this domain for others",
+ coaurem => "Co-author roles for this domain's users elsewhere",
+ domroles => "Domain roles in this domain assignable to others",
+ catalog => "Course Catalog for this domain displayed elsewhere",
+ reqcrs => "Requests for creation of courses in this domain by others",
+ msg => "Users in other domains can send messages to this domain",
+ exc => "Allow all, but exclude specific domains",
+ inc => "Deny all, but include specific domains",
+ );
+}
+
sub build_location_hashes {
- my ($intdoms,$by_ip,$by_location) = @_;
+ my ($intdoms,$by_ip,$by_location,$instdoms) = @_;
return unless((ref($intdoms) eq 'ARRAY') && (ref($by_ip) eq 'HASH') &&
- (ref($by_location) eq 'HASH'));
+ (ref($by_location) eq 'HASH') && (ref($instdoms) eq 'ARRAY'));
my %iphost = &Apache::lonnet::get_iphost();
my $primary_id = &Apache::lonnet::domain($env{'request.role.domain'},'primary');
my $primary_ip = &Apache::lonnet::get_host_ip($primary_id);
@@ -7534,7 +8576,13 @@ sub build_location_hashes {
foreach my $id (@{$iphost{$ip}}) {
my $location = &Apache::lonnet::internet_dom($id);
if ($location) {
- next if (grep(/^\Q$location\E$/,@{$intdoms}));
+ if (grep(/^\Q$location\E$/,@{$intdoms})) {
+ my $dom = &Apache::lonnet::host_domain($id);
+ unless (grep(/^\Q$dom\E/,@{$instdoms})) {
+ push(@{$instdoms},$dom);
+ }
+ next;
+ }
if (ref($by_ip->{$ip}) eq 'ARRAY') {
unless(grep(/^\Q$location\E$/,@{$by_ip->{$ip}})) {
push(@{$by_ip->{$ip}},$location);
@@ -7854,7 +8902,7 @@ sub print_loadbalancing {
my $disabled_div_style = 'display: block';
my $homedom_div_style = 'display: none';
$datatable .= ''.
- ''.
+ ' '.
'';
if ($lonhost eq '') {
$datatable .= '';
@@ -7887,7 +8935,7 @@ sub print_loadbalancing {
$homedom_div_style = 'display: block';
}
}
- $datatable .= '
'.
+ $datatable .= ' '.
''.$disabledtext.'
'."\n".
''.&mt('Offloads to:').'
';
@@ -7898,7 +8946,7 @@ sub print_loadbalancing {
no => ' checked="checked"',
);
my %balcookiechecked = (
- no => ' checked="checked"',
+ no => ' checked="checked"',
);
foreach my $sparetype (@sparestypes) {
my $targettable;
@@ -8119,7 +9167,7 @@ sub loadbalance_rule_row {
$space = '
';
}
my $output =
- '
'.$space.
+ ' '.$space.
''.$title.'
'."\n".
''.$space.
''."\n";
@@ -8255,11 +9303,11 @@ sub tool_titles {
blog => 'Blog',
webdav => 'WebDAV',
portfolio => 'Portfolio',
- timezone => 'Can set time zone',
official => 'Official courses (with institutional codes)',
unofficial => 'Unofficial courses',
community => 'Communities',
textbook => 'Textbook courses',
+ placement => 'Placement tests',
);
return %titles;
}
@@ -8270,9 +9318,10 @@ sub courserequest_titles {
unofficial => 'Unofficial',
community => 'Communities',
textbook => 'Textbook',
+ placement => 'Placement tests',
lti => 'LTI Provider',
norequest => 'Not allowed',
- approval => 'Approval by Dom. Coord.',
+ approval => 'Approval by DC',
validate => 'With validation',
autolimit => 'Numerical limit',
unlimited => '(blank for unlimited)',
@@ -8361,7 +9410,7 @@ sub print_usercreation {
}
$datatable .= '
'.
''.$lt{$item}.
- ' ';
+ ' ';
my @options = ('any');
if (ref($rules) eq 'HASH') {
if (keys(%{$rules}) > 0) {
@@ -8483,7 +9532,7 @@ sub print_selfcreation {
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
\%choices,$itemcount,$onclick);
$$rowtotal += $itemcount;
-
+
if (ref($usertypes) eq 'HASH') {
if (keys(%{$usertypes}) > 0) {
$datatable .= &insttypes_row($createsettings,$types,$usertypes,
@@ -8620,7 +9669,7 @@ sub print_selfcreation {
my $currstyle = 'display:none';
if (grep(/^\Q$status\E$/,@ordered)) {
$currstyle = $rowstyle;
- $hidden = 0;
+ $hidden = 0;
}
$datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain,
$emailrules,$emailruleorder,$settings,$status,$rowid,
@@ -8647,8 +9696,8 @@ sub print_selfcreation {
foreach my $status (@posstypes) {
my $rowid = $classprefix.$status;
my $datarowstyle = 'display:none';
- if (grep(/^\Q$status\E$/,@ordered)) {
- $datarowstyle = $rowstyle;
+ if (grep(/^\Q$status\E$/,@ordered)) {
+ $datarowstyle = $rowstyle;
}
$datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings,
$numinrow,$$rowtotal,\%usertypeshash,$infofields,
@@ -8750,7 +9799,7 @@ function toggleEmailOptions(form,radio,p
document.getElementById(altprefix+'_inst_'+status).style.display = 'none';
document.getElementById(altprefix+'_noninst_'+status).style.display = 'none';
if (curr == 'custom') {
- if (prefix) {
+ if (prefix) {
document.getElementById(prefix+'_'+status).style.display = 'inline';
}
} else if (curr == 'inst') {
@@ -8773,10 +9822,10 @@ ENDSCRIPT
sub noninst_users {
my ($processing,$emailverified,$emailoptions,$emaildomain,$emailrules,
- $emailruleorder,$settings,$type,$rowid,$typetitle,$css_class,$rowstyle,$intdom) = @_;
+ $emailruleorder,$settings,$type,$rowid,$typetitle,$css_class,$rowstyle,$intdom) = @_;
my $class = 'LC_left_item';
if ($css_class) {
- $css_class = ' class="'.$css_class.'"';
+ $css_class = ' class="'.$css_class.'"';
}
if ($rowid) {
$rowid = ' id="'.$rowid.'"';
@@ -8791,10 +9840,10 @@ sub noninst_users {
$description = &mt('Requests for: [_1] (status self-reported)',$typetitle);
}
$output = ''.
- "$description \n".
+ "$description \n".
''.
'';
- my %headers = &Apache::lonlocal::texthash(
+ my %headers = &Apache::lonlocal::texthash(
approve => 'Processing',
email => 'E-mail',
username => 'Username',
@@ -8804,7 +9853,7 @@ sub noninst_users {
}
$output .= ' ';
foreach my $item ('approve','email','username') {
- $output .= '';
+ $output .= ' ';
my (%choices,@options,$hashref,$defoption,$name,$onclick,$hascustom);
if ($item eq 'approve') {
%choices = &Apache::lonlocal::texthash (
@@ -8919,7 +9968,7 @@ sub noninst_users {
my $value;
if (ref($emaildomain) eq 'HASH') {
if (ref($emaildomain->{$type}) eq 'HASH') {
- $value = $emaildomain->{$type}->{$option};
+ $value = $emaildomain->{$type}->{$option};
}
}
if ($value eq '') {
@@ -9035,7 +10084,7 @@ sub user_formats_row {
'username' => 'new usernames',
'id' => 'IDs',
);
- unless (($type eq 'email') || ($type eq 'unamemap')) {
+ unless ($type eq 'email') {
my $css_class = $rowcount%2?' class="LC_odd_row"':'';
$output = ' '.
''.
@@ -9090,9 +10139,9 @@ sub user_formats_row {
} elsif ($colsleft == 1) {
$output .= ' ';
}
- $output .= ' ';
- unless (($type eq 'email') || ($type eq 'unamemap')) {
- $output .= '
';
+ $output .= '
';
+ unless ($type eq 'email') {
+ $output .= ' ';
}
return $output;
}
@@ -9224,34 +10273,18 @@ sub print_defaults {
} elsif ($item eq 'lang_def') {
my $includeempty = 1;
$datatable .= &Apache::loncommon::select_language($item,$defaults{$item},$includeempty);
- } elsif ($item eq 'portal_def') {
- $datatable .= ''.
- ''.$titles->{$field}.' '.
- '
';
- }
} else {
- $datatable .= ''.$item.' '.
''.&mt('Name displayed').':'.
+ ' '.&mt('Name displayed').':'.
' '.
+ ' '.
&mt('Name displayed').':'.
' '.&mt('Available conversions').' '.
- &user_formats_row('unamemap',$settings,$unamemaprules,
- $ruleorder,$numinrow).
- '
'.
- &mt('No rules set for domain in customized localenroll.pm').
- ' ';
- }
}
$$rowtotal += $rownum;
return $datatable;
@@ -9342,8 +10359,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',
@@ -9529,7 +10544,7 @@ sub print_scantronformat {
}
$datatable .= '';
if (keys(%error) == 0) {
- $datatable .= '';
+ $datatable .= ' ';
if (!$switchserver) {
$datatable .= &mt('Upload:').' '.
''.$title{'togglecats'}.' '.
@@ -9825,8 +10852,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;
@@ -9851,12 +10892,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;
@@ -9877,7 +10921,7 @@ sub print_coursecategories {
$datatable .= ''.$vpos.' ';
}
$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') {
@@ -9900,7 +10944,7 @@ sub print_coursecategories {
$datatable .= '
';
}
$datatable .= '';
@@ -9932,7 +10976,7 @@ sub print_coursecategories {
.' 0) {
- z.style.display = 'block';
- } else {
- z.style.display = 'none';
- }
- }
- }
-}
-ENDPORTAL
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
my $maxnum = scalar(@{$settings->{'inststatusorder'}});
if ($maxnum eq '') {
@@ -10099,17 +11126,6 @@ $jstext
return;
}
-$portal_js
-
-// ]]>
-
-
-ENDSCRIPT
- } else {
-return <<"ENDSCRIPT";
-
@@ -10119,26 +11135,17 @@ ENDSCRIPT
}
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).',
- );
- }
+ 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;
- if ($prefix eq 'passwords') { $intauthjs = <<"ENDSCRIPT";
+ my $intauthjs = <<"ENDSCRIPT";
function warnIntAuth(field) {
if (field.name == 'intauth_check') {
@@ -10158,17 +11165,11 @@ function warnIntAuth(field) {
return;
}
-ENDSCRIPT
-
- }
-
- $intauthjs .= <<"ENDSCRIPT";
-
-function warnInt$prefix(field) {
+function warnIntPass(field) {
field.value.replace(/^\s+/,'');
field.value.replace(/\s+\$/,'');
var regexdigit=/^\\d+\$/;
- if (field.name == '${prefix}_min') {
+ if (field.name == 'passwords_min') {
if (field.value == '') {
alert('$intalert{passmin}');
field.value = '$defmin';
@@ -10188,15 +11189,29 @@ function warnInt$prefix(field) {
field.value = '';
}
if (field.value != '') {
- if (!regexdigit.test(field.value)) {
- if (field.name == '${prefix}_max') {
- alert('$intalert{passmax}');
+ if (field.name == 'passwords_expire') {
+ var regexpposnum=/^\\d+(|\\.\\d*)\$/;
+ if (!regexpposnum.test(field.value)) {
+ alert('$intalert{passexp}');
+ field.value = '';
} else {
- if (field.name == '${prefix}_numsaved') {
- alert('$intalert{passnum}');
+ var expval = parseFloat(field.value);
+ if (expval == 0) {
+ alert('$intalert{passexp}');
+ field.value = '';
}
}
- 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 = '';
+ }
}
}
}
@@ -10231,9 +11246,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";