--- loncom/auth/lonroles.pm	2005/11/11 18:47:09	1.134
+++ loncom/auth/lonroles.pm	2006/03/16 19:19:59	1.146
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.134 2005/11/11 18:47:09 www Exp $
+# $Id: lonroles.pm,v 1.146 2006/03/16 19:19:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,7 +51,7 @@ sub redirect_user {
     my $navwindow;
     if ($launch_nav eq 'on') {
 	$navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef,
-						    ($url eq '/adm/whatsnew'));
+						  ($url =~ m-^/adm/whatsnew-));
     } else {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
@@ -108,10 +108,10 @@ sub handler {
 # Check if user is a DC trying to enter a course and needs privs to be created
         if ($numdc > 0) {
             foreach my $envkey (keys %env) {
-                if ($envkey =~ m-^form\.cc\./(\w+)/(\w+)$-) {
-                    if ($dcroles{$1}) {
-                        my $cckey = 'user.role.cc./'.$1.'/'.$2;
-                        &check_privs($cckey,$then,$now);
+                if (my ($domain,$coursenum) =
+                                    ($envkey =~ m-^form\.cc\./(\w+)/(\w+)$-)) {
+                    if ($dcroles{$domain}) {
+                        &check_privs($domain,$coursenum,$then,$now);
                     }
                     last;
                 }
@@ -126,6 +126,11 @@ sub handler {
 		if ($tstatus eq 'is') {
 		    $where=~s/^\///;
 		    my ($cdom,$cnum,$csec)=split(/\//,$where);
+# check for course groups
+                    my %coursegroups = &Apache::lonnet::get_active_groups(
+                          $env{'user.domain'},$env{'user.name'},$cdom, $cnum);
+                    my $cgrps = join(':',keys(%coursegroups));
+
 # store role if recent_role list being kept
                     if ($env{'environment.recentroles'}) {
 			&Apache::lonhtmlcommon::store_recent('roles',
@@ -227,7 +232,8 @@ ENDENTERKEY
 		    &Apache::lonnet::appenv(
 					   'request.role'        => $trolecode,
 					   'request.role.domain' => $cdom,
-					   'request.course.sec'  => $csec);
+					   'request.course.sec'  => $csec,
+                                           'request.course.groups' => $cgrps);
                     my $tadv=0;
 		    my $msg=&mt('Entering course ...');
 
@@ -265,13 +271,22 @@ ENDENTERKEY
 							  '.course.helper.not.run'}) {
 				$furl = "/adm/helper/course.initialization.helper";
 				# Send the user to the course they selected
-			    } elsif (($env{'request.course.fn'}) 
-				     && ($role eq 'cc' && ($env{'environment.course_init_display'} ne 'firstres')))  {
-				$msg = &mt('Entering course ....');
-				&redirect_user($r,&mt('New in course'),
-					       '/adm/whatsnew',$msg,
-					       $env{'environment.remotenavmap'});
-				return OK;
+			    } elsif ($env{'request.course.id'}) {
+                                if (&Apache::lonnet::allowed('whn',
+                                                  $env{'request.course.id'})
+				    || &Apache::lonnet::allowed('whn',
+					       $env{'request.course.id'}.'/'
+					      .$env{'request.course.sec'})
+				    ) {
+                                    my $startpage = &courseloadpage($courseid);
+                                    unless ($startpage eq 'firstres') {         
+				        $msg = &mt('Entering course ....');
+				        &redirect_user($r,&mt('New in course'),
+					     '/adm/whatsnew?refpage=start',$msg,
+					     $env{'environment.remotenavmap'});
+				        return OK;
+                                    }
+                                }
 			    }
 			    &redirect_user($r,&mt('Entering Course'),
                                            $furl,$msg,
@@ -316,6 +331,7 @@ ENDENTERKEY
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $bodytag=&Apache::loncommon::bodytag('User Roles');
     my $standby=&mt('Role selected. Please stand by.');
+    $standby=~s/\n/\\n/g;
     my $helptag='<table><tr><td>'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,undef,undef,undef,undef,,&mt("Click here for help")).'</td></td></tr></table>';
     $r->print(<<ENDHEADER);
 <html>
@@ -435,7 +451,7 @@ ENDHEADER
         if ($envkey=~/^user\.role\./) {
             my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont);
             &role_status($envkey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
-            next if (!defined($role) || $role eq '');
+            next if (!defined($role) || $role eq '' || $role =~ /^gr/);
             $tremark='';
             $tpstart='&nbsp;';
             $tpend='&nbsp;';
@@ -519,11 +535,7 @@ ENDHEADER
 		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
 			$button=0;
-                        $switchserver=&Apache::lonnet::escape('http://'.
-                         $Apache::lonnet::hostname{$home}.
-                          '/adm/login?domain='.$env{'user.domain'}.
-			   '&username='.$env{'user.name'}.
-                           '&firsturl=/priv/'.$env{'user.name'}.'/');
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
@@ -629,7 +641,7 @@ ENDHEADER
 	    if (defined($roletext{'user.role.'.$_})) {
 		$output.=$roletext{'user.role.'.$_};
                 if ($_ =~ m-dc\./(\w+)/- && $dcroles{$1}) {
-		    $output .= &allcourses_row($1);
+		    $output .= &allcourses_row($1,'recent');
                 }
 	    } elsif ($numdc > 0) {
                 unless ($_ =~/^error\:/) {
@@ -657,7 +669,7 @@ ENDHEADER
 		$output.=$roletext{$sortrole{$which}};
                 if ($sortrole{$which} =~ m-dc\./(\w+)/-) {
                     if ($dcroles{$1}) {
-                        $output .= &allcourses_row($1);
+                        $output .= &allcourses_row($1,'');
                     }
                 }
 	    }
@@ -835,15 +847,16 @@ sub build_roletext {
 }
 
 sub check_privs {
-    my ($cckey,$then,$now) = @_;
+    my ($cdom,$cnum,$then,$now) = @_;
+    my $cckey = 'user.role.cc./'.$cdom.'/'.$cnum; 
     if ($env{$cckey}) {
         my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont);
         &role_status($cckey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
         unless (($tstatus eq 'is') || ($tstatus eq 'will_not')) {
-            &set_privileges($1,$2);
+            &set_privileges($cdom,$cnum);
         }
     } else {
-        &set_privileges($1,$2);
+        &set_privileges($cdom,$cnum);
     }
 }
 
@@ -869,13 +882,13 @@ sub check_fordc {
 }
 
 sub courselink {
-    my ($dcdom) = @_;
+    my ($dcdom,$rowtype) = @_;
     my $courseform=&Apache::loncommon::selectcourse_link
-                     ('rolechoice','dccourse_'.$dcdom,'dcdomain_'.$dcdom,'coursedesc_'.$dcdom,$dcdom);
-    my $hiddenitems = '<input type="hidden" name="dcdomain_'.$dcdom.'" value="'.$dcdom.'" />'.
-                      '<input type="hidden" name="origdom_'.$dcdom.'" value="'.$dcdom.'" />'.
-                      '<input type="hidden" name="dccourse_'.$dcdom.'" value="" />'.
-                      '<input type="hidden" name="coursedesc_'.$dcdom.'" value="" />';
+                     ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.$dcdom,$dcdom);
+    my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
+                      '<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
+                      '<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'.
+                      '<input type="hidden" name="coursedesc'.$rowtype.'_'.$dcdom.'" value="" />';
     return $courseform.$hiddenitems;
 }
 
@@ -916,34 +929,26 @@ END
 }
 
 sub processpick {
-    my $dcdom = shift;
     my $process_pick = <<"END";
 <script>
 function process_pick(dom) {
-    var numbutton = getIndex(dom)
-    var pickedCourse = opener.document.rolechoice.dccourse_$dcdom.value
-    var pickedDomain = opener.document.rolechoice.dcdomain_$dcdom.value
-    if (opener.document.rolechoice.dcdomain_$dcdom.value == opener.document.rolechoice.origdom_$dcdom.value) {
+    var pickedCourse=opener.document.rolechoice.$env{'form.cnumelement'}.value;
+    var pickedDomain=opener.document.rolechoice.$env{'form.cdomelement'}.value;
+    var okDomain = 0;
+
+    if (pickedDomain == dom) {
         if (pickedCourse != '') {
-            if (numbutton != -1) {
-                var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
-                opener.document.rolechoice.elements[numbutton].name = courseTarget
-                opener.document.rolechoice.submit()
-            }
+            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");
     }
 }
  
-function getIndex(dom) {
-    var callername = 'ccpick_'+dom
-    for (var i=0;i<opener.document.rolechoice.elements.length;i++) {
-        var elemname = opener.document.rolechoice.elements[i].name
-        if (elemname == callername) {
-            return i;
-        }
-    }
-    return -1;
-}
 </script>
 END
     return $process_pick;
@@ -980,12 +985,10 @@ sub display_cc_role {
 }
 
 sub allcourses_row {
-    my $dcdom = shift;
+    my ($dcdom,$rowtype) = @_;
     my $ccrole = Apache::lonnet::plaintext('cc');
-    my $selectlink = &courselink($dcdom);
+    my $selectlink = &courselink($dcdom,$rowtype);
     my $output = '<tr bgcolor="#77FF77">'.
-	'<input type="hidden" name="ccpick_'.$dcdom.'" />'.
-	'<input type="hidden" name="pick_'.$dcdom.'" value="1" />'.
 	'<td colspan="5">'.
 	'<font color="#002200">'.$ccrole.'</font>'.
 	' <b>'.$selectlink.'</b>'.
@@ -1020,7 +1023,7 @@ sub set_privileges {
                          $env{'user.home'},
                         "Role ".$role);
     &Apache::lonnet::appenv(
-                          'request.role'        => $role,
+                          'request.role'        => $spec,
                           'request.role.domain' => $dcdom,
                           'request.course.sec'  => '');
     my $tadv=0;
@@ -1028,6 +1031,23 @@ sub set_privileges {
     &Apache::lonnet::appenv('request.role.adv'    => $tadv);
 }
 
+sub courseloadpage {
+    my ($courseid) = @_;
+    my $startpage;
+    my %entry_settings = &Apache::lonnet::get('nohist_whatsnew',
+					      [$courseid.':courseinit']);
+    my ($tmp) = %entry_settings;
+    unless ($tmp =~ /^error: 2 /) {
+        $startpage = $entry_settings{$courseid.':courseinit'};
+    }
+    if ($startpage eq '') {
+        if (exists($env{'environment.course_init_display'})) {
+            $startpage = $env{'environment.course_init_display'};
+        }
+    }
+    return $startpage;
+}
+
 1;
 __END__