--- loncom/interface/lonpickcourse.pm	2006/11/14 18:27:57	1.58
+++ loncom/interface/lonpickcourse.pm	2008/01/02 11:25:38	1.67.2.2
@@ -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.67.2.2 2008/01/02 11:25:38 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 {
@@ -73,18 +72,19 @@ sub handler {
     my $roledom = $env{'form.roleelement'};
     if ($roledom) {
         $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
-        $submitopener = &Apache::lonroles::processpick();
+        $submitopener = &processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';
     }
 
     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;
     }
 
     my %loaditem;
-    if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) {
+    if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
+        ($env{'form.pickedcourse'})) {
         $loaditem{'onload'} ="setSections()";
     }
     $r->print(&Apache::loncommon::start_page($title,undef,
@@ -93,7 +93,8 @@ sub handler {
 
     if ($env{'form.form'} eq 'portform') {
         $lastaction = 'document.courselist.submit()';
-    } elsif ($env{'form.form'} eq 'cu') {
+    } elsif ($env{'form.form'} eq 'cu' || ($env{'form.form'} eq 'studentform' &&
+        !$multiple)) {
         $lastaction = 
              'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n".
              'document.courselist.submit();';
@@ -102,8 +103,8 @@ sub handler {
     }
 
     # if called to assign a role in a course to a user via CUSR
-    if ($env{'form.form'} eq 'cu') {
-        $r->print(&create_user_javascript($type)); 
+    if ($env{'form.form'} eq 'cu' || $env{'form.form'} eq 'studentform') {
+        $r->print(&create_user_javascript($type));
     }
 
     # print javascript functions for choosing a course 
@@ -138,6 +139,49 @@ sub handler {
     return OK;
 }
 
+sub processpick {
+    my $openerform = 'rolechoice';
+    if ($env{'form.form'} eq 'studentform') {
+        $openerform = $env{'form.form'};
+    }
+    my $process_pick = <<"ENDONE";
+<script type="text/javascript">
+function process_pick(dom) {
+    var pickedCourse=opener.document.$openerform.$env{'form.cnumelement'}.value;
+    var pickedDomain=opener.document.$openerform.$env{'form.cdomelement'}.value;
+    var okDomain = 0;
+ENDONE
+    if ($openerform eq 'rolechoice') {
+        $process_pick .= <<"ENDTWO";
+    if (pickedDomain == dom) {
+        if (pickedCourse != '') {
+            var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
+            opener.document.title='Role selected. Please stand by.';
+            opener.status='Role selected. Please stand by.';
+            opener.document.rolechoice.newrole.value=courseTarget
+            opener.document.rolechoice.submit();
+        }
+    } 
+    else {
+        alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
+    }
+ENDTWO
+    } else {
+        $process_pick .= <<"ENDTHREE";
+    if (pickedDomain != dom) {
+        alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
+        return;
+    }
+ENDTHREE
+    }
+    $process_pick .= "
+}
+
+</script>
+";
+    return $process_pick;
+}
+
 sub create_user_javascript {
     my ($type) = @_;
     my $output;
@@ -171,12 +215,35 @@ sub display_matched_courses {
     if ($env{'form.form'} eq 'portform') {
         $action = '/adm/portfolio';
     }
+    my $numcourses = keys(%courses);
     $r->print('<form name="courselist" method="post" action="'.$action.'">');
+    if ($env{'form.form'} eq 'modifycourse') {
+        if ($numcourses > 0) {
+            my $cctitle = &Apache::lonnet::plaintext('cc',$type);
+            my $dctitle = &Apache::lonnet::plaintext('dc');
+            my $ccrolechk = ' checked="checked" ';
+            my $menuchk = ' ';
+            if ($env{'form.prevphase'} ne '') {
+                 $ccrolechk = ' ';
+                 $menuchk = ' checked="checked" ';
+            }
+            $r->print(
+                '<span class="LC_nobreak"><label>'.
+                '<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'.
+                '&nbsp;'.&mt('Enter the course with the role of [_1].',$cctitle).
+                '</label>'.('&nbsp;'x3).'</span><br />'.
+                '<span class="LC_nobreak"><label>'.
+                '<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;'.
+                &mt('View or modify course settings which only a [_1] may modify.',$dctitle).
+                '</label></span><br /><br />');
+        }
+    }
     my %by_descrip;
-    my $numcourses = keys(%courses);
     foreach my $course (keys(%courses)) {
         my $descr;
-        if ($courses{$course} =~ m/^([^:]*):/i) {
+        if (ref($courses{$course}) eq 'HASH') {
+            $descr = $courses{$course}{'description'};
+        } elsif ($courses{$course} =~ m/^([^:]*):/i) {
             $descr = &unescape($1);
         } else {
             $descr = &unescape($courses{$course});
@@ -196,19 +263,37 @@ 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}{'inst_code'};
+                $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 '') {
+            $r->print($description.' ('.
+                      (&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 '') {
-                $r->print('('.&unescape($ttype).')');
+            if ($ttype ne '') {
+                $r->print(' ('.&unescape($ttype).')');
             }
             if ($multiple) { $r->print("</label>\n"); }
             $r->print("<br />\n");
@@ -232,7 +317,6 @@ sub display_matched_courses {
         $r->print('<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />');
         $r->print('<input type="hidden" name="action" value="rolepicker" />');
     } elsif ($env{'form.form'} eq 'modifycourse') {
-        $r->print('<input type="hidden" name="phase" value="menu" />'."\n");
         $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form']));
     } else {
         $r->print('<input type="hidden" name="cnumelement" value="'.
@@ -266,14 +350,32 @@ 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;
+	    } elsif ($formname eq 'studentform') {
+                $filter->{$item} ||= $env{'request.role.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);
@@ -308,8 +410,7 @@ sub build_filters {
               'cog' => &mt('Course Type')
              );
 
-    $typeselectform =  '<select name="type" size="1"';
-    $typeselectform .= ">\n";
+    $typeselectform =  '<select name="type" size="1">'."\n";
     if ($type eq 'Course') {
         $instcodeform = 
                 '<input type="text" name="instcodefilter" size="10" value="'.
@@ -325,8 +426,10 @@ sub build_filters {
 <input type="hidden" name="form" value="$formname" />
 |;
     if ($formname eq 'modifycourse') {
-        $output .= '<input type="hidden" name="phase" value="courselist" />';
-    } else {     
+        $output .= '<input type="hidden" name="phase" value="courselist" />'."\n".
+                   '<input type="hidden" name="prevphase" value="'.
+                   $env{'form.prevphase'}.'" />'."\n";
+    } else {
         my $name_input;
         if ($env{'form.cnameelement'} ne '') {
             $name_input = '<input type="hidden" name="cnameelement" value="'.
@@ -339,6 +442,9 @@ $name_input
 $roleelement
 $multelement
 |;
+        if ($formname eq 'portform') {
+            $output .= '<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />';
+        }
     }
     if ($sincefilterform) { 
         $output .= $lt{'cac'}.': '.$sincefilterform.'<br />'."\n";
@@ -346,9 +452,9 @@ $multelement
     if ($domainselectform) {
         $output .= $lt{'cdo'}.': '.$domainselectform.'<br />'."\n";
     }
-    if ($typeselectform) {
-        $output .= $lt{'cog'}.': '.$typeselectform.'<br />'."\n";
-    }
+#    if ($typeselectform) {
+#        $output .= $lt{'cog'}.': '.$typeselectform.'<br />'."\n";
+#    }
     if ($instcodeform) {
         $output .= $lt{'cin'}.': '.$instcodeform.'<br />'."\n";
     }
@@ -406,8 +512,9 @@ sub search_courses {
                                           undef,undef,$type);
     } else {
         $r->print('<br />');
-        foreach my $cid (sort(&Apache::loncommon::findallcourses())) {
-            $courses{$cid} = $env{'course.'.$cid.'.description'};
+        my %coursehash = &Apache::loncommon::findallcourses(); 
+        foreach my $cid (sort(keys(%coursehash))) {
+            $courses{$cid}{'description'} = $env{'course.'.$cid.'.description'};
         }
     }
     return %courses;
@@ -671,7 +778,7 @@ Side Effects: None
 X<gochoose_javascript()>
 B<gochoose_javascript($type,$multiple,$autosubmit,$lastaction)>:
 
-Input: 4 - course type; single (0) or multiple courses (1); in context of DC selecting a CC role in a course: javascript code from Apache::lonroles::processpick(); final action to take after user chooses course(s):  either close window, or submit form for display of next page etc.
+Input: 4 - course type; single (0) or multiple courses (1); in context of DC selecting a CC role in a course: javascript code from &processpick(); final action to take after user chooses course(s):  either close window, or submit form for display of next page etc.
 
 Output: 1  $output - javascript wrapped in E<lt>scriptE<gt>E<lt>/scriptE<gt> tags