Better detection of admin pages vs public pages.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/_public.php b/_public.php
index bb3e6b4..a962ea5 100644 (file)
--- a/_public.php
+++ b/_public.php
@@ -1,5 +1,4 @@
 <?php
-define('IS_PUBLIC_PAGE', 1);
 
 require_once dirname(__FILE__) . '/page.auth.php';
 require_once dirname(__FILE__) . '/widget.auth.php';

diff --git a/class.xorg.auth.php b/class.xorg.auth.php
index e84a774..adba0c1 100644 (file)
--- a/class.xorg.auth.php
+++ b/class.xorg.auth.php
@@ -212,7 +212,8 @@ class xorgAuth extends dcAuth {
 
   public function userID() {
     $this->buildFromSession();
-    if (defined('IS_PUBLIC_PAGE')) {
+    $isadmin = preg_match('@/admin/[^/]\.php$@i', $_SERVER['SCRIPT_FILENAME']);
+    if (!$isadmin) {
       return null;
     }
     return parent::userID();