loncom/auth/lonroles.pm - diff

Return to lonroles.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonroles.pm between versions 1.142 and 1.171

version 1.142, 2005/12/22 03:39:36	version 1.171, 2006/12/01 21:52:29
Line 39 use Apache::loncommon;	Line 39 use Apache::loncommon;
use Apache::lonhtmlcommon;	use Apache::lonhtmlcommon;
use Apache::lonannounce;	use Apache::lonannounce;
use Apache::lonlocal;	use Apache::lonlocal;
	use Apache::lonpageflip();
	use Apache::lonnavdisplay();
use GDBM_File;	use GDBM_File;
	use LONCAPA qw(:DEFAULT :match);


sub redirect_user {	sub redirect_user {
my ($r,$title,$url,$msg,$launch_nav) = @_;	my ($r,$title,$url,$msg,$launch_nav) = @_;
Line 50 sub redirect_user {	Line 54 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',undef,undef,	$navwindow.=&Apache::lonnavdisplay::launch_win('now',undef,undef,
($url =~ m-^/adm/whatsnew-));	($url =~ m-^/adm/whatsnew-));
} else {	} else {
$navwindow.=&Apache::lonnavmaps::close();	$navwindow.=&Apache::lonnavmaps::close();
}	}
my $bodytag=&Apache::loncommon::bodytag('Switching Role');	my $start_page = &Apache::loncommon::start_page('Switching Role',undef,
	{'redirect' => [1,$url],});
	my $end_page = &Apache::loncommon::end_page();

# Note to style police:	# Note to style police:
# This must only replace the spaces, nothing else, or it bombs elsewhere.	# This must only replace the spaces, nothing else, or it bombs elsewhere.
$url=~s/ /\%20/g;	$url=~s/ /\%20/g;
$r->print(<<ENDREDIR);	$r->print(<<ENDREDIR);
<head><title>$title</title>	$start_page
<meta HTTP-EQUIV="Refresh" CONTENT="1; url=$url">
</head>
<html>
$bodytag
<script type="text/javascript">	<script type="text/javascript">
$swinfo	$swinfo
</script>	</script>
$navwindow	$navwindow
<h1>$msg</h1>	<h1>$msg</h1>
<a href="$url">Continue</a>	$end_page
</body>
</html>
ENDREDIR	ENDREDIR
return;	return;
}	}

	sub error_page {
	my ($r,$error,$dest)=@_;
	&Apache::loncommon::content_type($r,'text/html');
	&Apache::loncommon::no_cache($r);
	$r->send_http_header;
	return OK if $r->header_only;
	$r->print(&Apache::loncommon::start_page('Problems during Course Initialization').
	'<script type="text/javascript">'.
	&Apache::lonmenu::rawconfig().'</script>'.
	'<p>'.&mt('The following problems occurred:').
	$error.
	'</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'.
	&Apache::loncommon::end_page());
	}

