version 1.188, 2013/01/11 17:35:03
|
version 1.191, 2013/02/25 17:43:41
|
Line 1926 sub print_quotas {
|
Line 1926 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) { |
my $numinrow = 2; |
foreach my $dc (@currapproval) { |
|
unless (grep(/^\Q$dc\E$/,@domcoord)) { |
|
push(@domcoord,$dc); |
|
} |
|
} |
|
} |
|
@domcoord = sort(@domcoord); |
|
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 1965 sub print_requestmail {
|
Line 1946 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 2155 sub print_autoupdate {
|
Line 2106 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 2169 sub print_autocreate {
|
Line 2119 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 2177 sub print_autocreate {
|
Line 2129 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 2191 sub print_autocreate {
|
Line 2144 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 2322 sub print_contacts {
|
Line 2276 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 2358 sub print_contacts {
|
Line 2312 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 3248 sub contact_titles {
|
Line 3203 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 4210 sub print_serverstatuses {
|
Line 4166 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 6556 sub modify_contacts {
|
Line 6512 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 6568 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 8441 sub recurse_cat_deletes {
|
Line 8398 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; |
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>'; |
|
} |
|
} |
|
$table .= '</tr></table>'; |
|
} elsif ($numdcs == 1) { |
|
if ($inputtype eq 'radio') { |
|
$table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'; |
|
} else { |
|
my $check; |
|
if (exists($currhash{$domcoord[0]})) { |
|
$check = ' checked="checked"'; |
} |
} |
my ($dcname,$dcdom) = split(':',$dcs[$i]); |
$table .= '<input type="checkbox" name="'.$name.'" '. |
$datatable .= '<span class="LC_nobreak"><label>'. |
'value="'.$domcoord[0].'"'.$check.' />'; |
'<input type="radio" name="autocreate_xmldc"'. |
$rows ++; |
' value="'.$dcs[$i].'"'.$check.'/>'. |
} |
&Apache::loncommon::plainname($dcname,$dcdom). |
|
' ('.$dcname.':'.$dcdom.')'. |
|
'</label></span></td>'; |
|
} |
|
$datatable .= '</tr></table>'; |
|
} elsif (@dcs) { |
|
$datatable .= '<input type="hidden" name="autocreate_dc" value="'. |
|
$dcs[0].'" />'; |
|
} |
} |
return ($numdcs,$datatable); |
return ($numdcs,$table,$rows); |
} |
} |
|
|
sub usersession_titles { |
sub usersession_titles { |