version 1.123, 2005/06/07 00:24:08
|
version 1.129, 2005/09/16 19:47:42
|
Line 50 sub redirect_user {
|
Line 50 sub redirect_user {
|
my $swinfo=&Apache::lonmenu::rawconfig(); |
my $swinfo=&Apache::lonmenu::rawconfig(); |
my $navwindow; |
my $navwindow; |
if ($launch_nav eq 'on') { |
if ($launch_nav eq 'on') { |
$navwindow.=&Apache::lonnavmaps::launch_win('now'); |
$navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef, |
|
($url eq '/adm/whatsnew')); |
} else { |
} else { |
$navwindow.=&Apache::lonnavmaps::close(); |
$navwindow.=&Apache::lonnavmaps::close(); |
} |
} |
Line 227 ENDENTERKEY
|
Line 228 ENDENTERKEY
|
my $tadv=0; |
my $tadv=0; |
my $msg=&mt('Entering course ...'); |
my $msg=&mt('Entering course ...'); |
|
|
if (($cnum) && ($role ne 'ca')) { |
if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) { |
my ($furl,$ferr)= |
my ($furl,$ferr)= |
&Apache::lonuserstate::readmap($cdom.'/'.$cnum); |
&Apache::lonuserstate::readmap($cdom.'/'.$cnum); |
if (($env{'form.orgurl'}) && |
if (($env{'form.orgurl'}) && |
Line 260 ENDENTERKEY
|
Line 261 ENDENTERKEY
|
if ($role eq 'cc' && $env{'course.' . $courseid . |
if ($role eq 'cc' && $env{'course.' . $courseid . |
'.course.helper.not.run'}) { |
'.course.helper.not.run'}) { |
$furl = "/adm/helper/course.initialization.helper"; |
$furl = "/adm/helper/course.initialization.helper"; |
|
# Send the user to the course they selected |
|
} elsif (($env{'request.course.fn'}) |
|
&& ($role eq 'cc' && ($env{'environment.course_init_display'} ne 'firstres'))) { |
|
$msg = &mt('Entering course ....'); |
|
&redirect_user($r,&mt('New in course'), |
|
'/adm/whatsnew',$msg, |
|
$env{'environment.remotenavmap'}); |
|
return OK; |
} |
} |
# Send the user to the course they selected |
&redirect_user($r,&mt('Entering Course'), |
if (($env{'request.course.fn'}) |
|
&& ($role eq 'cc' && ($env{'environment.course_init_display'} ne 'firstres'))) { |
|
$msg = &mt('Entering course ....'); |
|
&redirect_user($r,&mt('New in course'), |
|
'/adm/whatsnew',$msg, |
|
$env{'environment.remotenavmap'}); |
|
} else { |
|
&redirect_user($r,&mt('Entering Course'), |
|
$furl,$msg, |
$furl,$msg, |
$env{'environment.remotenavmap'}); |
$env{'environment.remotenavmap'}); |
} |
return OK; |
return OK; |
|
} |
} |
} |
} |
# |
# |
# Send the user to the construction space they selected |
# Send the user to the construction space they selected |
if ($role =~ /^(au|ca)$/) { |
if ($role =~ /^(au|ca|aa)$/) { |
my $redirect_url = '/priv/'; |
my $redirect_url = '/priv/'; |
if ($role eq 'au') { |
if ($role eq 'au') { |
$redirect_url.=$env{'user.name'}; |
$redirect_url.=$env{'user.name'}; |
Line 344 ENDHEADER
|
Line 344 ENDHEADER
|
# --------------------------------------------------------------- Error Header? |
# --------------------------------------------------------------- Error Header? |
if ($error) { |
if ($error) { |
$r->print("<h1>LON-CAPA Access Control</h1>"); |
$r->print("<h1>LON-CAPA Access Control</h1>"); |
$r->print("<hr><pre>Access : ". |
$r->print("<!-- LONCAPAACCESSCONTROLERRORSCREEN --><hr /><pre>Access : ". |
Apache::lonnet::plaintext($priv)."\n"); |
Apache::lonnet::plaintext($priv)."\n"); |
$r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n"); |
$r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n"); |
$r->print("Action : $msg\n</pre><hr />"); |
$r->print("Action : $msg\n</pre><hr />"); |
Line 388 ENDHEADER
|
Line 388 ENDHEADER
|
($env{'user.name'},$env{'user.domain'})}. |
($env{'user.name'},$env{'user.domain'})}. |
"<br />\n"); |
"<br />\n"); |
$r->print(&mt( |
$r->print(&mt( |
"Author and Co-Author roles may not be available on servers other than your home server.")); |
"Author and Co-Author roles are not available on servers other than their respective home servers.")); |
} |
} |
if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) { |
if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) { |
$fn.='?'.$ENV{'REDIRECT_QUERY_STRING'}; |
$fn.='?'.$ENV{'REDIRECT_QUERY_STRING'}; |
Line 461 ENDHEADER
|
Line 461 ENDHEADER
|
my $trole; |
my $trole; |
if ($role =~ /^cr\//) { |
if ($role =~ /^cr\//) { |
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); |
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); |
$tremark.='<br>'.&mt('Defined by ').$rauthor. |
$tremark.='<br />'.&mt('Defined by ').$rauthor. |
&mt(' at ').$rdomain.'.'; |
&mt(' at ').$rdomain.'.'; |
$trole=$rrole; |
$trole=$rrole; |
} else { |
} else { |
Line 472 ENDHEADER
|
Line 472 ENDHEADER
|
my ($tdom,$trest,$tsection)= |
my ($tdom,$trest,$tsection)= |
split(/\//,Apache::lonnet::declutter($where)); |
split(/\//,Apache::lonnet::declutter($where)); |
# First, Co-Authorship roles |
# First, Co-Authorship roles |
if ($role eq 'ca') { |
if (($role eq 'ca') || ($role eq 'aa')) { |
my $home = &Apache::lonnet::homeserver($trest,$tdom); |
my $home = &Apache::lonnet::homeserver($trest,$tdom); |
my $allowed=0; |
my $allowed=0; |
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
Line 596 ENDHEADER
|
Line 596 ENDHEADER
|
'</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'. |
'</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'. |
&mt('Remarks and Calendar Announcements').'</th></tr>'."\n"); |
&mt('Remarks and Calendar Announcements').'</th></tr>'."\n"); |
my $doheaders=-1; |
my $doheaders=-1; |
foreach my $type ('Construction Space','Course','Domain','System') { |
foreach my $type ('Domain','Construction Space','Course','System') { |
my $haverole=0; |
my $haverole=0; |
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { |
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { |
if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { |
if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { |
Line 620 ENDHEADER
|
Line 620 ENDHEADER
|
} |
} |
} |
} |
if ($output) { |
if ($output) { |
$r->print("<tr bgcolor='#BBffBB'><td align='center' colspan='6'>". |
$r->print("<tr><td align='center' colspan='6'><font face='arial'>". |
&mt('Recent Roles')."</td>"); |
&mt('Recent Roles')."</font></td>"); |
$r->print($output); |
$r->print($output); |
$r->print("</tr>"); |
$r->print("</tr>"); |
$doheaders ++; |
$doheaders ++; |
Line 646 ENDHEADER
|
Line 646 ENDHEADER
|
} |
} |
if ($output) { |
if ($output) { |
if ($doheaders > 0) { |
if ($doheaders > 0) { |
$r->print("<tr bgcolor='#BBffBB'>". |
$r->print("<tr>". |
"<td align='center' colspan='6'>".&mt($type)."</td></tr>"); |
"<td align='center' colspan='6'><font face='arial'>".&mt($type)."</font></td></tr>"); |
} |
} |
$r->print($output); |
$r->print($output); |
} |
} |
Line 679 ENDHEADER
|
Line 679 ENDHEADER
|
} |
} |
# ------------------------------------------------------------ Privileges Info |
# ------------------------------------------------------------ Privileges Info |
if (($advanced) && (($env{'user.error.msg'}) || ($error))) { |
if (($advanced) && (($env{'user.error.msg'}) || ($error))) { |
$r->print('<hr><h2>Current Privileges</h2>'); |
$r->print('<hr /><h2>Current Privileges</h2>'); |
|
|
foreach $envkey (sort keys %env) { |
foreach $envkey (sort keys %env) { |
if ($envkey=~/^user\.priv\.$env{'request.role'}\./) { |
if ($envkey=~/^user\.priv\.$env{'request.role'}\./) { |
Line 955 sub allcourses_row {
|
Line 955 sub allcourses_row {
|
my $dcdom = shift; |
my $dcdom = shift; |
my $ccrole = Apache::lonnet::plaintext('cc'); |
my $ccrole = Apache::lonnet::plaintext('cc'); |
my $selectlink = &courselink($dcdom); |
my $selectlink = &courselink($dcdom); |
my $output = '<tr bgcolor="#77FF77">'. |
my $output = '<tr bgcolor="#99FF99">'. |
'<td><input type="button" value="'. |
'<td><input type="button" value="'. |
&mt('Select').'" name="ccpick_'.$dcdom.'"'. |
&mt('Select').'" name="ccpick_'.$dcdom.'"'. |
'onClick="verifyCoursePick(this)">'. |
'onClick="verifyCoursePick(this)">'. |