sub handler {	sub handler {

my $r = shift;	my $r = shift;
Line 86 sub handler {	Line 102 sub handler {
my $envkey;	my $envkey;
my %dcroles = ();	my %dcroles = ();
my $numdc = &check_fordc(\%dcroles,$then);	my $numdc = &check_fordc(\%dcroles,$then);
	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});

# ================================================================== Roles Init	# ================================================================== Roles Init
if ($env{'form.selectrole'}) {	if ($env{'form.selectrole'}) {
Line 108 sub handler {	Line 125 sub handler {
# Check if user is a DC trying to enter a course and needs privs to be created	# Check if user is a DC trying to enter a course and needs privs to be created
if ($numdc > 0) {	if ($numdc > 0) {
foreach my $envkey (keys %env) {	foreach my $envkey (keys %env) {
if ($envkey =~ m-^form\.cc\./(\w+)/(\w+)$-) {	if (my ($domain,$coursenum) =
if ($dcroles{$1}) {	($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {
my $cckey = 'user.role.cc./'.$1.'/'.$2;	if ($dcroles{$domain}) {
&check_privs($cckey,$then,$now);	&check_privs($domain,$coursenum,$then,$now);
}	}
last;	last;
}	}
Line 133 sub handler {	Line 150 sub handler {

# store role if recent_role list being kept	# store role if recent_role list being kept
if ($env{'environment.recentroles'}) {	if ($env{'environment.recentroles'}) {
	my %frozen_roles =
	&Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
&Apache::lonhtmlcommon::store_recent('roles',	&Apache::lonhtmlcommon::store_recent('roles',
$trolecode,' ');	$trolecode,' ',$frozen_roles{$trolecode});
}	}


Line 159 sub handler {	Line 178 sub handler {
&Apache::loncommon::no_cache($r);	&Apache::loncommon::no_cache($r);
$r->send_http_header;	$r->send_http_header;
my $swinfo=&Apache::lonmenu::rawconfig();	my $swinfo=&Apache::lonmenu::rawconfig();
my $bodytag=&Apache::loncommon::bodytag	my $start_page=&Apache::loncommon::start_page
('Verifying Access Key to Unlock this Course');	('Verifying Access Key to Unlock this Course');
	my $end_page=&Apache::loncommon::end_page();
my $buttontext=&mt('Enter Course');	my $buttontext=&mt('Enter Course');
my $message=&mt('Successfully registered key');	my $message=&mt('Successfully registered key');
my $assignresult=	my $assignresult=
Line 180 sub handler {	Line 200 sub handler {
$buttontext=&mt('Re-Enter Key');	$buttontext=&mt('Re-Enter Key');
}	}
$r->print(<<ENDENTEREDKEY);	$r->print(<<ENDENTEREDKEY);
<head><title>Verifying Course Access Key</title>	$start_page
</head>
<html>
$bodytag
<script>	<script>
$swinfo	$swinfo
</script>	</script>
Line 193 $swinfo	Line 210 $swinfo
<font size="+2">$message</font><br />	<font size="+2">$message</font><br />
<input type="submit" value="$buttontext" />	<input type="submit" value="$buttontext" />
</form>	</form>
</body></html>	$end_page
ENDENTEREDKEY	ENDENTEREDKEY
return OK;	return OK;
} else {	} else {
Line 202 ENDENTEREDKEY	Line 219 ENDENTEREDKEY
&Apache::loncommon::no_cache($r);	&Apache::loncommon::no_cache($r);
$r->send_http_header;	$r->send_http_header;
my $swinfo=&Apache::lonmenu::rawconfig();	my $swinfo=&Apache::lonmenu::rawconfig();
my $bodytag=&Apache::loncommon::bodytag	my $start_page=&Apache::loncommon::start_page
('Enter Access Key to Unlock this Course');	('Enter Access Key to Unlock this Course');
	my $end_page=&Apache::loncommon::end_page();
$r->print(<<ENDENTERKEY);	$r->print(<<ENDENTERKEY);
<head><title>Entering Course Access Key</title>	$start_page
</head>
<html>
$bodytag
<script>	<script>
$swinfo	$swinfo
</script>	</script>
Line 218 $swinfo	Line 233 $swinfo
<input type="text" size="20" name="newkey" value="$env{'form.newkey'}" />	<input type="text" size="20" name="newkey" value="$env{'form.newkey'}" />
<input type="submit" value="Enter key" />	<input type="submit" value="Enter key" />
</form>	</form>
</body></html>	$end_page
ENDENTERKEY	ENDENTERKEY
return OK;	return OK;
}	}
Line 235 ENDENTERKEY	Line 250 ENDENTERKEY
'request.course.sec' => $csec,	'request.course.sec' => $csec,
'request.course.groups' => $cgrps);	'request.course.groups' => $cgrps);
my $tadv=0;	my $tadv=0;
my $msg=&mt('Entering course ...');

if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {	if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
	my $msg;
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 245 ENDENTERKEY	Line 260 ENDENTERKEY
my $dest=$env{'form.orgurl'};	my $dest=$env{'form.orgurl'};
if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }	if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
&Apache::lonnet::appenv('request.role.adv'=>$tadv);	&Apache::lonnet::appenv('request.role.adv'=>$tadv);
$r->internal_redirect($dest);	if (($ferr) && ($tadv)) {
	&error_page($r,$ferr,$dest);
	} else {
	$r->internal_redirect($dest);
	}
return OK;	return OK;
} else {	} else {
unless ($env{'request.course.id'}) {	if (!$env{'request.course.id'}) {
&Apache::lonnet::appenv(	&Apache::lonnet::appenv(
"request.course.id" => $cdom.'_'.$cnum);	"request.course.id" => $cdom.'_'.$cnum);
$furl='/adm/roles?tryagain=1';	$furl='/adm/roles?tryagain=1';
$msg=	$msg=
'<h1><font color="red">'.	'<h1><span class="LC_error">'.
&mt('Could not initialize course at this time.').	&mt('Could not initialize [_1] at this time.',
'</font></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;	$env{'course.'.$cdom.'_'.$cnum.'.description'}).
	'</span></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;
}	}
if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }	if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
&Apache::lonnet::appenv('request.role.adv'=>$tadv);	&Apache::lonnet::appenv('request.role.adv'=>$tadv);

# Check to see if the user is a CC entering a course	if (($ferr) && ($tadv)) {
# for the first time	&error_page($r,$ferr,$furl);
my (undef, undef, $role, $courseid) = split(/\./, $envkey);	} else {
if (substr($courseid, 0, 1) eq '/') {	# Check to see if the user is a CC entering a course
$courseid = substr($courseid, 1);	# for the first time
}	my (undef, undef, $role, $courseid) = split(/\./, $envkey);
$courseid =~ s/\//_/;	if (substr($courseid, 0, 1) eq '/') {
if ($role eq 'cc' && $env{'course.' . $courseid .	$courseid = substr($courseid, 1);
'.course.helper.not.run'}) {	}
$furl = "/adm/helper/course.initialization.helper";	$courseid =~ s/\//_/;
# Send the user to the course they selected	if ($role eq 'cc' && $env{'course.' . $courseid .
} elsif ($env{'request.course.id'}) {	'.course.helper.not.run'}) {
if (&Apache::lonnet::allowed('whn',	$furl = "/adm/helper/course.initialization.helper";
$env{'request.course.id'})) {	# Send the user to the course they selected
my $startpage = &courseloadpage($courseid);	} elsif ($env{'request.course.id'}) {
unless ($startpage eq 'firstres') {	if (&Apache::lonnet::allowed('whn',
$msg = &mt('Entering course ....');	$env{'request.course.id'})
&redirect_user($r,&mt('New in course'),	\|\| &Apache::lonnet::allowed('whn',
'/adm/whatsnew?refpage=start',$msg,	$env{'request.course.id'}.'/'
$env{'environment.remotenavmap'});	.$env{'request.course.sec'})
return OK;	) {
}	my $startpage = &courseloadpage($courseid);
}	unless ($startpage eq 'firstres') {
	$msg = &mt('Entering [_1] ....',
	$env{'course.'.$courseid.'.description'});
	&redirect_user($r,&mt('New in course'),
	'/adm/whatsnew?refpage=start',$msg,
	$env{'environment.remotenavmap'});
	return OK;
	}
	}
	}
	# Are we allowed to look at the first resource?
	if ($furl !~ m\|^/adm/\|) {
	# Guess not ...
	$furl=&Apache::lonpageflip::first_accessible_resource();
	}
	$msg = &mt('Entering [_1] ...',
	$env{'course.'.$courseid.'.description'});
	&redirect_user($r,&mt('Entering [_1]',
	$env{'course.'.$courseid.'.description'}),
	$furl,$msg,
	$env{'environment.remotenavmap'});
}	}
&redirect_user($r,&mt('Entering Course'),
$furl,$msg,
$env{'environment.remotenavmap'});
return OK;	return OK;
}	}
}	}
Line 325 ENDENTERKEY	Line 362 ENDENTERKEY
return OK if $r->header_only;	return OK if $r->header_only;

my $swinfo=&Apache::lonmenu::rawconfig();	my $swinfo=&Apache::lonmenu::rawconfig();
my $bodytag=&Apache::loncommon::bodytag('User Roles');	my $start_page=&Apache::loncommon::start_page('User Roles');
my $standby=&mt('Role selected. Please stand by.');	my $standby=&mt('Role selected. Please stand by.');
$standby=~s/\n/\\n/g;	$standby=~s/\n/\\n/g;
my $helptag='<table><tr><td>'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,undef,undef,undef,undef,,&mt("Click here for help")).'</td></td></tr></table>';
$r->print(<<ENDHEADER);	$r->print(<<ENDHEADER);
<html>	$start_page
<head>	<br />
<title>LON-CAPA User Roles</title>
</head>
$bodytag
$helptag<br />
<script>	<script>
$swinfo	$swinfo
window.focus();	window.focus();
Line 385 ENDHEADER	Line 418 ENDHEADER
$last=$hash{'last_known'};	$last=$hash{'last_known'};
untie(%hash);	untie(%hash);
}	}
if ($last) { $fn.='?symb='.&Apache::lonnet::escape($last); }	if ($last) { $fn.='?symb='.&escape($last); }

&Apache::londocs::changewarning($r,undef,'You have modified your course recently, [_1] may fix this access problem.',	&Apache::londocs::changewarning($r,undef,'You have modified your course recently, [_1] may fix this access problem.',
&Apache::lonenc::check_encrypt($fn));	&Apache::lonenc::check_encrypt($fn));
} else {	} else {
if ($env{'user.error.msg'}) {	if ($env{'user.error.msg'}) {
$r->print(	$r->print(
'<h3><font color="red">'.	'<h3><span class="LC_error">'.
&mt('You need to choose another user role or enter a specific course for this function').'</font></h3>');	&mt('You need to choose another user role or enter a specific course for this function').'</span></h3>');
}	}
}	}
# -------------------------------------------------------- Choice or no choice?	# -------------------------------------------------------- Choice or no choice?
if ($nochoose) {	if ($nochoose) {
if ($advanced) {	$r->print("<h2>".&mt('Sorry ...')."</h2>\n".
$r->print("<h2>".&mt('Assigned User Roles')."</h2>\n");	&mt('This action is currently not authorized.').
} else {	&Apache::loncommon::end_page());
$r->print("<h2>".&mt('Sorry ...')."</h2>\n".	return OK;
&mt('This resource might be part of'));
if ($env{'request.course.id'}) {
$r->print(&mt(' another'));
} else {
$r->print(&mt(' a certain'));
}
$r->print(&mt(' course.').'</body></html>');
return OK;
}
} else {	} else {
if ($advanced) {	if ($advanced) {
$r->print(&mt("Your home server is ").	$r->print(&mt("Your home server is ").
Line 462 ENDHEADER	Line 486 ENDHEADER
$tstatus='selected';	$tstatus='selected';
}	}
my $tbg;	my $tbg;
if (($tstatus eq 'is') \|\| ($tstatus eq 'selected') \|\|	if (($tstatus eq 'is')
($env{'form.showall'})) {	\|\| ($tstatus eq 'selected')
	\|\| ($tstatus eq 'will')
	\|\| ($tstatus eq 'future')
	\|\| ($env{'form.showall'})) {
if ($tstatus eq 'is') {	if ($tstatus eq 'is') {
$tbg='#77FF77';	$tbg='#77FF77';
$tfont='#003300';	$tfont='#003300';
Line 495 ENDHEADER	Line 522 ENDHEADER
if ($tremark) { $tremark.='<br />'; }	if ($tremark) { $tremark.='<br />'; }
$tremark.=&mt('Defined by ').$rauthor.	$tremark.=&mt('Defined by ').$rauthor.
&mt(' at ').$rdomain.'.';	&mt(' at ').$rdomain.'.';
$trole=$rrole;	}
} else {	$trole=Apache::lonnet::plaintext($role);
$trole=Apache::lonnet::plaintext($role);
}
my $ttype;	my $ttype;
my $twhere;	my $twhere;
my ($tdom,$trest,$tsection)=	my ($tdom,$trest,$tsection)=
Line 531 ENDHEADER	Line 556 ENDHEADER
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }	foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
if (!$allowed) {	if (!$allowed) {
$button=0;	$button=0;
$switchserver=&Apache::lonnet::escape('http://'.	$switchserver='otherserver='.$home.'&role='.$trolecode;
$Apache::lonnet::hostname{$home}.
'/adm/login?domain='.$env{'user.domain'}.
'&username='.$env{'user.name'}.
'&firsturl=/priv/'.$env{'user.name'}.'/');
}	}
#next if ($home eq 'no_host');	#next if ($home eq 'no_host');
$home = $Apache::lonnet::hostname{$home};	$home = $Apache::lonnet::hostname{$home};
Line 546 ENDHEADER	Line 567 ENDHEADER
$tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$env{'user.name'}.'/');	$tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$env{'user.name'}.'/');
$sortkey=$role;	$sortkey=$role;
} elsif ($trest) {	} elsif ($trest) {
$ttype='Course';
my $tcourseid=$tdom.'_'.$trest;	my $tcourseid=$tdom.'_'.$trest;
	$ttype = &Apache::loncommon::course_type($tcourseid);
	$trole = &Apache::lonnet::plaintext($role,$ttype);
if ($env{'course.'.$tcourseid.'.description'}) {	if ($env{'course.'.$tcourseid.'.description'}) {
$twhere=$env{'course.'.$tcourseid.'.description'};	$twhere=$env{'course.'.$tcourseid.'.description'};
$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;	$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
Line 565 ENDHEADER	Line 587 ENDHEADER
' <font size="-2">'.	' <font size="-2">'.
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).	&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
'</font>';	'</font>';
	$ttype = $newhash{'type'};
	$trole = &Apache::lonnet::plaintext($role,$ttype);
} else {	} else {
$twhere=&mt('Currently not available');	$twhere=&mt('Currently not available');
$env{'course.'.$tcourseid.'.description'}=$twhere;	$env{'course.'.$tcourseid.'.description'}=$twhere;
$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;	$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
	$ttype = 'Unavailable';
}	}
}	}
if ($tsection) {	if ($tsection) {
$twhere.='<br />'.&mt('Section/Group').': '.$tsection;	$twhere.='<br />'.&mt('Section/Group').': '.$tsection;
}	}

