--- loncom/auth/lonstatusacc.pm	2008/12/25 01:52:56	1.4
+++ loncom/auth/lonstatusacc.pm	2009/01/15 21:01:37	1.6
@@ -1,7 +1,7 @@
 #
 # LON-CAPA authorization for pages generated by server-status reports 
 #
-# $Id: lonstatusacc.pm,v 1.4 2008/12/25 01:52:56 raeburn Exp $
+# $Id: lonstatusacc.pm,v 1.6 2009/01/15 21:01:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,7 +39,7 @@ use LONCAPA::lonauthcgi;
 sub handler {
     my $r = shift;
     my $reqhost = $r->get_remote_host(REMOTE_NOLOOKUP);
-    my $page = 'serverstatus';
+    my $page = 'server-status';
     if (($r->uri eq '/adm/domainstatus') ||
         ($r->uri eq '/adm/test')) {
         if (&LONCAPA::loncgi::check_cookie_and_load_env($r)) {
@@ -82,13 +82,13 @@ sub handler {
                 }
             }
         }
-    } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page,$reqhost)) {
+    }
+    if (&LONCAPA::lonauthcgi::check_ipbased_access($page,$reqhost)) {
         return OK;
-    } else {
-        if (&LONCAPA::loncgi::check_cookie_and_load_env($r)) {
-            if (&LONCAPA::lonauthcgi::can_view($page)) {
-                return OK;
-            }
+    }
+    if (&LONCAPA::loncgi::check_cookie_and_load_env($r)) {
+        if (&LONCAPA::lonauthcgi::can_view($page)) {
+            return OK;
         }
     }
     $r->log_reason("Invalid request for server status from $reqhost",