loncom/interface/lonpickcourse.pm - diff

Return to lonpickcourse.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonpickcourse.pm between versions 1.60 and 1.63.2.1

version 1.60, 2006/11/29 07:46:39	version 1.63.2.1, 2007/06/01 18:07:47
Line 35 use Apache::loncoursedata;	Line 35 use Apache::loncoursedata;
use Apache::lonnet;	use Apache::lonnet;
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::longroup;	use Apache::longroup;
use lib '/home/httpd/lib/perl/';
use LONCAPA;	use LONCAPA;

sub handler {	sub handler {
Line 199 sub display_matched_courses {	Line 198 sub display_matched_courses {
my ($descr,$instcode,$owner,$ttype) = split/:/,$courses{$course};	my ($descr,$instcode,$owner,$ttype) = split/:/,$courses{$course};
$r->print(&course_chooser($multiple,$cdom,$cnum,$cleandesc));	$r->print(&course_chooser($multiple,$cdom,$cnum,$cleandesc));
$r->print($description.'('.	$r->print($description.'('.
($Apache::lonnet::domaindescription{$cdom}?	(&Apache::lonnet::domain($cdom,'description')?
$Apache::lonnet::domaindescription{$cdom}:$cdom).")");	&Apache::lonnet::domain($cdom,'description'):$cdom).")");
unless ($instcode eq '') {	unless ($instcode eq '') {
$r->print(" - ".&unescape($instcode));	$r->print(" - ".&unescape($instcode));
}	}
Line 266 sub build_filters {	Line 265 sub build_filters {
foreach my $item (@{$filterlist}) {	foreach my $item (@{$filterlist}) {
$filter->{$item} = $env{'form.'.$item};	$filter->{$item} = $env{'form.'.$item};
if ($item ne 'descriptfilter' && $item ne 'instcodefilter') {	if ($item ne 'descriptfilter' && $item ne 'instcodefilter') {
$filter->{$item} =~ s/\W//g;	if ($item eq 'domainfilter' \|\| $item eq 'ownerdomfilter') {
	$filter->{$item} = &LONCAPA::clean_domain($filter->{$item});
	} elsif ($item eq 'coursefilter') {
	$filter->{$item} = &LONCAPA::clean_courseid($filter->{$item});
	} elsif ($item eq 'ownerfilter') {
	$filter->{$item} = &LONCAPA::clean_username($filter->{$item});
	} else {
	$filter->{$item} =~ s/\W//g;
	}
if (!$filter->{$item}) {	if (!$filter->{$item}) {
$filter->{$item} = '';	$filter->{$item} = '';
}	}
}	}
if ($item eq 'domainfilter') {	if ($item eq 'domainfilter') {
	my $allow_blank = 1;
	if ($formname eq 'portform') {
	$filter->{$item} \|\|= $env{'user.domain'};
	$allow_blank=0;
	}
$domainselectform =	$domainselectform =
&Apache::loncommon::select_dom_form($filter->{$item},'domainfilter',1);	&Apache::loncommon::select_dom_form($filter->{$item},
	'domainfilter',
	$allow_blank);
} elsif ($item eq 'ownerdomfilter') {	} elsif ($item eq 'ownerdomfilter') {
$ownerdomselectform =	$ownerdomselectform =
&Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1);	&Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1);
Line 349 $multelement	Line 363 $multelement
if ($domainselectform) {	if ($domainselectform) {
$output .= $lt{'cdo'}.': '.$domainselectform.'<br />'."\n";	$output .= $lt{'cdo'}.': '.$domainselectform.'<br />'."\n";
}	}
if ($typeselectform) {	# if ($typeselectform) {
$output .= $lt{'cog'}.': '.$typeselectform.'<br />'."\n";	# $output .= $lt{'cog'}.': '.$typeselectform.'<br />'."\n";
}	# }
if ($instcodeform) {	if ($instcodeform) {
$output .= $lt{'cin'}.': '.$instcodeform.'<br />'."\n";	$output .= $lt{'cin'}.': '.$instcodeform.'<br />'."\n";
}	}

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

Removed from v.1.60
changed lines
	Added in v.1.63.2.1