From: x2000habouzit Date: Mon, 17 Jul 2006 21:10:51 +0000 (+0000) Subject: remove $globals->root, only have spoolroot X-Git-Tag: xorg/0.9.11~364 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=172ec1475b515464799183a987f1f48b31e1da04;p=platal.git remove $globals->root, only have spoolroot git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@539 839d8a87-29fc-0310-9880-83ba4fa771e5 --- diff --git a/include/xnet/globals.inc.php b/include/xnet/globals.inc.php index c4185dd..1a537b3 100644 --- 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 --- 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 --- 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 --- 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 --- a/templates/xnet/skin.tpl +++ b/templates/xnet/skin.tpl @@ -23,7 +23,7 @@ - + Les associations polytechniciennes