--- loncom/auth/lonroles.pm	2009/12/20 04:11:27	1.240.2.4
+++ loncom/auth/lonroles.pm	2010/01/18 17:15:47	1.244
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.240.2.4 2009/12/20 04:11:27 raeburn Exp $
+# $Id: lonroles.pm,v 1.244 2010/01/18 17:15:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,7 +138,7 @@ use Apache::lonannounce;
 use Apache::lonlocal;
 use Apache::lonpageflip();
 use Apache::lonnavdisplay();
-use Apache::lonmainmenu();
+use Apache::loncoursequeueadmin;
 use GDBM_File;
 use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities;
@@ -225,7 +225,6 @@ sub handler {
     my %dcroles = ();
     my $numdc = &check_fordc(\%dcroles,$then);
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
-    my $custommenu = &Apache::loncommon::needs_gci_custom();
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
@@ -320,9 +319,7 @@ sub handler {
                 }
             }
         }
-        if (($env{'form.cm'}) && ($env{'form.orgurl'})) { 
-            $r->internal_redirect($env{'form.orgurl'});
-        }
+
         foreach $envkey (keys %env) {
             next if ($envkey!~/^user\.role\./);
             my ($where,$trolecode,$role,$tstatus,$tend,$tstart);
@@ -449,8 +446,6 @@ ENDENTERKEY
 
 		    if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
                         my $msg;
-                        if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
-                        &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
 			my ($furl,$ferr)=
 			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
 			if (($env{'form.orgurl'}) && 
@@ -464,6 +459,8 @@ ENDENTERKEY
                                 }
                                 $dest .= 'symb='.$env{'form.symb'};
                             }
+			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
+			    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
                             if (($ferr) && ($tadv)) {
 				&error_page($r,$ferr,$dest);
 			    } else {
@@ -482,6 +479,8 @@ ENDENTERKEY
                     .'<p>'.&mt('Please try again.').'</p>'
                     .'<p>'.$ferr.'</p>';
 			    }
+			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
+			    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
 
 			    if (($ferr) && ($tadv)) {
 				&error_page($r,$ferr,$furl);
@@ -493,7 +492,7 @@ ENDENTERKEY
 				    $courseid = substr($courseid, 1);
 				}
 				$courseid =~ s/\//_/;
-				if (($cdom ne 'gcitest') && (($role eq 'cc') || ($role eq 'co')) 
+				if ((($role eq 'cc') || ($role eq 'co')) 
                                     && ($env{'course.' . $courseid .'.course.helper.not.run'})) { 
 				    $furl = "/adm/helper/course.initialization.helper";
 				    # Send the user to the course they selected
@@ -517,7 +516,7 @@ ENDENTERKEY
 								    .$env{'request.course.sec'})
 					) {
 					my $startpage = &courseloadpage($courseid);
-					unless (($startpage eq 'firstres') || ($cdom eq 'gcitest')) {
+					unless ($startpage eq 'firstres') {         
 					    $msg = &mt('Entering [_1] ...',
 						       $env{'course.'.$courseid.'.description'});
 					    &redirect_user($r,&mt('New in course'),
@@ -532,9 +531,6 @@ ENDENTERKEY
 # Guess not ...
 				    $furl=&Apache::lonpageflip::first_accessible_resource();
 				}
-                                if (($cdom eq 'gcitest') && ($custommenu)) {
-                                    $furl = '/adm/navmaps';
-                                }
                                 $msg = &mt('Entering [_1] ...',
 					   $env{'course.'.$courseid.'.description'});
 				&redirect_user($r,&mt('Entering [_1]',
@@ -577,6 +573,7 @@ ENDENTERKEY
         }
     }
 
+
 # =============================================================== No Roles Init
 
     &Apache::loncommon::content_type($r,'text/html');
@@ -584,34 +581,23 @@ ENDENTERKEY
     $r->send_http_header;
     return OK if $r->header_only;
 
-    my ($crumbtext,$pagetitle,$recent,$show_course);
+    my $crumbtext = 'User Roles';
+    my $pagetitle = 'My Roles';
+    my $recent = &mt('Recent Roles');
+    my $show_course=&Apache::loncommon::show_course();
+    if ($show_course) {
+        $crumbtext = 'Courses';
+        $pagetitle = 'My Courses';
+        $recent = &mt('Recent Courses');
+    }
+    my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];
+    my $swinfo=&Apache::lonmenu::rawconfig();
+    my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
+    my $standby=&mt('Role selected. Please stand by.');
+    $standby=~s/\n/\\n/g;
     my $noscript='<span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
-    if ($custommenu) {
-        my $start_page = &Apache::loncommon::start_page('Main Menu',undef,
-                                                        {'bread_crumbs' => 1});
-        $r->print(<<"ENDCUSTOM");
-$start_page
-<br />
-<noscript>
-$noscript
-</noscript>
-ENDCUSTOM
-    } else {
-        $crumbtext = 'User Roles';
-        $pagetitle = 'My Roles';
-        $recent = &mt('Recent Roles');
-        $show_course=&Apache::loncommon::show_course();
-        if ($show_course) {
-            $crumbtext = 'Courses';
-            $pagetitle = 'My Courses';
-            $recent = &mt('Recent Courses');
-        }
-        my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];
-        my $swinfo=&Apache::lonmenu::rawconfig();
-        my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
-        my $standby=&mt('Role selected. Please stand by.');
-        $standby=~s/\n/\\n/g;
-        $r->print(<<ENDHEADER);
+
+    $r->print(<<ENDHEADER);
 $start_page
 <br />
 <noscript>
@@ -638,7 +624,6 @@ function enterrole (thisform,rolecode,bu
 // ]]>
 </script>
 ENDHEADER
-    }
 
 # ------------------------------------------ Get Error Message from Environment
 
@@ -706,12 +691,10 @@ ENDHEADER
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
         }
-        unless ($custommenu) {
-            $r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');
-            $r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');
-            $r->print('<input type="hidden" name="selectrole" value="1" />');
-            $r->print('<input type="hidden" name="newrole" value="" />');
-        }
+        $r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');
+        $r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');
+        $r->print('<input type="hidden" name="selectrole" value="1" />');
+        $r->print('<input type="hidden" name="newrole" value="" />');
     }
 
     my (%roletext,%sortrole,%roleclass,%futureroles,%timezones);
