version 1.160.6.84.2.9, 2017/11/16 23:33:05
|
version 1.294, 2017/03/13 18:30:07
|
Line 27
|
Line 27
|
# |
# |
# |
# |
############################################################### |
############################################################### |
############################################################### |
############################################################## |
|
|
=pod |
=pod |
|
|
Line 104 $datatable - HTML containing form eleme
|
Line 104 $datatable - HTML containing form eleme
|
|
|
In the case of course requests, radio buttons are displayed for each institutional |
In the case of course requests, radio buttons are displayed for each institutional |
affiliate type (and also default, and _LC_adv) for each of the course types |
affiliate type (and also default, and _LC_adv) for each of the course types |
(official, unofficial, community, and textbook). In each case the radio buttons |
(official, unofficial, community, textbook, and placement). |
allow the selection of one of four values: |
In each case the radio buttons allow the selection of one of four values: |
|
|
0, approval, validate, autolimit=N (where N is blank, or a positive integer). |
0, approval, validate, autolimit=N (where N is blank, or a positive integer). |
which have the following effects: |
which have the following effects: |
Line 170 use Apache::loncoursequeueadmin();
|
Line 170 use Apache::loncoursequeueadmin();
|
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA::Enrollment; |
use LONCAPA::Enrollment; |
use LONCAPA::lonauthcgi(); |
use LONCAPA::lonauthcgi(); |
|
use LONCAPA::SSL; |
use File::Copy; |
use File::Copy; |
use Locale::Language; |
use Locale::Language; |
use DateTime::TimeZone; |
use DateTime::TimeZone; |
use DateTime::Locale; |
use DateTime::Locale; |
|
use Time::HiRes qw( sleep ); |
|
|
my $registered_cleanup; |
my $registered_cleanup; |
my $modified_urls; |
my $modified_urls; |
Line 217 sub handler {
|
Line 219 sub handler {
|
'serverstatuses','requestcourses','helpsettings', |
'serverstatuses','requestcourses','helpsettings', |
'coursedefaults','usersessions','loadbalancing', |
'coursedefaults','usersessions','loadbalancing', |
'requestauthor','selfenrollment','inststatus', |
'requestauthor','selfenrollment','inststatus', |
'ltitools'],$dom); |
'ltitools','ssl','trust'],$dom); |
if (ref($domconfig{'ltitools'}) eq 'HASH') { |
|
my %encconfig = |
|
&Apache::lonnet::get_dom('encconfig',['ltitools'],$dom); |
|
if (ref($encconfig{'ltitools'}) eq 'HASH') { |
|
foreach my $id (keys(%{$domconfig{'ltitools'}})) { |
|
if (ref($domconfig{'ltitools'}{$id}) eq 'HASH') { |
|
foreach my $item ('key','secret') { |
|
$domconfig{'ltitools'}{$id}{$item} = $encconfig{'ltitools'}{$id}{$item}; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
'autoupdate','autocreate','directorysrch','contacts', |
'autoupdate','autocreate','directorysrch','contacts', |
'usercreation','selfcreation','usermodification','scantron', |
'usercreation','selfcreation','usermodification','scantron', |
'requestcourses','requestauthor','coursecategories', |
'requestcourses','requestauthor','coursecategories', |
'serverstatuses','helpsettings','coursedefaults', |
'serverstatuses','helpsettings','coursedefaults', |
'ltitools','selfenrollment','usersessions'); |
'ltitools','selfenrollment','usersessions','ssl','trust'); |
my %existing; |
my %existing; |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
%existing = %{$domconfig{'loadbalancing'}}; |
%existing = %{$domconfig{'loadbalancing'}}; |
Line 466 sub handler {
|
Line 455 sub handler {
|
print => \&print_selfenrollment, |
print => \&print_selfenrollment, |
modify => \&modify_selfenrollment, |
modify => \&modify_selfenrollment, |
}, |
}, |
|
'privacy' => |
|
{text => 'User Privacy', |
|
help => 'Domain_Configuration_User_Privacy', |
|
header => [{col1 => 'Setting', |
|
col2 => 'Value',}], |
|
print => \&print_privacy, |
|
modify => \&modify_privacy, |
|
}, |
'usersessions' => |
'usersessions' => |
{text => 'User session hosting/offloading', |
{text => 'User session hosting/offloading', |
help => 'Domain_Configuration_User_Sessions', |
help => 'Domain_Configuration_User_Sessions', |
Line 489 sub handler {
|
Line 486 sub handler {
|
print => \&print_loadbalancing, |
print => \&print_loadbalancing, |
modify => \&modify_loadbalancing, |
modify => \&modify_loadbalancing, |
}, |
}, |
'ltitools' => |
'ltitools' => |
{text => 'External Tools (LTI)', |
{text => 'External Tools (LTI)', |
help => 'Domain_Configuration_LTI_Tools', |
help => 'Domain_configuration_LTI_Tools', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
col2 => 'Value',}], |
col2 => 'Value',}], |
print => \&print_ltitools, |
print => \&print_ltitools, |
modify => \&modify_ltitools, |
modify => \&modify_ltitools, |
}, |
}, |
|
'ssl' => |
|
{text => 'LON-CAPA Network (SSL)', |
|
help => 'Domain_Configuration_Network_SSL', |
|
header => [{col1 => 'Server', |
|
col2 => 'Certificate Status'}, |
|
{col1 => 'Connections to other servers', |
|
col2 => 'Rules'}, |
|
{col1 => 'Connections from other servers', |
|
col2 => 'Rules'}, |
|
{col1 => "Replicating domain's published content", |
|
col2 => 'Rules'}], |
|
print => \&print_ssl, |
|
modify => \&modify_ssl, |
|
}, |
|
'trust' => |
|
{text => 'Trust Settings', |
|
help => 'Domain_Configuration_Trust', |
|
header => [{col1 => "Access to this domain's content by others", |
|
col2 => 'Rules'}, |
|
{col1 => "Access to other domain's content by this domain", |
|
col2 => 'Rules'}, |
|
{col1 => "Enrollment in this domain's courses by others", |
|
col2 => 'Rules',}, |
|
{col1 => "Co-author roles in this domain for others", |
|
col2 => 'Rules',}, |
|
{col1 => "Co-author roles for this domain's users elsewhere", |
|
col2 => 'Rules',}, |
|
{col1 => "Domain roles in this domain assignable to others", |
|
col2 => 'Rules'}, |
|
{col1 => "Course catalog for this domain displayed elsewhere", |
|
col2 => 'Rules'}, |
|
{col1 => "Requests for creation of courses in this domain by others", |
|
col2 => 'Rules'}, |
|
{col1 => "Users in other domains can send messages to this domain", |
|
col2 => 'Rules'},], |
|
print => \&print_trust, |
|
modify => \&modify_trust, |
|
}, |
); |
); |
if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
$prefs{'login'} = { text => 'Log-in page options', |
$prefs{'login'} = { text => 'Log-in page options', |
Line 642 sub process_changes {
|
Line 677 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,$lastactref,%domconfig); |
$output = &modify_directorysrch($dom,%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 675 sub process_changes {
|
Line 710 sub process_changes {
|
$output = &modify_loadbalancing($dom,%domconfig); |
$output = &modify_loadbalancing($dom,%domconfig); |
} elsif ($action eq 'ltitools') { |
} elsif ($action eq 'ltitools') { |
$output = &modify_ltitools($r,$dom,$action,$lastactref,%domconfig); |
$output = &modify_ltitools($r,$dom,$action,$lastactref,%domconfig); |
|
} elsif ($action eq 'ssl') { |
|
$output = &modify_ssl($dom,$lastactref,%domconfig); |
|
} elsif ($action eq 'trust') { |
|
$output = &modify_trust($dom,$lastactref,%domconfig); |
} |
} |
return $output; |
return $output; |
} |
} |
Line 701 sub print_config_box {
|
Line 740 sub print_config_box {
|
&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent); |
&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent); |
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); |
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); |
$output = |
$output = |
&Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full, |
&Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full, |
\@templateroles); |
\@templateroles); |
} |
} |
$output .= |
$output .= |
Line 738 sub print_config_box {
|
Line 777 sub print_config_box {
|
$rowtotal ++; |
$rowtotal ++; |
if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') || |
if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') || |
($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') || |
($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') || |
($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'directorysrch') || |
($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'ssl') || |
($action eq 'helpsettings') || ($action eq 'contacts')) { |
($action eq 'directorysrch') || ($action eq 'trust') || ($action eq 'helpsettings') || |
|
($action eq 'contacts')) { |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal); |
Line 769 sub print_config_box {
|
Line 809 sub print_config_box {
|
$rowtotal ++; |
$rowtotal ++; |
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 'defaults')) { |
($action eq 'trust') || ($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"'; |
|
} elsif ($action eq 'trust') { |
|
$output .= $item->{'print'}->('shared',$dom,$settings,\$rowtotal); |
} else { |
} else { |
$output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal); |
} |
} |
$output .= ' |
if ($action eq 'trust') { |
|
$output .= ' |
|
</table> |
|
</td> |
|
</tr>'; |
|
my @trusthdrs = qw(2 3 4 5 6 7); |
|
my @prefixes = qw(enroll othcoau coaurem domroles catalog reqcrs); |
|
for (my $i=0; $i<@trusthdrs; $i++) { |
|
$output .= ' |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[$trusthdrs[$i]]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[$trusthdrs[$i]]->{'col2'}).'</td></tr>'. |
|
$item->{'print'}->($prefixes[$i],$dom,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr>'; |
|
} |
|
$output .= ' |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[8]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[8]->{'col2'}).'</td></tr>'. |
|
$item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
|
} else { |
|
$output .= ' |
</table> |
</table> |
</td> |
</td> |
</tr> |
</tr> |
Line 788 sub print_config_box {
|
Line 859 sub print_config_box {
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> |
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> |
</tr>'."\n"; |
</tr>'."\n"; |
if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); |
} else { |
} else { |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
|
} |
} |
} |
$rowtotal ++; |
$rowtotal ++; |
} elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || |
} elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || |
($action eq 'defaults') || ($action eq 'directorysrch') || |
($action eq 'defaults') || ($action eq 'directorysrch') || |
($action eq 'helpsettings')) { |
($action eq 'helpsettings')) { |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
|
} elsif ($action eq 'ssl') { |
|
$output .= $item->{'print'}->('connto',$dom,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td></tr>'. |
|
$item->{'print'}->('connfrom',$dom,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'. |
|
$item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
if ($numheaders == 4) { |
if ($numheaders == 4) { |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
Line 954 sub print_config_box {
|
Line 1048 sub print_config_box {
|
if ($action eq 'quotas') { |
if ($action eq 'quotas') { |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
} elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || |
} elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || |
($action eq 'serverstatuses') || ($action eq 'loadbalancing') || |
($action eq 'serverstatuses') || ($action eq 'loadbalancing') || |
($action eq 'ltitools')) { |
($action eq 'ltitools')) { |
$output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
} elsif ($action eq 'scantron') { |
} elsif ($action eq 'scantron') { |
Line 1546 sub display_color_options {
|
Line 1640 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; |
my @args = ('convert','-sample',$size,$input,$output); |
system("convert -sample $size $input $output"); |
system({$args[0]} @args); |
|
$showfile = "/$imgdir/tn-".$filename; |
$showfile = "/$imgdir/tn-".$filename; |
} |
} |
} |
} |
Line 1760 sub print_quotas {
|
Line 1853 sub print_quotas {
|
my $typecount = 0; |
my $typecount = 0; |
my ($css_class,%titles); |
my ($css_class,%titles); |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
@usertools = ('official','unofficial','community','textbook'); |
@usertools = ('official','unofficial','community','textbook','placement'); |
@options =('norequest','approval','validate','autolimit'); |
@options =('norequest','approval','validate','autolimit'); |
%validations = &Apache::lonnet::auto_courserequest_checks($dom); |
%validations = &Apache::lonnet::auto_courserequest_checks($dom); |
%titles = &courserequest_titles(); |
%titles = &courserequest_titles(); |
Line 2212 sub print_studentcode {
|
Line 2305 sub print_studentcode {
|
my ($settings,$rowtotal) = @_; |
my ($settings,$rowtotal) = @_; |
my $rownum = 0; |
my $rownum = 0; |
my ($output,%current); |
my ($output,%current); |
my @crstypes = ('official','unofficial','community','textbook'); |
my @crstypes = ('official','unofficial','community','textbook','placement'); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'uniquecode'}) eq 'HASH') { |
if (ref($settings->{'uniquecode'}) eq 'HASH') { |
foreach my $type (@crstypes) { |
foreach my $type (@crstypes) { |
Line 2308 sub print_textbookcourses {
|
Line 2401 sub print_textbookcourses {
|
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.&mt('Thumbnail:'); |
'<span class="LC_nobreak">'.&mt('Thumbnail:'); |
if ($image) { |
if ($image) { |
$datatable .= '<span class="LC_nobreak">'. |
$datatable .= $imgsrc. |
$imgsrc. |
|
'<label><input type="checkbox" name="'.$type.'_image_del"'. |
'<label><input type="checkbox" name="'.$type.'_image_del"'. |
' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. |
' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. |
'<span class="LC_nobreak"> '.&mt('Replace:').' '; |
'<span class="LC_nobreak"> '.&mt('Replace:').' '; |
Line 2659 sub print_autoupdate {
|
Line 2751 sub print_autoupdate {
|
my $locknamesettings; |
my $locknamesettings; |
$datatable .= &insttypes_row($settings,$types,$usertypes, |
$datatable .= &insttypes_row($settings,$types,$usertypes, |
$dom,$numinrow,$othertitle, |
$dom,$numinrow,$othertitle, |
'lockablenames',$rowtotal); |
'lockablenames'); |
$$rowtotal ++; |
$$rowtotal ++; |
} else { |
} else { |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
Line 2802 sub print_directorysrch {
|
Line 2894 sub print_directorysrch {
|
if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
if (keys(%{$usertypes}) > 0) { |
if (keys(%{$usertypes}) > 0) { |
$datatable .= &insttypes_row($settings,$types,$usertypes,$dom, |
$datatable .= &insttypes_row($settings,$types,$usertypes,$dom, |
$numinrow,$othertitle,'cansearch', |
$numinrow,$othertitle,'cansearch'); |
$rowtotal); |
|
$cansrchrow = 1; |
$cansrchrow = 1; |
} |
} |
} |
} |
Line 3004 sub print_contacts {
|
Line 3095 sub print_contacts {
|
$to{$item}.'" /></td></tr>'; |
$to{$item}.'" /></td></tr>'; |
$rownum ++; |
$rownum ++; |
} |
} |
} elsif ($position eq 'bottom') { |
} else { |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td>'.&mt('Extra helpdesk form fields:').'<br />'. |
|
&mt('(e-mail, subject, and description always shown)'). |
|
'</td><td class="LC_left_item">'; |
|
if ((ref($fields) eq 'ARRAY') && (ref($fieldtitles) eq 'HASH') && |
|
(ref($fieldoptions) eq 'HASH') && (ref($possoptions) eq 'HASH')) { |
|
$datatable .= '<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Status').'</th></tr>'; |
|
foreach my $field (@{$fields}) { |
|
$datatable .= '<tr><td>'.$fieldtitles->{$field}; |
|
if (($field eq 'screenshot') || ($field eq 'cc')) { |
|
$datatable .= ' '.&mt('(logged-in users)'); |
|
} |
|
$datatable .='</td><td>'; |
|
my $clickaction; |
|
if ($field eq 'screenshot') { |
|
$clickaction = ' onclick="screenshotSize(this);"'; |
|
} |
|
if (ref($possoptions->{$field}) eq 'ARRAY') { |
|
foreach my $option (@{$possoptions->{$field}}) { |
|
my $checked; |
|
if ($currfield{$field} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="helpform_'.$field.'" '. |
|
'value="'.$option.'"'.$checked.$clickaction.' />'.$fieldoptions->{$option}. |
|
'</label></span>'.(' 'x2); |
|
} |
|
} |
|
if ($field eq 'screenshot') { |
|
my $display; |
|
if ($currfield{$field} eq 'no') { |
|
$display = ' style="display:none"'; |
|
} |
|
$datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.' />'. |
|
'<td>'.&mt('Maximum size for upload (MB)').'</td><td>'. |
|
'<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} |
|
$datatable .= '</td></tr>'."\n"; |
|
$rownum ++; |
|
} |
|
unless ($position eq 'top') { |
|
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
Line 3111 sub print_contacts {
|
Line 3155 sub print_contacts {
|
\%choices,$rownum); |
\%choices,$rownum); |
$datatable .= $reports; |
$datatable .= $reports; |
} elsif ($position eq 'bottom') { |
} elsif ($position eq 'bottom') { |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
my (@posstypes,%usertypeshash); |
$datatable .= '<tr'.$css_class.'>'. |
if (ref($types) eq 'ARRAY') { |
'<td>'.&mt('Extra helpdesk form fields:').'<br />'. |
@posstypes = @{$types}; |
&mt('(e-mail, subject, and description always shown)'). |
} |
'</td><td class="LC_left_item">'; |
if (@posstypes) { |
if ((ref($fields) eq 'ARRAY') && (ref($fieldtitles) eq 'HASH') && |
if (ref($usertypes) eq 'HASH') { |
(ref($fieldoptions) eq 'HASH') && (ref($possoptions) eq 'HASH')) { |
%usertypeshash = %{$usertypes}; |
$datatable .= '<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Status').'</th></tr>'; |
} |
foreach my $field (@{$fields}) { |
my @overridden; |
$datatable .= '<tr><td>'.$fieldtitles->{$field}; |
my $numinrow = 4; |
if (($field eq 'screenshot') || ($field eq 'cc')) { |
if (ref($settings) eq 'HASH') { |
$datatable .= ' '.&mt('(logged-in users)'); |
if (ref($settings->{'overrides'}) eq 'HASH') { |
} |
foreach my $key (sort(keys(%{$settings->{'overrides'}}))) { |
$datatable .='</td><td>'; |
if (ref($settings->{'overrides'}{$key}) eq 'HASH') { |
my $clickaction; |
push(@overridden,$key); |
if ($field eq 'screenshot') { |
foreach my $item (@contacts) { |
$clickaction = ' onclick="screenshotSize(this);"'; |
if ($settings->{'overrides'}{$key}{$item}) { |
} |
$checked{'override_'.$key}{$item} = ' checked="checked" '; |
if (ref($possoptions->{$field}) eq 'ARRAY') { |
} |
foreach my $option (@{$possoptions->{$field}}) { |
} |
my $checked; |
$otheremails{'override_'.$key} = $settings->{'overrides'}{$key}{'others'}; |
if ($currfield{$field} eq $option) { |
$bccemails{'override_'.$key} = $settings->{'overrides'}{$key}{'bcc'}; |
$checked = ' checked="checked"'; |
$includeloc{'override_'.$key} = ''; |
|
$includestr{'override_'.$key} = ''; |
|
if ($settings->{'overrides'}{$key}{'include'} ne '') { |
|
($includeloc{'override_'.$key},$includestr{'override_'.$key}) = |
|
split(/:/,$settings->{'overrides'}{$key}{'include'},2); |
|
$includestr{'override_'.$key} = &unescape($includestr{'override_'.$key}); |
|
} |
|
} |
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="helpform_'.$field.'" '. |
|
'value="'.$option.'"'.$checked.$clickaction.' />'.$fieldoptions->{$option}. |
|
'</label></span>'.(' 'x2); |
} |
} |
} |
} |
} |
if ($field eq 'screenshot') { |
my $customclass = 'LC_helpdesk_override'; |
my $display; |
my $optionsprefix = 'LC_options_helpdesk_'; |
if ($currfield{$field} eq 'no') { |
|
$display = ' style="display:none"'; |
my $onclicktypes = "toggleHelpdeskRow(this.form,'overrides','$customclass','$optionsprefix');"; |
} |
|
$datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.' />'. |
$datatable .= &insttypes_row($settings,$types,$usertypes,$dom, |
'<td>'.&mt('Maximum size for upload (MB)').'</td><td>'. |
$numinrow,$othertitle,'overrides', |
'<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />'; |
\$rownum,$onclicktypes,$customclass); |
|
$rownum ++; |
|
$usertypeshash{'default'} = $othertitle; |
|
foreach my $status (@posstypes) { |
|
my $css_class; |
|
if ($rownum%2) { |
|
$css_class = 'LC_odd_row '; |
|
} |
|
$css_class .= $customclass; |
|
my $rowid = $optionsprefix.$status; |
|
my $hidden = 1; |
|
my $currstyle = 'display:none'; |
|
if (grep(/^\Q$status\E$/,@overridden)) { |
|
$currstyle = 'display:table-row'; |
|
$hidden = 0; |
|
} |
|
my $key = 'override_'.$status; |
|
$datatable .= &overridden_helpdesk($checked{$key},$otheremails{$key},$bccemails{$key}, |
|
$includeloc{$key},$includestr{$key},$status,$rowid, |
|
$usertypeshash{$status},$css_class,$currstyle, |
|
\@contacts,$short_titles); |
|
unless ($hidden) { |
|
$rownum ++; |
|
} |
} |
|
$datatable .= '</td></tr>'; |
} |
} |
|
$datatable .= '</table>'; |
} |
} |
|
$datatable .= '</td></tr>'."\n"; |
|
$rownum ++; |
} |
} |
$$rowtotal += $rownum; |
$$rowtotal += $rownum; |
return $datatable; |
return $datatable; |
} |
} |
|
|
sub overridden_helpdesk { |
|
my ($checked,$otheremails,$bccemails,$includeloc,$includestr,$type,$rowid, |
|
$typetitle,$css_class,$rowstyle,$contacts,$short_titles) = @_; |
|
my $class = 'LC_left_item'; |
|
if ($css_class) { |
|
$css_class = ' class="'.$css_class.'"'; |
|
} |
|
if ($rowid) { |
|
$rowid = ' id="'.$rowid.'"'; |
|
} |
|
if ($rowstyle) { |
|
$rowstyle = ' style="'.$rowstyle.'"'; |
|
} |
|
my ($output,$description); |
|
$description = &mt('Helpdesk requests from: [_1] in this domain (overrides default)',"<b>$typetitle</b>"); |
|
$output = '<tr'.$css_class.$rowid.$rowstyle.'>'. |
|
"<td>$description</td>\n". |
|
'<td class="'.$class.'" colspan="2">'. |
|
'<fieldset><legend>'.&mt('E-mail recipient(s)').'</legend>'. |
|
'<span class="LC_nobreak">'; |
|
if (ref($contacts) eq 'ARRAY') { |
|
foreach my $item (@{$contacts}) { |
|
my $check; |
|
if (ref($checked) eq 'HASH') { |
|
$check = $checked->{$item}; |
|
} |
|
my $title; |
|
if (ref($short_titles) eq 'HASH') { |
|
$title = $short_titles->{$item}; |
|
} |
|
$output .= '<label>'. |
|
'<input type="checkbox" name="override_'.$type.'"'.$check. |
|
' value="'.$item.'" />'.$title.'</label> '; |
|
} |
|
} |
|
$output .= '</span><br />'.&mt('Others').': '. |
|
'<input type="text" name="override_'.$type.'_others" '. |
|
'value="'.$otheremails.'" />'; |
|
my %locchecked; |
|
foreach my $loc ('s','b') { |
|
if ($includeloc eq $loc) { |
|
$locchecked{$loc} = ' checked="checked"'; |
|
last; |
|
} |
|
} |
|
$output .= '<br />'.&mt('Bcc:').(' 'x6). |
|
'<input type="text" name="override_'.$type.'_bcc" '. |
|
'value="'.$bccemails.'" /></fieldset>'. |
|
'<fieldset><legend>'.&mt('Optional added text').'</legend>'. |
|
&mt('Text automatically added to e-mail:').' '. |
|
'<input type="text" name="override_'.$type.'_includestr" value="'.$includestr.'" /><br >'. |
|
'<span class="LC_nobreak">'.&mt('Location:').' '. |
|
'<label><input type="radio" name="override_'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'. |
|
(' 'x2). |
|
'<label><input type="radio" name="override_'.$type.'_includeloc" value="b"'.$locchecked{'b'}.' />'.&mt('in body').'</label>'. |
|
'</span></fieldset>'. |
|
'</td></tr>'."\n"; |
|
return $output; |
|
} |
|
|
|
sub contacts_javascript { |
sub contacts_javascript { |
return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
|
|
Line 3260 function screenshotSize(field) {
|
Line 3222 function screenshotSize(field) {
|
return; |
return; |
} |
} |
|
|
function toggleHelpdeskRow(form,checkbox,target,prefix,docount) { |
|
if (form.elements[checkbox].length != undefined) { |
|
var count = 0; |
|
if (docount) { |
|
for (var i=0; i<form.elements[checkbox].length; i++) { |
|
if (form.elements[checkbox][i].checked) { |
|
count ++; |
|
} |
|
} |
|
} |
|
for (var i=0; i<form.elements[checkbox].length; i++) { |
|
var type = form.elements[checkbox][i].value; |
|
if (document.getElementById(prefix+type)) { |
|
if (form.elements[checkbox][i].checked) { |
|
document.getElementById(prefix+type).style.display = 'table-row'; |
|
if (count % 2 == 1) { |
|
document.getElementById(prefix+type).className = target+' LC_odd_row'; |
|
} else { |
|
document.getElementById(prefix+type).className = target; |
|
} |
|
count ++; |
|
} else { |
|
document.getElementById(prefix+type).style.display = 'none'; |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
|
|
// ]]> |
// ]]> |
</script> |
</script> |
|
|
Line 3317 sub print_helpsettings {
|
Line 3248 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) eq 'HASH') { |
if (ref($settings->{'adhoc'}) eq 'HASH') { |
if (ref($settings->{'adhoc'}) eq 'HASH') { |
%current = %{$settings->{'adhoc'}}; |
%current = %{$settings->{'adhoc'}}; |
|
} |
|
} |
} |
my $count = 0; |
my $count = 0; |
foreach my $key (sort(keys(%existing))) { |
foreach my $key (sort(keys(%existing))) { |
Line 3816 sub print_ltitools {
|
Line 3745 sub print_ltitools {
|
if (ref($settings->{$item}->{'display'}) eq 'HASH') { |
if (ref($settings->{$item}->{'display'}) eq 'HASH') { |
if ($settings->{$item}->{'display'}->{'target'} eq 'window') { |
if ($settings->{$item}->{'display'}->{'target'} eq 'window') { |
$currdisp{'window'} = ' checked="checked"'; |
$currdisp{'window'} = ' checked="checked"'; |
} elsif ($settings->{$item}->{'display'}->{'target'} eq 'tab') { |
|
$currdisp{'tab'} = ' checked="checked"'; |
|
} else { |
} else { |
$currdisp{'iframe'} = ' checked="checked"'; |
$currdisp{'iframe'} = ' checked="checked"'; |
} |
} |
Line 3827 sub print_ltitools {
|
Line 3754 sub print_ltitools {
|
if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) { |
if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) { |
$currdisp{'height'} = $1; |
$currdisp{'height'} = $1; |
} |
} |
$currdisp{'linktext'} = $settings->{$item}->{'display'}->{'linktext'}; |
|
$currdisp{'explanation'} = $settings->{$item}->{'display'}->{'explanation'}; |
|
} else { |
} else { |
$currdisp{'iframe'} = ' checked="checked"'; |
$currdisp{'iframe'} = ' checked="checked"'; |
} |
} |
foreach my $disp ('iframe','tab','window') { |
foreach my $disp ('iframe','window') { |
$datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'. |
$datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'. |
$lt{$disp}.'</label>'.(' 'x2); |
$lt{$disp}.'</label>'.(' 'x2); |
} |
} |
Line 3842 sub print_ltitools {
|
Line 3767 sub print_ltitools {
|
'<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'. |
'<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'. |
(' 'x2); |
(' 'x2); |
} |
} |
$datatable .= '<br />'. |
|
'<div class="LC_left_float">'.$lt{'linktext'}.'<br />'. |
|
'<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></label></div>'. |
|
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
|
'<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}. |
|
'</textarea></div><div style=""></div><br />'; |
|
$datatable .= '<br />'; |
$datatable .= '<br />'; |
foreach my $extra ('passback','roster') { |
foreach my $extra ('passback','roster') { |
my $checkedon = ''; |
my $checkedon = ''; |
Line 3905 sub print_ltitools {
|
Line 3824 sub print_ltitools {
|
if (!$rolemaps{$role}) { |
if (!$rolemaps{$role}) { |
$selectnone = ' selected="selected"'; |
$selectnone = ' selected="selected"'; |
} |
} |
$datatable .= '<td align="center">'. |
$datatable .= '<td align="center">'. |
&Apache::lonnet::plaintext($role,'Course').'<br />'. |
&Apache::lonnet::plaintext($role,'Course').'<br />'. |
'<select name="ltitools_roles_'.$role.'_'.$i.'">'. |
'<select name="ltitools_roles_'.$role.'_'.$i.'">'. |
'<option value=""'.$selectnone.'>'.&mt('Select').'</option>'; |
'<option value=""'.$selectnone.'>'.&mt('Select').'</option>'; |
Line 3929 sub print_ltitools {
|
Line 3848 sub print_ltitools {
|
} |
} |
} |
} |
$datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
$datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
foreach my $item ('label','title','target','linktext','explanation') { |
foreach my $item ('label','title','target') { |
my $checked; |
my $checked; |
if ($courseconfig{$item}) { |
if ($courseconfig{$item}) { |
$checked = ' checked="checked"'; |
$checked = ' checked="checked"'; |
Line 3997 sub print_ltitools {
|
Line 3916 sub print_ltitools {
|
'<span class="LC_nobreak">'.&mt('Display target:'); |
'<span class="LC_nobreak">'.&mt('Display target:'); |
my %defaultdisp; |
my %defaultdisp; |
$defaultdisp{'iframe'} = ' checked="checked"'; |
$defaultdisp{'iframe'} = ' checked="checked"'; |
foreach my $disp ('iframe','tab','window') { |
foreach my $disp ('iframe','window') { |
$datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'. |
$datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'. |
$lt{$disp}.'</label>'.(' 'x2); |
$lt{$disp}.'</label>'.(' 'x2); |
} |
} |
Line 4007 sub print_ltitools {
|
Line 3926 sub print_ltitools {
|
'<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'. |
'<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'. |
(' 'x2); |
(' 'x2); |
} |
} |
$datatable .= '<br />'. |
$datatable .= '<br />'; |
'<div class="LC_left_float">'.$lt{'linktext'}.'<br />'. |
|
'<input type="text" name="ltitools_add_linktext" size="5" /></label></div>'. |
|
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
|
'<textarea name=ltitools_add_explanation" rows="5" cols="40"></textarea>'. |
|
'</div><div style=""></div><br />'; |
|
foreach my $extra ('passback','roster') { |
foreach my $extra ('passback','roster') { |
$datatable .= $lt{$extra}.' '. |
$datatable .= $lt{$extra}.' '. |
'<label><input type="radio" name="ltitools_add_'.$extra.'" value="1" />'. |
'<label><input type="radio" name="ltitools_add_'.$extra.'" value="1" />'. |
Line 4050 sub print_ltitools {
|
Line 3964 sub print_ltitools {
|
} |
} |
$datatable .= '</tr></table></fieldset>'. |
$datatable .= '</tr></table></fieldset>'. |
'<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
'<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
foreach my $item ('label','title','target','linktext','explanation') { |
foreach my $item ('label','title','target') { |
$datatable .= '<label>'. |
$datatable .= '<label>'. |
'<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'. |
'<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'. |
$lt{'crs'.$item}.'</label>'.(' ' x2)."\n"; |
$lt{'crs'.$item}.'</label>'.(' ' x2)."\n"; |
} |
} |
$datatable .= '</span></fieldset>'. |
$datatable .= '</span></fieldset>'. |
'<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'. |
'<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'. |
Line 4071 sub print_ltitools {
|
Line 3985 sub print_ltitools {
|
|
|
sub ltitools_names { |
sub ltitools_names { |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
'title' => 'Title', |
'title' => 'Title', |
'version' => 'Version', |
'version' => 'Version', |
'msgtype' => 'Message Type', |
'msgtype' => 'Message Type', |
'url' => 'URL', |
'url' => 'URL', |
'key' => 'Key', |
'key' => 'Key', |
'secret' => 'Secret', |
'secret' => 'Secret', |
'icon' => 'Icon', |
'icon' => 'Icon', |
'user' => 'Username:domain', |
'user' => 'Username:domain', |
'fullname' => 'Full Name', |
'fullname' => 'Full Name', |
'firstname' => 'First Name', |
'firstname' => 'First Name', |
'lastname' => 'Last Name', |
'lastname' => 'Last Name', |
'email' => 'E-mail', |
'email' => 'E-mail', |
'roles' => 'Role', |
'roles' => 'Role', |
'window' => 'Window', |
'window' => 'Window/Tab', |
'tab' => 'Tab', |
'iframe' => 'iFrame', |
'iframe' => 'iFrame', |
'height' => 'Height', |
'height' => 'Height', |
'width' => 'Width', |
'width' => 'Width', |
'passback' => 'Tool can return grades:', |
'linktext' => 'Default Link Text', |
'roster' => 'Tool can retrieve roster:', |
'explanation' => 'Default Explanation', |
'crstarget' => 'Display target', |
'passback' => 'Tool can return grades:', |
'crslabel' => 'Course label', |
'roster' => 'Tool can retrieve roster:', |
'crstitle' => 'Course title', |
'crstarget' => 'Display target', |
|
'crslabel' => 'Course label', |
|
'crstitle' => 'Course title', |
|
'crslinktext' => 'Link Text', |
|
'crsexplanation' => 'Explanation', |
|
); |
); |
|
|
return %lt; |
return %lt; |
} |
} |
|
|
Line 4108 sub print_coursedefaults {
|
Line 4016 sub print_coursedefaults {
|
my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles); |
my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles); |
my $itemcount = 1; |
my $itemcount = 1; |
my %choices = &Apache::lonlocal::texthash ( |
my %choices = &Apache::lonlocal::texthash ( |
|
canuse_pdfforms => 'Course/Community users can create/upload PDF forms', |
uploadquota => 'Default quota for files uploaded directly to course/community using Course Editor (MB)', |
uploadquota => 'Default quota for files uploaded directly to course/community using Course Editor (MB)', |
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
coursecredits => 'Credits can be specified for courses', |
coursecredits => 'Credits can be specified for courses', |
Line 4125 sub print_coursedefaults {
|
Line 4034 sub print_coursedefaults {
|
); |
); |
if ($position eq 'top') { |
if ($position eq 'top') { |
%defaultchecked = ( |
%defaultchecked = ( |
|
'canuse_pdfforms' => 'off', |
'uselcmath' => 'on', |
'uselcmath' => 'on', |
'usejsme' => 'on', |
'usejsme' => 'on', |
'canclone' => 'none', |
'canclone' => 'none', |
); |
); |
@toggles = ('uselcmath','usejsme'); |
@toggles = ('canuse_pdfforms','uselcmath','usejsme'); |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
\%choices,$itemcount); |
\%choices,$itemcount); |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
Line 4208 sub print_coursedefaults {
|
Line 4118 sub print_coursedefaults {
|
my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql); |
my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql); |
my $currusecredits = 0; |
my $currusecredits = 0; |
my $postsubmitclient = 1; |
my $postsubmitclient = 1; |
my @types = ('official','unofficial','community','textbook'); |
my @types = ('official','unofficial','community','textbook','placement'); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
if (ref($settings->{'uploadquota'}) eq 'HASH') { |
if (ref($settings->{'uploadquota'}) eq 'HASH') { |
Line 4351 sub print_coursedefaults {
|
Line 4261 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="8" /></td>'; |
' value="'.$currmysql{$type}.'" size="5" /></td>'; |
} |
} |
$datatable .= '</tr></table></td></tr>'."\n"; |
$datatable .= '</tr></table></td></tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
Line 4365 sub print_selfenrollment {
|
Line 4275 sub print_selfenrollment {
|
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable); |
my $itemcount = 1; |
my $itemcount = 1; |
my @types = ('official','unofficial','community','textbook'); |
my @types = ('official','unofficial','community','textbook','placement'); |
if (($position eq 'top') || ($position eq 'middle')) { |
if (($position eq 'top') || ($position eq 'middle')) { |
my ($rowsref,$titlesref) = &Apache::lonuserutils::get_selfenroll_titles(); |
my ($rowsref,$titlesref) = &Apache::lonuserutils::get_selfenroll_titles(); |
my %descs = &Apache::lonuserutils::selfenroll_default_descs(); |
my %descs = &Apache::lonuserutils::selfenroll_default_descs(); |
Line 4588 sub print_validation_rows {
|
Line 4498 sub print_validation_rows {
|
|
|
sub print_usersessions { |
sub print_usersessions { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($css_class,$datatable,%checked,%choices); |
my ($css_class,$datatable,$itemcount,%checked,%choices); |
my (%by_ip,%by_location,@intdoms); |
my (%by_ip,%by_location,@intdoms,@instdoms); |
&build_location_hashes(\@intdoms,\%by_ip,\%by_location); |
&build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms); |
|
|
my @alldoms = &Apache::lonnet::all_domains(); |
my @alldoms = &Apache::lonnet::all_domains(); |
my %serverhomes = %Apache::lonnet::serverhomeIDs; |
my %serverhomes = %Apache::lonnet::serverhomeIDs; |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %altids = &id_for_thisdom(%servers); |
my %altids = &id_for_thisdom(%servers); |
my $itemcount = 1; |
|
if ($position eq 'top') { |
if ($position eq 'top') { |
if (keys(%serverhomes) > 1) { |
if (keys(%serverhomes) > 1) { |
my %spareid = ¤t_offloads_to($dom,$settings,\%servers); |
my %spareid = ¤t_offloads_to($dom,$settings,\%servers); |
Line 4609 sub print_usersessions {
|
Line 4518 sub print_usersessions {
|
$datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal); |
$datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal); |
} else { |
} else { |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.'); |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.'). |
|
'</td></tr>'; |
} |
} |
} else { |
} else { |
if (keys(%by_location) == 0) { |
my %titles = &usersession_titles(); |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
my ($prefix,@types); |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.'); |
if ($position eq 'bottom') { |
|
$prefix = 'remote'; |
|
@types = ('version','excludedomain','includedomain'); |
} else { |
} else { |
my %lt = &usersession_titles(); |
$prefix = 'hosted'; |
my $numinrow = 5; |
@types = ('excludedomain','includedomain'); |
my $prefix; |
} |
my @types; |
($datatable,$itemcount) = &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles); |
if ($position eq 'bottom') { |
} |
$prefix = 'remote'; |
$$rowtotal += $itemcount; |
@types = ('version','excludedomain','includedomain'); |
return $datatable; |
} else { |
} |
$prefix = 'hosted'; |
|
@types = ('excludedomain','includedomain'); |
sub rules_by_location { |
} |
my ($settings,$prefix,$by_location,$by_ip,$types,$titles) = @_; |
my (%current,%checkedon,%checkedoff); |
my ($datatable,$itemcount,$css_class); |
my @lcversions = &Apache::lonnet::all_loncaparevs(); |
if (keys(%{$by_location}) == 0) { |
my @locations = sort(keys(%by_location)); |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
foreach my $type (@types) { |
$datatable = '<tr'.$css_class.'><td colspan="2">'. |
$checkedon{$type} = ''; |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.'). |
$checkedoff{$type} = ' checked="checked"'; |
'</td></tr>'; |
} |
$itemcount = 1; |
if (ref($settings) eq 'HASH') { |
} else { |
if (ref($settings->{$prefix}) eq 'HASH') { |
$itemcount = 0; |
foreach my $key (keys(%{$settings->{$prefix}})) { |
my $numinrow = 5; |
$current{$key} = $settings->{$prefix}{$key}; |
my (%current,%checkedon,%checkedoff); |
if ($key eq 'version') { |
my @locations = sort(keys(%{$by_location})); |
if ($current{$key} ne '') { |
foreach my $type (@{$types}) { |
$checkedon{$key} = ' checked="checked"'; |
$checkedon{$type} = ''; |
$checkedoff{$key} = ''; |
$checkedoff{$type} = ' checked="checked"'; |
} |
} |
} elsif (ref($current{$key}) eq 'ARRAY') { |
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"'; |
$checkedon{$key} = ' checked="checked"'; |
$checkedoff{$key} = ''; |
$checkedoff{$key} = ''; |
} |
} |
|
} elsif (ref($current{$key}) eq 'ARRAY') { |
|
$checkedon{$key} = ' checked="checked"'; |
|
$checkedoff{$key} = ''; |
} |
} |
} |
} |
} |
} |
foreach my $type (@types) { |
} |
next if ($type ne 'version' && !@locations); |
foreach my $type (@{$types}) { |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
next if ($type ne 'version' && !@locations); |
$datatable .= '<tr'.$css_class.'> |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
<td><span class="LC_nobreak">'.$lt{$type}.'</span><br /> |
$datatable .= '<tr'.$css_class.'> |
<span class="LC_nobreak"> |
<td><span class="LC_nobreak">'.$titles->{$type}.'</span><br /> |
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedoff{$type}.' value="0" />'.&mt('Not in use').'</label> |
<span class="LC_nobreak"> |
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedon{$type}.' value="1" />'.&mt('In use').'</label></span></td><td>'; |
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedoff{$type}.' value="0" />'.&mt('Not in use').'</label> |
if ($type eq 'version') { |
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedon{$type}.' value="1" />'.&mt('In use').'</label></span></td><td>'; |
my $selector = '<select name="'.$prefix.'_version">'; |
if ($type eq 'version') { |
foreach my $version (@lcversions) { |
my @lcversions = &Apache::lonnet::all_loncaparevs(); |
my $selected = ''; |
my $selector = '<select name="'.$prefix.'_version">'; |
if ($current{'version'} eq $version) { |
foreach my $version (@lcversions) { |
$selected = ' selected="selected"'; |
my $selected = ''; |
} |
if ($current{'version'} eq $version) { |
$selector .= ' <option value="'.$version.'"'. |
$selected = ' selected="selected"'; |
$selected.'>'.$version.'</option>'; |
|
} |
} |
$selector .= '</select> '; |
$selector .= ' <option value="'.$version.'"'. |
$datatable .= &mt('remote server must be version: [_1] or later',$selector); |
$selected.'>'.$version.'</option>'; |
} else { |
} |
$datatable.= '<div><input type="button" value="'.&mt('check all').'" '. |
$selector .= '</select> '; |
'onclick="javascript:checkAll(document.display.'.$prefix.'_'.$type.')"'. |
$datatable .= &mt('remote server must be version: [_1] or later',$selector); |
' />'.(' 'x2). |
} else { |
'<input type="button" value="'.&mt('uncheck all').'" '. |
$datatable.= '<div><input type="button" value="'.&mt('check all').'" '. |
'onclick="javascript:uncheckAll(document.display.'.$prefix.'_'.$type.')" />'. |
'onclick="javascript:checkAll(document.display.'.$prefix.'_'.$type.')"'. |
"\n". |
' />'.(' 'x2). |
'</div><div><table>'; |
'<input type="button" value="'.&mt('uncheck all').'" '. |
my $rem; |
'onclick="javascript:uncheckAll(document.display.'.$prefix.'_'.$type.')" />'. |
for (my $i=0; $i<@locations; $i++) { |
"\n". |
my ($showloc,$value,$checkedtype); |
'</div><div><table>'; |
if (ref($by_location{$locations[$i]}) eq 'ARRAY') { |
my $rem; |
my $ip = $by_location{$locations[$i]}->[0]; |
for (my $i=0; $i<@locations; $i++) { |
if (ref($by_ip{$ip}) eq 'ARRAY') { |
my ($showloc,$value,$checkedtype); |
$value = join(':',@{$by_ip{$ip}}); |
if (ref($by_location->{$locations[$i]}) eq 'ARRAY') { |
$showloc = join(', ',@{$by_ip{$ip}}); |
my $ip = $by_location->{$locations[$i]}->[0]; |
if (ref($current{$type}) eq 'ARRAY') { |
if (ref($by_ip->{$ip}) eq 'ARRAY') { |
foreach my $loc (@{$by_ip{$ip}}) { |
$value = join(':',@{$by_ip->{$ip}}); |
if (grep(/^\Q$loc\E$/,@{$current{$type}})) { |
$showloc = join(', ',@{$by_ip->{$ip}}); |
$checkedtype = ' checked="checked"'; |
if (ref($current{$type}) eq 'ARRAY') { |
last; |
foreach my $loc (@{$by_ip->{$ip}}) { |
} |
if (grep(/^\Q$loc\E$/,@{$current{$type}})) { |
|
$checkedtype = ' checked="checked"'; |
|
last; |
} |
} |
} |
} |
} |
} |
} |
} |
$rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$prefix.'_'.$type. |
|
'" value="'.$value.'"'.$checkedtype.' />'.$showloc. |
|
'</label></span></td>'; |
|
} |
} |
$rem = @locations%($numinrow); |
$rem = $i%($numinrow); |
my $colsleft = $numinrow - $rem; |
if ($rem == 0) { |
if ($colsleft > 1 ) { |
if ($i > 0) { |
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
$datatable .= '</tr>'; |
' </td>'; |
} |
} elsif ($colsleft == 1) { |
$datatable .= '<tr>'; |
$datatable .= '<td class="LC_left_item"> </td>'; |
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$prefix.'_'.$type. |
|
'" value="'.$value.'"'.$checkedtype.' />'.$showloc. |
|
'</label></span></td>'; |
|
} |
|
$rem = @locations%($numinrow); |
|
my $colsleft = $numinrow - $rem; |
|
if ($colsleft > 1 ) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
|
' </td>'; |
|
} elsif ($colsleft == 1) { |
|
$datatable .= '<td class="LC_left_item"> </td>'; |
|
} |
|
$datatable .= '</tr></table>'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
$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 = '<tr'.$css_class.'><td colspan="2">'; |
|
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 .= '</td></tr>'; |
|
$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 .= '<tr'.$css_class.'><td>'.$titles{$type}.'</td>'. |
|
'<td class="LC_right_item">'; |
|
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 .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="'.$position.'_'.$type.'" '. |
|
'value="'.$option.'"'.$checked{$option}.' />'.$titles{$option}. |
|
'</label></span>'.(' 'x2); |
} |
} |
$datatable .= '</tr></table>'; |
|
} |
} |
$datatable .= '</td></tr>'; |
$datatable .= '</td></tr>'; |
|
$itemcount ++; |
|
} |
|
} else { |
|
my $prefix = 'replication'; |
|
my @types = ('certreq','nocertreq'); |
|
if (keys(%by_location) == 0) { |
|
$datatable .= '<tr'.$css_class.'><td>'. |
|
&mt('Nothing to set here, as there are no other institutions'). |
|
'</td></tr>'; |
$itemcount ++; |
$itemcount ++; |
|
} else { |
|
($datatable,$itemcount) = |
|
&rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles); |
} |
} |
} |
} |
} |
} |
Line 4728 sub print_usersessions {
|
Line 4775 sub print_usersessions {
|
return $datatable; |
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 { |
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') && |
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 %iphost = &Apache::lonnet::get_iphost(); |
my $primary_id = &Apache::lonnet::domain($env{'request.role.domain'},'primary'); |
my $primary_id = &Apache::lonnet::domain($env{'request.role.domain'},'primary'); |
my $primary_ip = &Apache::lonnet::get_host_ip($primary_id); |
my $primary_ip = &Apache::lonnet::get_host_ip($primary_id); |
Line 4748 sub build_location_hashes {
|
Line 4845 sub build_location_hashes {
|
foreach my $id (@{$iphost{$ip}}) { |
foreach my $id (@{$iphost{$ip}}) { |
my $location = &Apache::lonnet::internet_dom($id); |
my $location = &Apache::lonnet::internet_dom($id); |
if ($location) { |
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') { |
if (ref($by_ip->{$ip}) eq 'ARRAY') { |
unless(grep(/^\Q$location\E$/,@{$by_ip->{$ip}})) { |
unless(grep(/^\Q$location\E$/,@{$by_ip->{$ip}})) { |
push(@{$by_ip->{$ip}},$location); |
push(@{$by_ip->{$ip}},$location); |
Line 5252 sub loadbalancing_titles {
|
Line 5355 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') { |
@available = @{$types}; |
unshift(@alltypes,@{$types},'default'); |
} |
|
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 5386 sub contact_titles {
|
Line 5484 sub contact_titles {
|
'adminemail' => 'Default Server Admin E-mail address', |
'adminemail' => 'Default Server Admin E-mail address', |
'errormail' => 'Error reports to be e-mailed to', |
'errormail' => 'Error reports to be e-mailed to', |
'packagesmail' => 'Package update alerts to be e-mailed to', |
'packagesmail' => 'Package update alerts to be e-mailed to', |
'helpdeskmail' => "Helpdesk requests from all users in this domain", |
'helpdeskmail' => "Helpdesk requests for this domain's users", |
'otherdomsmail' => 'Helpdesk requests from users in other (unconfigured) domains', |
'otherdomsmail' => 'Helpdesk requests for other (unconfigured) domains', |
'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)', |
'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)', |
'requestsmail' => 'E-mail from course requests requiring approval', |
'requestsmail' => 'E-mail from course requests requiring approval', |
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
Line 5438 sub tool_titles {
|
Line 5536 sub tool_titles {
|
unofficial => 'Unofficial courses', |
unofficial => 'Unofficial courses', |
community => 'Communities', |
community => 'Communities', |
textbook => 'Textbook courses', |
textbook => 'Textbook courses', |
|
placement => 'Placement tests', |
); |
); |
return %titles; |
return %titles; |
} |
} |
Line 5448 sub courserequest_titles {
|
Line 5547 sub courserequest_titles {
|
unofficial => 'Unofficial', |
unofficial => 'Unofficial', |
community => 'Communities', |
community => 'Communities', |
textbook => 'Textbook', |
textbook => 'Textbook', |
|
placement => 'Placement tests', |
norequest => 'Not allowed', |
norequest => 'Not allowed', |
approval => 'Approval by Dom. Coord.', |
approval => 'Approval by Dom. Coord.', |
validate => 'With validation', |
validate => 'With validation', |
Line 5635 sub print_selfcreation {
|
Line 5735 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 5651 sub print_selfcreation {
|
Line 5750 sub print_selfcreation {
|
\%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 5700 sub print_selfcreation {
|
Line 5801 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 @posstypes; |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
$usertypes->{'default'} = $othertitle; |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
@posstypes = @{$types}; |
push(@{$types},'default'); |
} |
$usertypes->{'default'} = $othertitle; |
unless (grep(/^default$/,@posstypes)) { |
foreach my $status (@{$types}) { |
push(@posstypes,'default'); |
$datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'}, |
} |
$numinrow,$$rowtotal,$usertypes); |
my %usertypeshash; |
$$rowtotal ++; |
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 5733 sub print_selfcreation {
|
Line 5828 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 (@ordered,%usertypeshash); |
my $usertypes = {}; |
if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') { |
my $order = []; |
@ordered = @{$domdefaults{'inststatusguest'}}; |
if ((ref($domdefaults{'inststatustypes'}) eq 'HASH') && (ref($domdefaults{'inststatusguest'}) eq 'ARRAY')) { |
} |
$usertypes = $domdefaults{'inststatustypes'}; |
if (@ordered) { |
$order = $domdefaults{'inststatusguest'}; |
unless (grep(/^default$/,@ordered)) { |
} |
push(@ordered,'default'); |
if (ref($order) eq 'ARRAY') { |
} |
push(@{$order},'default'); |
if (ref($usertypes) eq 'HASH') { |
if (@{$order} > 1) { |
%usertypeshash = %{$usertypes}; |
$usertypes->{'default'} = &mt('Other users'); |
} |
$additional .= '<table><tr>'; |
$usertypeshash{'default'} = $othertitle; |
foreach my $status (@{$order}) { |
$additional .= '<table><tr>'; |
$additional .= '<th>'.$usertypes->{$status}.'</th>'; |
foreach my $status (@ordered) { |
} |
$additional .= '<th>'.$usertypeshash{$status}.'</th>'; |
$additional .= '</tr><tr>'; |
} |
foreach my $status (@{$order}) { |
$additional .= '</tr><tr>'; |
$additional .= '<td>'.&email_as_username($rowtotal,$processing,$status).'</td>'; |
foreach my $status (@ordered) { |
} |
$additional .= '<td>'.&email_as_username($rowtotal,$processing,$status).'</td>'; |
$additional .= '</tr></table>'; |
|
} 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 5767 sub print_selfcreation {
|
Line 5861 sub print_selfcreation {
|
$$rowtotal ++; |
$$rowtotal ++; |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
$numinrow = 1; |
$numinrow = 1; |
foreach my $status (@ordered) { |
if (ref($order) eq 'ARRAY') { |
$datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings, |
foreach my $status (@{$order}) { |
$numinrow,$$rowtotal,\%usertypeshash,$infofields,$infotitles); |
$datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings, |
$$rowtotal ++; |
$numinrow,$$rowtotal,$usertypes,$infofields,$infotitles); |
|
$$rowtotal ++; |
|
} |
} |
} |
my ($emailrules,$emailruleorder) = |
my ($emailrules,$emailruleorder) = |
&Apache::lonnet::inst_userrules($dom,'email'); |
&Apache::lonnet::inst_userrules($dom,'email'); |
Line 5842 sub email_as_username {
|
Line 5938 sub email_as_username {
|
sub captcha_choice { |
sub captcha_choice { |
my ($context,$settings,$itemcount) = @_; |
my ($context,$settings,$itemcount) = @_; |
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext, |
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext, |
$vertext,$currver); |
$vertext,$currver); |
my %lt = &captcha_phrases(); |
my %lt = &captcha_phrases(); |
$keyentry = 'hidden'; |
$keyentry = 'hidden'; |
if ($context eq 'cancreate') { |
if ($context eq 'cancreate') { |
Line 6174 sub print_defaults {
|
Line 6270 sub print_defaults {
|
$datatable .= '</table>'; |
$datatable .= '</table>'; |
} else { |
} else { |
$datatable .= '<input type="text" name="'.$item.'" value="'. |
$datatable .= '<input type="text" name="'.$item.'" value="'. |
$defaults{$item}.'" size="3" onblur="javascript:warnIntAuth(this);" />'; |
$defaults{$item}.'" size="3" onblur="javascript:warnIntAuth(this);" />'; |
} |
} |
$datatable .= '</td></tr>'; |
$datatable .= '</td></tr>'; |
$rownum ++; |
$rownum ++; |
Line 6520 sub print_coursecategories {
|
Line 6616 sub print_coursecategories {
|
my $toggle_catscomm_dom = ' checked="checked" '; |
my $toggle_catscomm_dom = ' checked="checked" '; |
my $can_catcomm_comm = ' '; |
my $can_catcomm_comm = ' '; |
my $can_catcomm_dom = ' checked="checked" '; |
my $can_catcomm_dom = ' checked="checked" '; |
|
my $toggle_catsplace_place = ' '; |
|
my $toggle_catsplace_dom = ' checked="checked" '; |
|
my $can_catplace_place = ' '; |
|
my $can_catplace_dom = ' checked="checked" '; |
|
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'togglecats'} eq 'crs') { |
if ($settings->{'togglecats'} eq 'crs') { |
Line 6538 sub print_coursecategories {
|
Line 6638 sub print_coursecategories {
|
$can_catcomm_comm = $can_catcomm_dom; |
$can_catcomm_comm = $can_catcomm_dom; |
$can_catcomm_dom = ' '; |
$can_catcomm_dom = ' '; |
} |
} |
|
if ($settings->{'togglecatsplace'} eq 'place') { |
|
$toggle_catsplace_place = $toggle_catsplace_dom; |
|
$toggle_catsplace_dom = ' '; |
|
} |
|
if ($settings->{'categorizeplace'} eq 'place') { |
|
$can_catplace_place = $can_catplace_dom; |
|
$can_catplace_dom = ' '; |
|
} |
} |
} |
my %title = &Apache::lonlocal::texthash ( |
my %title = &Apache::lonlocal::texthash ( |
togglecats => 'Show/Hide a course in catalog', |
togglecats => 'Show/Hide a course in catalog', |
togglecatscomm => 'Show/Hide a community in catalog', |
togglecatscomm => 'Show/Hide a community in catalog', |
categorize => 'Assign a category to a course', |
togglecatsplace => 'Show/Hide a placement test in catalog', |
categorizecomm => 'Assign a category to a community', |
categorize => 'Assign a category to a course', |
|
categorizecomm => 'Assign a category to a community', |
|
categorizeplace => 'Assign a category to a placement test', |
); |
); |
my %level = &Apache::lonlocal::texthash ( |
my %level = &Apache::lonlocal::texthash ( |
dom => 'Set in Domain', |
dom => 'Set in Domain', |
crs => 'Set in Course', |
crs => 'Set in Course', |
comm => 'Set in Community', |
comm => 'Set in Community', |
|
place => 'Set in Placement Test', |
); |
); |
$datatable = '<tr class="LC_odd_row">'. |
$datatable = '<tr class="LC_odd_row">'. |
'<td>'.$title{'togglecats'}.'</td>'. |
'<td>'.$title{'togglecats'}.'</td>'. |
Line 6578 sub print_coursecategories {
|
Line 6689 sub print_coursecategories {
|
$can_catcomm_dom.' value="dom" />'.$level{'dom'}.'</label> '. |
$can_catcomm_dom.' value="dom" />'.$level{'dom'}.'</label> '. |
'<label><input type="radio" name="categorizecomm"'. |
'<label><input type="radio" name="categorizecomm"'. |
$can_catcomm_comm.'value="comm" />'.$level{'comm'}.'</label></span></td>'. |
$can_catcomm_comm.'value="comm" />'.$level{'comm'}.'</label></span></td>'. |
|
'</tr><tr>'. |
|
'<td>'.$title{'togglecatsplace'}.'</td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="togglecatsplace"'. |
|
$toggle_catsplace_dom.' value="dom" />'.$level{'dom'}.'</label> '. |
|
'<label><input type="radio" name="togglecatscomm"'. |
|
$toggle_catsplace_place.' value="comm" />'.$level{'place'}.'</label></span></td>'. |
|
'</tr><tr>'. |
|
'<td>'.$title{'categorizeplace'}.'</td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="categorizeplace"'. |
|
$can_catplace_dom.' value="dom" />'.$level{'dom'}.'</label> '. |
|
'<label><input type="radio" name="categorizeplace"'. |
|
$can_catplace_place.'value="place" />'.$level{'place'}.'</label></span></td>'. |
'</tr>'; |
'</tr>'; |
$$rowtotal += 4; |
$$rowtotal += 6; |
} else { |
} else { |
my $css_class; |
my $css_class; |
my $itemcount = 1; |
my $itemcount = 1; |
Line 6604 sub print_coursecategories {
|
Line 6729 sub print_coursecategories {
|
my %default_names = ( |
my %default_names = ( |
instcode => &mt('Official courses'), |
instcode => &mt('Official courses'), |
communities => &mt('Communities'), |
communities => &mt('Communities'), |
|
placement => &mt('Placement Tests'), |
); |
); |
|
|
if ((!grep(/^instcode$/,@{$cats[0]})) || |
if ((!grep(/^instcode$/,@{$cats[0]})) || |
($cathash->{'instcode::0'} eq '') || |
($cathash->{'instcode::0'} eq '') || |
(!grep(/^communities$/,@{$cats[0]})) || |
(!grep(/^communities$/,@{$cats[0]})) || |
($cathash->{'communities::0'} eq '')) { |
($cathash->{'communities::0'} eq '') || |
|
(!grep(/^placement$/,@{$cats[0]})) || |
|
($cathash->{'placement::0'} eq '')) { |
$maxnum ++; |
$maxnum ++; |
} |
} |
my $lastidx; |
my $lastidx; |
Line 6630 sub print_coursecategories {
|
Line 6758 sub print_coursecategories {
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
} |
} |
$datatable .= '</select></span></td><td>'; |
$datatable .= '</select></span></td><td>'; |
if ($parent eq 'instcode' || $parent eq 'communities') { |
if ($parent eq 'instcode' || $parent eq 'communities' || $parent eq 'placement') { |
$datatable .= '<span class="LC_nobreak">' |
$datatable .= '<span class="LC_nobreak">' |
.$default_names{$parent}.'</span>'; |
.$default_names{$parent}.'</span>'; |
if ($parent eq 'instcode') { |
if ($parent eq 'instcode') { |
Line 6653 sub print_coursecategories {
|
Line 6781 sub print_coursecategories {
|
$datatable .= '<label><input type="radio" name="' |
$datatable .= '<label><input type="radio" name="' |
.$parent.'" value="0" />' |
.$parent.'" value="0" />' |
.&mt('Do not display').'</label></span>'; |
.&mt('Do not display').'</label></span>'; |
if ($parent eq 'communities') { |
if (($parent eq 'communities') || ($parent eq 'placement')) { |
$datatable .= '</td></tr></table>'; |
$datatable .= '</td></tr></table>'; |
} |
} |
$datatable .= '</td>'; |
$datatable .= '</td>'; |
Line 6685 sub print_coursecategories {
|
Line 6813 sub print_coursecategories {
|
.'<input type="text" size="20" name="addcategory_name" value="" /></td>' |
.'<input type="text" size="20" name="addcategory_name" value="" /></td>' |
.'</tr>'."\n"; |
.'</tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
foreach my $default ('instcode','communities') { |
foreach my $default ('instcode','communities','placement') { |
if ((!grep(/^\Q$default\E$/,@{$cats[0]})) || ($cathash->{$default.'::0'} eq '')) { |
if ((!grep(/^\Q$default\E$/,@{$cats[0]})) || ($cathash->{$default.'::0'} eq '')) { |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','$lastidx'".');"'; |
my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','$lastidx'".');"'; |
Line 6774 sub print_serverstatuses {
|
Line 6902 sub print_serverstatuses {
|
|
|
sub serverstatus_pages { |
sub serverstatus_pages { |
return ('userstatus','lonstatus','loncron','server-status','codeversions', |
return ('userstatus','lonstatus','loncron','server-status','codeversions', |
'checksums','clusterstatus','metadata_keywords','metadata_harvest', |
'checksums','clusterstatus','certstatus','metadata_keywords', |
'takeoffline','takeonline','showenv','toggledebug','ping','domconf', |
'metadata_harvest','takeoffline','takeonline','showenv','toggledebug', |
'uniquecodes','diskusage','coursecatalog'); |
'ping','domconf','uniquecodes','diskusage','coursecatalog'); |
} |
} |
|
|
sub defaults_javascript { |
sub defaults_javascript { |
Line 6898 sub coursecategories_javascript {
|
Line 7026 sub coursecategories_javascript {
|
} |
} |
my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"'); |
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 $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.'); |
my $choose_again = "\n".&mt('Please use a different name for the new top level category.'); |
&js_escape(\$instcode_reserved); |
&js_escape(\$instcode_reserved); |
&js_escape(\$communities_reserved); |
&js_escape(\$communities_reserved); |
|
&js_escape(\$placement_reserved); |
&js_escape(\$choose_again); |
&js_escape(\$choose_again); |
$output = <<"ENDSCRIPT"; |
$output = <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
Line 6970 function categoryCheck(form) {
|
Line 7100 function categoryCheck(form) {
|
alert('$communities_reserved\\n$choose_again'); |
alert('$communities_reserved\\n$choose_again'); |
return false; |
return false; |
} |
} |
|
if (form.elements['addcategory_name'].value == 'placement') { |
|
alert('$placement_reserved\\n$choose_again'); |
|
return false; |
|
} |
return true; |
return true; |
} |
} |
|
|
Line 6986 sub initialize_categories {
|
Line 7120 sub initialize_categories {
|
my %default_names = ( |
my %default_names = ( |
instcode => 'Official courses (with institutional codes)', |
instcode => 'Official courses (with institutional codes)', |
communities => 'Communities', |
communities => 'Communities', |
|
placement => 'Placement Tests', |
); |
); |
my $select0 = ' selected="selected"'; |
my $select0 = ' selected="selected"'; |
my $select1 = ''; |
my $select1 = ''; |
foreach my $default ('instcode','communities') { |
foreach my $default ('instcode','communities','placement') { |
$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') || ($default eq 'placement')) { |
$select1 = $select0; |
$select1 = $select0; |
$select0 = ''; |
$select0 = ''; |
} |
} |
Line 7238 sub modifiable_userdata_row {
|
Line 7373 sub modifiable_userdata_row {
|
} |
} |
|
|
sub insttypes_row { |
sub insttypes_row { |
my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rowtotal,$onclick, |
my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rownum) = @_; |
$customcss,$rowstyle) = @_; |
|
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
cansearch => 'Users allowed to search', |
cansearch => 'Users allowed to search', |
statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)', |
statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)', |
lockablenames => 'User preference to lock name', |
lockablenames => 'User preference to lock name', |
overrides => "Override domain's helpdesk settings based on requester's affiliation", |
|
); |
); |
my $showdom; |
my $showdom; |
if ($context eq 'cansearch') { |
if ($context eq 'cansearch') { |
Line 7254 sub insttypes_row {
|
Line 7387 sub insttypes_row {
|
if ($context eq 'statustocreate') { |
if ($context eq 'statustocreate') { |
$class = 'LC_right_item'; |
$class = 'LC_right_item'; |
} |
} |
my $css_class; |
my $css_class = ' class="LC_odd_row"'; |
if ($$rowtotal%2) { |
if ($rownum ne '') { |
$css_class = 'LC_odd_row'; |
$css_class = ($rownum%2? ' class="LC_odd_row"':''); |
} |
|
if ($customcss) { |
|
$css_class .= ' '.$customcss; |
|
} |
|
$css_class =~ s/^\s+//; |
|
if ($css_class) { |
|
$css_class = ' class="'.$css_class.'"'; |
|
} |
|
if ($rowstyle) { |
|
$css_class .= ' style="'.$rowstyle.'"'; |
|
} |
|
if ($onclick) { |
|
$onclick = 'onclick="'.$onclick.'" '; |
|
} |
} |
my $output = '<tr'.$css_class.'>'. |
my $output = '<tr'.$css_class.'>'. |
'<td>'.$lt{$context}.$showdom. |
'<td>'.$lt{$context}.$showdom. |
Line 7291 sub insttypes_row {
|
Line 7411 sub insttypes_row {
|
if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) { |
if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) { |
$check = ' checked="checked" '; |
$check = ' checked="checked" '; |
} |
} |
} elsif (ref($settings->{$context}) eq 'HASH') { |
|
if (ref($settings->{$context}->{$types->[$i]}) eq 'HASH') { |
|
$check = ' checked="checked" '; |
|
} |
|
} elsif ($context eq 'statustocreate') { |
} elsif ($context eq 'statustocreate') { |
$check = ' checked="checked" '; |
$check = ' checked="checked" '; |
} |
} |
Line 7309 sub insttypes_row {
|
Line 7425 sub insttypes_row {
|
$rem = @{$types}%($numinrow); |
$rem = @{$types}%($numinrow); |
} |
} |
my $colsleft = $numinrow - $rem; |
my $colsleft = $numinrow - $rem; |
if ($context eq 'overrides') { |
if (($rem == 0) && (@{$types} > 0)) { |
if ($colsleft > 1) { |
$output .= '<tr>'; |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
} |
} else { |
if ($colsleft > 1) { |
$output .= '<td class="LC_left_item">'; |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
} |
|
$output .= ' '; |
|
} else { |
} else { |
if (($rem == 0) && (@{$types} > 0)) { |
$output .= '<td class="LC_left_item">'; |
$output .= '<tr>'; |
} |
} |
my $defcheck = ' '; |
if ($colsleft > 1) { |
if (ref($settings) eq 'HASH') { |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
if (ref($settings->{$context}) eq 'ARRAY') { |
} else { |
if (grep(/^default$/,@{$settings->{$context}})) { |
$output .= '<td class="LC_left_item">'; |
|
} |
|
my $defcheck = ' '; |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{$context}) eq 'ARRAY') { |
|
if (grep(/^default$/,@{$settings->{$context}})) { |
|
$defcheck = ' checked="checked" '; |
|
} |
|
} elsif ($context eq 'statustocreate') { |
|
$defcheck = ' checked="checked" '; |
$defcheck = ' checked="checked" '; |
} |
} |
|
} elsif ($context eq 'statustocreate') { |
|
$defcheck = ' checked="checked" '; |
} |
} |
$output .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$context.'" '. |
|
'value="default"'.$defcheck.'/>'. |
|
$othertitle.'</label></span>'; |
|
} |
} |
$output .= '</td></tr></table></td></tr>'; |
$output .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$context.'" '. |
|
'value="default"'.$defcheck.'/>'. |
|
$othertitle.'</label></span></td>'. |
|
'</tr></table></td></tr>'; |
return $output; |
return $output; |
} |
} |
|
|
Line 8329 sub check_authorstatus {
|
Line 8436 sub check_authorstatus {
|
|
|
sub publishlogo { |
sub publishlogo { |
my ($r,$action,$formname,$dom,$confname,$subdir,$thumbwidth,$thumbheight,$savefileas) = @_; |
my ($r,$action,$formname,$dom,$confname,$subdir,$thumbwidth,$thumbheight,$savefileas) = @_; |
my ($output,$fname,$logourl); |
my ($output,$fname,$logourl,$madethumb); |
if ($action eq 'upload') { |
if ($action eq 'upload') { |
$fname=$env{'form.'.$formname.'.filename'}; |
$fname=$env{'form.'.$formname.'.filename'}; |
chop($env{'form.'.$formname}); |
chop($env{'form.'.$formname}); |
Line 8374 sub publishlogo {
|
Line 8481 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 8442 $env{'user.name'}.':'.$env{'user.domain'
|
Line 8549 $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; |
my @args = ('convert','-sample',$thumbsize,$inputfile,$outfile); |
system("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 8458 $env{'user.name'}.':'.$env{'user.domain'
|
Line 8564 $env{'user.name'}.':'.$env{'user.domain'
|
$r->set_handlers('PerlCleanupHandler' => [\¬ifysubscribed,@{$handlers}]); |
$r->set_handlers('PerlCleanupHandler' => [\¬ifysubscribed,@{$handlers}]); |
$registered_cleanup=1; |
$registered_cleanup=1; |
} |
} |
|
$madethumb = 1; |
} else { |
} else { |
print $logfile "\nUnable to write ".$copyfile. |
print $logfile "\nUnable to write ".$copyfile. |
':'.$!."\n"; |
':'.$!."\n"; |
Line 8470 $env{'user.name'}.':'.$env{'user.domain'
|
Line 8577 $env{'user.name'}.':'.$env{'user.domain'
|
$output = $versionresult; |
$output = $versionresult; |
} |
} |
} |
} |
return ($output,$logourl); |
return ($output,$logourl,$madethumb); |
} |
} |
|
|
sub logo_versioning { |
sub logo_versioning { |
Line 8522 sub write_metadata {
|
Line 8629 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 8556 sub notifysubscribed {
|
Line 8663 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 8582 sub notifysubscribed {
|
Line 8689 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 8624 sub modify_quotas {
|
Line 8731 sub modify_quotas {
|
$context = $action; |
$context = $action; |
} |
} |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
@usertools = ('official','unofficial','community','textbook'); |
@usertools = ('official','unofficial','community','textbook','placement'); |
@options =('norequest','approval','validate','autolimit'); |
@options =('norequest','approval','validate','autolimit'); |
%validations = &Apache::lonnet::auto_courserequest_checks($dom); |
%validations = &Apache::lonnet::auto_courserequest_checks($dom); |
%titles = &courserequest_titles(); |
%titles = &courserequest_titles(); |
Line 8673 sub modify_quotas {
|
Line 8780 sub modify_quotas {
|
my @approvalnotify = &Apache::loncommon::get_env_multiple('form.'.$context.'notifyapproval'); |
my @approvalnotify = &Apache::loncommon::get_env_multiple('form.'.$context.'notifyapproval'); |
@approvalnotify = sort(@approvalnotify); |
@approvalnotify = sort(@approvalnotify); |
$confhash{'notify'}{'approval'} = join(',',@approvalnotify); |
$confhash{'notify'}{'approval'} = join(',',@approvalnotify); |
my @crstypes = ('official','unofficial','community','textbook'); |
my @crstypes = ('official','unofficial','community','textbook','placement'); |
my @hasuniquecode = &Apache::loncommon::get_env_multiple('form.uniquecode'); |
my @hasuniquecode = &Apache::loncommon::get_env_multiple('form.uniquecode'); |
foreach my $type (@hasuniquecode) { |
foreach my $type (@hasuniquecode) { |
if (grep(/^\Q$type\E$/,@crstypes)) { |
if (grep(/^\Q$type\E$/,@crstypes)) { |
Line 8781 sub modify_quotas {
|
Line 8888 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); |
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { |
my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i, |
$errors .= '<li><span class="LC_error">'.&mt('Image not saved: could not find textbook course').'</li>'; |
$cdom,$cnum,$type,$configuserok, |
} else { |
$switchserver,$author_ok); |
my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i, |
if ($imgurl) { |
$cdom,$cnum,$type,$configuserok, |
$confhash{$type}{$key}{'image'} = $imgurl; |
$switchserver,$author_ok); |
$changes{$type}{$key} = 1; |
if ($imgurl) { |
} |
$confhash{$type}{$key}{'image'} = $imgurl; |
if ($error) { |
$changes{$type}{$key} = 1; |
&Apache::lonnet::logthis($error); |
} |
$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 9328 sub process_textbook_image {
|
Line 9431 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/$cdom/$cnum/cover",$width,$height); |
"$type/$dom/$cnum/cover",$width,$height); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$url = $imageurl; |
$url = $imageurl; |
} else { |
} else { |
Line 9346 sub process_textbook_image {
|
Line 9449 sub process_textbook_image {
|
sub modify_ltitools { |
sub modify_ltitools { |
my ($r,$dom,$action,$lastactref,%domconfig) = @_; |
my ($r,$dom,$action,$lastactref,%domconfig) = @_; |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my ($newid,@allpos,%changes,%confhash,%encconfig,$errors,$resulttext); |
my ($newid,@allpos,%changes,%confhash,$errors,$resulttext); |
my $confname = $dom.'-domainconfig'; |
my $confname = $dom.'-domainconfig'; |
my $servadm = $r->dir_config('lonAdmEMail'); |
my $servadm = $r->dir_config('lonAdmEMail'); |
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
Line 9356 sub modify_ltitools {
|
Line 9459 sub modify_ltitools {
|
map { $posslti{$_} = 1; } @ltiroles; |
map { $posslti{$_} = 1; } @ltiroles; |
my @allfields = ('fullname','firstname','lastname','email','user','roles'); |
my @allfields = ('fullname','firstname','lastname','email','user','roles'); |
map { $possfield{$_} = 1; } @allfields; |
map { $possfield{$_} = 1; } @allfields; |
my %lt = <itools_names(); |
my %lt = <itools_names(); |
if ($env{'form.ltitools_add'}) { |
if ($env{'form.ltitools_add'}) { |
my $title = $env{'form.ltitools_add_title'}; |
my $title = $env{'form.ltitools_add_title'}; |
$title =~ s/(`)/'/g; |
$title =~ s/(`)/'/g; |
Line 9371 sub modify_ltitools {
|
Line 9474 sub modify_ltitools {
|
foreach my $item ('title','url','key','secret') { |
foreach my $item ('title','url','key','secret') { |
$env{'form.ltitools_add_'.$item} =~ s/(`)/'/g; |
$env{'form.ltitools_add_'.$item} =~ s/(`)/'/g; |
if ($env{'form.ltitools_add_'.$item}) { |
if ($env{'form.ltitools_add_'.$item}) { |
if (($item eq 'key') || ($item eq 'secret')) { |
$confhash{$newid}{$item} = $env{'form.ltitools_add_'.$item}; |
$encconfig{$newid}{$item} = $env{'form.ltitools_add_'.$item}; |
|
} else { |
|
$confhash{$newid}{$item} = $env{'form.ltitools_add_'.$item}; |
|
} |
|
} |
} |
} |
} |
if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') { |
if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') { |
Line 9384 sub modify_ltitools {
|
Line 9483 sub modify_ltitools {
|
if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') { |
if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') { |
$confhash{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'}; |
$confhash{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'}; |
} |
} |
foreach my $item ('width','height','linktext','explanation') { |
foreach my $item ('width','height') { |
$env{'form.ltitools_add_'.$item} =~ s/^\s+//; |
$env{'form.ltitools_add_'.$item} =~ s/^\s+//; |
$env{'form.ltitools_add_'.$item} =~ s/\s+$//; |
$env{'form.ltitools_add_'.$item} =~ s/\s+$//; |
if (($item eq 'width') || ($item eq 'height')) { |
if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) { |
if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) { |
$confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item}; |
$confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item}; |
|
} |
|
} else { |
|
if ($env{'form.ltitools_add_'.$item} ne '') { |
|
$confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item}; |
|
} |
|
} |
} |
} |
} |
if ($env{'form.ltitools_add_target'} eq 'window') { |
if ($env{'form.ltitools_add_target'} eq 'window') { |
$confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'}; |
$confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'}; |
} elsif ($env{'form.ltitools_add_target'} eq 'tab') { |
|
$confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'}; |
|
} else { |
} else { |
$confhash{$newid}{'display'}{'target'} = 'iframe'; |
$confhash{$newid}{'display'}{'target'} = 'iframe'; |
} |
} |
Line 9411 sub modify_ltitools {
|
Line 9502 sub modify_ltitools {
|
} |
} |
if ($env{'form.ltitools_add_image.filename'} ne '') { |
if ($env{'form.ltitools_add_image.filename'} ne '') { |
my ($imageurl,$error) = |
my ($imageurl,$error) = |
&process_ltitools_image($r,$dom,$confname,'ltitools_add_image',$newid, |
&process_ltitools_image($r,$dom,$confname,'ltitools_add_image',$dom, |
$configuserok,$switchserver,$author_ok); |
$configuserok,$switchserver,$author_ok); |
if ($imageurl) { |
if ($imageurl) { |
$confhash{$newid}{'image'} = $imageurl; |
$confhash{$newid}{'image'} = $imageurl; |
Line 9430 sub modify_ltitools {
|
Line 9521 sub modify_ltitools {
|
if (($choice ne '') && ($posslti{$choice})) { |
if (($choice ne '') && ($posslti{$choice})) { |
$confhash{$newid}{'roles'}{$role} = $choice; |
$confhash{$newid}{'roles'}{$role} = $choice; |
if ($role eq 'cc') { |
if ($role eq 'cc') { |
$confhash{$newid}{'roles'}{'co'} = $choice; |
$confhash{$newid}{'roles'}{'co'} = $choice; |
} |
} |
} |
} |
} |
} |
Line 9451 sub modify_ltitools {
|
Line 9542 sub modify_ltitools {
|
$confhash{$newid}{'custom'}{$name} = $value; |
$confhash{$newid}{'custom'}{$name} = $value; |
} |
} |
} else { |
} else { |
my $error = &mt('Failed to acquire unique ID for new external tool'); |
my $error = &mt('Failed to acquire unique ID for new external tool'); |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
} |
} |
} |
} |
Line 9465 sub modify_ltitools {
|
Line 9556 sub modify_ltitools {
|
my @newcustom = &Apache::loncommon::get_env_multiple('form.ltitools_customadd'); |
my @newcustom = &Apache::loncommon::get_env_multiple('form.ltitools_customadd'); |
if (@newcustom) { |
if (@newcustom) { |
map { $customadds{$_} = 1; } @newcustom; |
map { $customadds{$_} = 1; } @newcustom; |
} |
} |
my %imgdeletions; |
my %imgdeletions; |
my @todeleteimages = &Apache::loncommon::get_env_multiple('form.ltitools_image_del'); |
my @todeleteimages = &Apache::loncommon::get_env_multiple('form.ltitools_image_del'); |
if (@todeleteimages) { |
if (@todeleteimages) { |
Line 9474 sub modify_ltitools {
|
Line 9565 sub modify_ltitools {
|
my $maxnum = $env{'form.ltitools_maxnum'}; |
my $maxnum = $env{'form.ltitools_maxnum'}; |
for (my $i=0; $i<=$maxnum; $i++) { |
for (my $i=0; $i<=$maxnum; $i++) { |
my $itemid = $env{'form.ltitools_id_'.$i}; |
my $itemid = $env{'form.ltitools_id_'.$i}; |
$itemid =~ s/\D+//g; |
|
if (ref($domconfig{$action}{$itemid}) eq 'HASH') { |
if (ref($domconfig{$action}{$itemid}) eq 'HASH') { |
if ($deletions{$itemid}) { |
if ($deletions{$itemid}) { |
if ($domconfig{$action}{$itemid}{'image'}) { |
if ($domconfig{$action}{$itemid}{'image'}) { |
Line 9485 sub modify_ltitools {
|
Line 9575 sub modify_ltitools {
|
} else { |
} else { |
my $newpos = $env{'form.ltitools_'.$itemid}; |
my $newpos = $env{'form.ltitools_'.$itemid}; |
$newpos =~ s/\D+//g; |
$newpos =~ s/\D+//g; |
foreach my $item ('title','url') { |
foreach my $item ('title','url','key','secret') { |
$confhash{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
$confhash{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) { |
if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} |
} |
foreach my $item ('key','secret') { |
|
$encconfig{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
|
if ($domconfig{$action}{$itemid}{$item} ne $encconfig{$itemid}{$item}) { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') { |
if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') { |
$confhash{$itemid}{'version'} = $env{'form.ltitools_version_'.$i}; |
$confhash{$itemid}{'version'} = $env{'form.ltitools_version_'.$i}; |
} |
} |
Line 9515 sub modify_ltitools {
|
Line 9599 sub modify_ltitools {
|
} else { |
} else { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} elsif (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
|
if ($domconfig{$action}{$itemid}{'display'}{$size} ne '') { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
} |
|
foreach my $item ('linktext','explanation') { |
|
$env{'form.ltitools_'.$item.'_'.$i} =~ s/^\s+//; |
|
$env{'form.ltitools_'.$item.'_'.$i} =~ s/\s+$//; |
|
if ($env{'form.ltitools_'.$item.'_'.$i} ne '') { |
|
$confhash{$itemid}{'display'}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
|
if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
|
if ($domconfig{$action}{$itemid}{'display'}{$item} ne $confhash{$itemid}{'display'}{$item}) { |
|
$changes{$itemid} = 1; |
|
} |
|
} else { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
|
if ($domconfig{$action}{$itemid}{'display'}{$item} ne '') { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
} |
} |
} |
if ($env{'form.ltitools_target_'.$i} eq 'window') { |
if ($env{'form.ltitools_target_'.$i} eq 'window') { |
$confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i}; |
$confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i}; |
} elsif ($env{'form.ltitools_target_'.$i} eq 'tab') { |
|
$confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i}; |
|
} else { |
} else { |
$confhash{$itemid}{'display'}{'target'} = 'iframe'; |
$confhash{$itemid}{'display'}{'target'} = 'iframe'; |
} |
} |
Line 9562 sub modify_ltitools {
|
Line 9622 sub modify_ltitools {
|
} |
} |
} |
} |
my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i); |
my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i); |
foreach my $item ('label','title','target','linktext','explanation') { |
foreach my $item ('label','title','target') { |
if (grep(/^\Q$item\E$/,@courseconfig)) { |
if (grep(/^\Q$item\E$/,@courseconfig)) { |
$confhash{$itemid}{'crsconf'}{$item} = 1; |
$confhash{$itemid}{'crsconf'}{$item} = 1; |
if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') { |
if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') { |
Line 9642 sub modify_ltitools {
|
Line 9702 sub modify_ltitools {
|
} |
} |
} |
} |
my %customdels; |
my %customdels; |
my @customdeletions = &Apache::loncommon::get_env_multiple('form.ltitools_customdel_'.$i); |
my @customdeletions = &Apache::loncommon::get_env_multiple('form.ltitools_customdel_'.$i); |
if (@customdeletions) { |
if (@customdeletions) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
Line 9651 sub modify_ltitools {
|
Line 9711 sub modify_ltitools {
|
foreach my $key (keys(%{$domconfig{$action}{$itemid}{'custom'}})) { |
foreach my $key (keys(%{$domconfig{$action}{$itemid}{'custom'}})) { |
unless ($customdels{$key}) { |
unless ($customdels{$key}) { |
if ($env{'form.ltitools_customval_'.$key.'_'.$i} ne '') { |
if ($env{'form.ltitools_customval_'.$key.'_'.$i} ne '') { |
$confhash{$itemid}{'custom'}{$key} = $env{'form.ltitools_customval_'.$key.'_'.$i}; |
$confhash{$itemid}{'custom'}{$key} = $env{'form.ltitools_customval_'.$key.'_'.$i}; |
} |
} |
if ($domconfig{$action}{$itemid}{'custom'}{$key} ne $env{'form.ltitools_customval_'.$key.'_'.$i}) { |
if ($domconfig{$action}{$itemid}{'custom'}{$key} ne $env{'form.ltitools_customval_'.$key.'_'.$i}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
Line 9701 sub modify_ltitools {
|
Line 9761 sub modify_ltitools {
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash, |
$dom); |
$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
my %ltienchash = ( |
|
$action => { %encconfig } |
|
); |
|
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom); |
|
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
my %ltiall = %confhash; |
&Apache::lonnet::do_cache_new('ltitools',$dom,\%confhash,$cachetime); |
foreach my $id (keys(%ltiall)) { |
|
if (ref($encconfig{$id}) eq 'HASH') { |
|
foreach my $item ('key','secret') { |
|
$ltiall{$id}{$item} = $encconfig{$id}{$item}; |
|
} |
|
} |
|
} |
|
&Apache::lonnet::do_cache_new('ltitools',$dom,\%ltiall,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'ltitools'} = 1; |
$lastactref->{'ltitools'} = 1; |
} |
} |
Line 9726 sub modify_ltitools {
|
Line 9774 sub modify_ltitools {
|
$bynum{$position} = $itemid; |
$bynum{$position} = $itemid; |
} |
} |
foreach my $pos (sort { $a <=> $b } keys(%bynum)) { |
foreach my $pos (sort { $a <=> $b } keys(%bynum)) { |
my $itemid = $bynum{$pos}; |
my $itemid = $bynum{$pos}; |
if (ref($confhash{$itemid}) ne 'HASH') { |
if (ref($confhash{$itemid}) ne 'HASH') { |
$resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>'; |
$resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>'; |
} else { |
} else { |
Line 9739 sub modify_ltitools {
|
Line 9787 sub modify_ltitools {
|
$resulttext .= '</li><ul>'; |
$resulttext .= '</li><ul>'; |
my $position = $pos + 1; |
my $position = $pos + 1; |
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
foreach my $item ('version','msgtype','url') { |
foreach my $item ('version','msgtype','url','key') { |
if ($confhash{$itemid}{$item} ne '') { |
if ($confhash{$itemid}{$item} ne '') { |
$resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{$item}.'</li>'; |
$resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{$item}.'</li>'; |
} |
} |
} |
} |
if ($encconfig{$itemid}{'key'} ne '') { |
if ($confhash{$itemid}{'secret'} ne '') { |
$resulttext .= '<li>'.$lt{'key'}.': '.$encconfig{$itemid}{'key'}.'</li>'; |
|
} |
|
if ($encconfig{$itemid}{'secret'} ne '') { |
|
$resulttext .= '<li>'.$lt{'secret'}.': '; |
$resulttext .= '<li>'.$lt{'secret'}.': '; |
my $num = length($encconfig{$itemid}{'secret'}); |
my $num = length($confhash{$itemid}{'secret'}); |
$resulttext .= ('*'x$num).'</li>'; |
$resulttext .= ('*'x$num).'</li>'; |
} |
} |
$resulttext .= '<li>'.&mt('Configurable in course:'); |
$resulttext .= '<li>'.&mt('Configurable in course:'); |
my @possconfig = ('label','title','target','linktext','explanation'); |
my @possconfig = ('label','title','target'); |
my $numconfig = 0; |
my $numconfig = 0; |
if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') { |
if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') { |
foreach my $item (@possconfig) { |
foreach my $item (@possconfig) { |
if ($confhash{$itemid}{'crsconf'}{$item}) { |
if ($confhash{$itemid}{'crsconf'}{$item}) { |
$numconfig ++; |
$numconfig ++; |
$resulttext .= ' "'.$lt{'crs'.$item}.'"'; |
$resulttext .= ' '.$lt{'crs'.$item}; |
} |
} |
} |
} |
} |
} |
Line 9782 sub modify_ltitools {
|
Line 9827 sub modify_ltitools {
|
$displaylist = &mt('Display target').': '. |
$displaylist = &mt('Display target').': '. |
$confhash{$itemid}{'display'}{'target'}.','; |
$confhash{$itemid}{'display'}{'target'}.','; |
} |
} |
foreach my $size ('width','height') { |
foreach my $size ('width','height') { |
if ($confhash{$itemid}{'display'}{$size}) { |
if ($confhash{$itemid}{'display'}{$size}) { |
$displaylist .= (' 'x2).$lt{$size}.': '. |
$displaylist .= (' 'x2).$lt{$size}.': '. |
$confhash{$itemid}{'display'}{$size}.','; |
$confhash{$itemid}{'display'}{$size}.','; |
Line 9792 sub modify_ltitools {
|
Line 9837 sub modify_ltitools {
|
$displaylist =~ s/,$//; |
$displaylist =~ s/,$//; |
$resulttext .= '<li>'.$displaylist.'</li>'; |
$resulttext .= '<li>'.$displaylist.'</li>'; |
} |
} |
foreach my $item ('linktext','explanation') { |
} |
if ($confhash{$itemid}{'display'}{$item}) { |
|
$resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{'display'}{$item}.'</li>'; |
|
} |
|
} |
|
} |
|
if (ref($confhash{$itemid}{'fields'}) eq 'HASH') { |
if (ref($confhash{$itemid}{'fields'}) eq 'HASH') { |
my $fieldlist; |
my $fieldlist; |
foreach my $field (@allfields) { |
foreach my $field (@allfields) { |
Line 9819 sub modify_ltitools {
|
Line 9859 sub modify_ltitools {
|
} |
} |
} |
} |
if ($rolemaps) { |
if ($rolemaps) { |
$rolemaps =~ s/,$//; |
$rolemaps =~ s/,$//; |
$resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>'; |
$resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>'; |
} |
} |
} |
} |
Line 9828 sub modify_ltitools {
|
Line 9868 sub modify_ltitools {
|
if (keys(%{$confhash{$itemid}{'custom'}})) { |
if (keys(%{$confhash{$itemid}{'custom'}})) { |
foreach my $key (sort(keys(%{$confhash{$itemid}{'custom'}}))) { |
foreach my $key (sort(keys(%{$confhash{$itemid}{'custom'}}))) { |
$customlist .= $key.':'.$confhash{$itemid}{'custom'}{$key}.(' 'x2); |
$customlist .= $key.':'.$confhash{$itemid}{'custom'}{$key}.(' 'x2); |
} |
} |
} |
} |
if ($customlist) { |
if ($customlist) { |
$resulttext .= '<li>'.&mt('Custom items').':'.$customlist.'</li>'; |
$resulttext .= '<li>'.&mt('Custom items').':'.$customlist.'</li>'; |
} |
} |
} |
} |
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
} |
} |
Line 9894 sub get_ltitools_id {
|
Line 9934 sub get_ltitools_id {
|
my $tries = 0; |
my $tries = 0; |
my $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom); |
my $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom); |
my ($id,$error); |
my ($id,$error); |
|
|
while (($gotlock ne 'ok') && ($tries<10)) { |
while (($gotlock ne 'ok') && ($tries<10)) { |
$tries ++; |
$tries ++; |
sleep (0.1); |
sleep (0.1); |
Line 10012 sub modify_autoenroll {
|
Line 10052 sub modify_autoenroll {
|
} |
} |
if ($changes{'autofailsafe'}) { |
if ($changes{'autofailsafe'}) { |
if ($failsafe ne '') { |
if ($failsafe ne '') { |
$resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section set to: [_1]',$failsafe).'</li>'; |
$resulttext .= '<li>'.&mt("$title{'failsafe'} set to [_1]",$failsafe).'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section: deleted'); |
$resulttext .= '<li>'.&mt("$title{'failsafe'} 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 10293 sub modify_autocreate {
|
Line 10333 sub modify_autocreate {
|
} |
} |
|
|
sub modify_directorysrch { |
sub modify_directorysrch { |
my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
my ($resulttext,%changes); |
my ($resulttext,%changes); |
my %currdirsrch; |
my %currdirsrch; |
if (ref($domconfig{'directorysrch'}) eq 'HASH') { |
if (ref($domconfig{'directorysrch'}) eq 'HASH') { |
Line 10487 sub modify_directorysrch {
|
Line 10527 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 10552 sub modify_contacts {
|
Line 10588 sub modify_contacts {
|
my $value = $env{'form.helpform_'.$field}; |
my $value = $env{'form.helpform_'.$field}; |
$value =~ s/^\s+|\s+$//g; |
$value =~ s/^\s+|\s+$//g; |
if (grep(/^\Q$value\E$/,@{$possoptions->{$field}})) { |
if (grep(/^\Q$value\E$/,@{$possoptions->{$field}})) { |
$contacts_hash{'contacts'}{'helpform'}{$field} = $value; |
$contacts_hash{contacts}{'helpform'}{$field} = $value; |
if ($field eq 'screenshot') { |
if ($field eq 'screenshot') { |
$env{'form.helpform_maxsize'} =~ s/^\s+|\s+$//g; |
$env{'form.helpform_maxsize'} =~ s/^\s+|\s+$//g; |
if ($env{'form.helpform_maxsize'} =~ /^\d+\.?\d*$/) { |
if ($env{'form.helpform_maxsize'} =~ /^\d+\.?\d*$/) { |
$contacts_hash{'contacts'}{'helpform'}{'maxsize'} = $env{'form.helpform_maxsize'}; |
$contacts_hash{contacts}{'helpform'}{'maxsize'} = $env{'form.helpform_maxsize'}; |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my (@statuses,%usertypeshash,@overrides); |
|
if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) { |
|
@statuses = @{$types}; |
|
if (ref($usertypes) eq 'HASH') { |
|
%usertypeshash = %{$usertypes}; |
|
} |
|
} |
|
if (@statuses) { |
|
my @possoverrides = &Apache::loncommon::get_env_multiple('form.overrides'); |
|
foreach my $type (@possoverrides) { |
|
if (($type ne '') && (grep(/^\Q$type\E$/,@statuses))) { |
|
push(@overrides,$type); |
|
} |
|
} |
|
if (@overrides) { |
|
foreach my $type (@overrides) { |
|
my @standard = &Apache::loncommon::get_env_multiple('form.override_'.$type); |
|
foreach my $item (@contacts) { |
|
if (grep(/^\Q$item\E$/,@standard)) { |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{$item} = 1; |
|
$newsetting{'override_'.$type}{$item} = 1; |
|
} else { |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{$item} = 0; |
|
$newsetting{'override_'.$type}{$item} = 0; |
|
} |
|
} |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{'others'} = $env{'form.override_'.$type.'_others'}; |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{'bcc'} = $env{'form.override_'.$type.'_bcc'}; |
|
$newsetting{'override_'.$type}{'others'} = $env{'form.override_'.$type.'_others'}; |
|
$newsetting{'override_'.$type}{'bcc'} = $env{'form.override_'.$type.'_bcc'}; |
|
if (($env{'form.override_'.$type.'_includestr'} ne '') && ($env{'form.override_'.$type.'_includeloc'} =~ /^s|b$/)) { |
|
$includestr{$type} = $env{'form.override_'.$type.'_includestr'}; |
|
$includeloc{$type} = $env{'form.override_'.$type.'_includeloc'}; |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{'include'} = $includeloc{$type}.':'.&escape($includestr{$type}); |
|
$newsetting{'override_'.$type}{'include'} = $contacts_hash{'contacts'}{'overrides'}{$type}{'include'}; |
|
} |
|
} |
|
} |
|
} |
|
if (keys(%currsetting) > 0) { |
if (keys(%currsetting) > 0) { |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
if ($to{$item} ne $currsetting{$item}) { |
if ($to{$item} ne $currsetting{$item}) { |
Line 10657 sub modify_contacts {
|
Line 10653 sub modify_contacts {
|
} |
} |
} |
} |
} |
} |
if (@statuses) { |
|
if (ref($currsetting{'overrides'}) eq 'HASH') { |
|
foreach my $key (keys(%{$currsetting{'overrides'}})) { |
|
if (ref($currsetting{'overrides'}{$key}) eq 'HASH') { |
|
if (ref($newsetting{'override_'.$key}) eq 'HASH') { |
|
foreach my $item (@contacts,'bcc','others','include') { |
|
if ($currsetting{'overrides'}{$key}{$item} ne $newsetting{'override_'.$key}{$item}) { |
|
push(@{$changes{'overrides'}},$key); |
|
last; |
|
} |
|
} |
|
} else { |
|
push(@{$changes{'overrides'}},$key); |
|
} |
|
} |
|
} |
|
foreach my $key (@overrides) { |
|
unless (exists($currsetting{'overrides'}{$key})) { |
|
push(@{$changes{'overrides'}},$key); |
|
} |
|
} |
|
} else { |
|
foreach my $key (@overrides) { |
|
push(@{$changes{'overrides'}},$key); |
|
} |
|
} |
|
} |
|
} else { |
} else { |
my %default; |
my %default; |
$default{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
$default{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
Line 10784 sub modify_contacts {
|
Line 10753 sub modify_contacts {
|
$resulttext .= $bcctext.': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>'; |
$resulttext .= $bcctext.': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>'; |
} elsif (!@text) { |
} elsif (!@text) { |
$resulttext .= &mt('No one'); |
$resulttext .= &mt('No one'); |
} |
} |
if ($includestr{$type} ne '') { |
if ($includestr{$type} ne '') { |
if ($includeloc{$type} eq 'b') { |
if ($includeloc{$type} eq 'b') { |
$resulttext .= '<br />'.&mt('Text automatically added to e-mail body:').' '.$includestr{$type}; |
$resulttext .= '<br />'.&mt('Text automatically added to e-mail body:').' '.$includestr{$type}; |
Line 10798 sub modify_contacts {
|
Line 10767 sub modify_contacts {
|
$resulttext .= '</li>'; |
$resulttext .= '</li>'; |
} |
} |
} |
} |
if (ref($changes{'overrides'}) eq 'ARRAY') { |
|
my @deletions; |
|
foreach my $type (@{$changes{'overrides'}}) { |
|
if ($usertypeshash{$type}) { |
|
if (grep(/^\Q$type\E/,@overrides)) { |
|
$resulttext .= '<li>'.&mt("Overrides based on requester's affiliation set for [_1]", |
|
$usertypeshash{$type}).'<ul><li>'; |
|
if (ref($newsetting{'override_'.$type}) eq 'HASH') { |
|
my @text; |
|
foreach my $item (@contacts) { |
|
if ($newsetting{'override_'.$type}{$item}) { |
|
push(@text,$short_titles->{$item}); |
|
} |
|
} |
|
if ($newsetting{'override_'.$type}{'others'} ne '') { |
|
push(@text,$newsetting{'override_'.$type}{'others'}); |
|
} |
|
|
|
if (@text) { |
|
$resulttext .= &mt('Helpdesk e-mail sent to: [_1]', |
|
'<span class="LC_cusr_emph">'.join(', ',@text).'</span>'); |
|
} |
|
if ($newsetting{'override_'.$type}{'bcc'} ne '') { |
|
my $bcctext; |
|
if (@text) { |
|
$bcctext = ' '.&mt('with Bcc to'); |
|
} else { |
|
$bcctext = '(Bcc)'; |
|
} |
|
$resulttext .= $bcctext.': <span class="LC_cusr_emph">'.$newsetting{'override_'.$type}{'bcc'}.'</span>'; |
|
} elsif (!@text) { |
|
$resulttext .= &mt('Helpdesk e-mail sent to no one'); |
|
} |
|
$resulttext .= '</li>'; |
|
if ($newsetting{'override_'.$type}{'include'} ne '') { |
|
my ($loc,$str) = split(/:/,$newsetting{'override_'.$type}{'include'}); |
|
if ($loc eq 'b') { |
|
$resulttext .= '<li>'.&mt('Text automatically added to e-mail body:').' '.&unescape($str).'</li>'; |
|
} elsif ($loc eq 's') { |
|
$resulttext .= '<li>'.&mt('Text automatically added to e-mail subject:').' '.&unescape($str).'</li>'; |
|
} |
|
} |
|
} |
|
$resulttext .= '</li></ul></li>'; |
|
} else { |
|
push(@deletions,$usertypeshash{$type}); |
|
} |
|
} |
|
} |
|
if (@deletions) { |
|
$resulttext .= '<li>'.&mt("Overrides based on requester's affiliation discontinued for: [_1]", |
|
join(', ',@deletions)).'</li>'; |
|
} |
|
} |
|
my @offon = ('off','on'); |
my @offon = ('off','on'); |
if ($changes{'reporterrors'}) { |
if ($changes{'reporterrors'}) { |
$resulttext .= '<li>'. |
$resulttext .= '<li>'. |
Line 10907 sub modify_contacts {
|
Line 10822 sub modify_contacts {
|
&mt('Max size for file uploaded to help form by logged-in user set to [_1] MB.', |
&mt('Max size for file uploaded to help form by logged-in user set to [_1] MB.', |
$contacts_hash{'contacts'}{'helpform'}{'maxsize'}). |
$contacts_hash{'contacts'}{'helpform'}{'maxsize'}). |
'</li>'; |
'</li>'; |
|
|
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
Line 11500 sub modify_selfcreation {
|
Line 11416 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{'email_rule'} = \@email_rule; |
$save_usercreate{'emailrule'} = \@email_rule; |
|
|
my %userconfig_hash = ( |
my %userconfig_hash = ( |
usercreation => \%save_usercreate, |
usercreation => \%save_usercreate, |
Line 12321 sub modify_coursecategories {
|
Line 12237 sub modify_coursecategories {
|
if ($domconfig{'coursecategories'}{'categorizecomm'} ne $env{'form.categorizecomm'}) { |
if ($domconfig{'coursecategories'}{'categorizecomm'} ne $env{'form.categorizecomm'}) { |
$changes{'categorizecomm'} = 1; |
$changes{'categorizecomm'} = 1; |
$domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'}; |
$domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'}; |
|
|
|
} |
|
if ($domconfig{'coursecategories'}{'togglecatsplace'} ne $env{'form.togglecatsplace'}) { |
|
$changes{'togglecatsplace'} = 1; |
|
$domconfig{'coursecategories'}{'togglecatsplace'} = $env{'form.togglecatsplace'}; |
|
} |
|
if ($domconfig{'coursecategories'}{'categorizeplace'} ne $env{'form.categorizeplace'}) { |
|
$changes{'categorizeplace'} = 1; |
|
$domconfig{'coursecategories'}{'categorizeplace'} = $env{'form.categorizeplace'}; |
} |
} |
foreach my $item (@catitems) { |
foreach my $item (@catitems) { |
if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) { |
if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) { |
Line 12335 sub modify_coursecategories {
|
Line 12260 sub modify_coursecategories {
|
$changes{'categorize'} = 1; |
$changes{'categorize'} = 1; |
$changes{'togglecatscomm'} = 1; |
$changes{'togglecatscomm'} = 1; |
$changes{'categorizecomm'} = 1; |
$changes{'categorizecomm'} = 1; |
|
$changes{'togglecatsplace'} = 1; |
|
$changes{'categorizeplace'} = 1; |
$domconfig{'coursecategories'} = { |
$domconfig{'coursecategories'} = { |
togglecats => $env{'form.togglecats'}, |
togglecats => $env{'form.togglecats'}, |
categorize => $env{'form.categorize'}, |
categorize => $env{'form.categorize'}, |
togglecatscomm => $env{'form.togglecatscomm'}, |
togglecatscomm => $env{'form.togglecatscomm'}, |
categorizecomm => $env{'form.categorizecomm'}, |
categorizecomm => $env{'form.categorizecomm'}, |
|
togglecatsplace => $env{'form.togglecatsplace'}, |
|
categorizeplace => $env{'form.categorizeplace'}, |
}; |
}; |
foreach my $item (@catitems) { |
foreach my $item (@catitems) { |
if ($env{'form.coursecat_'.$item} ne 'std') { |
if ($env{'form.coursecat_'.$item} ne 'std') { |
Line 12357 sub modify_coursecategories {
|
Line 12286 sub modify_coursecategories {
|
if (($domconfig{'coursecategories'}{'cats'}{'communities::0'} ne '') && ($env{'form.communities'} == 0)) { |
if (($domconfig{'coursecategories'}{'cats'}{'communities::0'} ne '') && ($env{'form.communities'} == 0)) { |
push(@deletecategory,'communities::0'); |
push(@deletecategory,'communities::0'); |
} |
} |
|
if (($domconfig{'coursecategories'}{'cats'}{'placement::0'} ne '') && ($env{'form.placement'} == 0)) { |
|
push(@deletecategory,'placement::0'); |
|
} |
} |
} |
my (@predelcats,@predeltrails,%predelallitems,%sort_by_deltrail); |
my (@predelcats,@predeltrails,%predelallitems,%sort_by_deltrail); |
if (ref($cathash) eq 'HASH') { |
if (ref($cathash) eq 'HASH') { |
Line 12419 sub modify_coursecategories {
|
Line 12351 sub modify_coursecategories {
|
$adds{$newitem} = 1; |
$adds{$newitem} = 1; |
} |
} |
} |
} |
|
if ($env{'form.placement'} eq '1') { |
|
if (ref($cathash) eq 'HASH') { |
|
my $newitem = 'placement::0'; |
|
if ($cathash->{$newitem} eq '') { |
|
$domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.placement_pos'}; |
|
$adds{$newitem} = 1; |
|
} |
|
} else { |
|
my $newitem = 'placement::0'; |
|
$domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.placement_pos'}; |
|
$adds{$newitem} = 1; |
|
} |
|
} |
if ($env{'form.addcategory_name'} ne '') { |
if ($env{'form.addcategory_name'} ne '') { |
if (($env{'form.addcategory_name'} ne 'instcode') && |
if (($env{'form.addcategory_name'} ne 'instcode') && |
($env{'form.addcategory_name'} ne 'communities')) { |
($env{'form.addcategory_name'} ne 'communities') && |
|
($env{'form.addcategory_name'} ne 'placement')) { |
my $newitem = &escape($env{'form.addcategory_name'}).'::0'; |
my $newitem = &escape($env{'form.addcategory_name'}).'::0'; |
$domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'}; |
$domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'}; |
$adds{$newitem} = 1; |
$adds{$newitem} = 1; |
Line 12933 sub modify_helpsettings {
|
Line 12879 sub modify_helpsettings {
|
order => 'Order', |
order => 'Order', |
desc => 'Role description', |
desc => 'Role description', |
access => 'Role usage', |
access => 'Role usage', |
status => 'Allowed institutional types', |
status => 'Allowed instituional types', |
exc => 'Allowed personnel', |
exc => 'Allowed personnel', |
inc => 'Disallowed personnel', |
inc => 'Disallowed personnel', |
); |
); |
Line 13016 sub modify_coursedefaults {
|
Line 12962 sub modify_coursedefaults {
|
my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,$errors,%changes,%defaultshash); |
my ($resulttext,$errors,%changes,%defaultshash); |
my %defaultchecked = ( |
my %defaultchecked = ( |
|
'canuse_pdfforms' => 'off', |
'uselcmath' => 'on', |
'uselcmath' => 'on', |
'usejsme' => 'on' |
'usejsme' => 'on' |
); |
); |
my @toggles = ('uselcmath','usejsme'); |
my @toggles = ('canuse_pdfforms','uselcmath','usejsme'); |
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
'uploadquota_community','uploadquota_textbook','mysqltables_official', |
'uploadquota_community','uploadquota_textbook','uploadquota_placement', |
'mysqltables_unofficial','mysqltables_community','mysqltables_textbook'); |
'mysqltables_official','mysqltables_unofficial','mysqltables_community', |
my @types = ('official','unofficial','community','textbook'); |
'mysqltables_textbook','mysqltables_placement'); |
|
my @types = ('official','unofficial','community','textbook','placement'); |
my %staticdefaults = ( |
my %staticdefaults = ( |
anonsurvey_threshold => 10, |
anonsurvey_threshold => 10, |
uploadquota => 500, |
uploadquota => 500, |
Line 13208 sub modify_coursedefaults {
|
Line 13156 sub modify_coursedefaults {
|
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
if (($changes{'uploadquota'}) || ($changes{'postsubmit'}) || |
if (($changes{'canuse_pdfforms'}) || ($changes{'uploadquota'}) || ($changes{'postsubmit'}) || |
($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) || |
($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) || |
($changes{'canclone'}) || ($changes{'mysqltables'})) { |
($changes{'canclone'}) || ($changes{'mysqltables'})) { |
foreach my $item ('uselcmath','usejsme') { |
foreach my $item ('canuse_pdfforms','uselcmath','usejsme') { |
if ($changes{$item}) { |
if ($changes{$item}) { |
$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item}; |
$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item}; |
} |
} |
Line 13262 sub modify_coursedefaults {
|
Line 13210 sub modify_coursedefaults {
|
} |
} |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
foreach my $item (sort(keys(%changes))) { |
foreach my $item (sort(keys(%changes))) { |
if ($item eq 'uselcmath') { |
if ($item eq 'canuse_pdfforms') { |
|
if ($env{'form.'.$item} eq '1') { |
|
$resulttext .= '<li>'.&mt("Course/Community users can create/upload PDF forms set to 'on'").'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>'; |
|
} |
|
} elsif ($item eq 'uselcmath') { |
if ($env{'form.'.$item} eq '1') { |
if ($env{'form.'.$item} eq '1') { |
$resulttext .= '<li>'.&mt('Math preview uses LON-CAPA previewer (javascript), if supported by browser.').'</li>'; |
$resulttext .= '<li>'.&mt('Math preview uses LON-CAPA previewer (javascript), if supported by browser.').'</li>'; |
} else { |
} else { |
Line 13282 sub modify_coursedefaults {
|
Line 13236 sub modify_coursedefaults {
|
'<li>'.&mt('Official courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'official'}.'</b>').'</li>'. |
'<li>'.&mt('Official courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'official'}.'</b>').'</li>'. |
'<li>'.&mt('Unofficial courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'unofficial'}.'</b>').'</li>'. |
'<li>'.&mt('Unofficial courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'unofficial'}.'</b>').'</li>'. |
'<li>'.&mt('Textbook courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'textbook'}.'</b>').'</li>'. |
'<li>'.&mt('Textbook courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'textbook'}.'</b>').'</li>'. |
|
'<li>'.&mt('Placement tests: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'placement'}.'</b>').'</li>'. |
'<li>'.&mt('Communities: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'community'}.'</b>').'</li>'. |
'<li>'.&mt('Communities: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'community'}.'</b>').'</li>'. |
'</ul>'. |
'</ul>'. |
'</li>'; |
'</li>'; |
Line 13295 sub modify_coursedefaults {
|
Line 13249 sub modify_coursedefaults {
|
'<li>'.&mt('Official courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'official'}.'</b>').'</li>'. |
'<li>'.&mt('Official courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'official'}.'</b>').'</li>'. |
'<li>'.&mt('Unofficial courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'unofficial'}.'</b>').'</li>'. |
'<li>'.&mt('Unofficial courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'unofficial'}.'</b>').'</li>'. |
'<li>'.&mt('Textbook courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'textbook'}.'</b>').'</li>'. |
'<li>'.&mt('Textbook courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'textbook'}.'</b>').'</li>'. |
|
'<li>'.&mt('Placement tests: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'placement'}.'</b>').'</li>'. |
'<li>'.&mt('Communities: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'community'}.'</b>').'</li>'. |
'<li>'.&mt('Communities: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'community'}.'</b>').'</li>'. |
'</ul>'. |
'</ul>'. |
'</li>'; |
'</li>'; |
Line 13330 sub modify_coursedefaults {
|
Line 13285 sub modify_coursedefaults {
|
$resulttext .= &mt('Unofficial courses'); |
$resulttext .= &mt('Unofficial courses'); |
} elsif ($type eq 'textbook') { |
} elsif ($type eq 'textbook') { |
$resulttext .= &mt('Textbook courses'); |
$resulttext .= &mt('Textbook courses'); |
|
} elsif ($type eq 'placement') { |
|
$resulttext .= &mt('Placement tests'); |
} |
} |
$resulttext .= ' -- '.$display.'</li>'; |
$resulttext .= ' -- '.$display.'</li>'; |
} |
} |
Line 13381 sub modify_coursedefaults {
|
Line 13338 sub modify_coursedefaults {
|
sub modify_selfenrollment { |
sub modify_selfenrollment { |
my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,$errors,%changes,%selfenrollhash,%ordered); |
my ($resulttext,$errors,%changes,%selfenrollhash,%ordered); |
my @types = ('official','unofficial','community','textbook'); |
my @types = ('official','unofficial','community','textbook','placement'); |
my %titles = &tool_titles(); |
my %titles = &tool_titles(); |
my %descs = &Apache::lonuserutils::selfenroll_default_descs(); |
my %descs = &Apache::lonuserutils::selfenroll_default_descs(); |
($ordered{'admin'},my $titlesref) = &Apache::lonuserutils::get_selfenroll_titles(); |
($ordered{'admin'},my $titlesref) = &Apache::lonuserutils::get_selfenroll_titles(); |
Line 13628 sub modify_usersessions {
|
Line 13585 sub modify_usersessions {
|
); |
); |
my @prefixes = ('remote','hosted','spares'); |
my @prefixes = ('remote','hosted','spares'); |
my @lcversions = &Apache::lonnet::all_loncaparevs(); |
my @lcversions = &Apache::lonnet::all_loncaparevs(); |
my (%by_ip,%by_location,@intdoms); |
my (%by_ip,%by_location,@intdoms,@instdoms); |
&build_location_hashes(\@intdoms,\%by_ip,\%by_location); |
&build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms); |
my @locations = sort(keys(%by_location)); |
my @locations = sort(keys(%by_location)); |
my (%defaultshash,%changes); |
my (%defaultshash,%changes); |
foreach my $prefix (@prefixes) { |
foreach my $prefix (@prefixes) { |
Line 13849 sub modify_usersessions {
|
Line 13806 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 13945 sub modify_usersessions {
|
Line 13900 sub modify_usersessions {
|
return $resulttext; |
return $resulttext; |
} |
} |
|
|
|
sub modify_ssl { |
|
my ($dom,$lastactref,%domconfig) = @_; |
|
my (%by_ip,%by_location,@intdoms,@instdoms); |
|
&build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms); |
|
my @locations = sort(keys(%by_location)); |
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
|
my (%defaultshash,%changes); |
|
my $action = 'ssl'; |
|
my @prefixes = ('connto','connfrom','replication'); |
|
foreach my $prefix (@prefixes) { |
|
$defaultshash{$action}{$prefix} = {}; |
|
} |
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
|
my $resulttext; |
|
my %iphost = &Apache::lonnet::get_iphost(); |
|
my @reptypes = ('certreq','nocertreq'); |
|
my @connecttypes = ('dom','intdom','other'); |
|
my %types = ( |
|
connto => \@connecttypes, |
|
connfrom => \@connecttypes, |
|
replication => \@reptypes, |
|
); |
|
foreach my $prefix (sort(keys(%types))) { |
|
foreach my $type (@{$types{$prefix}}) { |
|
if (($prefix eq 'connto') || ($prefix eq 'connfrom')) { |
|
my $value = 'yes'; |
|
if ($env{'form.'.$prefix.'_'.$type} =~ /^(no|req)$/) { |
|
$value = $env{'form.'.$prefix.'_'.$type}; |
|
} |
|
if (ref($domconfig{$action}{$prefix}) eq 'HASH') { |
|
if ($domconfig{$action}{$prefix}{$type} ne '') { |
|
if ($value ne $domconfig{$action}{$prefix}{$type}) { |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
$defaultshash{$action}{$prefix}{$type} = $value; |
|
} else { |
|
$defaultshash{$action}{$prefix}{$type} = $value; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} else { |
|
$defaultshash{$action}{$prefix}{$type} = $value; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
if (($type eq 'dom') && (keys(%servers) == 1)) { |
|
delete($changes{$prefix}{$type}); |
|
} elsif (($type eq 'intdom') && (@instdoms == 1)) { |
|
delete($changes{$prefix}{$type}); |
|
} elsif (($type eq 'other') && (keys(%by_location) == 0)) { |
|
delete($changes{$prefix}{$type}); |
|
} |
|
} elsif ($prefix eq 'replication') { |
|
if (@locations > 0) { |
|
my $inuse = $env{'form.'.$prefix.'_'.$type.'_inuse'}; |
|
my @vals = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_'.$type); |
|
my @okvals; |
|
foreach my $val (@vals) { |
|
if ($val =~ /:/) { |
|
my @items = split(/:/,$val); |
|
foreach my $item (@items) { |
|
if (ref($by_location{$item}) eq 'ARRAY') { |
|
push(@okvals,$item); |
|
} |
|
} |
|
} else { |
|
if (ref($by_location{$val}) eq 'ARRAY') { |
|
push(@okvals,$val); |
|
} |
|
} |
|
} |
|
@okvals = sort(@okvals); |
|
if (ref($domconfig{$action}) eq 'HASH') { |
|
if (ref($domconfig{$action}{$prefix}) eq 'HASH') { |
|
if (ref($domconfig{$action}{$prefix}{$type}) eq 'ARRAY') { |
|
if ($inuse == 0) { |
|
$changes{$prefix}{$type} = 1; |
|
} else { |
|
$defaultshash{$action}{$prefix}{$type} = \@okvals; |
|
my @changed = &Apache::loncommon::compare_arrays($domconfig{$action}{$prefix}{$type},$defaultshash{$action}{$prefix}{$type}); |
|
if (@changed > 0) { |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if ($inuse == 1) { |
|
$defaultshash{$action}{$prefix}{$type} = \@okvals; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if ($inuse == 1) { |
|
$defaultshash{$action}{$prefix}{$type} = \@okvals; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if ($inuse == 1) { |
|
$defaultshash{$action}{$prefix}{$type} = \@okvals; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
my $nochgmsg = &mt('No changes made to LON-CAPA SSL settings'); |
|
if (keys(%changes) > 0) { |
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
|
$dom); |
|
if ($putresult eq 'ok') { |
|
if (ref($defaultshash{$action}) eq 'HASH') { |
|
if (ref($defaultshash{$action}{'replication'}) eq 'HASH') { |
|
$domdefaults{'replication'} = $defaultshash{$action}{'replication'}; |
|
} |
|
if (ref($defaultshash{$action}{'connto'}) eq 'HASH') { |
|
$domdefaults{'connto'} = $domconfig{$action}{'connto'}; |
|
} |
|
if (ref($defaultshash{$action}{'connfrom'}) eq 'HASH') { |
|
$domdefaults{'connfrom'} = $domconfig{$action}{'connfrom'}; |
|
} |
|
} |
|
my $cachetime = 24*60*60; |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
if (keys(%changes) > 0) { |
|
my %titles = &ssl_titles(); |
|
$resulttext = &mt('Changes made:').'<ul>'; |
|
foreach my $prefix (@prefixes) { |
|
if (ref($changes{$prefix}) eq 'HASH') { |
|
$resulttext .= '<li>'.$titles{$prefix}.'<ul>'; |
|
foreach my $type (@{$types{$prefix}}) { |
|
if (defined($changes{$prefix}{$type})) { |
|
my $newvalue; |
|
if (ref($defaultshash{$action}) eq 'HASH') { |
|
if (ref($defaultshash{$action}{$prefix})) { |
|
if (($prefix eq 'connto') || ($prefix eq 'connfrom')) { |
|
$newvalue = $titles{$defaultshash{$action}{$prefix}{$type}}; |
|
} elsif (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') { |
|
if (@{$defaultshash{$action}{$prefix}{$type}} > 0) { |
|
$newvalue = join(', ',@{$defaultshash{$action}{$prefix}{$type}}); |
|
} |
|
} |
|
} |
|
if ($newvalue eq '') { |
|
$resulttext .= '<li>'.&mt('[_1] set to: none',$titles{$type}).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$titles{$type},$newvalue).'</li>'; |
|
} |
|
} |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} |
|
} |
|
} else { |
|
$resulttext = $nochgmsg; |
|
} |
|
} else { |
|
$resulttext = '<span class="LC_error">'. |
|
&mt('An error occurred: [_1]',$putresult).'</span>'; |
|
} |
|
} else { |
|
$resulttext = $nochgmsg; |
|
} |
|
return $resulttext; |
|
} |
|
|
|
sub modify_trust { |
|
my ($dom,$lastactref,%domconfig) = @_; |
|
my (%by_ip,%by_location,@intdoms,@instdoms); |
|
&build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms); |
|
my @locations = sort(keys(%by_location)); |
|
my @prefixes = qw(content shared enroll othcoau coaurem domroles catalog reqcrs msg); |
|
my @types = ('exc','inc'); |
|
my (%defaultshash,%changes); |
|
foreach my $prefix (@prefixes) { |
|
$defaultshash{'trust'}{$prefix} = {}; |
|
} |
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
|
my $resulttext; |
|
foreach my $prefix (@prefixes) { |
|
foreach my $type (@types) { |
|
my $inuse = $env{'form.'.$prefix.'_'.$type.'_inuse'}; |
|
my @vals = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_'.$type); |
|
my @okvals; |
|
foreach my $val (@vals) { |
|
if ($val =~ /:/) { |
|
my @items = split(/:/,$val); |
|
foreach my $item (@items) { |
|
if (ref($by_location{$item}) eq 'ARRAY') { |
|
push(@okvals,$item); |
|
} |
|
} |
|
} else { |
|
if (ref($by_location{$val}) eq 'ARRAY') { |
|
push(@okvals,$val); |
|
} |
|
} |
|
} |
|
@okvals = sort(@okvals); |
|
if (ref($domconfig{'trust'}) eq 'HASH') { |
|
if (ref($domconfig{'trust'}{$prefix}) eq 'HASH') { |
|
if (ref($domconfig{'trust'}{$prefix}{$type}) eq 'ARRAY') { |
|
if ($inuse == 0) { |
|
$changes{$prefix}{$type} = 1; |
|
} else { |
|
$defaultshash{'trust'}{$prefix}{$type} = \@okvals; |
|
my @changed = &Apache::loncommon::compare_arrays($domconfig{'trust'}{$prefix}{$type},$defaultshash{'trust'}{$prefix}{$type}); |
|
if (@changed > 0) { |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if ($inuse == 1) { |
|
$defaultshash{'trust'}{$prefix}{$type} = \@okvals; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if ($inuse == 1) { |
|
$defaultshash{'trust'}{$prefix}{$type} = \@okvals; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if ($inuse == 1) { |
|
$defaultshash{'trust'}{$prefix}{$type} = \@okvals; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} |
|
} |
|
my $nochgmsg = &mt('No changes made to trust settings.'); |
|
if (keys(%changes) > 0) { |
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
|
$dom); |
|
if ($putresult eq 'ok') { |
|
if (ref($defaultshash{'trust'}) eq 'HASH') { |
|
foreach my $prefix (@prefixes) { |
|
if (ref($defaultshash{'trust'}{$prefix}) eq 'HASH') { |
|
$domdefaults{'trust'.$prefix} = $defaultshash{'trust'}{$prefix}; |
|
} |
|
} |
|
} |
|
my $cachetime = 24*60*60; |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
if (keys(%changes) > 0) { |
|
my %lt = &trust_titles(); |
|
$resulttext = &mt('Changes made:').'<ul>'; |
|
foreach my $prefix (@prefixes) { |
|
if (ref($changes{$prefix}) eq 'HASH') { |
|
$resulttext .= '<li>'.$lt{$prefix}.'<ul>'; |
|
foreach my $type (@types) { |
|
if (defined($changes{$prefix}{$type})) { |
|
my $newvalue; |
|
if (ref($defaultshash{'trust'}) eq 'HASH') { |
|
if (ref($defaultshash{'trust'}{$prefix})) { |
|
if (ref($defaultshash{'trust'}{$prefix}{$type}) eq 'ARRAY') { |
|
if (@{$defaultshash{'trust'}{$prefix}{$type}} > 0) { |
|
$newvalue = join(', ',@{$defaultshash{'trust'}{$prefix}{$type}}); |
|
} |
|
} |
|
} |
|
} |
|
if ($newvalue eq '') { |
|
$resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>'; |
|
} |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$resulttext = $nochgmsg; |
|
} |
|
} else { |
|
$resulttext = '<span class="LC_error">'. |
|
&mt('An error occurred: [_1]',$putresult).'</span>'; |
|
} |
|
} else { |
|
$resulttext = $nochgmsg; |
|
} |
|
return $resulttext; |
|
} |
|
|
sub modify_loadbalancing { |
sub modify_loadbalancing { |
my ($dom,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
my $primary_id = &Apache::lonnet::domain($dom,'primary'); |
my $primary_id = &Apache::lonnet::domain($dom,'primary'); |
Line 14936 sub devalidate_remote_domconfs {
|
Line 15183 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','ltitools','usersessions','directorysrch'); |
my @posscached = ('domainconfig','domdefaults','ltitools'); |
if (keys(%servers)) { |
if (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
next if ($thismachine{$server}); |
next if ($thismachine{$server}); |