loncom/interface/lonsimplepage.pm - diff

Return to lonsimplepage.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsimplepage.pm between versions 1.36 and 1.38

version 1.36, 2006/03/29 20:07:00	version 1.38, 2006/04/10 19:59:54
Line 52 sub handler {	Line 52 sub handler {
# Is this even in a course?	# Is this even in a course?
unless ($env{'request.course.id'}) {	unless ($env{'request.course.id'}) {
if ($target ne 'tex') {	if ($target ne 'tex') {
return &Apache::loncommon::simple_error_page($r,'',	&Apache::loncommon::simple_error_page($r,'','Not in a course');
'Not in a course');
} else {	} else {
$r->print('\textbf{Not in a course}\end{document}');	$r->print('\textbf{Not in a course}\end{document}');
}	}
	return OK;
}	}

my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
Line 72 sub handler {	Line 72 sub handler {
$namespace = 'grppage_'.$marker;	$namespace = 'grppage_'.$marker;
my %curr_groups;	my %curr_groups;
if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) {	if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) {
return &Apache::loncommon::simple_error_page($r,'',	&Apache::loncommon::simple_error_page($r,'','Invalid group name');
'Invalid group name');	return OK;
}	}
%groupinfo =	%groupinfo =
&Apache::loncommon::get_group_settings($curr_groups{$marker});	&Apache::loncommon::get_group_settings($curr_groups{$marker});
Line 83 sub handler {	Line 83 sub handler {
}	}

if (!$marker) {	if (!$marker) {
return &Apache::loncommon::simple_error_page($r,'','Invalid call');	&Apache::loncommon::simple_error_page($r,'','Invalid call');
	return OK;
}	}

# --------------------------------------------------------- The syllabus fields	# --------------------------------------------------------- The syllabus fields
Line 99 sub handler {	Line 100 sub handler {
# ------------------------------------------------------------ Get query string	# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi	&Apache::loncommon::get_unprocessed_cgi
($ENV{'QUERY_STRING'},['forcestudent','forceedit','register']);	($ENV{'QUERY_STRING'},['forcestudent','forceedit','register']);
# ----------------------------------------------------- Force menu registration
my $addentries='';
if ($env{'form.register'}) {
$addentries=' onLoad="'.&Apache::lonmenu::loadevents().
'" onUnload="'.&Apache::lonmenu::unloadevents().'"';
}
# --------------------------------------------------------------- Force Student	# --------------------------------------------------------------- Force Student
my $forcestudent='';	my $forcestudent='';
if ($env{'form.forcestudent'} \|\| $target eq 'tex' ) { $forcestudent='student'; };	if ($env{'form.forcestudent'} \|\| $target eq 'tex' ) { $forcestudent='student'; };
my $forceedit='';	my $forceedit='';
if ($env{'form.forceedit'}) { $forceedit='edit'; }	if ($env{'form.forceedit'}) { $forceedit='edit'; }


my %syllabus=&Apache::lonnet::dump($namespace,$dom,$crs);	my %syllabus=&Apache::lonnet::dump($namespace,$dom,$crs);
Line 124 sub handler {	Line 119 sub handler {
my $start_page =	my $start_page =
&Apache::loncommon::start_page($title,undef,	&Apache::loncommon::start_page($title,undef,
{'function' => $forcestudent,	{'function' => $forcestudent,
'add_entries' => $addentries,
'domain' => $dom,	'domain' => $dom,
'force_register' =>	'force_register' =>
$env{'form.register'},});	$env{'form.register'},});

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

Removed from v.1.36
changed lines
	Added in v.1.38