--- loncom/auth/lonroles.pm 2005/06/05 07:10:32 1.120 +++ loncom/auth/lonroles.pm 2006/01/03 17:48:06 1.138.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.120 2005/06/05 07:10:32 albertel Exp $ +# $Id: lonroles.pm,v 1.138.2.1 2006/01/03 17:48:06 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,7 +50,8 @@ sub redirect_user { my $swinfo=&Apache::lonmenu::rawconfig(); my $navwindow; if ($launch_nav eq 'on') { - $navwindow.=&Apache::lonnavmaps::launch_win('now'); + $navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef, + ($url eq '/adm/whatsnew')); } else { $navwindow.=&Apache::lonnavmaps::close(); } @@ -88,6 +89,9 @@ sub handler { # ================================================================== Roles Init if ($env{'form.selectrole'}) { + if ($env{'form.newrole'}) { + $env{'form.'.$env{'form.newrole'}}=1; + } if ($env{'request.course.id'}) { my %temp=('logout_'.$env{'request.course.id'} => time); &Apache::lonnet::put('email_status',\%temp); @@ -122,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', @@ -223,11 +232,12 @@ 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 ...'); - if (($cnum) && ($role ne 'ca')) { + if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) { my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum); if (($env{'form.orgurl'}) && @@ -243,7 +253,7 @@ ENDENTERKEY "request.course.id" => $cdom.'_'.$cnum); $furl='/adm/roles?tryagain=1'; $msg= - '

'. + '

'. &mt('Could not initialize course at this time.'). '

'.&mt('Please try again.').'

'.$ferr; } @@ -260,17 +270,24 @@ ENDENTERKEY if ($role eq 'cc' && $env{'course.' . $courseid . '.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; } - # Send the user to the course they selected - &redirect_user($r,&mt('Entering Course'), + &redirect_user($r,&mt('Entering Course'), $furl,$msg, $env{'environment.remotenavmap'}); - return OK; + return OK; } } # # Send the user to the construction space they selected - if ($role =~ /^(au|ca)$/) { + if ($role =~ /^(au|ca|aa)$/) { my $redirect_url = '/priv/'; if ($role eq 'au') { $redirect_url.=$env{'user.name'}; @@ -304,6 +321,8 @@ 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='
'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,undef,undef,undef,undef,,&mt("Click here for help")).'
'; $r->print(< @@ -315,6 +334,20 @@ $helptag
ENDHEADER @@ -336,7 +369,7 @@ ENDHEADER # --------------------------------------------------------------- Error Header? if ($error) { $r->print("

LON-CAPA Access Control

"); - $r->print("
Access  : ".
+        $r->print("
Access  : ".
                   Apache::lonnet::plaintext($priv)."\n");
         $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
         $r->print("Action  : $msg\n
");
@@ -354,7 +387,7 @@ ENDHEADER
     } else {
         if ($env{'user.error.msg'}) {
 	    $r->print(
- '
'.
+ '
'.
  &mt('You need to choose another user role or enter a specific course for this function').'
');
 	}
     }
@@ -380,7 +413,7 @@ ENDHEADER
                       ($env{'user.name'},$env{'user.domain'})}.
 		      "