if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }	if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
} elsif ($tdom) {	} elsif ($tdom) {
$ttype='Domain';	$ttype='Domain';
Line 585 ENDHEADER	Line 609 ENDHEADER
$twhere=&mt('system wide');	$twhere=&mt('system wide');
$sortkey=$role.$twhere;	$sortkey=$role.$twhere;
}	}
	$roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver);
$roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver);
$roletext{$envkey}=$roletext;	$roletext{$envkey}=$roletext;
if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}	if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
$sortrole{$sortkey}=$envkey;	$sortrole{$sortkey}=$envkey;
Line 601 ENDHEADER	Line 624 ENDHEADER
} else {	} else {
$r->print('<h2>'.&mt('Currently no active roles or courses').'</h2>');	$r->print('<h2>'.&mt('Currently no active roles or courses').'</h2>');
}	}
$r->print('</form></body></html>');	$r->print('</form>'.&Apache::loncommon::end_page());
return OK;	return OK;
# Is there only one choice?	# Is there only one choice?
} elsif (($countactive==1) && ($env{'request.role'} eq 'cm')) {	} elsif (($countactive==1) && ($env{'request.role'} eq 'cm')) {
Line 610 ENDHEADER	Line 633 ENDHEADER
$r->print("</form>\n");	$r->print("</form>\n");
$r->rflush();	$r->rflush();
$r->print('<script>document.forms.rolechoice.submit();</script>');	$r->print('<script>document.forms.rolechoice.submit();</script>');
$r->print('</body></html>');	$r->print(&Apache::loncommon::end_page());
return OK;	return OK;
}	}
# More than one possible role	# More than one possible role
# ----------------------------------------------------------------------- Table	# ----------------------------------------------------------------------- Table
unless (($advanced) \|\| ($nochoose)) {	unless (($advanced) \|\| ($nochoose)) {
$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");	$r->print("<h2>".&mt('Select a Course/Group to Enter')."</h2>\n");
}	}
$r->print('<br /><table><tr>');	$r->print('<br /><table><tr>');
unless ($nochoose) { $r->print('<th> </th>'); }	unless ($nochoose) { $r->print('<th> </th>'); }
$r->print('<th>'.&mt('User Role').'</th><th>'.&mt('Extent').	$r->print('<th>'.&mt('User Role').'</th><th>'.&mt('Extent').
'</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>'."\n");	'</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>'."\n");
my $doheaders=-1;	my $doheaders=-1;
foreach my $type ('Domain','Construction Space','Course','System') {	foreach my $type ('Domain','Construction Space','Course','Group','Unavailable','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 640 ENDHEADER	Line 663 ENDHEADER
foreach (sort(keys(%recent_roles))) {	foreach (sort(keys(%recent_roles))) {
if (defined($roletext{'user.role.'.$_})) {	if (defined($roletext{'user.role.'.$_})) {
$output.=$roletext{'user.role.'.$_};	$output.=$roletext{'user.role.'.$_};
if ($_ =~ m-dc\./(\w+)/- && $dcroles{$1}) {	if ($_ =~ m-dc\./($match_domain)/-
	&& $dcroles{$1}) {
$output .= &allcourses_row($1,'recent');	$output .= &allcourses_row($1,'recent');
}	}
} elsif ($numdc > 0) {	} elsif ($numdc > 0) {
Line 662 ENDHEADER	Line 686 ENDHEADER
$r->print(&coursepick_jscript());	$r->print(&coursepick_jscript());
$r->print(&Apache::loncommon::coursebrowser_javascript());	$r->print(&Apache::loncommon::coursebrowser_javascript());
}	}
foreach my $type ('Construction Space','Domain','Course','System') {	foreach my $type ('Construction Space','Domain','Course','Group','Unavailable','System') {
my $output;	my $output;
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/) {
$output.=$roletext{$sortrole{$which}};	$output.=$roletext{$sortrole{$which}};
if ($sortrole{$which} =~ m-dc\./(\w+)/-) {	if ($sortrole{$which} =~ m-dc\./($match_domain)/-) {
if ($dcroles{$1}) {	if ($dcroles{$1}) {
$output .= &allcourses_row($1,'');	$output .= &allcourses_row($1,'');
}	}
Line 724 ENDHEADER	Line 748 ENDHEADER
$ttype='Construction Space';	$ttype='Construction Space';
$twhere='User: '.$trest.', Domain: '.$tdom;	$twhere='User: '.$trest.', Domain: '.$tdom;
} else {	} else {
$ttype='Course';	$ttype=
	&Apache::loncommon::course_type($tdom.'_'.$trest);
$twhere=$env{'course.'.$tdom.'_'.$trest.'.description'};	$twhere=$env{'course.'.$tdom.'_'.$trest.'.description'};
if ($tsec) {	if ($tsec) {
$twhere.=' (Section/Group: '.$tsec.')';	$twhere.=' (Section: '.$tsec.')';
}	}
}	}
} elsif ($tdom) {	} elsif ($tdom) {
Line 767 ENDHEADER	Line 792 ENDHEADER
$r->dir_config('lonVersion').'</i><br />'.	$r->dir_config('lonVersion').'</i><br />'.
'<a href="/adm/logout">'.&mt('Logout').'</a></small></p>');	'<a href="/adm/logout">'.&mt('Logout').'</a></small></p>');
}	}
$r->print("</body></html>\n");	$r->print(&Apache::loncommon::end_page());
return OK;	return OK;
}	}

