--- loncom/auth/lonroles.pm	2005/04/07 06:56:21	1.118
+++ loncom/auth/lonroles.pm	2005/06/07 00:24:08	1.123
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.118 2005/04/07 06:56:21 albertel Exp $
+# $Id: lonroles.pm,v 1.123 2005/06/07 00:24:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,7 @@ use Apache::loncommon;
 use Apache::lonhtmlcommon;
 use Apache::lonannounce;
 use Apache::lonlocal;
+use GDBM_File;
 
 sub redirect_user {
     my ($r,$title,$url,$msg,$launch_nav) = @_;
@@ -232,9 +233,6 @@ ENDENTERKEY
 			if (($env{'form.orgurl'}) && 
 			    ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
 			    my $dest=$env{'form.orgurl'};
-			    if ( &Apache::lonnet::mod_perl_version() == 2 ) {
-				&Apache::lonnet::cleanenv();
-			    }
 			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
 			    &Apache::lonnet::appenv('request.role.adv'=>$tadv);
 			    $r->internal_redirect($dest);
@@ -264,9 +262,17 @@ ENDENTERKEY
 				$furl = "/adm/helper/course.initialization.helper";
 			    }
                             # Send the user to the course they selected
-                            &redirect_user($r,&mt('Entering Course'),
+                            if (($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'});
+                            } else {
+                                &redirect_user($r,&mt('Entering Course'),
                                            $furl,$msg,
 					   $env{'environment.remotenavmap'});
+                            }
                             return OK;
 			}
 		    }
@@ -341,7 +347,18 @@ ENDHEADER
         $r->print("<hr><pre>Access  : ".
                   Apache::lonnet::plaintext($priv)."\n");
         $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
-        $r->print("Action  : $msg\n</pre><hr>");
+        $r->print("Action  : $msg\n</pre><hr />");
+	my $url=$fn;
+	my $last;
+	if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+		&GDBM_READER(),0640)) {
+	    $last=$hash{'last_known'};
+	    untie(%hash);
+	}
+	if ($last) { $fn.='?symb='.&Apache::lonnet::escape($last); }
+
+	&Apache::londocs::changewarning($r,undef,'You have modified your course recently, [_1] may fix this access problem.',
+					&Apache::lonenc::check_encrypt($fn));
     } else {
         if ($env{'user.error.msg'}) {
 	    $r->print(
@@ -502,9 +519,6 @@ ENDHEADER
 		    $sortkey=$role;
                 } elsif ($trest) {
                     $ttype='Course';
-                    if ($tsection) {
-                        $ttype.='<br>'.&mt('Section/Group').': '.$tsection;
-		    }
                     my $tcourseid=$tdom.'_'.$trest;
                     if ($env{'course.'.$tcourseid.'.description'}) {
                         $twhere=$env{'course.'.$tcourseid.'.description'};
@@ -529,6 +543,10 @@ ENDHEADER
 			    $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
                         }
                     }
+                    if ($tsection) {
+                        $twhere.='<br />'.&mt('Section/Group').': '.$tsection;
+		    }
+
 		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
                 } elsif ($tdom) {
                     $ttype='Domain';
@@ -574,7 +592,7 @@ ENDHEADER
     }
     $r->print('<br /><table><tr>');
     unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
-    $r->print('<th>'.&mt('User Role').'</th><th colspan=2>'.&mt('Extent').
+    $r->print('<th>'.&mt('User Role').'</th><th>'.&mt('Extent').
          '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'.
 	      &mt('Remarks and Calendar Announcements').'</th></tr>'."\n");
     my $doheaders=-1;
@@ -602,7 +620,7 @@ ENDHEADER
             } 
 	}
 	if ($output) {
-	    $r->print("<tr bgcolor='#BBffBB'><td align='center' colspan='7'>".
+	    $r->print("<tr bgcolor='#BBffBB'><td align='center' colspan='6'>".
 		      &mt('Recent Roles')."</td>");
 	    $r->print($output);
 	    $r->print("</tr>");
@@ -629,7 +647,7 @@ ENDHEADER
 	if ($output) {
 	    if ($doheaders > 0) {
 		$r->print("<tr bgcolor='#BBffBB'>".
-			  "<td align='center' colspan='7'>".&mt($type)."</td></tr>");
+			  "<td align='center' colspan='6'>".&mt($type)."</td></tr>");
 	    }
 	    $r->print($output);	
 	}
@@ -651,7 +669,7 @@ ENDHEADER
 	    $r->print('<td>&nbsp;</td>');
 	}
     }
-    $r->print('<td colspan=5><font color="'.$tfont.'">'.&mt('No role specified').
+    $r->print('<td colspan="4"><font color="'.$tfont.'">'.&mt('No role specified').
       '</font></td><td><font color="'.$tfont.'">'.$tremark.
       '&nbsp;</font></td></tr>'."\n");
 
@@ -780,8 +798,7 @@ sub build_roletext {
 
 
     $roletext.='<td><font color="'.$tfont.'">'.$trole.
-               '</font></td><td><font color="'.$tfont.'">'.$ttype.
-               '</font></td><td><font color="'.$tfont.'">'.$twhere.
+	       '</font></td><td><font color="'.$tfont.'">'.$twhere.
                '</font></td><td><font color="'.$tfont.'">'.$tpstart.
                '</font></td><td><font color="'.$tfont.'">'.$tpend.
                '</font></td><td><font color="'.$tfont.'">'.$tremark.
@@ -944,11 +961,11 @@ sub allcourses_row {
               'onClick="verifyCoursePick(this)">'.
               '<input type="hidden" name="pick_'.$dcdom.'" value="1"></td>'.
               '<td><font color="#002200">'.
-              $ccrole.'</font></td><td>'.&mt('Course').'</td>'.
+              $ccrole.'</font></td>'.
               '<td><font color="#002200">'.&mt('All courses').':<b>&nbsp;'.
               $selectlink.'</b>'.
               '<br />'.&mt('Domain').':'.$dcdom.'</font>'.
-              '<td colspan="4"><font color="#002200">'.
+              '<td colspan="3"><font color="#002200">'.
               &mt('Course Coordinator access to all courses in domain').
               ': <b>'.$dcdom.'</b></font></td></tr>'."\n";
     return $output;