--- loncom/interface/lonpickcourse.pm 2006/11/14 18:27:57 1.58
+++ loncom/interface/lonpickcourse.pm 2007/10/03 19:57:29 1.64
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Pick a course
#
-# $Id: lonpickcourse.pm,v 1.58 2006/11/14 18:27:57 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.64 2007/10/03 19:57:29 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,7 +35,6 @@ use Apache::loncoursedata;
use Apache::lonnet;
use Apache::lonlocal;
use Apache::longroup;
-use lib '/home/httpd/lib/perl/';
use LONCAPA;
sub handler {
@@ -79,7 +78,7 @@ sub handler {
my $onlyown = 0;
# if called to assign course-based portfolio access control
- if ((($env{'form.form'} eq 'portform') && ($env{'user.adv'}))) {
+ if ((($env{'form.form'} eq 'portform') && (!$env{'user.adv'}))) {
$onlyown = 1;
}
@@ -176,7 +175,9 @@ sub display_matched_courses {
my $numcourses = keys(%courses);
foreach my $course (keys(%courses)) {
my $descr;
- if ($courses{$course} =~ m/^([^:]*):/i) {
+ if (ref($courses{$course}) eq 'HASH') {
+ $descr = &unescape($courses{$course}{'description'});
+ } elsif ($courses{$course} =~ m/^([^:]*):/i) {
$descr = &unescape($1);
} else {
$descr = &unescape($courses{$course});
@@ -196,18 +197,36 @@ sub display_matched_courses {
my $cleandesc=&HTML::Entities::encode($description,'<>&"');
$cleandesc=~s/'/\\'/g;
my ($cdom,$cnum)=split(/\_/,$course);
- my ($descr,$instcode,$owner,$ttype) = split/:/,$courses{$course};
+ my ($descr,$instcode,$ttype,@owners);
+ if (ref($courses{$course}) eq 'HASH') {
+ $descr = $courses{$course}{'description'};
+ $instcode = $courses{$course}{'instcode'};
+ $ttype = $courses{$course}{'type'};
+ push(@owners,&unescape($courses{$course}{'owner'}));
+ if (ref($courses{$course}{'co-owners'}) eq 'ARRAY') {
+ foreach my $item (@{$courses{$course}{'co-owners'}}) {
+ push(@owners,&unescape($item));
+ }
+ }
+ } else {
+ my $singleowner;
+ ($descr,$instcode,$singleowner,$ttype)=split(/:/,$courses{$course});
+ push(@owners,&unescape($singleowner));
+ }
+ my $owner = join(', ',@owners);
$r->print(&course_chooser($multiple,$cdom,$cnum,$cleandesc));
$r->print($description.'('.
- ($Apache::lonnet::domaindescription{$cdom}?
- $Apache::lonnet::domaindescription{$cdom}:$cdom).")");
- unless ($instcode eq '') {
+ (&Apache::lonnet::domain($cdom,'description')?
+ &Apache::lonnet::domain($cdom,'description'):$cdom).")");
+ if ($instcode ne '') {
$r->print(" - ".&unescape($instcode));
}
- unless ($owner eq '') {
- $r->print(", owner - ".&unescape($owner));
+ if (@owners > 1) {
+ $r->print(', '.&mt('owners').' - ',join(', ',@owners));
+ } elsif (@owners == 1) {
+ $r->print(', '.&mt('owner').' - '.$owner);
}
- unless ($ttype eq '') {
+ if ($ttype ne '') {
$r->print('('.&unescape($ttype).')');
}
if ($multiple) { $r->print("\n"); }
@@ -266,14 +285,29 @@ sub build_filters {
foreach my $item (@{$filterlist}) {
$filter->{$item} = $env{'form.'.$item};
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}) {
$filter->{$item} = '';
}
}
if ($item eq 'domainfilter') {
+ my $allow_blank = 1;
+ if ($formname eq 'portform') {
+ $filter->{$item} ||= $env{'user.domain'};
+ $allow_blank=0;
+ }
$domainselectform =
- &Apache::loncommon::select_dom_form($filter->{$item},'domainfilter',1);
+ &Apache::loncommon::select_dom_form($filter->{$item},
+ 'domainfilter',
+ $allow_blank);
} elsif ($item eq 'ownerdomfilter') {
$ownerdomselectform =
&Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1);
@@ -339,6 +373,9 @@ $name_input
$roleelement
$multelement
|;
+ if ($formname eq 'portform') {
+ $output .= '';
+ }
}
if ($sincefilterform) {
$output .= $lt{'cac'}.': '.$sincefilterform.'
'."\n";
@@ -406,7 +443,8 @@ sub search_courses {
undef,undef,$type);
} else {
$r->print('
');
- foreach my $cid (sort(&Apache::loncommon::findallcourses())) {
+ my %coursehash = &Apache::loncommon::findallcourses();
+ foreach my $cid (sort(keys(%coursehash))) {
$courses{$cid} = $env{'course.'.$cid.'.description'};
}
}