projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7b2413f)
remove $globals->root, only have spoolroot
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 17 Jul 2006 21:10:51 +0000 (21:10 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 17 Jul 2006 21:10:51 +0000 (21:10 +0000)
git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@539 839d8a87-29fc-0310-9880-83ba4fa771e5

include/xnet/globals.inc.php patch | blob | blame | history
include/xorg.mailer.inc.php patch | blob | blame | history
include/xorg/globals.inc.php patch | blob | blame | history
include/xorg/hook.inc.php patch | blob | blame | history
templates/xnet/skin.tpl patch | blob | blame | history

diff --git a/include/xnet/globals.inc.php b/include/xnet/globals.inc.php
index c4185dd..1a537b3 100644 (file)
--- a/include/xnet/globals.inc.php
+++ b/include/xnet/globals.inc.php
@@ -37,7 +37,6 @@ class XnetGlobals extends PlatalGlobals
 
         $globals       = new XnetGlobals;
         $globals->core = new CoreConfig;
-        $globals->root = dirname(dirname(dirname(__FILE__)));
         $globals->hook = new XOrgHook();
 
         $globals->hook->config(null);
diff --git a/include/xorg.mailer.inc.php b/include/xorg.mailer.inc.php
index 19e64a2..a96661f 100644 (file)
--- a/include/xorg.mailer.inc.php
+++ b/include/xorg.mailer.inc.php
@@ -54,9 +54,9 @@ class XOrgMailer extends Smarty
         $this->caching=false;
         $this->compile_check=true;
 
-        $this->template_dir = $globals->root . "/templates/";
-        $this->compile_dir  = $globals->root . "/spool/templates_c/";
-        $this->config_dir   = $globals->root . "/configs/";
+        $this->template_dir = $globals->spoolroot . "/templates/";
+        $this->compile_dir  = $globals->spoolroot . "/spool/templates_c/";
+        $this->config_dir   = $globals->spoolroot . "/configs/";
 
         $this->register_outputfilter('mail_format');
         $this->register_function('from', 'set_from');
diff --git a/include/xorg/globals.inc.php b/include/xorg/globals.inc.php
index 8d60895..6e85264 100644 (file)
--- a/include/xorg/globals.inc.php
+++ b/include/xorg/globals.inc.php
@@ -38,7 +38,6 @@ class XorgGlobals extends PlatalGlobals
 
         $globals       = new XorgGlobals;
         $globals->core = new CoreConfig;
-        $globals->root = dirname(dirname(dirname(__FILE__)));
         $globals->hook = new XOrgHook();
         $globals->menu = new XOrgMenu();
 
diff --git a/include/xorg/hook.inc.php b/include/xorg/hook.inc.php
index 9245122..77a4ad4 100644 (file)
--- a/include/xorg/hook.inc.php
+++ b/include/xorg/hook.inc.php
@@ -67,7 +67,7 @@ class XOrgHook
     {
         global $globals;
 
-        foreach (glob($globals->root."/hooks/*.inc.php") as $file) {
+        foreach (glob($globals->spoolroot."/hooks/*.inc.php") as $file) {
             require_once("$file");
             $this->_mods[] = basename($file, '.inc.php');
         }
diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 7fe3ed4..4e694ea 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -23,7 +23,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <base href="{#globals.baseurl#}" />
+    <base href="{#globals.baseurl#}/" />
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 
     <title>Les associations polytechniciennes</title>
plat/al