@@ -721,32 +704,6 @@ ENDHEADER
 
     $refresh = $now;
     &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
-    if ($custommenu) {
-        my %courses = &Apache::loncommon::existing_gcitest_courses();
-        $env{'browser.interface'}='faketextual';
-        $env{'environment.remote'}='off';
-        my $numcourses = keys(%courses);
-        my $switcher;
-        if ($numcourses > 0) {
-            $switcher = &Apache::lonmainmenu::gcitest_switcher(%courses);
-            my $current;
-            if ($env{'request.course.id'}) {
-                $current = 'cc./'.$env{'course.'.$env{'request.course.id'}.'.domain'}.
-                           '/'.$env{'course.'.$env{'request.course.id'}.'.num'};
-            }
-            my $switcher_js = &Apache::lonmainmenu::gcitest_switcher_js($current,$numcourses);
-            $r->print(<<"ENDSCRIPT");
-<script type="text/javascript">
-// <![CDATA[
-$switcher_js
-// ]]>
-</script>
-ENDSCRIPT
-        }
-        $r->print(&Apache::lonmenu::inlinemenu('gcicustom',$switcher).
-                  &Apache::loncommon::end_page());
-        return OK;
-    }
     if ($env{'user.adv'}) {
         $r->print('<p><label><input type="checkbox" name="showall"');
         if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
@@ -755,7 +712,7 @@ ENDSCRIPT
                  .'</p>');
     } else {
         if ($countactive > 0) {
-            &queued_selfenrollment($r);
+            $r->print(&Apache::loncoursequeueadmin::queued_selfenrollment());
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
             $r->print(
@@ -811,27 +768,6 @@ ENDSCRIPT
         }
         $r->print(&Apache::loncommon::end_page());
 	return OK;
-    } elsif ($countactive==1) { # Is there only one choice?
-        my $needs_switchserver;
-        if ($env{'user.author'}) {
-            $needs_switchserver = &check_needs_switchserver($possiblerole);
-        }
-        if ((!$needs_switchserver) && ($env{'request.role'} eq 'cm')) {
-            $r->print('<h3>'.&mt('Please stand by.').'</h3>'.
-                '<input type="hidden" name="'.$possiblerole.'" value="1" />'.
-            '<noscript><br /><input type="submit" name="submit" value="'.&mt('Continue').'" /></noscript>');
-            $r->print("</form>\n");
-            $r->rflush();
-            $r->print('<script type="text/javascript">document.forms.rolechoice.submit();</script>');
-            $r->print(&Apache::loncommon::end_page());
-            return OK;
-        }
-        if ($needs_switchserver) {
-            $r->print("<h2>".&mt('Server Switch Required')."</h2>\n".
-                      &mt('Construction Space access is only available from '.
-                          'the home server of the corresponding Author.').'<br />'.
-                      &mt("Click the 'Switch Server' link to go there.").'<br />');
-        }
     }
 # ----------------------------------------------------------------------- Table
     unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) {
@@ -1040,7 +976,7 @@ sub gather_roles {
                 } elsif ($trest) {
                     my $tcourseid=$tdom.'_'.$trest;
                     $ttype = &Apache::loncommon::course_type($tcourseid);
-                    $trole = &Apache::lonnet::plaintext($role,$ttype);
+                    $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
                     if ($env{'course.'.$tcourseid.'.description'}) {
                         $twhere=$env{'course.'.$tcourseid.'.description'};
                         $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
@@ -1059,7 +995,7 @@ sub gather_roles {
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
                               '</span>';
                             $ttype = $newhash{'type'};
-                            $trole = &Apache::lonnet::plaintext($role,$ttype);
+                            $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
                         } else {
                             $twhere=&mt('Currently not available');
                             $env{'course.'.$tcourseid.'.description'}=$twhere;
@@ -1239,8 +1175,8 @@ sub findcourse_advice {
     }
     $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
               '<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
-    $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>');
-    &queued_selfenrollment($r);
+    $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>'.
+              &Apache::loncoursequeueadmin::queued_selfenrollment());
     return;
 }
 
@@ -1297,49 +1233,6 @@ sub requestcourse_advice {
     return;
 }
 
-sub queued_selfenrollment {
-    my ($r) = @_;
-    my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
-    my %reqs_by_date;
-    foreach my $item (keys(%selfenrollrequests)) {
-        if (ref($selfenrollrequests{$item}) eq 'HASH') {
-            if ($selfenrollrequests{$item}{'status'} eq 'request') {
-                if ($selfenrollrequests{$item}{'timestamp'}) {
-                    push(@{$reqs_by_date{$selfenrollrequests{$item}{'timestamp'}}},$item);
-                }
-            } 
-        }
-    }
-    if (keys(%reqs_by_date)) {
-        my $rolename = &Apache::lonnet::plaintext('st');
-        $r->print('<b>'.&mt('Enrollment requests pending Course Coordinator approval').'</b><br />'.
-                  &Apache::loncommon::start_data_table().
-                  &Apache::loncommon::start_data_table_header_row().
-                  '<th>'.&mt('Date requested').'</th><th>'.&mt('Course title').'</th>'.
-                  '<th>'.&mt('User role').'</th><th>'.&mt('Section').'</th>'.
-                 &Apache::loncommon::end_data_table_header_row());
-        my @sorted = sort { $a <=> $b } (keys(%reqs_by_date));
-        foreach my $item (@sorted) {
-            if (ref($reqs_by_date{$item}) eq 'ARRAY') {
-                foreach my $crs (@{$reqs_by_date{$item}}) {
-                    my %courseinfo = &Apache::lonnet::coursedescription($crs);
-                    my $usec = $selfenrollrequests{$crs}{'section'};
-                    if ($usec eq '') {
-                        $usec = &mt('No section'); 
-                    }
-                    $r->print(&Apache::loncommon::start_data_table_row().
-                             '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'.
-                             '<td>'.$courseinfo{'description'}.'</td>'.
-                             '<td>'.$rolename.'</td><td>'.$usec.'</td>'.
-                             &Apache::loncommon::end_data_table_row());
-                }
-            }
-        }
-        $r->print(&Apache::loncommon::end_data_table());
-    }
-    return;
-}
-
 sub privileges_info {
     my ($which) = @_;
     my $output;
@@ -1680,7 +1573,7 @@ sub display_cc_role {
                 $twhere=&mt('Currently not available');
                 $env{'course.'.$tcourseid.'.description'}=$twhere;
             }
-            my $trole = &Apache::lonnet::plaintext($ccrole,$ttype);
+            my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid);
             $twhere.="<br />".&mt('Domain').":".$1;
             ($roletext,$roletext_end) = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
         }