Use $core->blog->url when possible.

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

diff --git a/class.xorg.auth.php b/class.xorg.auth.php
index 0986afc..c1e9b82 100644 (file)
--- a/class.xorg.auth.php
+++ b/class.xorg.auth.php
@@ -36,12 +36,13 @@ class xorgAuth extends dcAuth {
     if (@$_SESSION['auth-xorg']) {
       return true;
     }
+    global $core;
     $_SESSION["auth-x-challenge"] = md5(uniqid(rand(), 1));
     $url = "https://www.polytechnique.org/auth-groupex/utf8";
     $url .= "?session=" . session_id();
     $url .= "&challenge=" . $_SESSION["auth-x-challenge"];
     $url .= "&pass=" . md5($_SESSION["auth-x-challenge"] . XORG_AUTH_KEY);
-    $url .= "&url=http://murphy.m4x.org/~x2003bruneau/dotclear/auth/XorgReturn" . urlencode("?path=" . $path);
+    $url .= "&url=" . urlencode($core->blog->url . "auth/XorgReturn?path=" . $path);
     session_write_close();
     header("Location: $url");
     exit;
@@ -111,7 +112,7 @@ class xorgAuth extends dcAuth {
     global $core;
     $core->session->start();
     $core->session->destroy();
-    header('Location: http://murphy.m4x.org/~x2003bruneau/dotclear/');
+    header('Location: ' . $core->blog->url);
     exit;
   }
 

diff --git a/page.auth.admin.php b/page.auth.admin.php
index fc07a97..31f0901 100644 (file)
--- a/page.auth.admin.php
+++ b/page.auth.admin.php
@@ -14,7 +14,8 @@ class xorgLoginPage extends dcUrlHandlers {
     # If we have a session cookie, go to index.php
     if (isset($_SESSION['sess_user_id']))
     {
-      header('Location: http://murphy.m4x.org/~x2003bruneau/dotclear/admin/index.php');
+      global $core;
+      header('Location: ' . $core->blog->url . 'admin/index.php');
     }
 
     # Loading locales for detected language
@@ -70,8 +71,8 @@ class xorgLoginPage extends dcUrlHandlers {
     {
       echo
       '<fieldset>'.
-      '<p><a href="http://murphy.m4x.org/~x2003bruneau/dotclear/auth/Xorg?path=/~x2003bruneau/dotclear/admin/index.php">Via Polytechnique.org</a></p>' .
-      '<p><a href="http://murphy.m4x.org/~x2003bruneau/dotclear/admin/auth.php">Via le formulaire</a></p>' .
+      '<p><a href="' . $core->blog->url . 'auth/Xorg?path=/~x2003bruneau/dotclear/admin/index.php">Via Polytechnique.org</a></p>' .
+      '<p><a href="' . $core->blog->url . 'admin/auth.php">Via le formulaire</a></p>' .
       '</fieldset>'.
       
       '<p>'.__('You must accept cookies in order to use the private area.').'</p>';