version 1.304, 2014/05/20 20:36:16
|
version 1.308, 2014/05/31 12:49:12
|
Line 202 sub handler {
|
Line 202 sub handler {
|
|
|
my $r = shift; |
my $r = shift; |
|
|
# Check for critical messages and redirect if present. |
# Check for critical messages and redirect if present. |
print STDERR "crit check\n"; |
|
my ($redirect,$url) = &Apache::loncommon::critical_redirect(300); |
my ($redirect,$url) = &Apache::loncommon::critical_redirect(300); |
print STDERR "(redirect, url) = $redirect, $url\n"; |
|
if ($redirect) { |
if ($redirect) { |
print STDERR "check passed. Redirecting to $url\n"; |
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->header_out(Location => $url); |
$r->header_out(Location => $url); |
return REDIRECT; |
return REDIRECT; |
Line 258 sub handler {
|
Line 255 sub handler {
|
my $envkey; |
my $envkey; |
my %dcroles = (); |
my %dcroles = (); |
my $numdc = &check_fordc(\%dcroles,$update,$then); |
my $numdc = &check_fordc(\%dcroles,$update,$then); |
#my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'}; |
|
my $loncaparev = $r->dir_config('lonVersion'); |
my $loncaparev = $r->dir_config('lonVersion'); |
print STDERR "loncaparev set ||$loncaparev||\n"; |
|
|
|
# ================================================================== Roles Init |
# ================================================================== Roles Init |
if ($env{'form.selectrole'}) { |
if ($env{'form.selectrole'}) { |
Line 931 ENDHEADER
|
Line 926 ENDHEADER
|
|
|
# No active roles |
# No active roles |
if ($countactive==0) { |
if ($countactive==0) { |
if ($inrole) { |
&requestcourse_advice($r,$cattype,$inrole); |
$r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>'); |
|
} else { |
|
$r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>'); |
|
} |
|
&requestcourse_advice($r,$cattype); |
|
$r->print('</form>'); |
$r->print('</form>'); |
if ($countfuture) { |
if ($countfuture) { |
$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture)); |
$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture)); |
Line 1077 ENDHEADER
|
Line 1067 ENDHEADER
|
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
$r->print('<p><small><i>' |
$r->print('<p><small><i>' |
.&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion')) |
.&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion')) |
.'</i><br />' |
.'</i></small></p>'); |
.'<a href="/adm/logout">'.&mt('Logout').'</a> ' |
|
.'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">' |
|
.&mt('Course/Community Catalog') |
|
.'</a></small></p>'); |
|
} |
} |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
Line 1449 sub findcourse_advice {
|
Line 1435 sub findcourse_advice {
|
} |
} |
|
|
sub requestcourse_advice { |
sub requestcourse_advice { |
my ($r,$cattype) = @_; |
my ($r,$cattype,$inrole) = @_; |
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
my (%can_request,%request_doms); |
my (%can_request,%request_doms,$output); |
&Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms); |
&Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms); |
if (keys(%request_doms) > 0) { |
if (keys(%request_doms) > 0) { |
my ($types,$typename) = &Apache::loncommon::course_types(); |
my ($types,$typename) = &Apache::loncommon::course_types(); |
if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) { |
if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) { |
$r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'. |
|
'<p>'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'<ul>'); |
|
my (@reqdoms,@reqtypes); |
my (@reqdoms,@reqtypes); |
foreach my $type (sort(keys(%request_doms))) { |
foreach my $type (sort(keys(%request_doms))) { |
push(@reqtypes,$type); |
push(@reqtypes,$type); |
if (ref($request_doms{$type}) eq 'ARRAY') { |
if (ref($request_doms{$type}) eq 'ARRAY') { |
my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}})); |
my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}})); |
$r->print( |
$output .= |
'<li>' |
'<li>' |
.&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]', |
.&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]', |
'<i>', |
'<i>', |
'</i>', |
'</i>', |
'<b>'.$domstr.'</b>') |
'<b>'.$domstr.'</b>') |
.'</li>' |
.'</li>'; |
); |
|
foreach my $dom (@{$request_doms{$type}}) { |
foreach my $dom (@{$request_doms{$type}}) { |
unless (grep(/^\Q$dom\E/,@reqdoms)) { |
unless (grep(/^\Q$dom\E/,@reqdoms)) { |
push(@reqdoms,$dom); |
push(@reqdoms,$dom); |
Line 1494 sub requestcourse_advice {
|
Line 1477 sub requestcourse_advice {
|
} |
} |
if (@reqdoms == 1 || @showtypes > 0) { |
if (@reqdoms == 1 || @showtypes > 0) { |
$requrl .= '&state=crstype&action=new'; |
$requrl .= '&state=crstype&action=new'; |
} |
} |
$r->print('</ul>'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','<a href="'.$requrl.'">','</a>').'</p>'); |
if ($output) { |
|
$r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'. |
|
'<p>'. |
|
&mt('You have rights to request the creation of courses and/or communities in the following domain(s):'). |
|
'<ul>'. |
|
$output. |
|
'</ul>'. |
|
&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.', |
|
'<a href="'.$requrl.'">','</a>'). |
|
'</p>'); |
|
} |
} |
} |
} elsif (!$env{'user.adv'}) { |
} elsif (!$env{'user.adv'}) { |
|
if ($inrole) { |
|
$r->print('<h3>'.&mt('Currently no additional roles, courses or communities').'</h3>'); |
|
} else { |
|
$r->print('<h3>'.&mt('Currently no active roles, courses or communities').'</h3>'); |
|
} |
&findcourse_advice($r,$cattype); |
&findcourse_advice($r,$cattype); |
} |
} |
return; |
return; |
Line 1767 sub check_release_required {
|
Line 1765 sub check_release_required {
|
if ($required ne '') { |
if ($required ne '') { |
my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/); |
my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/); |
my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/); |
my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/); |
print STDERR "version: required ||$required|| loncaparev ||$loncaparev||\n"; |
|
if ($reqdmajor ne '' && $reqdminor ne '') { |
if ($reqdmajor ne '' && $reqdminor ne '') { |
my $otherserver; |
my $otherserver; |
if (($major eq '' && $minor eq '') || |
if (($major eq '' && $minor eq '') || |