Line 797 sub role_status {	Line 822 sub role_status {
}	}

sub build_roletext {	sub build_roletext {
my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;	my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
my $roletext='<tr bgcolor="'.$tbg.'">';	my $roletext='<tr bgcolor="'.$tbg.'">';
my $is_dc=($trolecode =~ m/^dc\./);	my $is_dc=($trolecode =~ m/^dc\./);
my $rowspan=($is_dc) ? ''	my $rowspan=($is_dc) ? ''
Line 811 sub build_roletext {	Line 836 sub build_roletext {
$roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.	$roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.
$switchserver.'">'.&mt('Switch Server').'</a></td>';	$switchserver.'">'.&mt('Switch Server').'</a></td>';
} else {	} else {
$roletext.=('<td> </td>');	$roletext.=('<td'.$rowspan.'> </td>');
}	}
} elsif ($tstatus eq 'is') {	} elsif ($tstatus eq 'is') {
$roletext.='<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.	$roletext.='<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
Line 831 sub build_roletext {	Line 856 sub build_roletext {
$roletext.='<td'.$rowspan.'> </td>';	$roletext.='<td'.$rowspan.'> </td>';
}	}
}	}
$tremark.=&Apache::lonannounce::showday(time,1,	if ($trolecode !~ m/^(dc\|ca\|au\|aa)\./) {
&Apache::lonannounce::readcalendar($tdom.'_'.$trest));	$tremark.=&Apache::lonannounce::showday(time,1,
	&Apache::lonannounce::readcalendar($tdom.'_'.$trest));
	}
