--- loncom/interface/coursecatalog.pm	2006/10/16 19:39:51	1.7
+++ loncom/interface/coursecatalog.pm	2006/12/05 02:55:51	1.11
@@ -42,6 +42,16 @@ sub handler {
     if ($r->header_only) {
         return OK;
     }
+    my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
+    my $lonid=$cookies{'lonID'};
+    my $lonidsdir=$r->dir_config('lonIDsDir');
+    my $handle;
+    if ($lonid) {
+	my $handle=&LONCAPA::clean_handle($lonid->value);
+    }
+    if ((-e "$lonidsdir/$handle.id") && ($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']);
@@ -50,7 +60,7 @@ sub handler {
     my $domdesc = $Apache::lonnet::domaindescription{$codedom};
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
-    if ($env{'form.coursenum'} ne '') {
+    if ($env{'form.coursenum'} ne '' && &user_is_known()) {
         &course_details($r,$codedom,$formname,$domdesc);
     } else {
         &course_selector($r,$codedom,$formname,$domdesc);
@@ -369,7 +379,9 @@ sub print_course_listing {
             $output = &mt('No courses match the criteria you selected.');
             return $output;
         }
-        $output = &mt('<b>Note for students:</b> If you are officially enrolled in a course but the course is not listed in your LON-CAPA courses, click the "Show more details" link for the specific course and check the default access dates and/or automated enrollment settings.<br /><br />');
+        if (&user_is_known()) {
+            $output = &mt('<b>Note for students:</b> If you are officially enrolled in a course but the course is not listed in your LON-CAPA courses, click the "Show more details" link for the specific course and check the default access dates and/or automated enrollment settings.<br /><br />');
+        }
     }
     $output .= &Apache::loncommon::start_data_table().
                &Apache::loncommon::start_data_table_header_row();
@@ -389,13 +401,15 @@ sub print_course_listing {
         }
         $output .= '</th>';
     }
-    if ($env{'form.coursenum'} eq '') {
-        $output .= '<th>&nbsp;</th>';
-    } else {
-        $output .=
+    if (&user_is_known()) {
+        if ($env{'form.coursenum'} eq '') {
+            $output .= '<th>&nbsp;</th>';
+        } else {
+            $output .=
               '<th>'.&mt('Default Access Dates for Students').'</th>'.
               '<th>'.&mt('Student Counts').'</th>'.
               '<th>'.&mt('Auto-enrollment of <br />registered students').'</th>';
+        }
     }
     &Apache::loncommon::end_data_table_header_row();
     my %courseinfo = &build_courseinfo_hash(%courses);
@@ -441,6 +455,7 @@ sub build_courseinfo_hash {
         }
         my $cleandesc=&HTML::Entities::encode($descr,'<>&"');
         $cleandesc=~s/'/\\'/g;
+        $cleandesc =~ s/^\s+//;
         my ($cdom,$cnum)=split(/\_/,$course);
 
         my ($desc,$instcode,$owner,$ttype) = split(/:/,$courses{$course});
@@ -573,13 +588,15 @@ sub courseinfo_row {
     }
     $output .= '</font></td>'.
                '<td>'.$ownerlast.'</td>';
-    if ($env{'form.coursenum'} eq '') {
-        $output .= "<td><a href=\"javascript:setCourseId('$cnum')\">".&mt('Show more details').'</a></td>';
-    } else {
-        $output .=
+    if (&user_is_known()) {
+        if ($env{'form.coursenum'} eq '') {
+            $output .= "<td><a href=\"javascript:setCourseId('$cnum')\">".&mt('Show more details').'</a></td>';
+        } else { 
+            $output .=
                '<td>'.$accessdates.'</td>'. 
                '<td>'.$counts.'</td>'.
                '<td>'.$autoenrollment.'</td>';
+        }
     }
     return $output;
 }
@@ -741,39 +758,44 @@ function courseSet() {
             }
         }
         else {
-            for (var k=0; k<idyears.length; k++) {
-                if (idyears[k] == valyr) {
-                    idyr = k;
+            if (selDepartment > -1) {
+                for (var k=0; k<idyears.length; k++) {
+                    if (idyears[k] == valyr) {
+                        idyr = k;
+                    }
                 }
-            }
-            if (idyr != -1) {
-                for (var k=0; k<idsems[idyr].length; k++) {
-                    if (idsems[idyr][k] == valsem) {
-                        idsem = k;
+                if (idyr != -1) {
+                    for (var k=0; k<idsems[idyr].length; k++) {
+                        if (idsems[idyr][k] == valsem) {
+                            idsem = k;
+                        }
                     }
                 }
-            }
-            if (idsem != -1) {
-                for (var k=0; k<idcodes[idyr][idsem].length; k++) {
-                    if (idcodes[idyr][idsem][k] == valdept) {
-                        iddept = k;
+                if (idsem != -1) {
+                    for (var k=0; k<idcodes[idyr][idsem].length; k++) {
+                        if (idcodes[idyr][idsem][k] == valdept) {
+                            iddept = k;
+                        }
                     }
                 }
-            }
-            if (iddept != -1) {
-                document.$formname.Number.options[0] =  new Option('All','0',false,false);
-                for (var i=0; i<idcourses[idyr][idsem][iddept].length; i++) {
-                    var display = idcourses[idyr][idsem][iddept][i];
-                    if (longtitles[3] == 1) {
-                        if (idcourseslongs[idyr][idsem][iddept][i] != "") {
-                            display = idcourseslongs[idyr][idsem][iddept][i]
+                if (iddept != -1) {
+                    document.$formname.Number.options[0] =  new Option('All','0',false,false);
+                    for (var i=0; i<idcourses[idyr][idsem][iddept].length; i++) {
+                        var display = idcourses[idyr][idsem][iddept][i];
+                        if (longtitles[3] == 1) {
+                            if (idcourseslongs[idyr][idsem][iddept][i] != "") {
+                                display = idcourseslongs[idyr][idsem][iddept][i]
+                            }
                         }
+                        document.$formname.Number.options[i+1] = new Option(display,idcourses[idyr][idsem][iddept][i],false,false)
                     }
-                    document.$formname.Number.options[i+1] = new Option(display,idcourses[idyr][idsem][iddept][i],false,false)
+                } 
+                else {
+                    document.$formname.Number.options[0] =  new Option('No courses','0',true,true);
                 }
-            }
+            } 
             else {
-                document.$formname.Number.options[0] =  new Option('No courses','0',true,true);
+                document.$formname.Number.options[0] =  new Option('All','0',true,true);
             }
         }
         document.$formname.Number.selectedIndex = 0
@@ -821,4 +843,13 @@ sub autoenroll_info {
     return $autoenrolldates;
 }
 
+sub user_is_known {
+    my $known = 0;
+    if ($env{'user.name'} ne '' && $env{'user.name'} ne 'public' 
+        && $env{'user.domain'} ne '' && $env{'user.domain'} ne 'public') {
+        $known = 1;
+    }
+    return $known;
+}
+
 1;