version 1.160.6.78, 2017/01/24 00:19:15
|
version 1.160.6.89, 2018/09/15 15:15:32
|
Line 262 sub handler {
|
Line 262 sub handler {
|
help => 'Domain_Configuration_LangTZAuth', |
help => 'Domain_Configuration_LangTZAuth', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
col2 => 'Value'}, |
col2 => 'Value'}, |
|
{col1 => 'Internal Authentication', |
|
col2 => 'Value'}, |
{col1 => 'Institutional user types', |
{col1 => 'Institutional user types', |
col2 => 'Assignable to e-mail usernames'}], |
col2 => 'Assignable to e-mail usernames'}], |
print => \&print_defaults, |
print => \&print_defaults, |
Line 618 sub process_changes {
|
Line 620 sub process_changes {
|
} elsif ($action eq 'autocreate') { |
} elsif ($action eq 'autocreate') { |
$output = &modify_autocreate($dom,%domconfig); |
$output = &modify_autocreate($dom,%domconfig); |
} elsif ($action eq 'directorysrch') { |
} elsif ($action eq 'directorysrch') { |
$output = &modify_directorysrch($dom,%domconfig); |
$output = &modify_directorysrch($dom,$lastactref,%domconfig); |
} elsif ($action eq 'usercreation') { |
} elsif ($action eq 'usercreation') { |
$output = &modify_usercreation($dom,%domconfig); |
$output = &modify_usercreation($dom,%domconfig); |
} elsif ($action eq 'selfcreation') { |
} elsif ($action eq 'selfcreation') { |
Line 744 sub print_config_box {
|
Line 746 sub print_config_box {
|
if (($action eq 'autoupdate') || ($action eq 'usercreation') || |
if (($action eq 'autoupdate') || ($action eq 'usercreation') || |
($action eq 'selfcreation') || ($action eq 'selfenrollment') || |
($action eq 'selfcreation') || ($action eq 'selfenrollment') || |
($action eq 'usersessions') || ($action eq 'coursecategories') || |
($action eq 'usersessions') || ($action eq 'coursecategories') || |
($action eq 'contacts')) { |
($action eq 'contacts') || ($action eq 'defaults')) { |
if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
Line 1276 sub print_login {
|
Line 1278 sub print_login {
|
} else { |
} else { |
$datatable .= '<input type="file" name="loginheadtag_'.$lonhost.'" />'; |
$datatable .= '<input type="file" name="loginheadtag_'.$lonhost.'" />'; |
} |
} |
$datatable .= '</td><td><input type="textbox" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>'; |
$datatable .= '</td><td><input type="text" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>'; |
} |
} |
$datatable .= '</table></td></tr>'; |
$datatable .= '</table></td></tr>'; |
} |
} |
Line 1436 sub display_color_options {
|
Line 1438 sub display_color_options {
|
my $datatable = '<tr'.$css_class.'>'. |
my $datatable = '<tr'.$css_class.'>'. |
'<td>'.$choices->{'font'}.'</td>'; |
'<td>'.$choices->{'font'}.'</td>'; |
if (!$is_custom->{'font'}) { |
if (!$is_custom->{'font'}) { |
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>'; |
$datatable .= '<td>'.&mt('Default in use:').' <span class="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>'; |
} else { |
} else { |
$datatable .= '<td> </td>'; |
$datatable .= '<td> </td>'; |
} |
} |
Line 1445 sub display_color_options {
|
Line 1447 sub display_color_options {
|
$datatable .= '<td><span class="LC_nobreak">'. |
$datatable .= '<td><span class="LC_nobreak">'. |
'<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'. |
'<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'. |
' value="'.$current_color.'" /> '. |
' value="'.$current_color.'" /> '. |
' </td></tr>'; |
' </span></td></tr>'; |
unless ($role eq 'login') { |
unless ($role eq 'login') { |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td>'.$choices->{'fontmenu'}.'</td>'; |
'<td>'.$choices->{'fontmenu'}.'</td>'; |
if (!$is_custom->{'fontmenu'}) { |
if (!$is_custom->{'fontmenu'}) { |
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>'; |
$datatable .= '<td>'.&mt('Default in use:').' <span class="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>'; |
} else { |
} else { |
$datatable .= '<td> </td>'; |
$datatable .= '<td> </td>'; |
} |
} |
Line 1460 sub display_color_options {
|
Line 1462 sub display_color_options {
|
'<input class="colorchooser" type="text" size="10" name="' |
'<input class="colorchooser" type="text" size="10" name="' |
.$role.'_fontmenu"'. |
.$role.'_fontmenu"'. |
' value="'.$current_color.'" /> '. |
' value="'.$current_color.'" /> '. |
' </td></tr>'; |
' </span></td></tr>'; |
} |
} |
my $switchserver = &check_switchserver($dom,$confname); |
my $switchserver = &check_switchserver($dom,$confname); |
foreach my $img (@{$images}) { |
foreach my $img (@{$images}) { |
Line 1519 sub display_color_options {
|
Line 1521 sub display_color_options {
|
if ($fullwidth ne '' && $fullheight ne '') { |
if ($fullwidth ne '' && $fullheight ne '') { |
if ($fullwidth > $width && $fullheight > $height) { |
if ($fullwidth > $width && $fullheight > $height) { |
my $size = $width.'x'.$height; |
my $size = $width.'x'.$height; |
system("convert -sample $size $input $output"); |
my @args = ('convert','-sample',$size,$input,$output); |
|
system({$args[0]} @args); |
$showfile = "/$imgdir/tn-".$filename; |
$showfile = "/$imgdir/tn-".$filename; |
} |
} |
} |
} |
Line 1577 sub display_color_options {
|
Line 1580 sub display_color_options {
|
my $bgs_def; |
my $bgs_def; |
foreach my $item (@{$bgs}) { |
foreach my $item (@{$bgs}) { |
if (!$is_custom->{$item}) { |
if (!$is_custom->{$item}) { |
$bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span> <span id="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';"> </span><br />'.$defaults->{'bgs'}{$item}.'</td>'; |
$bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span> <span class="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';"> </span><br />'.$defaults->{'bgs'}{$item}.'</td>'; |
} |
} |
} |
} |
if ($bgs_def) { |
if ($bgs_def) { |
Line 1605 sub display_color_options {
|
Line 1608 sub display_color_options {
|
my $links_def; |
my $links_def; |
foreach my $item (@{$links}) { |
foreach my $item (@{$links}) { |
if (!$is_custom->{$item}) { |
if (!$is_custom->{$item}) { |
$links_def .= '<td>'.$choices->{$item}.'<br /><span id="css_default_'.$role.'_'.$item.'" style="color: '.$defaults->{'links'}{$item}.';">'.$defaults->{'links'}{$item}.'</span></td>'; |
$links_def .= '<td>'.$choices->{$item}.'<br /><span class="css_default_'.$role.'_'.$item.'" style="color: '.$defaults->{'links'}{$item}.';">'.$defaults->{'links'}{$item}.'</span></td>'; |
} |
} |
} |
} |
if ($links_def) { |
if ($links_def) { |
Line 1691 sub image_changes {
|
Line 1694 sub image_changes {
|
my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_; |
my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_; |
my $output; |
my $output; |
if ($img eq 'login') { |
if ($img eq 'login') { |
# suppress image for Log-in header |
$output = '</td><td>'.$logincolors; # suppress image for Log-in header |
} elsif (!$is_custom) { |
} elsif (!$is_custom) { |
if ($img ne 'domlogo') { |
if ($img ne 'domlogo') { |
$output .= &mt('Default image:').'<br />'; |
$output = &mt('Default image:').'<br />'; |
} else { |
} else { |
$output .= &mt('Default in use:').'<br />'; |
$output = &mt('Default in use:').'<br />'; |
} |
} |
} |
} |
if ($img eq 'login') { # suppress image for Log-in header |
if ($img ne 'login') { |
$output .= '<td>'.$logincolors; |
|
} else { |
|
if ($img_import) { |
if ($img_import) { |
$output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />'; |
$output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />'; |
} |
} |
Line 2312 sub print_textbookcourses {
|
Line 2313 sub print_textbookcourses {
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
} |
} |
$datatable .= '</select> '."\n". |
$datatable .= '</select> '."\n". |
'<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</td>'."\n". |
'<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</span></td>'."\n". |
'<td colspan="2">'. |
'<td colspan="2">'. |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_addbook_subject" value="" /></span> '."\n". |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_addbook_subject" value="" /></span> '."\n". |
(' 'x2). |
(' 'x2). |
Line 2329 sub print_textbookcourses {
|
Line 2330 sub print_textbookcourses {
|
} else { |
} else { |
$datatable .= '<input type="file" name="'.$type.'_addbook_image" value="" />'; |
$datatable .= '<input type="file" name="'.$type.'_addbook_image" value="" />'; |
} |
} |
|
$datatable .= '</span>'."\n"; |
} |
} |
$datatable .= '</span>'."\n". |
$datatable .= '<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
'<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
|
&Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom'). |
&Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom'). |
'<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'. |
'<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'. |
&Apache::loncommon::selectcourse_link |
&Apache::loncommon::selectcourse_link |
('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course'); |
('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course'). |
'</span></td>'."\n". |
'</span></td>'."\n". |
'</tr>'."\n"; |
'</tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
Line 2514 sub print_autoenroll {
|
Line 2515 sub print_autoenroll {
|
'<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'. |
'<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<input type="text" name="autoenroll_failsafe"'. |
'<input type="text" name="autoenroll_failsafe"'. |
' value="'.$failsafe.'" size="4" /></td></tr>'; |
' value="'.$failsafe.'" size="4" /></span></td></tr>'; |
$$rowtotal += 4; |
$$rowtotal += 4; |
return $datatable; |
return $datatable; |
} |
} |
Line 2941 sub print_contacts {
|
Line 2942 sub print_contacts {
|
'value="'.$bccemails{$type}.'" /></fieldset>'. |
'value="'.$bccemails{$type}.'" /></fieldset>'. |
'<fieldset><legend>'.&mt('Optional added text').'</legend>'. |
'<fieldset><legend>'.&mt('Optional added text').'</legend>'. |
&mt('Text automatically added to e-mail:').' '. |
&mt('Text automatically added to e-mail:').' '. |
'<input type="text" name="'.$type.'_includestr" value="'.$includestr{$type}.'" /><br >'. |
'<input type="text" name="'.$type.'_includestr" value="'.$includestr{$type}.'" /><br />'. |
'<span class="LC_nobreak">'.&mt('Location:').' '. |
'<span class="LC_nobreak">'.&mt('Location:').' '. |
'<label><input type="radio" name="'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'. |
'<label><input type="radio" name="'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'. |
(' 'x2). |
(' 'x2). |
Line 3002 sub print_contacts {
|
Line 3003 sub print_contacts {
|
if ($currfield{$field} eq 'no') { |
if ($currfield{$field} eq 'no') { |
$display = ' style="display:none"'; |
$display = ' style="display:none"'; |
} |
} |
$datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.' />'. |
$datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.'>'. |
'<td>'.&mt('Maximum size for upload (MB)').'</td><td>'. |
'<td>'.&mt('Maximum size for upload (MB)').'</td><td>'. |
'<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />'; |
'<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />'; |
} |
} |
Line 3060 sub print_helpsettings {
|
Line 3061 sub print_helpsettings {
|
my $css_class; |
my $css_class; |
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
my (%customroles,%ordered,%current); |
my (%customroles,%ordered,%current); |
if (ref($settings->{'adhoc'}) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
%current = %{$settings->{'adhoc'}}; |
if (ref($settings->{'adhoc'}) eq 'HASH') { |
|
%current = %{$settings->{'adhoc'}}; |
|
} |
} |
} |
my $count = 0; |
my $count = 0; |
foreach my $key (sort(keys(%existing))) { |
foreach my $key (sort(keys(%existing))) { |
Line 3088 sub print_helpsettings {
|
Line 3091 sub print_helpsettings {
|
my $context = 'domprefs'; |
my $context = 'domprefs'; |
my $crstype = 'Course'; |
my $crstype = 'Course'; |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my @accesstypes = ('all','none'); |
my @accesstypes = ('all','dh','da','none'); |
my ($numstatustypes,@jsarray); |
my ($numstatustypes,@jsarray); |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
if (@{$types} > 0) { |
if (@{$types} > 0) { |
Line 3097 sub print_helpsettings {
|
Line 3100 sub print_helpsettings {
|
@jsarray = ('bystatus'); |
@jsarray = ('bystatus'); |
} |
} |
} |
} |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh']); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']); |
if (keys(%domhelpdesk)) { |
if (keys(%domhelpdesk)) { |
push(@accesstypes,('inc','exc')); |
push(@accesstypes,('inc','exc')); |
push(@jsarray,('notinc','notexc')); |
push(@jsarray,('notinc','notexc')); |
Line 3206 sub print_helpsettings {
|
Line 3209 sub print_helpsettings {
|
\@templateroles,$newcust). |
\@templateroles,$newcust). |
&Apache::lonuserutils::custom_role_table('Course',\%full,\%levels, |
&Apache::lonuserutils::custom_role_table('Course',\%full,\%levels, |
\%levelscurrent,$newcust). |
\%levelscurrent,$newcust). |
'</fieldset></td></tr>'; |
'</fieldset>'. |
|
&helpsettings_javascript(\@roles_by_num,$maxnum,$hiddenstr,$formname). |
|
'</td></tr>'; |
$count ++; |
$count ++; |
$$rowtotal += $count; |
$$rowtotal += $count; |
} |
} |
Line 3306 function helpdeskAccess(num) {
|
Line 3311 function helpdeskAccess(num) {
|
shown = Array('notinc'); |
shown = Array('notinc'); |
hidden = Array('notexc','bystatus'); |
hidden = Array('notexc','bystatus'); |
} |
} |
if (curraccess == 'all') { |
if ((curraccess == 'all') || (curraccess == 'dh') || (curraccess == 'da')) { |
hidden = Array('notinc','notexc','bystatus'); |
hidden = Array('notinc','notexc','bystatus'); |
} |
} |
} |
} |
Line 3363 sub helpdeskroles_access {
|
Line 3368 sub helpdeskroles_access {
|
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
'rou' => 'Role usage', |
'rou' => 'Role usage', |
'whi' => 'Which helpdesk personnel may use this role?', |
'whi' => 'Which helpdesk personnel may use this role?', |
'all' => 'All', |
'all' => 'All with domain helpdesk or helpdesk assistant role', |
|
'dh' => 'All with domain helpdesk role', |
|
'da' => 'All with domain helpdesk assistant role', |
'none' => 'None', |
'none' => 'None', |
'status' => 'Determined based on institutional status', |
'status' => 'Determined based on institutional status', |
'inc' => 'Include all, but exclude specific personnel', |
'inc' => 'Include all, but exclude specific personnel', |
Line 3723 sub print_coursedefaults {
|
Line 3730 sub print_coursedefaults {
|
foreach my $type (@types) { |
foreach my $type (@types) { |
$datatable .= '<td align="center">'.&mt($type).'<br />'. |
$datatable .= '<td align="center">'.&mt($type).'<br />'. |
'<input type="text" name="mysqltables_'.$type.'"'. |
'<input type="text" name="mysqltables_'.$type.'"'. |
' value="'.$currmysql{$type}.'" size="5" /></td>'; |
' value="'.$currmysql{$type}.'" size="8" /></td>'; |
} |
} |
$datatable .= '</tr></table></td></tr>'."\n"; |
$datatable .= '</tr></table></td></tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
Line 3921 sub print_validation_rows {
|
Line 3928 sub print_validation_rows {
|
'</label></span> '; |
'</label></span> '; |
} |
} |
} elsif ($item eq 'markup') { |
} elsif ($item eq 'markup') { |
$datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5" wrap="soft">'. |
$datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5">'. |
$currvalidation{$item}. |
$currvalidation{$item}. |
'</textarea>'; |
'</textarea>'; |
} |
} |
Line 3943 sub print_validation_rows {
|
Line 3950 sub print_validation_rows {
|
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
'validationdc',%currhash); |
'validationdc',%currhash); |
my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$datatable .= '</td></tr><tr'.$css_class.'><td>'; |
$datatable .= '<tr'.$css_class.'><td>'; |
if ($numdc > 1) { |
if ($numdc > 1) { |
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)'); |
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)'); |
} else { |
} else { |
Line 4624 sub loadbalancing_titles {
|
Line 4631 sub loadbalancing_titles {
|
'_LC_ipchange' => &mt('Non-SSO users with IP mismatch'), |
'_LC_ipchange' => &mt('Non-SSO users with IP mismatch'), |
); |
); |
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange'); |
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange'); |
|
my @available; |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
unshift(@alltypes,@{$types},'default'); |
@available = @{$types}; |
} |
} |
|
unless (grep(/^default$/,@available)) { |
|
push(@available,'default'); |
|
} |
|
unshift(@alltypes,@available); |
my %titles; |
my %titles; |
foreach my $type (@alltypes) { |
foreach my $type (@alltypes) { |
if ($type =~ /^_LC_/) { |
if ($type =~ /^_LC_/) { |
Line 5002 sub print_selfcreation {
|
Line 5014 sub print_selfcreation {
|
my %radiohash; |
my %radiohash; |
my $numinrow = 4; |
my $numinrow = 4; |
map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate; |
map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate; |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
if ($position eq 'top') { |
if ($position eq 'top') { |
my %choices = &Apache::lonlocal::texthash ( |
my %choices = &Apache::lonlocal::texthash ( |
cancreate_login => 'Institutional Login', |
cancreate_login => 'Institutional Login', |
Line 5016 sub print_selfcreation {
|
Line 5029 sub print_selfcreation {
|
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked, |
\%choices,$itemcount,$onclick); |
\%choices,$itemcount,$onclick); |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
|
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
|
|
if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
if (keys(%{$usertypes}) > 0) { |
if (keys(%{$usertypes}) > 0) { |
$datatable .= &insttypes_row($createsettings,$types,$usertypes, |
$datatable .= &insttypes_row($createsettings,$types,$usertypes, |
$dom,$numinrow,$othertitle, |
$dom,$numinrow,$othertitle, |
'statustocreate',$$rowtotal); |
'statustocreate',$rowtotal); |
$$rowtotal ++; |
$$rowtotal ++; |
} |
} |
} |
} |
Line 5036 sub print_selfcreation {
|
Line 5047 sub print_selfcreation {
|
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td class="LC_left_item">'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'</td>'. |
'<td class="LC_left_item">'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'</td>'. |
'<td class="LC_left_item">'."\n". |
'<td class="LC_left_item">'."\n". |
'<table><tr><td>'."\n"; |
'<table>'."\n"; |
for (my $i=0; $i<@fields; $i++) { |
for (my $i=0; $i<@fields; $i++) { |
$rem = $i%($numperrow); |
$rem = $i%($numperrow); |
if ($rem == 0) { |
if ($rem == 0) { |
Line 5068 sub print_selfcreation {
|
Line 5079 sub print_selfcreation {
|
$$rowtotal ++; |
$$rowtotal ++; |
} elsif ($position eq 'middle') { |
} elsif ($position eq 'middle') { |
my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom); |
my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my @posstypes; |
$usertypes->{'default'} = $othertitle; |
|
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
push(@{$types},'default'); |
@posstypes = @{$types}; |
$usertypes->{'default'} = $othertitle; |
} |
foreach my $status (@{$types}) { |
unless (grep(/^default$/,@posstypes)) { |
$datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'}, |
push(@posstypes,'default'); |
$numinrow,$$rowtotal,$usertypes); |
} |
$$rowtotal ++; |
my %usertypeshash; |
} |
if (ref($usertypes) eq 'HASH') { |
|
%usertypeshash = %{$usertypes}; |
|
} |
|
$usertypeshash{'default'} = $othertitle; |
|
foreach my $status (@posstypes) { |
|
$datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'}, |
|
$numinrow,$$rowtotal,\%usertypeshash); |
|
$$rowtotal ++; |
} |
} |
} else { |
} else { |
my %choices = &Apache::lonlocal::texthash ( |
my %choices = &Apache::lonlocal::texthash ( |
Line 5095 sub print_selfcreation {
|
Line 5112 sub print_selfcreation {
|
my $onclick = "toggleDisplay(this.form,'emailoptions');"; |
my $onclick = "toggleDisplay(this.form,'emailoptions');"; |
my $additional = '<div id="emailoptions" style="display: '.$display.'">'; |
my $additional = '<div id="emailoptions" style="display: '.$display.'">'; |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my $usertypes = {}; |
my (@ordered,%usertypeshash); |
my $order = []; |
if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') { |
if ((ref($domdefaults{'inststatustypes'}) eq 'HASH') && (ref($domdefaults{'inststatusguest'}) eq 'ARRAY')) { |
@ordered = @{$domdefaults{'inststatusguest'}}; |
$usertypes = $domdefaults{'inststatustypes'}; |
} |
$order = $domdefaults{'inststatusguest'}; |
if (@ordered) { |
} |
unless (grep(/^default$/,@ordered)) { |
if (ref($order) eq 'ARRAY') { |
push(@ordered,'default'); |
push(@{$order},'default'); |
} |
if (@{$order} > 1) { |
if (ref($usertypes) eq 'HASH') { |
$usertypes->{'default'} = &mt('Other users'); |
%usertypeshash = %{$usertypes}; |
$additional .= '<table><tr>'; |
} |
foreach my $status (@{$order}) { |
$usertypeshash{'default'} = $othertitle; |
$additional .= '<th>'.$usertypes->{$status}.'</th>'; |
$additional .= '<table><tr>'; |
} |
foreach my $status (@ordered) { |
$additional .= '</tr><tr>'; |
$additional .= '<th>'.$usertypeshash{$status}.'</th>'; |
foreach my $status (@{$order}) { |
} |
$additional .= '<td>'.&email_as_username($rowtotal,$processing,$status).'</td>'; |
$additional .= '</tr><tr>'; |
} |
foreach my $status (@ordered) { |
$additional .= '</tr></table>'; |
$additional .= '<td>'.&email_as_username($rowtotal,$processing,$status).'</td>'; |
} else { |
|
$usertypes->{'default'} = &mt('All users'); |
|
$additional .= &email_as_username($rowtotal,$processing); |
|
} |
} |
|
$additional .= '</tr></table>'; |
|
} else { |
|
$usertypeshash{'default'} = $othertitle; |
|
$additional .= &email_as_username($rowtotal,$processing); |
} |
} |
$additional .= '</div>'."\n"; |
$additional .= '</div>'."\n"; |
|
|
Line 5128 sub print_selfcreation {
|
Line 5146 sub print_selfcreation {
|
$$rowtotal ++; |
$$rowtotal ++; |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
$numinrow = 1; |
$numinrow = 1; |
if (ref($order) eq 'ARRAY') { |
foreach my $status (@ordered) { |
foreach my $status (@{$order}) { |
$datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings, |
$datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings, |
$numinrow,$$rowtotal,\%usertypeshash,$infofields,$infotitles); |
$numinrow,$$rowtotal,$usertypes,$infofields,$infotitles); |
$$rowtotal ++; |
$$rowtotal ++; |
|
} |
|
} |
} |
my ($emailrules,$emailruleorder) = |
my ($emailrules,$emailruleorder) = |
&Apache::lonnet::inst_userrules($dom,'email'); |
&Apache::lonnet::inst_userrules($dom,'email'); |
Line 5400 sub print_usermodification {
|
Line 5416 sub print_usermodification {
|
sub print_defaults { |
sub print_defaults { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my $rownum = 0; |
my $rownum = 0; |
my ($datatable,$css_class); |
my ($datatable,$css_class,$titles); |
|
unless ($position eq 'bottom') { |
|
$titles = &defaults_titles($dom); |
|
} |
if ($position eq 'top') { |
if ($position eq 'top') { |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def', |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def', |
'datelocale_def','portal_def'); |
'datelocale_def','portal_def'); |
Line 5413 sub print_defaults {
|
Line 5432 sub print_defaults {
|
$defaults{$item} = $domdefaults{$item}; |
$defaults{$item} = $domdefaults{$item}; |
} |
} |
} |
} |
my $titles = &defaults_titles($dom); |
|
foreach my $item (@items) { |
foreach my $item (@items) { |
if ($rownum%2) { |
if ($rownum%2) { |
$css_class = ''; |
$css_class = ''; |
Line 5461 sub print_defaults {
|
Line 5479 sub print_defaults {
|
$datatable .= '</td></tr>'; |
$datatable .= '</td></tr>'; |
$rownum ++; |
$rownum ++; |
} |
} |
|
} elsif ($position eq 'middle') { |
|
my @items = ('intauth_cost','intauth_check','intauth_switch'); |
|
my %defaults; |
|
if (ref($settings) eq 'HASH') { |
|
%defaults = %{$settings}; |
|
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; |
|
} |
|
} else { |
|
%defaults = ( |
|
'intauth_cost' => 10, |
|
'intauth_check' => 0, |
|
'intauth_switch' => 0, |
|
); |
|
} |
|
foreach my $item (@items) { |
|
if ($rownum%2) { |
|
$css_class = ''; |
|
} else { |
|
$css_class = ' class="LC_odd_row" '; |
|
} |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td><span class="LC_nobreak">'.$titles->{$item}. |
|
'</span></td><td class="LC_left_item" colspan="3">'; |
|
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 .= '<table width="100%">'; |
|
foreach my $option (@options) { |
|
my $checked = ' '; |
|
if ($defaults{$item} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="'.$item. |
|
'" value="'.$option.'"'.$checked.' />'. |
|
$optiondesc{$option}.'</label></span></td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} 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 .= '<table width="100%">'; |
|
foreach my $option (@options) { |
|
my $checked = ' '; |
|
my $onclick; |
|
if ($defaults{$item} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
if ($option == 2) { |
|
$onclick = ' onclick="javascript:warnIntAuth(this);"'; |
|
} |
|
$datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="'.$item. |
|
'" value="'.$option.'"'.$checked.$onclick.' />'. |
|
$optiondesc{$option}.'</label></span></td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} else { |
|
$datatable .= '<input type="text" name="'.$item.'" value="'. |
|
$defaults{$item}.'" size="3" onblur="javascript:warnIntAuth(this);" />'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
$rownum ++; |
|
} |
} else { |
} else { |
my (%defaults); |
my %defaults; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') && |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') && |
(ref($settings->{'inststatusguest'}) eq 'ARRAY')) { |
(ref($settings->{'inststatusguest'}) eq 'ARRAY')) { |
Line 5557 sub defaults_titles {
|
Line 5654 sub defaults_titles {
|
'timezone_def' => 'Default timezone', |
'timezone_def' => 'Default timezone', |
'datelocale_def' => 'Default locale for dates', |
'datelocale_def' => 'Default locale for dates', |
'portal_def' => 'Portal/Default URL', |
'portal_def' => 'Portal/Default 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', |
); |
); |
if ($dom) { |
if ($dom) { |
my $uprimary_id = &Apache::lonnet::domain($dom,'primary'); |
my $uprimary_id = &Apache::lonnet::domain($dom,'primary'); |
Line 5786 sub print_coursecategories {
|
Line 5886 sub print_coursecategories {
|
'<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked. |
'<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked. |
' />'.$lt{$type}.'</label> '; |
' />'.$lt{$type}.'</label> '; |
} |
} |
$datatable .= '</td></tr>'; |
$datatable .= '</span></td></tr>'; |
$itemcount ++; |
$itemcount ++; |
} |
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
Line 5997 sub print_coursecategories {
|
Line 6097 sub print_coursecategories {
|
$datatable .= &initialize_categories($itemcount); |
$datatable .= &initialize_categories($itemcount); |
} |
} |
} else { |
} else { |
$datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td>' |
$datatable .= '<tr><td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td></tr>' |
.&initialize_categories($itemcount); |
.&initialize_categories($itemcount); |
} |
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
Line 6045 sub print_serverstatuses {
|
Line 6145 sub print_serverstatuses {
|
'<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
'<input type="text" name="'.$type.'_machines" '. |
'<input type="text" name="'.$type.'_machines" '. |
'value="'.$machineaccess{$type}.'" size="10" />'. |
'value="'.$machineaccess{$type}.'" size="10" />'. |
'</td></tr>'."\n"; |
'</span></td></tr>'."\n"; |
} |
} |
$$rowtotal += $rownum; |
$$rowtotal += $rownum; |
return $datatable; |
return $datatable; |
Line 6060 sub serverstatus_pages {
|
Line 6160 sub serverstatus_pages {
|
|
|
sub defaults_javascript { |
sub defaults_javascript { |
my ($settings) = @_; |
my ($settings) = @_; |
return unless (ref($settings) eq 'HASH'); |
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 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; |
|
} |
|
|
|
ENDSCRIPT |
|
|
|
if (ref($settings) ne 'HASH') { |
|
return &Apache::lonhtmlcommon::scripttag($intauthjs); |
|
} |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
if ($maxnum eq '') { |
if ($maxnum eq '') { |
Line 6114 $jstext
|
Line 6242 $jstext
|
return; |
return; |
} |
} |
|
|
|
$intauthjs |
|
|
// ]]> |
// ]]> |
</script> |
</script> |
|
|
ENDSCRIPT |
ENDSCRIPT |
|
} else { |
|
return &Apache::lonhtmlcommon::scripttag($intauthjs); |
} |
} |
} |
} |
|
|
Line 6238 sub initialize_categories {
|
Line 6370 sub initialize_categories {
|
my $select1 = ''; |
my $select1 = ''; |
foreach my $default ('instcode','communities') { |
foreach my $default ('instcode','communities') { |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"'; |
$chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','0'".');"'; |
if ($default eq 'communities') { |
if ($default eq 'communities') { |
$select1 = $select0; |
$select1 = $select0; |
$select0 = ''; |
$select0 = ''; |
Line 6263 sub initialize_categories {
|
Line 6395 sub initialize_categories {
|
.'<option value="0">1</option>' |
.'<option value="0">1</option>' |
.'<option value="1">2</option>' |
.'<option value="1">2</option>' |
.'<option value="2" selected="selected">3</option></select> ' |
.'<option value="2" selected="selected">3</option></select> ' |
.&mt('Add category').'</td><td>'.&mt('Name:') |
.&mt('Add category').'</span></td><tda<span class="LC_nobreak">>'.&mt('Name:') |
.' <input type="text" size="20" name="addcategory_name" value="" /></td></tr>'; |
.' <input type="text" size="20" name="addcategory_name" value="" /></span>' |
|
.'</td></tr>'; |
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 6319 sub build_category_rows {
|
Line 6452 sub build_category_rows {
|
pop(@{$path}); |
pop(@{$path}); |
} |
} |
} else { |
} else { |
$text .= &mt('Add subcategory:').' </span><input type="textbox" size="20" name="addcategory_name_'; |
$text .= &mt('Add subcategory:').' </span><input type="text" size="20" name="addcategory_name_'; |
if ($j == $numchildren) { |
if ($j == $numchildren) { |
$text .= $name; |
$text .= $name; |
} else { |
} else { |
Line 6342 sub build_category_rows {
|
Line 6475 sub build_category_rows {
|
my $colspan; |
my $colspan; |
if ($parent ne 'instcode') { |
if ($parent ne 'instcode') { |
$colspan = $maxdepth - $depth - 1; |
$colspan = $maxdepth - $depth - 1; |
$text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="textbox" size="20" name="subcat_'.$name.'" value="" /></td>'; |
$text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="text" size="20" name="subcat_'.$name.'" value="" /></td>'; |
} |
} |
} |
} |
} |
} |
Line 6537 sub insttypes_row {
|
Line 6670 sub insttypes_row {
|
$rem = @{$types}%($numinrow); |
$rem = @{$types}%($numinrow); |
} |
} |
my $colsleft = $numinrow - $rem; |
my $colsleft = $numinrow - $rem; |
if (($rem == 0) && (@{$types} > 0)) { |
if ($rem == 0) { |
$output .= '<tr>'; |
$output .= '<tr>'; |
} |
} |
if ($colsleft > 1) { |
if ($colsleft > 1) { |
Line 7593 sub publishlogo {
|
Line 7726 sub publishlogo {
|
} else { |
} else { |
my $source = $filepath.'/'.$file; |
my $source = $filepath.'/'.$file; |
my $logfile; |
my $logfile; |
if (!open($logfile,">>$source".'.log')) { |
if (!open($logfile,">>",$source.'.log')) { |
return (&mt('No write permission to Authoring Space')); |
return (&mt('No write permission to Authoring Space')); |
} |
} |
print $logfile |
print $logfile |
"\n================= Publish ".localtime()." ================\n". |
"\n================= Publish ".localtime()." ================\n". |
$env{'user.name'}.':'.$env{'user.domain'}."\n"; |
$env{'user.name'}.':'.$env{'user.domain'}."\n"; |
# Save the file |
# Save the file |
if (!open(FH,'>'.$source)) { |
if (!open(FH,">",$source)) { |
&Apache::lonnet::logthis('Failed to create '.$source); |
&Apache::lonnet::logthis('Failed to create '.$source); |
return (&mt('Failed to create file')); |
return (&mt('Failed to create file')); |
} |
} |
Line 7661 $env{'user.name'}.':'.$env{'user.domain'
|
Line 7794 $env{'user.name'}.':'.$env{'user.domain'
|
if ($fullwidth ne '' && $fullheight ne '') { |
if ($fullwidth ne '' && $fullheight ne '') { |
if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) { |
if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) { |
my $thumbsize = $thumbwidth.'x'.$thumbheight; |
my $thumbsize = $thumbwidth.'x'.$thumbheight; |
system("convert -sample $thumbsize $inputfile $outfile"); |
my @args = ('convert','-sample',$thumbsize,$inputfile,$outfile); |
|
system({$args[0]} @args); |
chmod(0660, $filepath.'/tn-'.$file); |
chmod(0660, $filepath.'/tn-'.$file); |
if (-e $outfile) { |
if (-e $outfile) { |
my $copyfile=$targetdir.'/tn-'.$file; |
my $copyfile=$targetdir.'/tn-'.$file; |
Line 7740 sub write_metadata {
|
Line 7874 sub write_metadata {
|
{ |
{ |
print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file; |
print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file; |
my $mfh; |
my $mfh; |
if (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) { |
if (open($mfh,">",$targetdir.'/'.$file.'.meta')) { |
foreach (sort(keys(%metadatafields))) { |
foreach (sort(keys(%metadatafields))) { |
unless ($_=~/\./) { |
unless ($_=~/\./) { |
my $unikey=$_; |
my $unikey=$_; |
Line 7774 sub notifysubscribed {
|
Line 7908 sub notifysubscribed {
|
next unless (ref($targetsource) eq 'ARRAY'); |
next unless (ref($targetsource) eq 'ARRAY'); |
my ($target,$source)=@{$targetsource}; |
my ($target,$source)=@{$targetsource}; |
if ($source ne '') { |
if ($source ne '') { |
if (open(my $logfh,'>>'.$source.'.log')) { |
if (open(my $logfh,">>",$source.'.log')) { |
print $logfh "\nCleanup phase: Notifications\n"; |
print $logfh "\nCleanup phase: Notifications\n"; |
my @subscribed=&subscribed_hosts($target); |
my @subscribed=&subscribed_hosts($target); |
foreach my $subhost (@subscribed) { |
foreach my $subhost (@subscribed) { |
Line 7800 sub notifysubscribed {
|
Line 7934 sub notifysubscribed {
|
sub subscribed_hosts { |
sub subscribed_hosts { |
my ($target) = @_; |
my ($target) = @_; |
my @subscribed; |
my @subscribed; |
if (open(my $fh,"<$target.subscription")) { |
if (open(my $fh,"<","$target.subscription")) { |
while (my $subline=<$fh>) { |
while (my $subline=<$fh>) { |
if ($subline =~ /^($match_lonid):/) { |
if ($subline =~ /^($match_lonid):/) { |
my $host = $1; |
my $host = $1; |
Line 7999 sub modify_quotas {
|
Line 8133 sub modify_quotas {
|
#FIXME need to obsolete item in RES space |
#FIXME need to obsolete item in RES space |
} elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) { |
} elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) { |
my ($cdom,$cnum) = split(/_/,$key); |
my ($cdom,$cnum) = split(/_/,$key); |
my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i, |
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { |
$cdom,$cnum,$type,$configuserok, |
$errors .= '<li><span class="LC_error">'.&mt('Image not saved: could not find textbook course').'</li>'; |
$switchserver,$author_ok); |
} else { |
if ($imgurl) { |
my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i, |
$confhash{$type}{$key}{'image'} = $imgurl; |
$cdom,$cnum,$type,$configuserok, |
$changes{$type}{$key} = 1; |
$switchserver,$author_ok); |
} |
if ($imgurl) { |
if ($error) { |
$confhash{$type}{$key}{'image'} = $imgurl; |
&Apache::lonnet::logthis($error); |
$changes{$type}{$key} = 1; |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
} |
} |
} elsif ($domconfig{$action}{$type}{$key}{'image'}) { |
} elsif ($domconfig{$action}{$type}{$key}{'image'}) { |
$confhash{$type}{$key}{'image'} = |
$confhash{$type}{$key}{'image'} = |
Line 8042 sub modify_quotas {
|
Line 8180 sub modify_quotas {
|
if ($type eq 'textbooks') { |
if ($type eq 'textbooks') { |
if ($env{'form.'.$type.'_addbook_image.filename'} ne '') { |
if ($env{'form.'.$type.'_addbook_image.filename'} ne '') { |
my ($cdom,$cnum) = split(/_/,$newbook{$type}); |
my ($cdom,$cnum) = split(/_/,$newbook{$type}); |
my ($imageurl,$error) = |
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { |
&process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type, |
$errors .= '<li><span class="LC_error">'.&mt('Image not saved: could not find textbook course').'</li>'; |
$configuserok,$switchserver,$author_ok); |
} else { |
if ($imageurl) { |
my ($imageurl,$error) = |
$confhash{$type}{$newbook{$type}}{'image'} = $imageurl; |
&process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type, |
} |
$configuserok,$switchserver,$author_ok); |
if ($error) { |
if ($imageurl) { |
&Apache::lonnet::logthis($error); |
$confhash{$type}{$newbook{$type}}{'image'} = $imageurl; |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
} |
} |
} |
} |
} |
} |
Line 8542 sub process_textbook_image {
|
Line 8684 sub process_textbook_image {
|
} elsif ($author_ok eq 'ok') { |
} elsif ($author_ok eq 'ok') { |
my ($result,$imageurl) = |
my ($result,$imageurl) = |
&publishlogo($r,'upload',$caller,$dom,$confname, |
&publishlogo($r,'upload',$caller,$dom,$confname, |
"$type/$dom/$cnum/cover",$width,$height); |
"$type/$cdom/$cnum/cover",$width,$height); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$url = $imageurl; |
$url = $imageurl; |
} else { |
} else { |
Line 8642 sub modify_autoenroll {
|
Line 8784 sub modify_autoenroll {
|
} |
} |
if ($changes{'autofailsafe'}) { |
if ($changes{'autofailsafe'}) { |
if ($failsafe ne '') { |
if ($failsafe ne '') { |
$resulttext .= '<li>'.&mt("$title{'failsafe'} set to [_1]",$failsafe).'</li>'; |
$resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section set to: [_1]',$failsafe).'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt("$title{'failsafe'} deleted"); |
$resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section: deleted'); |
} |
} |
&Apache::lonnet::get_domain_defaults($dom,1); |
&Apache::lonnet::get_domain_defaults($dom,1); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
Line 8923 sub modify_autocreate {
|
Line 9065 sub modify_autocreate {
|
} |
} |
|
|
sub modify_directorysrch { |
sub modify_directorysrch { |
my ($dom,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,%changes); |
my ($resulttext,%changes); |
my %currdirsrch; |
my %currdirsrch; |
if (ref($domconfig{'directorysrch'}) eq 'HASH') { |
if (ref($domconfig{'directorysrch'}) eq 'HASH') { |
Line 9117 sub modify_directorysrch {
|
Line 9259 sub modify_directorysrch {
|
$resulttext .= '<li>'.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).'</li>'; |
$resulttext .= '<li>'.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).'</li>'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
|
&Apache::lonnet::do_cache_new('directorysrch',$dom,$dirsrch_hash{'directorysrch'},3600); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'directorysrch'} = 1; |
|
} |
} else { |
} else { |
$resulttext = &mt('No changes made to directory search settings'); |
$resulttext = &mt('No changes made to directory search settings'); |
} |
} |
Line 10006 sub modify_selfcreation {
|
Line 10152 sub modify_selfcreation {
|
$save_usercreate{'cancreate'}{'shibenv'} = $cancreate{'shibenv'}; |
$save_usercreate{'cancreate'}{'shibenv'} = $cancreate{'shibenv'}; |
} |
} |
$save_usercreate{'cancreate'}{'emailusername'} = $cancreate{'emailusername'}; |
$save_usercreate{'cancreate'}{'emailusername'} = $cancreate{'emailusername'}; |
$save_usercreate{'emailrule'} = \@email_rule; |
$save_usercreate{'email_rule'} = \@email_rule; |
|
|
my %userconfig_hash = ( |
my %userconfig_hash = ( |
usercreation => \%save_usercreate, |
usercreation => \%save_usercreate, |
Line 10442 sub modify_defaults {
|
Line 10588 sub modify_defaults {
|
my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors); |
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def','portal_def'); |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def', |
|
'portal_def','intauth_cost','intauth_check','intauth_switch'); |
my @authtypes = ('internal','krb4','krb5','localauth'); |
my @authtypes = ('internal','krb4','krb5','localauth'); |
foreach my $item (@items) { |
foreach my $item (@items) { |
$newvalues{$item} = $env{'form.'.$item}; |
$newvalues{$item} = $env{'form.'.$item}; |
Line 10484 sub modify_defaults {
|
Line 10631 sub modify_defaults {
|
push(@errors,$item); |
push(@errors,$item); |
} |
} |
} |
} |
|
} elsif ($item eq 'intauth_cost') { |
|
if ($newvalues{$item} ne '') { |
|
if ($newvalues{$item} =~ /\D/) { |
|
push(@errors,$item); |
|
} |
|
} |
|
} elsif ($item eq 'intauth_check') { |
|
if ($newvalues{$item} ne '') { |
|
unless ($newvalues{$item} =~ /^(0|1|2)$/) { |
|
push(@errors,$item); |
|
} |
|
} |
|
} elsif ($item eq 'intauth_switch') { |
|
if ($newvalues{$item} ne '') { |
|
unless ($newvalues{$item} =~ /^(0|1|2)$/) { |
|
push(@errors,$item); |
|
} |
|
} |
} |
} |
if (grep(/^\Q$item\E$/,@errors)) { |
if (grep(/^\Q$item\E$/,@errors)) { |
$newvalues{$item} = $domdefaults{$item}; |
$newvalues{$item} = $domdefaults{$item}; |
Line 10638 sub modify_defaults {
|
Line 10803 sub modify_defaults {
|
localauth => 'loc', |
localauth => 'loc', |
); |
); |
$value = $authnames{$shortauth{$value}}; |
$value = $authnames{$shortauth{$value}}; |
|
} elsif ($item eq 'intauth_switch') { |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes', |
|
2 => 'Yes, and copy existing passwd file to passwd.bak file', |
|
); |
|
if ($value =~ /^(0|1|2)$/) { |
|
$value = $optiondesc{$value}; |
|
} else { |
|
$value = &mt('none -- defaults to No'); |
|
} |
|
} elsif ($item eq 'intauth_check') { |
|
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', |
|
); |
|
if ($value =~ /^(0|1|2)$/) { |
|
$value = $optiondesc{$value}; |
|
} else { |
|
$value = &mt('none -- defaults to No'); |
|
} |
} |
} |
$resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>'; |
$mailmsgtext .= "$title->{$item} set to $value\n"; |
$mailmsgtext .= "$title->{$item} set to $value\n"; |
Line 11192 sub modify_helpsettings {
|
Line 11379 sub modify_helpsettings {
|
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
my (@allpos,%newsettings,%changedprivs,$newrole); |
my (@allpos,%newsettings,%changedprivs,$newrole); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my @accesstypes = ('all','none','status','inc','exc'); |
my @accesstypes = ('all','dh','da','none','status','inc','exc'); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh']); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']); |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
s => 'system', |
s => 'system', |
d => 'domain', |
d => 'domain', |
order => 'Display order', |
order => 'Display order', |
access => 'Role usage', |
access => 'Role usage', |
all => 'All', |
all => 'All with domain helpdesk or helpdesk assistant role', |
|
dh => 'All with domain helpdesk role', |
|
da => 'All with domain helpdesk assistant role', |
none => 'None', |
none => 'None', |
status => 'Determined based on institutional status', |
status => 'Determined based on institutional status', |
inc => 'Include all, but exclude specific personnel', |
inc => 'Include all, but exclude specific personnel', |
Line 11396 sub modify_helpsettings {
|
Line 11585 sub modify_helpsettings {
|
order => 'Order', |
order => 'Order', |
desc => 'Role description', |
desc => 'Role description', |
access => 'Role usage', |
access => 'Role usage', |
status => 'Allowed instituional types', |
status => 'Allowed institutional types', |
exc => 'Allowed personnel', |
exc => 'Allowed personnel', |
inc => 'Disallowed personnel', |
inc => 'Disallowed personnel', |
); |
); |
Line 12312 sub modify_usersessions {
|
Line 12501 sub modify_usersessions {
|
} |
} |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
&Apache::lonnet::do_cache_new('usersessions',$dom,$defaultshash{'usersessions'},3600); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'domdefaults'} = 1; |
$lastactref->{'domdefaults'} = 1; |
|
$lastactref->{'usersessions'} = 1; |
} |
} |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my %lt = &usersession_titles(); |
my %lt = &usersession_titles(); |
Line 13397 sub devalidate_remote_domconfs {
|
Line 13588 sub devalidate_remote_domconfs {
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %thismachine; |
my %thismachine; |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
my @posscached = ('domainconfig','domdefaults'); |
my @posscached = ('domainconfig','domdefaults','usersessions','directorysrch'); |
if (keys(%servers)) { |
if (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
next if ($thismachine{$server}); |
next if ($thismachine{$server}); |