--- loncom/auth/publiccheck.pm	2007/10/02 01:09:59	1.15
+++ loncom/auth/publiccheck.pm	2014/12/01 22:52:54	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: publiccheck.pm,v 1.15 2007/10/02 01:09:59 albertel Exp $
+# $Id: publiccheck.pm,v 1.24 2014/12/01 22:52:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,10 +42,15 @@ sub handler {
     my $r = shift;
 
     my $requrl=$r->uri;
+
     if (&Apache::lonnet::is_domainimage($requrl)) {
         return OK;
     }
 
+    if ($requrl =~ m{^/res/adm/pages/[^/]+\.(gif|png)$}) {
+        return OK;
+    }
+
     my $handle = &Apache::lonnet::check_for_valid_session($r);
     if ($handle ne '') {
         my $lonidsdir=$r->dir_config('lonIDsDir');
@@ -58,13 +63,14 @@ sub handler {
     if ($requrl=~m|^/public/|
 	|| $requrl=~m|^/adm/help/.*\.hlp$|
 	|| $requrl=~m|^/adm/[^/]+/[^/]+/aboutme/portfolio$|
-	|| (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) {
+	|| (&Apache::lonnet::metadata($requrl,'copyright') eq 'public') 
+    || $requrl=~m|^/adm/blockingstatus/.*$|) {
         &process_public($r,$requrl);
         return OK;
     } elsif (&Apache::lonnet::is_portfolio_url($requrl)) {
 	my (undef,$udom,$unum,$file_name,$group) = 
 	    &Apache::lonnet::parse_portfolio_url($requrl);
-        my $access = &process_portfolio($udom,$unum,$file_name,$group);
+        my $access = &process_portfolio($r,$udom,$unum,$file_name,$group);
         if ($access) {
             &process_public($r,$requrl,$access);
             return OK;
@@ -75,7 +81,7 @@ sub handler {
     } elsif ($requrl eq '/adm/blockedaccess') {
        &process_public($r,$requrl);
        return OK;
-    } 
+    }
     return DECLINED;
 }
 
@@ -96,11 +102,12 @@ sub process_public {
 }
 
 sub process_portfolio {
-    my ($udom,$unum,$file_name,$group) = @_;
+    my ($r,$udom,$unum,$file_name,$group) = @_;
     my $current_perms = &Apache::lonnet::get_portfile_permissions($udom,$unum);
     my %access_controls = &Apache::lonnet::get_access_controls($current_perms,$group,$file_name);
     my $access = '';
     my $now = time;
+    my $clientip = $r->get_remote_host();
     foreach my $key (keys(%{$access_controls{$file_name}})) {
         my ($num,$scope,$end,$start) = ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
         if ($start > $now) {
@@ -113,6 +120,16 @@ sub process_portfolio {
             $access = 'public';
             last;
         }
+        if ($scope eq 'ip') {
+            if (ref($access_controls{$file_name}{$key}) eq 'HASH') {
+                if (ref($access_controls{$file_name}{$key}{'ip'}) eq 'ARRAY') {
+                    if (&Apache::loncommon::check_ip_acc(join(',',@{$access_controls{$file_name}{$key}{'ip'}}),$clientip)) {
+                        $access = 'ip';
+                        last;
+                    }
+                }
+            }
+        }
         if ($scope eq 'guest') {
             $access = 'guest';
         }