version 1.122, 2005/06/06 22:39:59
|
version 1.125, 2005/06/19 00:41:32
|
Line 227 ENDENTERKEY
|
Line 227 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 260 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 471 ENDHEADER
|
Line 471 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(); |