From 1ad0c45cacf86a7532a530cb5ae5f116eefcdedb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Sun, 20 Sep 2009 00:56:08 +0200
Subject: [PATCH] Fix perms problems in xorgAuth
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---
 class.xorg.auth.php | 10 +++++-----
 page.auth.php       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/class.xorg.auth.php b/class.xorg.auth.php
index d593724..675e5d9 100644
--- a/class.xorg.auth.php
+++ b/class.xorg.auth.php
@@ -224,10 +224,10 @@ class xorgAuth extends dcAuth {
 
   public function userID() {
     $this->buildFromSession();
-    $isadmin = preg_match('@/admin/[^/]+\.php$@i', $_SERVER['SCRIPT_FILENAME']);
-    if (!$isadmin) {
-      return null;
-    }
+//    $isadmin = preg_match('@/admin/[^/]+\.php$@i', $_SERVER['SCRIPT_FILENAME']);
+//    if (!$isadmin) {
+//      return null;
+//    }
     return parent::userID();
   }
 
@@ -240,7 +240,7 @@ class xorgAuth extends dcAuth {
     $this->buildFromSession();
     if ($n == 'xorg_group_member') {
       global $core;
-      if ($core->blog->settings('xorg_blog_owner') != $_SESSION['xorg-group']) {
+      if ($core->blog->settings->get('xorg_blog_owner') != $_SESSION['xorg-group']) {
         return false;
       }
       $perm = $this->xorg_infos['grpauth'];
diff --git a/page.auth.php b/page.auth.php
index 6a197f0..e9c912f 100644
--- a/page.auth.php
+++ b/page.auth.php
@@ -9,7 +9,7 @@ class xorgAuthentifier extends dcUrlHandlers {
       break;
      case 'Xorg':
       if ($core->auth->callXorg($_GET['path'])) {
-        header('Location: http://murphy.m4x.org' . $_GET['path']);
+        header('Location: ' . $core->blog->url . $_GET['path']);
         exit;
       }
       break;
-- 
2.1.4