--- loncom/auth/lonacc.pm	2009/09/25 13:51:44	1.128
+++ loncom/auth/lonacc.pm	2011/11/18 22:41:02	1.130.6.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.128 2009/09/25 13:51:44 droeschl Exp $
+# $Id: lonacc.pm,v 1.130.6.1 2011/11/18 22:41:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -411,6 +411,22 @@ sub handler {
 	}
 	$env{'request.filename'} = $r->filename;
 	$env{'request.noversionuri'} = &Apache::lonnet::deversion($requrl);
+        if ($requrl =~ m{^/adm/wrapper/ext/}) {
+            my $query = $r->args;
+            if ($query) {
+                my $preserved;
+                foreach my $pair (split(/&/,$query)) {
+                    my ($name, $value) = split(/=/,$pair);
+                    unless (($name eq 'symb') || ($name eq 'wrapperdisplay')) {
+                        $preserved .= $pair.'&';
+                    }
+                }
+                $preserved =~ s/\&$//;
+                if ($preserved) {
+                    $env{'request.external.querystring'} = $preserved;
+                }
+            }
+        }
 # -------------------------------------------------------- Load POST parameters
 
 	&Apache::lonacc::get_posted_cgi($r);
@@ -433,8 +449,16 @@ sub handler {
                 return OK;
             }
 	    if (($access ne '2') && ($access ne 'F')) {
-		$env{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
-		return HTTP_NOT_ACCEPTABLE; 
+                if ($requrl =~ m{^/res/}) {
+                    $access = &Apache::lonnet::allowed('bro',$requrl);
+                    if ($access ne 'F') {
+                        $env{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
+                        return HTTP_NOT_ACCEPTABLE;
+                    }
+                } else {
+		    $env{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
+		    return HTTP_NOT_ACCEPTABLE;
+                }
 	    }
 	}
 	if ($requrl =~ m|^/prtspool/|) {
@@ -465,7 +489,14 @@ sub handler {
 	}
 # ------------------------------------------------------------- This is allowed
 	if ($env{'request.course.id'}) {
-	    &Apache::lonnet::countacc($requrl);
+            my $skiplogging;
+            if ((!&Apache::loncommon::needs_gci_custom()) &&  
+                ($env{'course.'.$env{'request.course.id'}.'.internal.courseowner'} ne $env{'user.name'}.':'.$env{'user.domain'})) {
+                $skiplogging = 1;
+            }
+            unless ($skiplogging) {
+	        &Apache::lonnet::countacc($requrl);
+            }
 	    $requrl=~/\.(\w+)$/;
             my $query=$r->args;
 	    if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
@@ -516,10 +547,14 @@ sub handler {
 		    }
 		}
 		$env{'request.symb'}=$symb;
-		&Apache::lonnet::courseacclog($symb);
+                unless ($skiplogging) {
+		    &Apache::lonnet::courseacclog($symb);
+                }
 	    } else {
 # ------------------------------------------------------- This is other content
-		&Apache::lonnet::courseacclog($requrl);    
+                unless ($skiplogging) {
+		    &Apache::lonnet::courseacclog($requrl);
+                }
 	    }
             my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};;
             my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};;