From: x2000habouzit <x2000habouzit>
Date: Sat, 7 Feb 2004 14:22:41 +0000 (+0000)
Subject: petit pb à cause de la boite de login, lorsqu'on veut se connecter à une page dans... 
X-Git-Tag: xorg/old~1898
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1b0ecfceb43204e6bb46572cc9026fe6b8712b61;p=platal.git

petit pb à cause de la boite de login, lorsqu'on veut se connecter à une page dans un ss répertoire
---

diff --git a/include/auto.prepend.inc.php b/include/auto.prepend.inc.php
index 785714a..2a0cab5 100644
--- a/include/auto.prepend.inc.php
+++ b/include/auto.prepend.inc.php
@@ -5,7 +5,7 @@ setlocale(LC_TIME, "fr_FR");
 require("xorg.common.inc.php");
 
 function _new_page($type, $tpl_name, $tpl_head, $min_auth, $popup=false, $admin=false) {
-    global $page,$globals;
+    global $page;
     require("xorg.page.inc.php");
     if(!empty($admin)) {
         $page = new XorgAdmin($tpl_name, $type);
@@ -20,20 +20,10 @@ function _new_page($type, $tpl_name, $tpl_head, $min_auth, $popup=false, $admin=
             $page = new XorgAuth($tpl_name, $type);
     }
 
-    $page->template_dir = $globals->spoolroot . "/templates/";
-    $page->compile_dir  = $globals->spoolroot . "/templates_c/";
-    $page->plugins_dir[]= $globals->spoolroot . "/plugins/";
-    $page->config_dir   = $globals->spoolroot . "/configs/";
-    $page->cache_dir    = $globals->spoolroot . "/cache/";
-
     $page->assign('xorg_head', $tpl_head);
     $page->assign('xorg_tpl', $tpl_name);
     if($popup)
         $page->assign('popup_enable', true);
-
-    $page->config_overwrite=false;
-    $page->compile_check=true;
-    $page->caching=true;
 }
 
 function new_skinned_page($tpl_name, $min_auth, $popup=false, $tpl_head="") {
diff --git a/include/xorg.page.inc.php b/include/xorg.page.inc.php
index d05967b..a63f8f0 100644
--- a/include/xorg.page.inc.php
+++ b/include/xorg.page.inc.php
@@ -13,7 +13,17 @@ class XorgPage extends DiogenesCorePage {
   var $_tpl;
   
   function XorgPage($tpl, $type=SKINNED) {
-    global $site_dev,$marketing_admin;
+    global $site_dev,$marketing_admin,$globals;
+
+    $this->template_dir = $globals->spoolroot."/templates/";
+    $this->compile_dir  = $globals->spoolroot."/templates_c/";
+    $this->plugins_dir[]= $globals->spoolroot."/plugins/";
+    $this->config_dir   = $globals->spoolroot."/configs/";
+    $this->cache_dir    = $globals->spoolroot."/cache/";
+
+    $this->config_overwrite=false;
+    $this->compile_check=true;
+    $this->caching=true;
 
     $this->_page_type = SKINNED;
     $this->_tpl = $tpl;