\n");
 	    $r->print(&mt(
-      "Author and Co-Author roles may not be available on servers other than your home server."));
+      "Author and Co-Author roles are not available on servers other than their respective home servers."));
         }
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
@@ -388,6 +421,7 @@ ENDHEADER
         $r->print('
');
         $r->print('');
         $r->print('');
+        $r->print('');
     }
     if ($env{'user.adv'}) {
 	$r->print(
@@ -408,7 +442,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=' ';
             $tpend=' ';
@@ -453,7 +487,8 @@ ENDHEADER
                 my $trole;
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
-                    $tremark.='
'.&mt('Defined by ').$rauthor.
+		    if ($tremark) { $tremark.='
'; }
+                    $tremark.=&mt('Defined by ').$rauthor.
 			&mt(' at ').$rdomain.'.';
                     $trole=$rrole;
                 } else {
@@ -464,18 +499,14 @@ ENDHEADER
                 my ($tdom,$trest,$tsection)=
                     split(/\//,Apache::lonnet::declutter($where));
                 # First, Co-Authorship roles
-                if ($role eq 'ca') {
+                if (($role eq 'ca') || ($role eq 'aa')) {
                     my $home = &Apache::lonnet::homeserver($trest,$tdom);
 		    my $allowed=0;
 		    my @ids=&Apache::lonnet::current_machine_ids();
 		    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/'.$trest.'/');
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
@@ -495,11 +526,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};
@@ -511,9 +538,6 @@ ENDHEADER
 		    $sortkey=$role;
                 } elsif ($trest) {
                     $ttype='Course';
-                    if ($tsection) {
-                        $ttype.='
'.&mt('Section/Group').': '.$tsection;
-		    }
                     my $tcourseid=$tdom.'_'.$trest;
                     if ($env{'course.'.$tcourseid.'.description'}) {
                         $twhere=$env{'course.'.$tcourseid.'.description'};
@@ -538,6 +562,10 @@ ENDHEADER
 			    $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
                         }
                     }
+                    if ($tsection) {
+                        $twhere.='
'.&mt('Section/Group').': '.$tsection;
+		    }
+
 		    if ($role ne 'st') { $twhere.="
".&mt('Domain').":".$tdom; }
                 } elsif ($tdom) {
                     $ttype='Domain';
@@ -583,11 +611,10 @@ ENDHEADER
     }
     $r->print('
');
     unless ($nochoose) { $r->print(''); }
-    $r->print(''."\n");
+    $r->print(''."\n");
     my $doheaders=-1;
-    foreach my $type ('Construction Space','Course','Domain','System') {
+    foreach my $type ('Domain','Construction Space','Course','System') {
 	my $haverole=0;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
@@ -604,6 +631,9 @@ ENDHEADER
 	foreach (sort(keys(%recent_roles))) {
 	    if (defined($roletext{'user.role.'.$_})) {
 		$output.=$roletext{'user.role.'.$_};
+                if ($_ =~ m-dc\./(\w+)/- && $dcroles{$1}) {
+		    $output .= &allcourses_row($1,'recent');
+                }
 	    } elsif ($numdc > 0) {
                 unless ($_ =~/^error\:/) {
                     $output.=&display_cc_role('user.role.'.$_);
@@ -611,8 +641,8 @@ ENDHEADER
             } 
 	}
 	if ($output) {
-	    $r->print("");
+	    $r->print("");
 	    $r->print($output);
 	    $r->print("");
             $doheaders ++;
@@ -623,22 +653,22 @@ ENDHEADER
         $r->print(&coursepick_jscript());
         $r->print(&Apache::loncommon::coursebrowser_javascript());
     }
-    foreach my $type ('Construction Space','Course','Domain','System') {
+    foreach my $type ('Construction Space','Domain','Course','System') {
 	my $output;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
 		$output.=$roletext{$sortrole{$which}};
                 if ($sortrole{$which} =~ m-dc\./(\w+)/-) {
                     if ($dcroles{$1}) {
-                        $output .= &allcourses_row($1);
+                        $output .= &allcourses_row($1,'');
                     }
                 }
 	    }
 	}
 	if ($output) {
 	    if ($doheaders > 0) {
-		$r->print("".
-			  "");
+		$r->print("".
+			  "");
 	    }
 	    $r->print($output);	
 	}
@@ -654,13 +684,13 @@ ENDHEADER
     }
     unless ($nochoose) {
 	if ($env{'request.role'} ne 'cm') {
-	    $r->print('');
 	} else {
 	    $r->print('');
 	}
     }
-    $r->print(''."\n");
 
@@ -670,7 +700,7 @@ ENDHEADER
     }
 # ------------------------------------------------------------ Privileges Info
     if (($advanced) && (($env{'user.error.msg'}) || ($error))) {
-	$r->print('
Current Privileges
');
+	$r->print('
Current Privileges
');
 
 	foreach $envkey (sort keys %env) {
 	    if ($envkey=~/^user\.priv\.$env{'request.role'}\./) {
@@ -760,41 +790,50 @@ sub role_status {
 sub build_roletext {
     my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
     my $roletext='';
+    my $is_dc=($trolecode =~ m/^dc\./);
+    my $rowspan=($is_dc) ? ''
+                         : ' rowspan="2" ';
+
     unless ($nochoose) {
+        my $buttonname=$trolecode;
+        $buttonname=~s/\W//g;
         if (!$button) {
             if ($switchserver) {
-                $roletext.='';
             } else {
                 $roletext.=('');
             }
         } elsif ($tstatus eq 'is') {
-            $roletext.=('');
+            $roletext.='';
         } elsif ($tryagain) {
             $roletext.=
-                '';
+                '';
         } elsif ($advanced) {
             $roletext.=
-                '';
+                '';
         } else {
-            $roletext.='';
+            $roletext.=' ';
         }
     }
     $tremark.=&Apache::lonannounce::showday(time,1,
                  &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
 
-
     $roletext.=''."\n";
+               '';
+    if (!$is_dc) {
+	$roletext.=''."\n";
+    }
     return $roletext;
 }
 
@@ -833,13 +872,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 = ''.
-                      ''.
-                      ''.
-                      '';
+                     ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.$dcdom,$dcdom);
+    my $hiddenitems = ''.
+                      ''.
+                      ''.
+                      '';
     return $courseform.$hiddenitems;
 }
 
@@ -880,34 +919,26 @@ END
 }
 
 sub processpick {
-    my $dcdom = shift;
     my $process_pick = <<"END";
 
 END
     return $process_pick;
@@ -944,22 +975,15 @@ 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 = ''.
-              ''.
-              ''.
-              ''."\n";
+	''."\n";
     return $output;
 }
 

 '.&mt('User Role').''.&mt('Extent').
-         ''.&mt('Start').''.&mt('End').''.
-	      &mt('Remarks and Calendar Announcements').'
'.&mt('User Role').''.&mt('Extent').
+         ''.&mt('Start').''.&mt('End').'
".
-		      &mt('Recent Roles')."
".
+		      &mt('Recent Roles')."
".&mt($type)."
".&mt($type)."
 '.&mt('No role specified').
+    $r->print(''.&mt('No role specified').
       ''.$tremark.
       ' 
'.&mt('Switch Server').'  '.$trole.
-               ''.$ttype.
-               ''.$twhere.
+	       ''.$twhere.
                ''.$tpstart.
                ''.$tpend.
-               ''.$tremark.
-               ' 
'.$tremark.
+	    ' 
'.
-              ''.
-              $ccrole.''.&mt('Course').''.&mt('All courses').': '.
-              $selectlink.''.
-              '
'.&mt('Domain').':'.$dcdom.''.
-              '		'.
-              &mt('Course Coordinator access to all courses in domain').
-              ': '.$dcdom.'
'.
+	''.$ccrole.''.
+	' '.$selectlink.''.
+	' from '.&mt('Domain').' '.$dcdom.
+	'