version 1.181, 2012/12/20 13:23:49
|
version 1.194, 2013/04/08 23:01:51
|
Line 45 described at http://www.lon-capa.org.
|
Line 45 described at http://www.lon-capa.org.
|
=head1 OVERVIEW |
=head1 OVERVIEW |
|
|
Each institution using LON-CAPA will typically have a single domain designated |
Each institution using LON-CAPA will typically have a single domain designated |
for use by individuals affliated with the institution. Accordingly, each domain |
for use by individuals affiliated with the institution. Accordingly, each domain |
may define a default set of logos and a color scheme which can be used to "brand" |
may define a default set of logos and a color scheme which can be used to "brand" |
the LON-CAPA instance. In addition, an institution will typically have a language |
the LON-CAPA instance. In addition, an institution will typically have a language |
and timezone which are used for the majority of courses. |
and timezone which are used for the majority of courses. |
Line 386 sub handler {
|
Line 386 sub handler {
|
col2 => 'Rules'}], |
col2 => 'Rules'}], |
}, |
}, |
'loadbalancing' => |
'loadbalancing' => |
{text => 'Dedicated Load Balancer', |
{text => 'Dedicated Load Balancer(s)', |
help => 'Domain_Configuration_Load_Balancing', |
help => 'Domain_Configuration_Load_Balancing', |
header => [{col1 => 'Balancers', |
header => [{col1 => 'Balancers', |
col2 => 'Default destinations', |
col2 => 'Default destinations', |
col3 => 'User affliation', |
col3 => 'User affiliation', |
col4 => 'Overrides'}, |
col4 => 'Overrides'}, |
], |
], |
}, |
}, |
Line 407 sub handler {
|
Line 407 sub handler {
|
}; |
}; |
} |
} |
|
|
|
|
|
|
my @roles = ('student','coordinator','author','admin'); |
my @roles = ('student','coordinator','author','admin'); |
my @actions = &Apache::loncommon::get_env_multiple('form.actions'); |
my @actions = &Apache::loncommon::get_env_multiple('form.actions'); |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
Line 419 sub handler {
|
Line 417 sub handler {
|
if ($phase eq 'process') { |
if ($phase eq 'process') { |
&Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles); |
&Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles); |
} elsif ($phase eq 'display') { |
} elsif ($phase eq 'display') { |
my $js = &recaptcha_js(); |
my $js = &recaptcha_js(). |
|
&credits_js(); |
if ((keys(%servers) > 1) || (keys(%existing) > 0)) { |
if ((keys(%servers) > 1) || (keys(%existing) > 0)) { |
my ($othertitle,$usertypes,$types) = |
my ($othertitle,$usertypes,$types) = |
&Apache::loncommon::sorted_inst_types($dom); |
&Apache::loncommon::sorted_inst_types($dom); |
Line 492 sub handler {
|
Line 491 sub handler {
|
} |
} |
} |
} |
} |
} |
|
|
&Apache::lonconfigsettings::display_choices($r,$phase,$context,\@prefs_order,\%prefs); |
&Apache::lonconfigsettings::display_choices($r,$phase,$context,\@prefs_order,\%prefs); |
} |
} |
return OK; |
return OK; |
Line 554 sub print_config_box {
|
Line 552 sub print_config_box {
|
my ($r,$dom,$confname,$phase,$action,$item,$settings) = @_; |
my ($r,$dom,$confname,$phase,$action,$item,$settings) = @_; |
my $rowtotal = 0; |
my $rowtotal = 0; |
my $output; |
my $output; |
|
|
if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
$output = &coursecategories_javascript($settings); |
$output = &coursecategories_javascript($settings); |
} |
} |
Line 843 sub print_login {
|
Line 840 sub print_login {
|
'<td><select name="'.$lonhost.'_server">'. |
'<td><select name="'.$lonhost.'_server">'. |
'<option value=""'.$direct.'>'.$choices{'directlogin'}. |
'<option value=""'.$direct.'>'.$choices{'directlogin'}. |
'</option>'; |
'</option>'; |
foreach my $hostid (sort keys(%servers)) { |
foreach my $hostid (sort(keys(%servers))) { |
next if ($servers{$hostid} eq $servers{$lonhost}); |
next if ($servers{$hostid} eq $servers{$lonhost}); |
my $selected = ''; |
my $selected = ''; |
if (ref($disallowed{$lonhost}) eq 'HASH') { |
if (ref($disallowed{$lonhost}) eq 'HASH') { |
Line 886 sub print_login {
|
Line 883 sub print_login {
|
} elsif ($caller eq 'page') { |
} elsif ($caller eq 'page') { |
my %defaultchecked = ( |
my %defaultchecked = ( |
'coursecatalog' => 'on', |
'coursecatalog' => 'on', |
|
'helpdesk' => 'on', |
'adminmail' => 'off', |
'adminmail' => 'off', |
'newuser' => 'off', |
'newuser' => 'off', |
); |
); |
my @toggles = ('coursecatalog','adminmail','newuser'); |
my @toggles = ('coursecatalog','adminmail','helpdesk','newuser'); |
my (%checkedon,%checkedoff); |
my (%checkedon,%checkedoff); |
foreach my $item (@toggles) { |
foreach my $item (@toggles) { |
if ($defaultchecked{$item} eq 'on') { |
if ($defaultchecked{$item} eq 'on') { |
Line 1105 sub login_choices {
|
Line 1103 sub login_choices {
|
&Apache::lonlocal::texthash ( |
&Apache::lonlocal::texthash ( |
coursecatalog => 'Display Course/Community Catalog link?', |
coursecatalog => 'Display Course/Community Catalog link?', |
adminmail => "Display Administrator's E-mail Address?", |
adminmail => "Display Administrator's E-mail Address?", |
|
helpdesk => 'Display "Contact Helpdesk" link', |
disallowlogin => "Login page requests redirected", |
disallowlogin => "Login page requests redirected", |
hostid => "Server", |
hostid => "Server", |
server => "Redirect to:", |
server => "Redirect to:", |
Line 1373 sub display_color_options {
|
Line 1372 sub display_color_options {
|
$datatable .= '<td class="LC_right_item">'. |
$datatable .= '<td class="LC_right_item">'. |
'<table border="0"><tr>'; |
'<table border="0"><tr>'; |
|
|
|
|
foreach my $item (@{$bgs}) { |
foreach my $item (@{$bgs}) { |
# my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'bgs'}{$item}); |
|
$datatable .= '<td align="center">'; |
$datatable .= '<td align="center">'; |
my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item}; |
my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item}; |
if ($designs->{'bgs'}{$item}) { |
if ($designs->{'bgs'}{$item}) { |
Line 1930 sub print_quotas {
|
Line 1927 sub print_quotas {
|
|
|
sub print_requestmail { |
sub print_requestmail { |
my ($dom,$action,$settings,$rowtotal) = @_; |
my ($dom,$action,$settings,$rowtotal) = @_; |
my ($now,$datatable,%dompersonnel,@domcoord,@currapproval,$rows); |
my ($now,$datatable,%currapp,$rows); |
$now = time; |
$now = time; |
$rows = 0; |
|
%dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now); |
|
foreach my $server (keys(%dompersonnel)) { |
|
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { |
|
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
|
if (!grep(/^$uname:$udom$/,@domcoord)) { |
|
push(@domcoord,$uname.':'.$udom); |
|
} |
|
} |
|
} |
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'notify'}) eq 'HASH') { |
if (ref($settings->{'notify'}) eq 'HASH') { |
if ($settings->{'notify'}{'approval'} ne '') { |
if ($settings->{'notify'}{'approval'} ne '') { |
@currapproval = split(',',$settings->{'notify'}{'approval'}); |
map {$currapp{$_}=1;} split(/,/,$settings->{'notify'}{'approval'}); |
} |
|
} |
|
} |
|
if (@currapproval) { |
|
foreach my $dc (@currapproval) { |
|
unless (grep(/^\Q$dc\E$/,@domcoord)) { |
|
push(@domcoord,$dc); |
|
} |
} |
} |
} |
} |
} |
@domcoord = sort(@domcoord); |
my $numinrow = 2; |
my $numinrow = 4; |
|
my $numdc = @domcoord; |
|
my $css_class = 'class="LC_odd_row"'; |
my $css_class = 'class="LC_odd_row"'; |
my $text; |
my $text; |
if ($action eq 'requestcourses') { |
if ($action eq 'requestcourses') { |
Line 1969 sub print_requestmail {
|
Line 1947 sub print_requestmail {
|
$datatable = '<tr '.$css_class.'>'. |
$datatable = '<tr '.$css_class.'>'. |
' <td>'.$text.'</td>'. |
' <td>'.$text.'</td>'. |
' <td class="LC_left_item">'; |
' <td class="LC_left_item">'; |
if (@domcoord > 0) { |
my ($numdc,$table,$rows) = &active_dc_picker($dom,$numinrow,'checkbox', |
$datatable .= '<table>'; |
'reqapprovalnotify',%currapp); |
for (my $i=0; $i<$numdc; $i++) { |
if ($numdc > 0) { |
my $rem = $i%($numinrow); |
$datatable .= $table; |
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
$rows ++; |
|
} |
|
my $check = ' '; |
|
if (grep(/^\Q$domcoord[$i]\E$/,@currapproval)) { |
|
$check = ' checked="checked" '; |
|
} |
|
my ($uname,$udom) = split(':',$domcoord[$i]); |
|
my $fullname = &Apache::loncommon::plainname($uname,$udom); |
|
if ($i == $numdc-1) { |
|
my $colsleft = $numinrow-$rem; |
|
if ($colsleft > 1) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
|
} else { |
|
$datatable .= '<td class="LC_left_item">'; |
|
} |
|
} else { |
|
$datatable .= '<td class="LC_left_item">'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="reqapprovalnotify" '. |
|
'value="'.$domcoord[$i].'"'.$check.'/>'. |
|
$fullname.' ('.$uname.':'.$udom.')</label></span></td>'; |
|
} |
|
$datatable .= '</tr></table>'; |
|
} else { |
} else { |
$datatable .= &mt('There are no active Domain Coordinators'); |
$datatable .= &mt('There are no active Domain Coordinators'); |
$rows ++; |
|
} |
} |
$datatable .='</td></tr>'; |
$datatable .='</td></tr>'; |
$$rowtotal += $rows; |
$$rowtotal += $rows; |
Line 2159 sub print_autoupdate {
|
Line 2107 sub print_autoupdate {
|
|
|
sub print_autocreate { |
sub print_autocreate { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my (%createon,%createoff); |
my (%createon,%createoff,%currhash); |
my $curr_dc; |
|
my @types = ('xml','req'); |
my @types = ('xml','req'); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
foreach my $item (@types) { |
foreach my $item (@types) { |
Line 2173 sub print_autocreate {
|
Line 2120 sub print_autocreate {
|
} |
} |
} |
} |
} |
} |
$curr_dc = $settings->{'xmldc'}; |
if ($settings->{'xmldc'} ne '') { |
|
$currhash{$settings->{'xmldc'}} = 1; |
|
} |
} else { |
} else { |
foreach my $item (@types) { |
foreach my $item (@types) { |
$createoff{$item} = ' checked="checked" '; |
$createoff{$item} = ' checked="checked" '; |
Line 2181 sub print_autocreate {
|
Line 2130 sub print_autocreate {
|
} |
} |
} |
} |
$$rowtotal += 2; |
$$rowtotal += 2; |
|
my $numinrow = 2; |
my $datatable='<tr class="LC_odd_row">'. |
my $datatable='<tr class="LC_odd_row">'. |
'<td>'.&mt('Create pending official courses from XML files').'</td>'. |
'<td>'.&mt('Create pending official courses from XML files').'</td>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
Line 2195 sub print_autocreate {
|
Line 2145 sub print_autocreate {
|
$createon{'req'}.' value="1" />'.&mt('Yes').'</label> '. |
$createon{'req'}.' value="1" />'.&mt('Yes').'</label> '. |
'<label><input type="radio" name="autocreate_req"'. |
'<label><input type="radio" name="autocreate_req"'. |
$createoff{'req'}.' value="0" />'.&mt('No').'</label></span>'; |
$createoff{'req'}.' value="0" />'.&mt('No').'</label></span>'; |
my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc); |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
|
'autocreate_xmldc',%currhash); |
if ($numdc > 1) { |
if ($numdc > 1) { |
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
&mt('Course creation processed as: (choose Dom. Coord.)'). |
&mt('Course creation processed as: (choose Dom. Coord.)'). |
'</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
'</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
$$rowtotal ++ ; |
|
} else { |
} else { |
$datatable .= $dctable.'</td></tr>'; |
$datatable .= $dctable.'</td></tr>'; |
} |
} |
|
$$rowtotal += $rows; |
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 2326 sub print_contacts {
|
Line 2277 sub print_contacts {
|
my @contacts = ('adminemail','supportemail'); |
my @contacts = ('adminemail','supportemail'); |
my (%checked,%to,%otheremails,%bccemails); |
my (%checked,%to,%otheremails,%bccemails); |
my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail', |
my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail', |
'requestsmail'); |
'requestsmail','updatesmail'); |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
$otheremails{$type} = ''; |
$otheremails{$type} = ''; |
} |
} |
Line 2362 sub print_contacts {
|
Line 2313 sub print_contacts {
|
$checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" '; |
$checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" '; |
$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'requestsmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'requestsmail'}{'adminemail'} = ' checked="checked" '; |
|
$checked{'updatesmail'}{'adminemail'} = ' checked="checked" '; |
} |
} |
my ($titles,$short_titles) = &contact_titles(); |
my ($titles,$short_titles) = &contact_titles(); |
my $rownum = 0; |
my $rownum = 0; |
Line 2421 sub print_helpsettings {
|
Line 2373 sub print_helpsettings {
|
} |
} |
|
|
sub radiobutton_prefs { |
sub radiobutton_prefs { |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount) = @_; |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick, |
|
$additional) = @_; |
return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
(ref($choices) eq 'HASH')); |
(ref($choices) eq 'HASH')); |
|
|
Line 2447 sub radiobutton_prefs {
|
Line 2400 sub radiobutton_prefs {
|
} |
} |
} |
} |
} |
} |
|
if ($onclick) { |
|
$onclick = ' onclick="'.$onclick.'"'; |
|
} |
foreach my $item (@{$toggles}) { |
foreach my $item (@{$toggles}) { |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$datatable .= |
$datatable .= |
'<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices->{$item}. |
'<tr'.$css_class.'><td valign="top">'. |
|
'<span class="LC_nobreak">'.$choices->{$item}. |
'</span></td>'. |
'</span></td>'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<label><input type="radio" name="'. |
'<label><input type="radio" name="'. |
$item.'" '.$checkedon{$item}.' value="1" />'.&mt('Yes'). |
$item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes'). |
'</label> <label><input type="radio" name="'.$item.'" '. |
'</label> <label><input type="radio" name="'.$item.'" '. |
$checkedoff{$item}.' value="0" />'.&mt('No').'</label>'. |
$checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No').'</label>'. |
'</span></td>'. |
'</span>'.$additional. |
|
'</td>'. |
'</tr>'; |
'</tr>'; |
$itemcount ++; |
$itemcount ++; |
} |
} |
Line 2466 sub radiobutton_prefs {
|
Line 2424 sub radiobutton_prefs {
|
|
|
sub print_coursedefaults { |
sub print_coursedefaults { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles); |
my $itemcount = 1; |
my $itemcount = 1; |
|
my %choices = &Apache::lonlocal::texthash ( |
|
canuse_pdfforms => 'Course/Community users can create/upload PDF forms', |
|
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
|
coursecredits => 'Credits can be specified for courses', |
|
); |
if ($position eq 'top') { |
if ($position eq 'top') { |
my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles); |
|
%choices = |
|
&Apache::lonlocal::texthash ( |
|
canuse_pdfforms => 'Course/Community users can create/upload PDF forms', |
|
); |
|
%defaultchecked = ('canuse_pdfforms' => 'off'); |
%defaultchecked = ('canuse_pdfforms' => 'off'); |
@toggles = ('canuse_pdfforms',); |
@toggles = ('canuse_pdfforms'); |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
\%choices,$itemcount); |
\%choices,$itemcount); |
$$rowtotal += $itemcount; |
|
} else { |
} else { |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
my %choices = |
my ($currdefresponder,$def_official_credits,$def_unofficial_credits); |
&Apache::lonlocal::texthash ( |
my $currusecredits = 0; |
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
|
); |
|
my $currdefresponder; |
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
|
if (ref($settings->{'coursecredits'}) eq 'HASH') { |
|
$def_official_credits = $settings->{'coursecredits'}->{'official'}; |
|
$def_unofficial_credits = $settings->{'coursecredits'}->{'unofficial'}; |
|
if (($def_official_credits ne '') || ($def_unofficial_credits ne '')) { |
|
$currusecredits = 1; |
|
} |
|
} |
} |
} |
if (!$currdefresponder) { |
if (!$currdefresponder) { |
$currdefresponder = 10; |
$currdefresponder = 10; |
Line 2495 sub print_coursedefaults {
|
Line 2456 sub print_coursedefaults {
|
$currdefresponder = 1; |
$currdefresponder = 1; |
} |
} |
$datatable .= |
$datatable .= |
'<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices{'anonsurvey_threshold'}. |
'<tr'.$css_class.'><td><span class="LC_nobreak">'. |
|
$choices{'anonsurvey_threshold'}. |
'</span></td>'. |
'</span></td>'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<input type="text" name="anonsurvey_threshold"'. |
'<input type="text" name="anonsurvey_threshold"'. |
' value="'.$currdefresponder.'" size="5" /></span>'. |
' value="'.$currdefresponder.'" size="5" /></span>'. |
'</td></tr>'; |
'</td></tr>'."\n"; |
|
$itemcount ++; |
|
my $onclick = 'toggleCredits(this.form);'; |
|
my $display = 'none'; |
|
if ($currusecredits) { |
|
$display = 'block'; |
|
} |
|
my $additional = '<div id="credits" style="display: '.$display.'">'. |
|
'<span class="LC_nobreak">'. |
|
&mt('Default credits for official courses [_1]', |
|
'<input type="text" name="official_credits" value="'. |
|
$def_official_credits.'" size="3" />'). |
|
'</span><br />'. |
|
'<span class="LC_nobreak">'. |
|
&mt('Default credits for unofficial courses [_1]', |
|
'<input type="text" name="unofficial_credits" value="'. |
|
$def_unofficial_credits.'" size="3" />'). |
|
'</span></div>'."\n"; |
|
%defaultchecked = ('coursecredits' => 'off'); |
|
@toggles = ('coursecredits'); |
|
my $current = { |
|
'coursecredits' => $currusecredits, |
|
}; |
|
(my $table,$itemcount) = |
|
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
|
\%choices,$itemcount,$onclick,$additional); |
|
$datatable .= $table; |
} |
} |
|
$$rowtotal += $itemcount; |
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 2792 sub spares_row {
|
Line 2781 sub spares_row {
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$datatable .= '<tr'.$css_class.'> |
$datatable .= '<tr'.$css_class.'> |
<td rowspan="2"> |
<td rowspan="2"> |
<span class="LC_nobreak"><b>'.$server.'</b> when busy, offloads to:</span></td>'."\n"; |
<span class="LC_nobreak">'. |
|
&mt('[_1] when busy, offloads to:' |
|
,'<b>'.$server.'</b>'). |
|
"\n"; |
my (%current,%canselect); |
my (%current,%canselect); |
my @choices = |
my @choices = |
&possible_newspares($server,$spareid->{$server},$serverhomes,$altids); |
&possible_newspares($server,$spareid->{$server},$serverhomes,$altids); |
Line 3041 sub print_loadbalancing {
|
Line 3033 sub print_loadbalancing {
|
'<table><tr>'.$targettable.'</tr></table><br />'; |
'<table><tr>'.$targettable.'</tr></table><br />'; |
} |
} |
} |
} |
my $cssidx = $balnum%2; |
|
$datatable .= '</div></td></tr>'. |
$datatable .= '</div></td></tr>'. |
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost}, |
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost}, |
$othertitle,$usertypes,$types,\%servers, |
$othertitle,$usertypes,$types,\%servers, |
Line 3250 sub contact_titles {
|
Line 3241 sub contact_titles {
|
'helpdeskmail' => 'Helpdesk requests to be e-mailed to', |
'helpdeskmail' => 'Helpdesk requests to be e-mailed to', |
'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', |
); |
); |
my %short_titles = &Apache::lonlocal::texthash ( |
my %short_titles = &Apache::lonlocal::texthash ( |
adminemail => 'Admin E-mail address', |
adminemail => 'Admin E-mail address', |
Line 3297 sub authorrequest_titles {
|
Line 3289 sub authorrequest_titles {
|
sub courserequest_conditions { |
sub courserequest_conditions { |
my %conditions = &Apache::lonlocal::texthash ( |
my %conditions = &Apache::lonlocal::texthash ( |
approval => '(Processing of request subject to approval by Domain Coordinator).', |
approval => '(Processing of request subject to approval by Domain Coordinator).', |
validate => '(Processing of request subject to instittutional validation).', |
validate => '(Processing of request subject to institutional validation).', |
); |
); |
return %conditions; |
return %conditions; |
} |
} |
Line 4212 sub print_serverstatuses {
|
Line 4204 sub print_serverstatuses {
|
|
|
sub serverstatus_pages { |
sub serverstatus_pages { |
return ('userstatus','lonstatus','loncron','server-status','codeversions', |
return ('userstatus','lonstatus','loncron','server-status','codeversions', |
'clusterstatus','metadata_keywords','metadata_harvest', |
'checksums','clusterstatus','metadata_keywords','metadata_harvest', |
'takeoffline','takeonline','showenv','toggledebug','ping','domconf'); |
'takeoffline','takeonline','showenv','toggledebug','ping','domconf'); |
} |
} |
|
|
Line 4667 sub modify_login {
|
Line 4659 sub modify_login {
|
%curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon); |
%curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon); |
%title = ( coursecatalog => 'Display course catalog', |
%title = ( coursecatalog => 'Display course catalog', |
adminmail => 'Display administrator E-mail address', |
adminmail => 'Display administrator E-mail address', |
|
helpdesk => 'Display "Contact Helpdesk" link', |
newuser => 'Link for visitors to create a user account', |
newuser => 'Link for visitors to create a user account', |
loginheader => 'Log-in box header'); |
loginheader => 'Log-in box header'); |
@offon = ('off','on'); |
@offon = ('off','on'); |
Line 4679 sub modify_login {
|
Line 4672 sub modify_login {
|
} |
} |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
\%domconfig,\%loginhash); |
\%domconfig,\%loginhash); |
my @toggles = ('coursecatalog','adminmail','newuser'); |
my @toggles = ('coursecatalog','adminmail','helpdesk','newuser'); |
foreach my $item (@toggles) { |
foreach my $item (@toggles) { |
$loginhash{login}{$item} = $env{'form.'.$item}; |
$loginhash{login}{$item} = $env{'form.'.$item}; |
} |
} |
Line 4867 sub modify_login {
|
Line 4860 sub modify_login {
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, |
$dom); |
$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
my @toggles = ('coursecatalog','adminmail','newuser'); |
my @toggles = ('coursecatalog','adminmail','helpdesk','newuser'); |
my %defaultchecked = ( |
my %defaultchecked = ( |
'coursecatalog' => 'on', |
'coursecatalog' => 'on', |
|
'helpdesk' => 'on', |
'adminmail' => 'off', |
'adminmail' => 'off', |
'newuser' => 'off', |
'newuser' => 'off', |
); |
); |
Line 5614 sub write_metadata {
|
Line 5608 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=$_; |
$unikey=~/^([A-Za-z]+)/; |
$unikey=~/^([A-Za-z]+)/; |
Line 6556 sub modify_contacts {
|
Line 6550 sub modify_contacts {
|
my (%others,%to,%bcc); |
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','updatesmail'); |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
@{$newsetting{$type}} = |
@{$newsetting{$type}} = |
&Apache::loncommon::get_env_multiple('form.'.$type); |
&Apache::loncommon::get_env_multiple('form.'.$type); |
Line 6612 sub modify_contacts {
|
Line 6606 sub modify_contacts {
|
$default{'helpdeskmail'} = 'supportemail'; |
$default{'helpdeskmail'} = 'supportemail'; |
$default{'lonstatusmail'} = 'adminemail'; |
$default{'lonstatusmail'} = 'adminemail'; |
$default{'requestsmail'} = 'adminemail'; |
$default{'requestsmail'} = 'adminemail'; |
|
$default{'updatesmail'} = 'adminemail'; |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
if ($to{$item} ne $default{$item}) { |
if ($to{$item} ne $default{$item}) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
Line 7854 sub modify_coursedefaults {
|
Line 7849 sub modify_coursedefaults {
|
my ($dom,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
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 @toggles = ('canuse_pdfforms'); |
my @toggles = ('canuse_pdfforms'); |
|
|
$defaultshash{'coursedefaults'} = {}; |
$defaultshash{'coursedefaults'} = {}; |
Line 7871 sub modify_coursedefaults {
|
Line 7865 sub modify_coursedefaults {
|
if (($domconfig{'coursedefaults'}{$item} eq '') && |
if (($domconfig{'coursedefaults'}{$item} eq '') && |
($env{'form.'.$item} eq '0')) { |
($env{'form.'.$item} eq '0')) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} elsif ($domconfig{'coursdefaults'}{$item} ne $env{'form.'.$item}) { |
} elsif ($domconfig{'coursedefaults'}{$item} ne $env{'form.'.$item}) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} elsif ($defaultchecked{$item} eq 'off') { |
} elsif ($defaultchecked{$item} eq 'off') { |
Line 7896 sub modify_coursedefaults {
|
Line 7890 sub modify_coursedefaults {
|
$changes{'anonsurvey_threshold'} = 1; |
$changes{'anonsurvey_threshold'} = 1; |
} |
} |
} |
} |
|
my $officialcreds = $env{'form.official_credits'}; |
|
$officialcreds =~ s/^[^\d\.]//g; |
|
my $unofficialcreds = $env{'form.unofficial_credits'}; |
|
$unofficialcreds =~ s/^[^\d\.]//g; |
|
if (ref($domconfig{'coursedefaults'}{'coursecredits'} ne 'HASH') && |
|
($env{'form.coursecredits'} eq '1')) { |
|
$changes{'coursecredits'} = 1; |
|
} else { |
|
if (($domconfig{'coursedefaults'}{'coursecredits'}{'official'} ne $officialcreds) || |
|
($domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'} ne $unofficialcreds)) { |
|
$changes{'coursecredits'} = 1; |
|
} |
|
} |
|
$defaultshash{'coursedefaults'}{'coursecredits'} = { |
|
official => $officialcreds, |
|
unofficial => $unofficialcreds, |
|
} |
} |
} |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
$dom); |
$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
|
my %domdefaults; |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
if ($changes{'canuse_pdfforms'}) { |
if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'})) { |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
%domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
$domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'}; |
if ($changes{'canuse_pdfforms'}) { |
|
$domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'}; |
|
} |
|
if ($changes{'coursecredits'}) { |
|
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
|
$domdefaults{'officialcredits'} = |
|
$defaultshash{'coursedefaults'}{'coursecredits'}{'official'}; |
|
$domdefaults{'unofficialcredits'} = |
|
$defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'}; |
|
} |
|
} |
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); |
} |
} |
Line 7916 sub modify_coursedefaults {
|
Line 7938 sub modify_coursedefaults {
|
$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') { |
} 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 .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>'; |
|
} elsif ($item eq 'coursecredits') { |
|
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
|
if (($domdefaults{'officialcredits'} eq '') && |
|
($domdefaults{'unofficialcredits'} eq '')) { |
|
$resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Student credits can be set per course by a Domain Coordinator, with the following defaults applying:').'<ul>'. |
|
'<li>'.&mt('Official courses: [_1]',$defaultshash{'coursedefaults'}{'coursecredits'}{'official'}).'</li>'. |
|
'<li>'.&mt('Unofficial courses: [_1]',$defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'}).'</li>'. |
|
'</ul>'. |
|
'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>'; |
|
} |
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
Line 8441 sub recurse_cat_deletes {
|
Line 8478 sub recurse_cat_deletes {
|
|
|
sub get_active_dcs { |
sub get_active_dcs { |
my ($dom) = @_; |
my ($dom) = @_; |
my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']); |
my $now = time; |
|
my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now); |
my %domcoords; |
my %domcoords; |
my $numdcs = 0; |
my $numdcs = 0; |
my $now = time; |
|
foreach my $server (keys(%dompersonnel)) { |
foreach my $server (keys(%dompersonnel)) { |
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { |
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { |
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
my ($end,$start) = split(':',$dompersonnel{$server}{$user}); |
$domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user}; |
if (($end eq '') || ($end == 0) || ($end > $now)) { |
|
if ($start <= $now) { |
|
$domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user}; |
|
} |
|
} |
|
} |
} |
} |
} |
return %domcoords; |
return %domcoords; |
} |
} |
|
|
sub active_dc_picker { |
sub active_dc_picker { |
my ($dom,$curr_dc) = @_; |
my ($dom,$numinrow,$inputtype,$name,%currhash) = @_; |
my %domcoords = &get_active_dcs($dom); |
my %domcoords = &get_active_dcs($dom); |
my @dcs = sort(keys(%domcoords)); |
my @domcoord = keys(%domcoords); |
my $numdcs = scalar(@dcs); |
if (keys(%currhash)) { |
my $datatable; |
foreach my $dc (keys(%currhash)) { |
my $numinrow = 2; |
unless (exists($domcoords{$dc})) { |
|
push(@domcoord,$dc); |
|
} |
|
} |
|
} |
|
@domcoord = sort(@domcoord); |
|
my $numdcs = scalar(@domcoord); |
|
my $rows = 0; |
|
my $table; |
if ($numdcs > 1) { |
if ($numdcs > 1) { |
$datatable = '<table>'; |
$table = '<table>'; |
for (my $i=0; $i<@dcs; $i++) { |
for (my $i=0; $i<@domcoord; $i++) { |
my $rem = $i%($numinrow); |
my $rem = $i%($numinrow); |
if ($rem == 0) { |
if ($rem == 0) { |
if ($i > 0) { |
if ($i > 0) { |
$datatable .= '</tr>'; |
$table .= '</tr>'; |
} |
} |
$datatable .= '<tr>'; |
$table .= '<tr>'; |
|
$rows ++; |
} |
} |
my $check = ' '; |
my $check = ''; |
if ($curr_dc eq '') { |
if ($inputtype eq 'radio') { |
if (!$i) { |
if (keys(%currhash) == 0) { |
$check = ' checked="checked" '; |
if (!$i) { |
|
$check = ' checked="checked"'; |
|
} |
|
} elsif (exists($currhash{$domcoord[$i]})) { |
|
$check = ' checked="checked"'; |
|
} |
|
} else { |
|
if (exists($currhash{$domcoord[$i]})) { |
|
$check = ' checked="checked"'; |
} |
} |
} elsif ($dcs[$i] eq $curr_dc) { |
|
$check = ' checked="checked" '; |
|
} |
} |
if ($i == @dcs - 1) { |
if ($i == @domcoord - 1) { |
my $colsleft = $numinrow - $rem; |
my $colsleft = $numinrow - $rem; |
if ($colsleft > 1) { |
if ($colsleft > 1) { |
$datatable .= '<td colspan="'.$colsleft.'">'; |
$table .= '<td class="LC_left_item" colspan="'.$colsleft.'">'; |
} else { |
} else { |
$datatable .= '<td>'; |
$table .= '<td class="LC_left_item">'; |
} |
} |
} else { |
} else { |
$datatable .= '<td>'; |
$table .= '<td class="LC_left_item">'; |
|
} |
|
my ($dcname,$dcdom) = split(':',$domcoord[$i]); |
|
my $user = &Apache::loncommon::plainname($dcname,$dcdom); |
|
$table .= '<span class="LC_nobreak"><label>'. |
|
'<input type="'.$inputtype.'" name="'.$name.'"'. |
|
' value="'.$domcoord[$i].'"'.$check.' />'.$user; |
|
if ($user ne $dcname.':'.$dcdom) { |
|
$table .= ' ('.$dcname.':'.$dcdom.')'. |
|
'</label></span></td>'; |
} |
} |
my ($dcname,$dcdom) = split(':',$dcs[$i]); |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="autocreate_xmldc"'. |
|
' value="'.$dcs[$i].'"'.$check.'/>'. |
|
&Apache::loncommon::plainname($dcname,$dcdom). |
|
' ('.$dcname.':'.$dcdom.')'. |
|
'</label></span></td>'; |
|
} |
} |
$datatable .= '</tr></table>'; |
$table .= '</tr></table>'; |
} elsif (@dcs) { |
} elsif ($numdcs == 1) { |
$datatable .= '<input type="hidden" name="autocreate_dc" value="'. |
if ($inputtype eq 'radio') { |
$dcs[0].'" />'; |
$table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'; |
|
} else { |
|
my $check; |
|
if (exists($currhash{$domcoord[0]})) { |
|
$check = ' checked="checked"'; |
|
} |
|
$table .= '<input type="checkbox" name="'.$name.'" '. |
|
'value="'.$domcoord[0].'"'.$check.' />'; |
|
$rows ++; |
|
} |
} |
} |
return ($numdcs,$datatable); |
return ($numdcs,$table,$rows); |
} |
} |
|
|
sub usersession_titles { |
sub usersession_titles { |
Line 9027 function updateCaptcha(caller,context) {
|
Line 9085 function updateCaptcha(caller,context) {
|
} |
} |
} |
} |
return; |
return; |
|
} |
|
|
|
// ]]> |
|
</script> |
|
|
|
END |
|
|
|
} |
|
|
|
sub credits_js { |
|
return <<"END"; |
|
|
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
|
|
function toggleCredits(domForm) { |
|
if (document.getElementById('credits')) { |
|
creditsitem = document.getElementById('credits'); |
|
var creditsLength = domForm.coursecredits.length; |
|
if (creditsLength) { |
|
var currval; |
|
for (var i=0; i<creditsLength; i++) { |
|
if (domForm.coursecredits[i].checked) { |
|
currval = domForm.coursecredits[i].value; |
|
} |
|
} |
|
if (currval == 1) { |
|
creditsitem.style.display = 'block'; |
|
} else { |
|
creditsitem.style.display = 'none'; |
|
} |
|
} |
|
} |
|
return; |
} |
} |
|
|
// ]]> |
// ]]> |