$roletext.='<td><font color="'.$tfont.'">'.$trole.	$roletext.='<td><font color="'.$tfont.'">'.$trole.
'</font></td><td><font color="'.$tfont.'">'.$twhere.	'</font></td><td><font color="'.$tfont.'">'.$twhere.
'</font></td><td><font color="'.$tfont.'">'.$tpstart.	'</font></td><td><font color="'.$tfont.'">'.$tpstart.
Line 847 sub build_roletext {	Line 873 sub build_roletext {
}	}

sub check_privs {	sub check_privs {
my ($cckey,$then,$now) = @_;	my ($cdom,$cnum,$then,$now) = @_;
	my $cckey = 'user.role.cc./'.$cdom.'/'.$cnum;
if ($env{$cckey}) {	if ($env{$cckey}) {
my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont);	my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont);
&role_status($cckey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);	&role_status($cckey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
unless (($tstatus eq 'is') \|\| ($tstatus eq 'will_not')) {	unless (($tstatus eq 'is') \|\| ($tstatus eq 'will_not')) {
&set_privileges($1,$2);	&set_privileges($cdom,$cnum);
}	}
} else {	} else {
&set_privileges($1,$2);	&set_privileges($cdom,$cnum);
}	}
}	}

Line 864 sub check_fordc {	Line 891 sub check_fordc {
my $numdc = 0;	my $numdc = 0;
if ($env{'user.adv'}) {	if ($env{'user.adv'}) {
foreach my $envkey (sort keys %env) {	foreach my $envkey (sort keys %env) {
if ($envkey=~/^user\.role\.dc\.\/(\w+)\/$/) {	if ($envkey=~/^user\.role\.dc\.\/($match_domain)\/$/) {
my $dcdom = $1;	my $dcdom = $1;
my $livedc = 1;	my $livedc = 1;
my ($tstart,$tend)=split(/\./,$env{$envkey});	my ($tstart,$tend)=split(/\./,$env{$envkey});
Line 881 sub check_fordc {	Line 908 sub check_fordc {
}	}

sub courselink {	sub courselink {
my ($dcdom,$rowtype) = @_;	my ($dcdom,$rowtype,$selecttype) = @_;
my $courseform=&Apache::loncommon::selectcourse_link	my $courseform=&Apache::loncommon::selectcourse_link
('rolechoice','dccourse'.$rowtype.'_'.$dcdom,'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.$dcdom,$dcdom);	('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
	'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
	$dcdom,$dcdom,undef,$selecttype);
my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.	my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
'<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.	'<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
'<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'.	'<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'.
Line 959 sub display_cc_role {	Line 988 sub display_cc_role {
my $advanced = $env{'user.adv'};	my $advanced = $env{'user.adv'};
my $tryagain = $env{'form.tryagain'};	my $tryagain = $env{'form.tryagain'};
unless ($rolekey =~/^error\:/) {	unless ($rolekey =~/^error\:/) {
if ($rolekey =~ m-^user\.role.cc\./(\w+)/(\w+)$-) {	if ($rolekey =~ m-^user\.role.cc\./($match_domain)/($match_courseid)$-) {
my $tcourseid = $1.'_'.$2;	my $tcourseid = $1.'_'.$2;
my $trolecode = 'cc./'.$1.'/'.$2;	my $trolecode = 'cc./'.$1.'/'.$2;
my $trole = Apache::lonnet::plaintext('cc');
my $twhere;	my $twhere;
	my $ttype;
my $tbg='#77FF77';	my $tbg='#77FF77';
my $tfont='#003300';	my $tfont='#003300';
my %newhash=&Apache::lonnet::coursedescription($tcourseid);	my %newhash=&Apache::lonnet::coursedescription($tcourseid);
Line 972 sub display_cc_role {	Line 1001 sub display_cc_role {
' <font size="-2">'.	' <font size="-2">'.
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1,$tfont).	&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1,$tfont).
'</font>';	'</font>';
	$ttype = $newhash{'type'};
} else {	} else {
$twhere=&mt('Currently not available');	$twhere=&mt('Currently not available');
$env{'course.'.$tcourseid.'.description'}=$twhere;	$env{'course.'.$tcourseid.'.description'}=$twhere;
}	}
	my $trole = &Apache::lonnet::plaintext('cc',$ttype);
$twhere.="<br />".&mt('Domain').":".$1;	$twhere.="<br />".&mt('Domain').":".$1;
$roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,&mt('Course'),$twhere,'','','',1,'');	$roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,$twhere,'','','',1,'');
}	}
}	}
return $roletext;	return ($roletext);
}	}

sub allcourses_row {	sub allcourses_row {
my ($dcdom,$rowtype) = @_;	my ($dcdom,$rowtype) = @_;
my $ccrole = Apache::lonnet::plaintext('cc');
my $selectlink = &courselink($dcdom,$rowtype);
my $output = '<tr bgcolor="#77FF77">'.	my $output = '<tr bgcolor="#77FF77">'.
'<td colspan="5">'.	' <td colspan="5">';
'<font color="#002200">'.$ccrole.'</font>'.	foreach my $type ('Course','Group') {
' <b>'.$selectlink.'</b>'.	my $selectlink = &courselink($dcdom,$rowtype,$type);
' from '.&mt('Domain').' '.$dcdom.	my $ccrole = &Apache::lonnet::plaintext('cc',$type);
'<tr><td colspan="5" height="3"></td></tr>'."\n";	$output.= '<font color="#002200">'.$ccrole.'</font>'.
	' <b>'.$selectlink.'</b>'.
	' from '.&mt('Domain').' '.$dcdom.'<br />';
	}
	$output .= '</tr><tr><td colspan="5" height="3"></td></tr>'."\n";
return $output;	return $output;
}	}

sub recent_filename {	sub recent_filename {
my $area=shift;	my $area=shift;
return 'nohist_recent_'.&Apache::lonnet::escape($area);	return 'nohist_recent_'.&escape($area);
}	}

sub set_privileges {	sub set_privileges {
Line 1006 sub set_privileges {	Line 1039 sub set_privileges {
my $area = '/'.$dcdom.'/'.$pickedcourse;	my $area = '/'.$dcdom.'/'.$pickedcourse;
my $role = 'cc';	my $role = 'cc';
my $spec = $role.'.'.$area;	my $spec = $role.'.'.$area;
my $userroles = &Apache::lonnet::set_arearole($role,$area,'','',$dcdom,$env{'user.name'});	my %userroles = &Apache::lonnet::set_arearole($role,$area,'','',
	$env{'user.domain'},
	$env{'user.name'});
my %ccrole = ();	my %ccrole = ();
&Apache::lonnet::standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);	&Apache::lonnet::standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);
my ($author,$adv)= &Apache::lonnet::set_userprivs(\$userroles,\%ccrole);	my ($author,$adv)= &Apache::lonnet::set_userprivs(\%userroles,\%ccrole);
my @newprivs = split/\n/,$userroles;	&Apache::lonnet::appenv(%userroles);
my %newccroles = ();
foreach (@newprivs) {
my ($key,$val) = split/=/,$_;
$newccroles{$key} = $val;
}
&Apache::lonnet::appenv(%newccroles);
&Apache::lonnet::log($env{'user.domain'},	&Apache::lonnet::log($env{'user.domain'},
$env{'user.name'},	$env{'user.name'},
$env{'user.home'},	$env{'user.home'},
"Role ".$role);	"Role ".$role);
&Apache::lonnet::appenv(	&Apache::lonnet::appenv(
'request.role' => $role,	'request.role' => $spec,
'request.role.domain' => $dcdom,	'request.role.domain' => $dcdom,
'request.course.sec' => '');	'request.course.sec' => '');
my $tadv=0;	my $tadv=0;
Line 1033 sub set_privileges {	Line 1062 sub set_privileges {
sub courseloadpage {	sub courseloadpage {
my ($courseid) = @_;	my ($courseid) = @_;
my $startpage;	my $startpage;
my %entry_settings =	my %entry_settings = &Apache::lonnet::get('nohist_whatsnew',
&Apache::lonnet::dump('nohist_whatsnew',$env{'user.domain'},	[$courseid.':courseinit']);
$env{'user.name'},$courseid.':courseinit');
my ($tmp) = %entry_settings;	my ($tmp) = %entry_settings;
unless ($tmp =~ /^Error/) {	unless ($tmp =~ /^error: 2 /) {
$startpage = $entry_settings{$courseid.':courseinit'};	$startpage = $entry_settings{$courseid.':courseinit'};
}	}
if ($startpage eq '') {	if ($startpage eq '') {

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.142
changed lines
	Added in v.1.171