--- loncom/auth/lonroles.pm	2006/05/15 17:45:46	1.148
+++ loncom/auth/lonroles.pm	2006/05/30 17:15:00	1.150
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.148 2006/05/15 17:45:46 albertel Exp $
+# $Id: lonroles.pm,v 1.150 2006/05/30 17:15:00 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,9 @@ use Apache::lonhtmlcommon;
 use Apache::lonannounce;
 use Apache::lonlocal;
 use GDBM_File;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 sub redirect_user {
     my ($r,$title,$url,$msg,$launch_nav) = @_;
@@ -74,6 +77,21 @@ ENDREDIR
     return;
 }
 
+sub error_page {
+    my ($r,$error,$dest)=@_;
+    &Apache::loncommon::content_type($r,'text/html');
+    &Apache::loncommon::no_cache($r);
+    $r->send_http_header;
+    return OK if $r->header_only;
+    $r->print(&Apache::loncommon::start_page('Problems during Course Initialization').
+	      '<script type="text/javascript">'.
+	      &Apache::lonmenu::rawconfig().'</script>'.
+	      '<p>'.&mt('The following problems occurred:').
+	      $error.
+	      '</p><br /><a href="'.$dest.'>'.&mt('Continue').'</a>'.
+	      &Apache::loncommon::end_page());
+}
+
 sub handler {
 
     my $r = shift;
@@ -239,7 +257,11 @@ ENDENTERKEY
 			    my $dest=$env{'form.orgurl'};
 			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
 			    &Apache::lonnet::appenv('request.role.adv'=>$tadv);
-			    $r->internal_redirect($dest);
+                            if (($ferr) && ($tadv)) {
+				&error_page($r,$ferr,$dest);
+			    } else {
+				$r->internal_redirect($dest);
+			    }
 			    return OK;
 			} else {
 			    unless ($env{'request.course.id'}) {
@@ -253,38 +275,41 @@ ENDENTERKEY
 			    }
 			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
 			    &Apache::lonnet::appenv('request.role.adv'=>$tadv);
-
-			    # Check to see if the user is a CC entering a course 
-			    # for the first time
-			    my (undef, undef, $role, $courseid) = split(/\./, $envkey);
-			    if (substr($courseid, 0, 1) eq '/') {
-				$courseid = substr($courseid, 1);
-			    }
-			    $courseid =~ s/\//_/;
-			    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.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;
-                                    }
-                                }
+			    if (($ferr) && ($tadv)) {
+				&error_page($r,$ferr,$furl);
+			    } else {
+				# Check to see if the user is a CC entering a course 
+				# for the first time
+				my (undef, undef, $role, $courseid) = split(/\./, $envkey);
+				if (substr($courseid, 0, 1) eq '/') {
+				    $courseid = substr($courseid, 1);
+				}
+				$courseid =~ s/\//_/;
+				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.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,
+					       $env{'environment.remotenavmap'});
 			    }
-			    &redirect_user($r,&mt('Entering Course'),
-                                           $furl,$msg,
-					   $env{'environment.remotenavmap'});
 			    return OK;
 			}
 		    }
@@ -379,7 +404,7 @@ ENDHEADER
 	    $last=$hash{'last_known'};
 	    untie(%hash);
 	}
-	if ($last) { $fn.='?symb='.&Apache::lonnet::escape($last); }
+	if ($last) { $fn.='?symb='.&escape($last); }
 
 	&Apache::londocs::changewarning($r,undef,'You have modified your course recently, [_1] may fix this access problem.',
 					&Apache::lonenc::check_encrypt($fn));
@@ -392,20 +417,10 @@ ENDHEADER
     }
 # -------------------------------------------------------- Choice or no choice?
     if ($nochoose) {
-        if ($advanced) {
-	    $r->print("<h2>".&mt('Assigned User Roles')."</h2>\n");
-        } else {
-	    $r->print("<h2>".&mt('Sorry ...')."</h2>\n".
-		      &mt('This resource might be part of'));
-	    if ($env{'request.course.id'}) {
-		$r->print(&mt(' another'));
-	    } else {
-		$r->print(&mt(' a certain'));
-	    } 
-	    $r->print(&mt(' course.').
-		      &Apache::loncommon::end_page());
-	    return OK;
-        } 
+	$r->print("<h2>".&mt('Sorry ...')."</h2>\n".
+		  &mt('This action is currently not authorized.').
+		  &Apache::loncommon::end_page());
+	return OK;
     } else {
         if ($advanced) {
 	    $r->print(&mt("Your home server is ").
@@ -990,7 +1005,7 @@ sub allcourses_row {
 
 sub recent_filename {
     my $area=shift;
-    return 'nohist_recent_'.&Apache::lonnet::escape($area);
+    return 'nohist_recent_'.&escape($area);
 }
 
 sub set_privileges {