version 1.133, 2010/03/22 17:23:34
|
version 1.138.2.3, 2010/08/26 08:27:38
|
Line 202 sub handler {
|
Line 202 sub handler {
|
'quotas','autoenroll','autoupdate','autocreate', |
'quotas','autoenroll','autoupdate','autocreate', |
'directorysrch','usercreation','usermodification', |
'directorysrch','usercreation','usermodification', |
'contacts','defaults','scantron','coursecategories', |
'contacts','defaults','scantron','coursecategories', |
'serverstatuses','requestcourses','helpsettings', |
'serverstatuses','requestcourses','coursedefaults', |
'coursedefaults'],$dom); |
'usersessions'],$dom); |
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','usermodification','scantron', |
'usercreation','usermodification','scantron', |
'requestcourses','coursecategories','serverstatuses','helpsettings', |
'requestcourses','coursecategories','serverstatuses', |
'coursedefaults'); |
'coursedefaults','usersessions'); |
my %prefs = ( |
my %prefs = ( |
'rolecolors' => |
'rolecolors' => |
{ text => 'Default color schemes', |
{ text => 'Default color schemes', |
Line 337 sub handler {
|
Line 337 sub handler {
|
{col1 => 'Unauthenticated Help Settings', |
{col1 => 'Unauthenticated Help Settings', |
col2 => ''}], |
col2 => ''}], |
}, |
}, |
'coursedefaults' => |
'coursedefaults' => |
{text => 'Course/Community defaults', |
{text => 'Course/Community defaults', |
help => 'Domain_Configuration_Course_Defaults', |
help => 'Domain_Configuration_Course_Defaults', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Defaults which can be overridden for each course by a DC', |
col2 => 'Value',}], |
col2 => 'Value',}], |
}, |
}, |
'privacy' => |
'privacy' => |
Line 349 sub handler {
|
Line 349 sub handler {
|
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
col2 => 'Value',}], |
col2 => 'Value',}], |
}, |
}, |
|
'usersessions' => |
|
{text => 'User session hosting', |
|
help => 'Domain_Configuration_User_Sessions', |
|
header => [{col1 => 'Hosting of users from other domains', |
|
col2 => 'Rules'}, |
|
{col1 => "Hosting domain's own users elsewhere", |
|
col2 => 'Rules'}], |
|
}, |
); |
); |
my %servers = &dom_servers($dom); |
my %servers = &dom_servers($dom); |
if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
Line 447 sub process_changes {
|
Line 455 sub process_changes {
|
$output = &modify_serverstatuses($dom,%domconfig); |
$output = &modify_serverstatuses($dom,%domconfig); |
} elsif ($action eq 'requestcourses') { |
} elsif ($action eq 'requestcourses') { |
$output = &modify_quotas($dom,$action,%domconfig); |
$output = &modify_quotas($dom,$action,%domconfig); |
} elsif ($action eq 'helpsettings') { |
|
$output = &modify_helpsettings($r,$dom,$confname,%domconfig); |
|
} elsif ($action eq 'coursedefaults') { |
} elsif ($action eq 'coursedefaults') { |
$output = &modify_coursedefaults($dom,%domconfig); |
$output = &modify_coursedefaults($dom,%domconfig); |
|
} elsif ($action eq 'usersessions') { |
|
$output = &modify_usersessions($dom,%domconfig); |
} |
} |
return $output; |
return $output; |
} |
} |
Line 503 sub print_config_box {
|
Line 511 sub print_config_box {
|
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
} elsif ($action eq 'helpsettings') { |
} elsif ($action eq 'helpsettings') { |
$output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal); |
$output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal); |
|
} elsif ($action eq 'usersessions') { |
|
$output .= &print_usersessions('top',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'rolecolors') { |
} elsif ($action eq 'rolecolors') { |
$output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal); |
$output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal); |
} |
} |
Line 566 sub print_config_box {
|
Line 576 sub print_config_box {
|
$output .= &print_courserequestmail($dom,$settings,\$rowtotal); |
$output .= &print_courserequestmail($dom,$settings,\$rowtotal); |
} elsif ($action eq 'helpsettings') { |
} elsif ($action eq 'helpsettings') { |
$output .= &print_helpsettings('bottom',$dom,$confname,$settings,\$rowtotal); |
$output .= &print_helpsettings('bottom',$dom,$confname,$settings,\$rowtotal); |
|
} elsif ($action eq 'usersessions') { |
|
$output .= &print_usersessions('bottom',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'rolecolors') { |
} elsif ($action eq 'rolecolors') { |
$output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).' |
$output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).' |
</table> |
</table> |
Line 652 sub print_config_box {
|
Line 664 sub print_config_box {
|
$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); |
$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); |
} elsif ($action eq 'serverstatuses') { |
} elsif ($action eq 'serverstatuses') { |
$output .= &print_serverstatuses($dom,$settings,\$rowtotal); |
$output .= &print_serverstatuses($dom,$settings,\$rowtotal); |
} elsif ($action eq 'helpsettings') { |
} elsif ($action eq 'coursedefaults') { |
$output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal); |
$output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'coursedefaults') { |
|
$output .= &print_coursedefaults($dom,$settings,\$rowtotal); |
|
} |
} |
} |
} |
$output .= ' |
$output .= ' |
Line 756 sub print_login {
|
Line 766 sub print_login {
|
$checkedon{$item} = ' '; |
$checkedon{$item} = ' '; |
} |
} |
} |
} |
my $loginheader = 'image'; |
|
my @images = ('img','logo','domlogo','login'); |
my @images = ('img','logo','domlogo','login'); |
my @logintext = ('textcol','bgcol'); |
my @logintext = ('textcol','bgcol'); |
my @bgs = ('pgbg','mainbg','sidebg'); |
my @bgs = ('pgbg','mainbg','sidebg'); |
Line 805 sub print_login {
|
Line 814 sub print_login {
|
$is_custom{$item} = 1; |
$is_custom{$item} = 1; |
} |
} |
} |
} |
if ($settings->{'loginheader'} ne '') { |
|
$loginheader = $settings->{'loginheader'}; |
|
} |
|
if ($settings->{'font'} ne '') { |
if ($settings->{'font'} ne '') { |
$designs{'font'} = $settings->{'font'}; |
$designs{'font'} = $settings->{'font'}; |
$is_custom{'font'} = 1; |
$is_custom{'font'} = 1; |
Line 866 sub print_login {
|
Line 872 sub print_login {
|
'</tr>'; |
'</tr>'; |
$itemcount ++; |
$itemcount ++; |
} |
} |
$datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext,$loginheader); |
$datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext); |
$datatable .= '</tr></table></td></tr>'; |
$datatable .= '</tr></table></td></tr>'; |
return $datatable; |
return $datatable; |
} |
} |
Line 986 sub print_rolecolors {
|
Line 992 sub print_rolecolors {
|
|
|
sub display_color_options { |
sub display_color_options { |
my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, |
my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, |
$images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_; |
$images,$bgs,$links,$alt_text,$rowtotal,$logintext) = @_; |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $datatable = '<tr>'. |
my $datatable = '<tr'.$css_class.'>'. |
'<td>'.$choices->{'font'}.'</td>'; |
'<td>'.$choices->{'font'}.'</td>'; |
if (!$is_custom->{'font'}) { |
if (!$is_custom->{'font'}) { |
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>'; |
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>'; |
Line 1028 sub display_color_options {
|
Line 1034 sub display_color_options {
|
if ($role eq 'login') { |
if ($role eq 'login') { |
if ($img eq 'login') { |
if ($img eq 'login') { |
$login_hdr_pick = |
$login_hdr_pick = |
&login_header_options($img,$role,$defaults,$is_custom,$choices, |
&login_header_options($img,$role,$defaults,$is_custom,$choices); |
$loginheader); |
|
$logincolors = |
$logincolors = |
&login_text_colors($img,$role,$logintext,$phase,$choices, |
&login_text_colors($img,$role,$logintext,$phase,$choices, |
$designs); |
$designs); |
Line 1106 sub display_color_options {
|
Line 1111 sub display_color_options {
|
} |
} |
$datatable .= '<td>'; |
$datatable .= '<td>'; |
if ($img eq 'login') { |
if ($img eq 'login') { |
$datatable .= $login_hdr_pick; |
$datatable .= $login_hdr_pick; |
} |
} |
$datatable .= &image_changes($is_custom->{$img},$alt_text->{$img},$img_import, |
$datatable .= &image_changes($is_custom->{$img},$alt_text->{$img},$img_import, |
$showfile,$fullsize,$role,$img,$imgfile,$logincolors); |
$showfile,$fullsize,$role,$img,$imgfile,$logincolors); |
} else { |
} else { |
Line 1121 sub display_color_options {
|
Line 1126 sub display_color_options {
|
if ($switchserver) { |
if ($switchserver) { |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
} else { |
} else { |
$datatable .=' <input type="file" name="'.$role.'_'.$img.'" />'; |
if ($img ne 'login') { # suppress file selection for Log-in header |
|
$datatable .=' <input type="file" name="'.$role.'_'.$img.'" />'; |
|
} |
} |
} |
$datatable .= '</td></tr>'; |
$datatable .= '</td></tr>'; |
} |
} |
Line 1210 sub logo_display_options {
|
Line 1217 sub logo_display_options {
|
} |
} |
|
|
sub login_header_options { |
sub login_header_options { |
my ($img,$role,$defaults,$is_custom,$choices,$loginheader) = @_; |
my ($img,$role,$defaults,$is_custom,$choices) = @_; |
my $image_checked = ' checked="checked" '; |
my $output = ''; |
my $text_checked = ' '; |
|
if ($loginheader eq 'text') { |
|
$image_checked = ' '; |
|
$text_checked = ' checked="checked" '; |
|
} |
|
my $output = '<span class="LC_nobreak"><label><input type="radio" name="'. |
|
'loginheader" value="image" '.$image_checked.'/>'. |
|
&mt('use image').'</label> '. |
|
'<label><input type="radio" name="loginheader" value="text"'. |
|
$text_checked.'/>'.&mt('use text').'</label><br />'."\n"; |
|
if ((!$is_custom->{'textcol'}) || (!$is_custom->{'bgcol'})) { |
if ((!$is_custom->{'textcol'}) || (!$is_custom->{'bgcol'})) { |
$output .= &mt('Text default(s)').':<br />'; |
$output .= &mt('Text default(s):').'<br />'; |
if (!$is_custom->{'textcol'}) { |
if (!$is_custom->{'textcol'}) { |
$output .= $choices->{'textcol'}.': '.$defaults->{'logintext'}{'textcol'}. |
$output .= $choices->{'textcol'}.': '.$defaults->{'logintext'}{'textcol'}. |
' '; |
' '; |
Line 1259 sub login_text_colors {
|
Line 1256 sub login_text_colors {
|
sub image_changes { |
sub image_changes { |
my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_; |
my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_; |
my $output; |
my $output; |
if (!$is_custom) { |
if ($img eq 'login') { |
|
# suppress image for Log-in header |
|
} elsif (!$is_custom) { |
if ($img ne 'domlogo') { |
if ($img ne 'domlogo') { |
$output .= &mt('Default image:').'<br />'; |
$output .= &mt('Default image:').'<br />'; |
} else { |
} else { |
$output .= &mt('Default in use:').'<br />'; |
$output .= &mt('Default in use:').'<br />'; |
} |
} |
} |
} |
if ($img_import) { |
if ($img eq 'login') { # suppress image for Log-in header |
$output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />'; |
$output .= '<td>'.$logincolors; |
} |
|
$output .= '<a href="'.$fullsize.'" target="_blank"><img src="'. |
|
$showfile.'" alt="'.$alt_text.'" border="0" /></a></td>'; |
|
if ($is_custom) { |
|
$output .= '<td>'.$logincolors.'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'. |
|
$role.'_del_'.$img.'" value="1" />'.&mt('Delete?'). |
|
'</label> '.&mt('Replace:').'</span><br />'; |
|
} else { |
} else { |
$output .= '<td valign="bottom">'.$logincolors.&mt('Upload:').'<br />'; |
if ($img_import) { |
|
$output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />'; |
|
} |
|
$output .= '<a href="'.$fullsize.'" target="_blank"><img src="'. |
|
$showfile.'" alt="'.$alt_text.'" border="0" /></a></td>'; |
|
if ($is_custom) { |
|
$output .= '<td>'.$logincolors.'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'. |
|
$role.'_del_'.$img.'" value="1" />'.&mt('Delete?'). |
|
'</label> '.&mt('Replace:').'</span><br />'; |
|
} else { |
|
$output .= '<td valign="bottom">'.$logincolors.&mt('Upload:').'<br />'; |
|
} |
} |
} |
return $output; |
return $output; |
} |
} |
Line 2014 sub print_contacts {
|
Line 2017 sub print_contacts {
|
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my $datatable; |
my $datatable; |
my @contacts = ('adminemail','supportemail'); |
my @contacts = ('adminemail','supportemail'); |
my (%checked,%to,%otheremails); |
my (%checked,%to,%otheremails,%bccemails); |
my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail', |
my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail', |
'requestsmail'); |
'requestsmail'); |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
$otheremails{$type} = ''; |
$otheremails{$type} = ''; |
} |
} |
|
$bccemails{'helpdeskmail'} = ''; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
if (exists($settings->{$item})) { |
if (exists($settings->{$item})) { |
Line 2035 sub print_contacts {
|
Line 2039 sub print_contacts {
|
} |
} |
} |
} |
$otheremails{$type} = $settings->{$type}{'others'}; |
$otheremails{$type} = $settings->{$type}{'others'}; |
|
if ($type eq 'helpdeskmail') { |
|
$bccemails{$type} = $settings->{$type}{'bcc'}; |
|
} |
} |
} |
} elsif ($type eq 'lonstatusmail') { |
} elsif ($type eq 'lonstatusmail') { |
$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; |
Line 2078 sub print_contacts {
|
Line 2085 sub print_contacts {
|
} |
} |
$datatable .= '</span><br />'.&mt('Others').': '. |
$datatable .= '</span><br />'.&mt('Others').': '. |
'<input type="text" name="'.$type.'_others" '. |
'<input type="text" name="'.$type.'_others" '. |
'value="'.$otheremails{$type}.'" />'. |
'value="'.$otheremails{$type}.'" />'; |
'</td></tr>'."\n"; |
if ($type eq 'helpdeskmail') { |
|
$datatable .= '<br />'.&mt('Bcc:').(' 'x6). |
|
'<input type="text" name="'.$type.'_bcc" '. |
|
'value="'.$bccemails{$type}.'" />'; |
|
} |
|
$datatable .= '</td></tr>'."\n"; |
} |
} |
$$rowtotal += $rownum; |
$$rowtotal += $rownum; |
return $datatable; |
return $datatable; |
Line 2224 sub radiobutton_prefs {
|
Line 2236 sub radiobutton_prefs {
|
} |
} |
|
|
sub print_coursedefaults { |
sub print_coursedefaults { |
my ($dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable); |
my $itemcount = 1; |
my $itemcount = 1; |
my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles); |
if ($position eq 'top') { |
%choices = |
my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles); |
&Apache::lonlocal::texthash ( |
%choices = |
canuse_pdfforms => 'Course/Community users can create/upload PDF forms', |
&Apache::lonlocal::texthash ( |
); |
canuse_pdfforms => 'Course/Community users can create/upload PDF forms', |
%defaultchecked = ('canuse_pdfforms' => 'off'); |
); |
@toggles = ('canuse_pdfforms',); |
%defaultchecked = ('canuse_pdfforms' => 'off'); |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
@toggles = ('canuse_pdfforms',); |
|
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
\%choices,$itemcount); |
\%choices,$itemcount); |
|
$$rowtotal += $itemcount; |
|
} else { |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
my %choices = |
|
&Apache::lonlocal::texthash ( |
|
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
|
); |
|
my $currdefresponder; |
|
if (ref($settings) eq 'HASH') { |
|
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
|
} |
|
if (!$currdefresponder) { |
|
$currdefresponder = 10; |
|
} elsif ($currdefresponder < 1) { |
|
$currdefresponder = 1; |
|
} |
|
$datatable .= |
|
'<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices{'anonsurvey_threshold'}. |
|
'</span></td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak">'. |
|
'<input type="text" name="anonsurvey_threshold"'. |
|
' value="'.$currdefresponder.'" size="5" /></span>'. |
|
'</td></tr>'; |
|
} |
|
return $datatable; |
|
} |
|
|
|
sub print_usersessions { |
|
my ($position,$dom,$settings,$rowtotal) = @_; |
|
my ($css_class,$datatable,%checked,%choices); |
|
my %lt = &usersession_titles(); |
|
my $itemcount = 1; |
|
my $numinrow = 6; |
|
my $prefix; |
|
my @types; |
|
if ($position eq 'top') { |
|
$prefix = 'hosted'; |
|
@types = ('excludedomain','includedomain'); |
|
} else { |
|
$prefix = 'remote'; |
|
@types = ('version','excludedomain','includedomain'); |
|
} |
|
my (%current,%checkedon,%checkedoff); |
|
my @lcversions = &Apache::lonnet::all_loncaparevs(); |
|
my (%by_ip,%by_location,@intdoms); |
|
&build_location_hashes(\@intdoms,\%by_ip,\%by_location); |
|
my @locations = sort(keys(%by_location)); |
|
foreach my $type (@types) { |
|
$checkedon{$type} = ''; |
|
$checkedoff{$type} = ' checked="checked"'; |
|
} |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{$prefix}) eq 'HASH') { |
|
foreach my $key (keys(%{$settings->{$prefix}})) { |
|
$current{$key} = $settings->{$prefix}{$key}; |
|
if ($key eq 'version') { |
|
if ($current{$key} ne '') { |
|
$checkedon{$key} = ' checked="checked"'; |
|
$checkedoff{$key} = ''; |
|
} |
|
} elsif (ref($current{$key}) eq 'ARRAY') { |
|
$checkedon{$key} = ' checked="checked"'; |
|
$checkedoff{$key} = ''; |
|
} |
|
} |
|
} |
|
} |
|
foreach my $type (@types) { |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'> |
|
<td><span class="LC_nobreak">'.$lt{$type}.'</span><br /> |
|
<span class="LC_nobreak"> |
|
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedoff{$type}.' value="0" />'.&mt('Not in use').'</label> |
|
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedon{$type}.' value="1" />'.&mt('In use').'</label></span></td><td>'; |
|
if ($type eq 'version') { |
|
my $selector = '<select name="'.$prefix.'_version">'; |
|
foreach my $version (@lcversions) { |
|
my $selected = ''; |
|
if ($current{'version'} eq $version) { |
|
$selected = ' selected="selected"'; |
|
} |
|
$selector .= ' <option value="'.$version.'"'. |
|
$selected.'>'.$version.'</option>'; |
|
} |
|
$selector .= '</select> '; |
|
$datatable .= &mt('remote server must be version: [_1] or later',$selector); |
|
} else { |
|
$datatable.= '<div><input type="button" value="'.&mt('check all').'" '. |
|
'onclick="javascript:checkAll(document.display.'.$prefix.'_'.$type.')"'. |
|
' />'.(' 'x2). |
|
'<input type="button" value="'.&mt('uncheck all').'" '. |
|
'onclick="javascript:uncheckAll(document.display.'.$prefix.'_'.$type.')" />'. |
|
"\n". |
|
'</div><div><table>'; |
|
my $rem; |
|
for (my $i=0; $i<@locations; $i++) { |
|
my ($showloc,$value,$checkedtype); |
|
if (ref($by_location{$locations[$i]}) eq 'ARRAY') { |
|
my $ip = $by_location{$locations[$i]}->[0]; |
|
if (ref($by_ip{$ip}) eq 'ARRAY') { |
|
$value = join(':',@{$by_ip{$ip}}); |
|
$showloc = join(', ',@{$by_ip{$ip}}); |
|
if (ref($current{$type}) eq 'ARRAY') { |
|
foreach my $loc (@{$by_ip{$ip}}) { |
|
if (grep(/^\Q$loc\E$/,@{$current{$type}})) { |
|
$checkedtype = ' checked="checked"'; |
|
last; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
$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); |
|
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 ++; |
|
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub build_location_hashes { |
|
my ($intdoms,$by_ip,$by_location) = @_; |
|
return unless((ref($intdoms) eq 'ARRAY') && (ref($by_ip) eq 'HASH') && |
|
(ref($by_location) eq 'HASH')); |
|
my %iphost = &Apache::lonnet::get_iphost(); |
|
my $primary_id = &Apache::lonnet::domain($env{'request.role.domain'},'primary'); |
|
my $primary_ip = &Apache::lonnet::get_host_ip($primary_id); |
|
if (ref($iphost{$primary_ip}) eq 'ARRAY') { |
|
foreach my $id (@{$iphost{$primary_ip}}) { |
|
my $intdom = &Apache::lonnet::internet_dom($id); |
|
unless(grep(/^\Q$intdom\E$/,@{$intdoms})) { |
|
push(@{$intdoms},$intdom); |
|
} |
|
} |
|
} |
|
foreach my $ip (keys(%iphost)) { |
|
if (ref($iphost{$ip}) eq 'ARRAY') { |
|
foreach my $id (@{$iphost{$ip}}) { |
|
my $location = &Apache::lonnet::internet_dom($id); |
|
if ($location) { |
|
next if (grep(/^\Q$location\E$/,@{$intdoms})); |
|
if (ref($by_ip->{$ip}) eq 'ARRAY') { |
|
unless(grep(/^\Q$location\E$/,@{$by_ip->{$ip}})) { |
|
push(@{$by_ip->{$ip}},$location); |
|
} |
|
} else { |
|
$by_ip->{$ip} = [$location]; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
foreach my $ip (sort(keys(%{$by_ip}))) { |
|
if (ref($by_ip->{$ip}) eq 'ARRAY') { |
|
@{$by_ip->{$ip}} = sort(@{$by_ip->{$ip}}); |
|
my $first = $by_ip->{$ip}->[0]; |
|
if (ref($by_location->{$first}) eq 'ARRAY') { |
|
unless (grep(/^\Q$ip\E$/,@{$by_location->{$first}})) { |
|
push(@{$by_location->{$first}},$ip); |
|
} |
|
} else { |
|
$by_location->{$first} = [$ip]; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
sub contact_titles { |
sub contact_titles { |
my %titles = &Apache::lonlocal::texthash ( |
my %titles = &Apache::lonlocal::texthash ( |
'supportemail' => 'Support E-mail address', |
'supportemail' => 'Support E-mail address', |
Line 3699 sub modify_login {
|
Line 3898 sub modify_login {
|
} |
} |
} |
} |
} |
} |
if (($domconfig{'login'}{'loginheader'} eq 'text') && |
|
($env{'form.loginheader'} eq 'image')) { |
|
$changes{'loginheader'} = 1; |
|
} elsif (($domconfig{'login'}{'loginheader'} eq '' || |
|
$domconfig{'login'}{'loginheader'} eq 'image') && |
|
($env{'form.loginheader'} eq 'text')) { |
|
$changes{'loginheader'} = 1; |
|
} |
|
} |
} |
if (keys(%changes) > 0 || $colchgtext) { |
if (keys(%changes) > 0 || $colchgtext) { |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
$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 'loginheader') { |
if ($item eq 'loginvia') { |
$resulttext .= '<li>'.&mt("$title{$item} set to $env{'form.loginheader'}").'</li>'; |
|
} elsif ($item eq 'loginvia') { |
|
if (ref($changes{$item}) eq 'HASH') { |
if (ref($changes{$item}) eq 'HASH') { |
$resulttext .= '<li>'.&mt('Log-in page availability:').'<ul>'; |
$resulttext .= '<li>'.&mt('Log-in page availability:').'<ul>'; |
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
Line 5186 sub modify_contacts {
|
Line 5375 sub modify_contacts {
|
$currsetting{$key} = $domconfig{'contacts'}{$key}; |
$currsetting{$key} = $domconfig{'contacts'}{$key}; |
} |
} |
} |
} |
my (%others,%to); |
my (%others,%to,%bcc); |
my @contacts = ('supportemail','adminemail'); |
my @contacts = ('supportemail','adminemail'); |
my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail', |
my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail', |
'requestsmail'); |
'requestsmail'); |
Line 5202 sub modify_contacts {
|
Line 5391 sub modify_contacts {
|
} |
} |
$others{$type} = $env{'form.'.$type.'_others'}; |
$others{$type} = $env{'form.'.$type.'_others'}; |
$contacts_hash{contacts}{$type}{'others'} = $others{$type}; |
$contacts_hash{contacts}{$type}{'others'} = $others{$type}; |
|
if ($type eq 'helpdeskmail') { |
|
$bcc{$type} = $env{'form.'.$type.'_bcc'}; |
|
$contacts_hash{contacts}{$type}{'bcc'} = $bcc{$type}; |
|
} |
} |
} |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
$to{$item} = $env{'form.'.$item}; |
$to{$item} = $env{'form.'.$item}; |
Line 5226 sub modify_contacts {
|
Line 5419 sub modify_contacts {
|
if ($others{$type} ne $currsetting{$type}{'others'}) { |
if ($others{$type} ne $currsetting{$type}{'others'}) { |
push(@{$changes{$type}},'others'); |
push(@{$changes{$type}},'others'); |
} |
} |
|
if ($type eq 'helpdeskmail') { |
|
if ($bcc{$type} ne $currsetting{$type}{'bcc'}) { |
|
push(@{$changes{$type}},'bcc'); |
|
} |
|
} |
} |
} |
} else { |
} else { |
my %default; |
my %default; |
Line 5248 sub modify_contacts {
|
Line 5446 sub modify_contacts {
|
} |
} |
if ($others{$type} ne '') { |
if ($others{$type} ne '') { |
push(@{$changes{$type}},'others'); |
push(@{$changes{$type}},'others'); |
} |
} |
|
if ($type eq 'helpdeskmail') { |
|
if ($bcc{$type} ne '') { |
|
push(@{$changes{$type}},'bcc'); |
|
} |
|
} |
} |
} |
} |
} |
my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash, |
Line 5276 sub modify_contacts {
|
Line 5479 sub modify_contacts {
|
push(@text,$others{$type}); |
push(@text,$others{$type}); |
} |
} |
$resulttext .= '<span class="LC_cusr_emph">'. |
$resulttext .= '<span class="LC_cusr_emph">'. |
join(', ',@text).'</span></li>'; |
join(', ',@text).'</span>'; |
|
if ($type eq 'helpdeskmail') { |
|
if ($bcc{$type} ne '') { |
|
$resulttext .= ' '.&mt('with Bcc to').': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>'; |
|
} |
|
} |
|
$resulttext .= '</li>'; |
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
Line 6446 sub modify_coursedefaults {
|
Line 6655 sub modify_coursedefaults {
|
my ($resulttext,$errors,%changes,%defaultshash); |
my ($resulttext,$errors,%changes,%defaultshash); |
my %defaultchecked = ('canuse_pdfforms' => 'off'); |
my %defaultchecked = ('canuse_pdfforms' => 'off'); |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
my @toggles = ('canuse_pdfforms'); |
my @toggles = (); |
|
|
$defaultshash{'coursedefaults'} = {}; |
$defaultshash{'coursedefaults'} = {}; |
|
|
Line 6475 sub modify_coursedefaults {
|
Line 6684 sub modify_coursedefaults {
|
} |
} |
$defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item}; |
$defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item}; |
} |
} |
|
my $currdefresponder = $domconfig{'coursedefaults'}{'anonsurvey_threshold'}; |
|
my $newdefresponder = $env{'form.anonsurvey_threshold'}; |
|
$newdefresponder =~ s/\D//g; |
|
if ($newdefresponder eq '' || $newdefresponder < 1) { |
|
$newdefresponder = 1; |
|
} |
|
$defaultshash{'coursedefaults'}{'anonsurvey_threshold'} = $newdefresponder; |
|
if ($currdefresponder ne $newdefresponder) { |
|
unless ($currdefresponder eq '' && $newdefresponder == 10) { |
|
$changes{'anonsurvey_threshold'} = 1; |
|
} |
|
} |
} |
} |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
$dom); |
$dom); |
Line 6494 sub modify_coursedefaults {
|
Line 6715 sub modify_coursedefaults {
|
} else { |
} else { |
$resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>'; |
$resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>'; |
} |
} |
|
} elsif ($item eq 'anonsurvey_threshold') { |
|
$resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>'; |
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
Line 6507 sub modify_coursedefaults {
|
Line 6730 sub modify_coursedefaults {
|
return $resulttext; |
return $resulttext; |
} |
} |
|
|
|
sub modify_usersessions { |
|
my ($dom,%domconfig) = @_; |
|
my @types = ('version','excludedomain','includedomain'); |
|
my @prefixes = ('remote','hosted'); |
|
my @lcversions = &Apache::lonnet::all_loncaparevs(); |
|
my (%by_ip,%by_location,@intdoms); |
|
&build_location_hashes(\@intdoms,\%by_ip,\%by_location); |
|
my @locations = sort(keys(%by_location)); |
|
my (%defaultshash,%changes); |
|
foreach my $prefix (@prefixes) { |
|
$defaultshash{'usersessions'}{$prefix} = {}; |
|
} |
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
|
my $resulttext; |
|
my %iphost = &Apache::lonnet::get_iphost(); |
|
foreach my $prefix (@prefixes) { |
|
foreach my $type (@types) { |
|
my $inuse = $env{'form.'.$prefix.'_'.$type.'_inuse'}; |
|
if ($type eq 'version') { |
|
my $value = $env{'form.'.$prefix.'_'.$type}; |
|
my $okvalue; |
|
if ($value ne '') { |
|
if (grep(/^\Q$value\E$/,@lcversions)) { |
|
$okvalue = $value; |
|
} |
|
} |
|
if (ref($domconfig{'usersessions'}) eq 'HASH') { |
|
if (ref($domconfig{'usersessions'}{$prefix}) eq 'HASH') { |
|
if ($domconfig{'usersessions'}{$prefix}{$type} ne '') { |
|
if ($inuse == 0) { |
|
$changes{$prefix}{$type} = 1; |
|
} else { |
|
if ($okvalue ne $domconfig{'usersessions'}{$prefix}{$type}) { |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
if ($okvalue ne '') { |
|
$defaultshash{'usersessions'}{$prefix}{$type} = $okvalue; |
|
} |
|
} |
|
} else { |
|
if (($inuse == 1) && ($okvalue ne '')) { |
|
$defaultshash{'usersessions'}{$prefix}{$type} = $okvalue; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if (($inuse == 1) && ($okvalue ne '')) { |
|
$defaultshash{'usersessions'}{$prefix}{$type} = $okvalue; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if (($inuse == 1) && ($okvalue ne '')) { |
|
$defaultshash{'usersessions'}{$prefix}{$type} = $okvalue; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
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{'usersessions'}) eq 'HASH') { |
|
if (ref($domconfig{'usersessions'}{$prefix}) eq 'HASH') { |
|
if (ref($domconfig{'usersessions'}{$prefix}{$type}) eq 'ARRAY') { |
|
if ($inuse == 0) { |
|
$changes{$prefix}{$type} = 1; |
|
} else { |
|
$defaultshash{'usersessions'}{$prefix}{$type} = \@okvals; |
|
my @changed = &Apache::loncommon::compare_arrays($domconfig{'usersessions'}{$prefix}{$type},$defaultshash{'usersessions'}{$prefix}{$type}); |
|
if (@changed > 0) { |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if ($inuse == 1) { |
|
$defaultshash{'usersessions'}{$prefix}{$type} = \@okvals; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if ($inuse == 1) { |
|
$defaultshash{'usersessions'}{$prefix}{$type} = \@okvals; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if ($inuse == 1) { |
|
$defaultshash{'usersessions'}{$prefix}{$type} = \@okvals; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if (keys(%changes) > 0) { |
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
|
$dom); |
|
if ($putresult eq 'ok') { |
|
if (ref($defaultshash{'usersessions'}) eq 'HASH') { |
|
if (ref($defaultshash{'usersessions'}{'remote'}) eq 'HASH') { |
|
$domdefaults{'remotesessions'} = $defaultshash{'usersessions'}{'remote'}; |
|
} |
|
if (ref($defaultshash{'usersessions'}{'hosted'}) eq 'HASH') { |
|
$domdefaults{'hostedsessions'} = $defaultshash{'usersessions'}{'hosted'}; |
|
} |
|
} |
|
my $cachetime = 24*60*60; |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
my %lt = &usersession_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{'usersessions'}) eq 'HASH') { |
|
if (ref($defaultshash{'usersessions'}{$prefix})) { |
|
if ($type eq 'version') { |
|
$newvalue = $defaultshash{'usersessions'}{$prefix}{$type}; |
|
} elsif (ref($defaultshash{'usersessions'}{$prefix}{$type}) eq 'ARRAY') { |
|
if (@{$defaultshash{'usersessions'}{$prefix}{$type}} > 0) { |
|
$newvalue = join(', ',@{$defaultshash{'usersessions'}{$prefix}{$type}}); |
|
} |
|
} |
|
} |
|
} |
|
if ($newvalue eq '') { |
|
if ($type eq 'version') { |
|
$resulttext .= '<li>'.&mt('[_1] set to: off',$lt{$type}).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>'; |
|
} |
|
} else { |
|
if ($type eq 'version') { |
|
$newvalue .= ' '.&mt('(or later)'); |
|
} |
|
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>'; |
|
} |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$resulttext = '<span class="LC_error">'. |
|
&mt('An error occurred: [_1]',$putresult).'</span>'; |
|
} |
|
} else { |
|
$resulttext = &mt('No changes made to settings for user session hosting.'); |
|
} |
|
return $resulttext; |
|
} |
|
|
sub recurse_check { |
sub recurse_check { |
my ($chkcats,$categories,$depth,$name) = @_; |
my ($chkcats,$categories,$depth,$name) = @_; |
if (ref($chkcats->[$depth]{$name}) eq 'ARRAY') { |
if (ref($chkcats->[$depth]{$name}) eq 'ARRAY') { |
Line 6650 sub active_dc_picker {
|
Line 7042 sub active_dc_picker {
|
return ($numdcs,$datatable); |
return ($numdcs,$datatable); |
} |
} |
|
|
|
sub usersession_titles { |
|
return &Apache::lonlocal::texthash( |
|
hosted => 'Hosting of sessions for users from other domains on servers in this domain', |
|
|
|
remote => 'Hosting of sessions for users in this domain on servers in other domains', |
|
version => 'LON-CAPA version requirement', |
|
excludedomain => 'Allow all, but exclude specific domains', |
|
includedomain => 'Deny all, but include specific domains', |
|
); |
|
} |
|
|
1; |
1; |