--- loncom/interface/coursecatalog.pm 2007/01/10 03:57:51 1.16
+++ loncom/interface/coursecatalog.pm 2007/10/02 01:10:27 1.21
@@ -1,3 +1,7 @@
+# The LearningOnline Network with CAPA
+# Handler for displaying the course catalog interface
+#
+# $Id: coursecatalog.pm,v 1.21 2007/10/02 01:10:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,31 +46,33 @@ sub handler {
if ($r->header_only) {
return OK;
}
- my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
- my $lonid=$cookies{'lonID'};
+ my $handle = &Apache::lonnet::check_for_valid_session($r);
my $lonidsdir=$r->dir_config('lonIDsDir');
- my $handle;
- if ($lonid) {
- $handle=&LONCAPA::clean_handle($lonid->value);
- }
- if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
+ if ($handle ne '') {
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
}
&Apache::lonacc::get_posted_cgi($r);
&Apache::lonlocal::get_language_handle($r);
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sortby']);
- my $codedom = $Apache::lonnet::perlvar{'lonDefDomain'};
+ my $codedom = &Apache::lonnet::default_login_domain();
+
+ if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) {
+ $codedom = $env{'user.domain'};
+ if ($env{'request.role.domain'} ne '') {
+ $codedom = $env{'request.role.domain'};
+ }
+ }
my $formname = 'coursecatalog';
- my $domdesc = $Apache::lonnet::domaindescription{$codedom};
+ my $domdesc = &Apache::lonnet::domain($codedom,'description');
&Apache::lonhtmlcommon::clear_breadcrumbs();
if ($env{'form.coursenum'} ne '' && &user_is_known()) {
&course_details($r,$codedom,$formname,$domdesc);
} else {
- &course_selector($r,$codedom,$formname,$domdesc);
+ my $numtitles = &course_selector($r,$codedom,$formname,$domdesc);
if ($env{'form.state'} eq 'listing') {
- $r->print('
'.&print_course_listing($codedom).'
');
- }
+ $r->print(&print_course_listing($codedom,$numtitles).'
');
+ }
}
$r->print(&Apache::loncommon::end_page());
return OK;
@@ -83,10 +89,13 @@ sub course_details {
'add_entries' => \%add_entries,
'no_inline_link' => 1,});
$r->print($start_page);
+ if ($env{'form.numtitles'} > 0) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Select courses"});
+ }
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/coursecatalog",
- text=>"Select courses"},
- {href=>"javascript:document.$formname.submit()",
+ ({href=>"javascript:document.$formname.submit()",
text=>"Course listing"},
{text=>"Course details"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Details'));
@@ -133,41 +142,49 @@ sub course_selector {
if ($numtitles > 4) {
$lasttitle = 4;
}
- my @data = ('top');
- for (my $k=0; $k<$lasttitle; $k++) {
- my $cat = $codetitles[$k];
- my $level = 1;
- $level = &recurse_options($codetitles[$k],$idlist{$codetitles[$k]},$level,$cat,\%cat_items,\@data,\%by_year,\%by_sem,\%by_dept); }
- $scripttext .= &build_javascript(\%by_year,\%by_sem,\%by_dept,\%cat_order,\@codetitles);
- $jscript .= &javascript_select_filler($formname,$scripttext,\@codetitles,$longtitles_str,$allidlist);
- }
- if ($env{'form.state'} eq 'listing') {
- $jscript .= '
+ if ($numtitles == 0) {
+ if (!defined($env{'form.state'})) {
+ $env{'form.state'} = 'listing';
+ }
+ } else {
+ my @data = ('top');
+ for (my $k=0; $k<$lasttitle; $k++) {
+ my $cat = $codetitles[$k];
+ my $level = 1;
+ $level = &recurse_options($codetitles[$k],$idlist{$codetitles[$k]},$level,$cat,\%cat_items,\@data,\%by_year,\%by_sem,\%by_dept);
+ }
+ $scripttext .= &build_javascript(\%by_year,\%by_sem,\%by_dept,\%cat_order,\@codetitles);
+ $jscript .= &javascript_select_filler($formname,$scripttext,\@codetitles,$longtitles_str,$allidlist);
+ if ($env{'form.state'} eq 'listing') {
+ $jscript .= '
function setElements() {
';
- for (my $i=0; $i<@codetitles-1; $i++) {
- if ($env{'form.'.$codetitles[$i]} != -1) {
- $jscript .= '
+ for (my $i=0; $i<@codetitles-1; $i++) {
+ if ($env{'form.'.$codetitles[$i]} != -1) {
+ $jscript .= '
for (var j=0; j'."\n$jscript\n".
'';
my %add_entries = (topmargin => "0",
marginheight => "0",);
- if ($env{'form.state'} eq 'listing') {
+ if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) {
$add_entries{'onLoad'} = 'setElements()';
}
my $start_page =
@@ -191,11 +209,16 @@ function setCourseId(caller) {
'no_inline_link' => 1,});
$r->print($start_page);
if ($env{'form.state'} eq 'listing') {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/coursecatalog",
- text=>"Select courses"},
- {text=>"Course listing"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Listing'));
+ if ($numtitles > 0) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Select courses"},
+ {text=>"Course listing"});
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({text=>"Course listing"});
+ }
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Listing'));
} else {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/coursecatalog",
@@ -203,9 +226,9 @@ function setCourseId(caller) {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Select courses'));
}
$r->print(''.&mt('Display information about official [_1] classes for which LON-CAPA courses have been created:',$domdesc).'
');
- $r->print(&mt('Choose which course(s) to list.
'));
$r->print('