From 1edb5aa5afd0d6c0172d845537c9b51fb47874fb Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sun, 22 Jun 2008 14:36:46 +0200 Subject: [PATCH] First bench of moves. Signed-off-by: Florent Bruneau --- {classes => core/classes}/csvimporter.php | 0 {classes => core/classes}/env.php | 0 {classes => core/classes}/miniwiki.php | 0 {classes => core/classes}/mmlist.php | 0 {classes => core/classes}/platal.php | 0 {classes => core/classes}/plbacktrace.php | 0 {classes => core/classes}/plflagset.php | 0 {classes => core/classes}/plglobals.php | 2 +- {classes => core/classes}/pliterator.php | 0 {classes => core/classes}/pllogger.php | 0 {classes => core/classes}/plmailer.php | 0 {classes => core/classes}/plmodule.php | 7 ++++++- {classes => core/classes}/plpage.php | 0 {classes => core/classes}/plprofiler.php | 0 {classes => core/classes}/plsession.php | 0 {classes => core/classes}/plset.php | 0 {classes => core/classes}/pltableeditor.php | 0 {classes => core/classes}/plupload.php | 0 {classes => core/classes}/plwizard.php | 0 {classes => core/classes}/s.php | 0 {classes => core/classes}/varstream.php | 0 {classes => core/classes}/xdb.php | 0 {classes => core/classes}/xmlrpcclient.php | 0 {include => core/include}/platal.inc.php | 19 ++++++++----------- {modules => core/modules}/core.php | 0 include/xnet.inc.php | 14 ++++++++++++-- include/xorg.inc.php | 14 ++++++++++++-- 27 files changed, 39 insertions(+), 17 deletions(-) rename {classes => core/classes}/csvimporter.php (100%) rename {classes => core/classes}/env.php (100%) rename {classes => core/classes}/miniwiki.php (100%) rename {classes => core/classes}/mmlist.php (100%) rename {classes => core/classes}/platal.php (100%) rename {classes => core/classes}/plbacktrace.php (100%) rename {classes => core/classes}/plflagset.php (100%) rename {classes => core/classes}/plglobals.php (99%) rename {classes => core/classes}/pliterator.php (100%) rename {classes => core/classes}/pllogger.php (100%) rename {classes => core/classes}/plmailer.php (100%) rename {classes => core/classes}/plmodule.php (91%) rename {classes => core/classes}/plpage.php (100%) rename {classes => core/classes}/plprofiler.php (100%) rename {classes => core/classes}/plsession.php (100%) rename {classes => core/classes}/plset.php (100%) rename {classes => core/classes}/pltableeditor.php (100%) rename {classes => core/classes}/plupload.php (100%) rename {classes => core/classes}/plwizard.php (100%) rename {classes => core/classes}/s.php (100%) rename {classes => core/classes}/varstream.php (100%) rename {classes => core/classes}/xdb.php (100%) rename {classes => core/classes}/xmlrpcclient.php (100%) rename {include => core/include}/platal.inc.php (92%) rename {modules => core/modules}/core.php (100%) diff --git a/classes/csvimporter.php b/core/classes/csvimporter.php similarity index 100% rename from classes/csvimporter.php rename to core/classes/csvimporter.php diff --git a/classes/env.php b/core/classes/env.php similarity index 100% rename from classes/env.php rename to core/classes/env.php diff --git a/classes/miniwiki.php b/core/classes/miniwiki.php similarity index 100% rename from classes/miniwiki.php rename to core/classes/miniwiki.php diff --git a/classes/mmlist.php b/core/classes/mmlist.php similarity index 100% rename from classes/mmlist.php rename to core/classes/mmlist.php diff --git a/classes/platal.php b/core/classes/platal.php similarity index 100% rename from classes/platal.php rename to core/classes/platal.php diff --git a/classes/plbacktrace.php b/core/classes/plbacktrace.php similarity index 100% rename from classes/plbacktrace.php rename to core/classes/plbacktrace.php diff --git a/classes/plflagset.php b/core/classes/plflagset.php similarity index 100% rename from classes/plflagset.php rename to core/classes/plflagset.php diff --git a/classes/plglobals.php b/core/classes/plglobals.php similarity index 99% rename from classes/plglobals.php rename to core/classes/plglobals.php index f614458..2636890 100644 --- a/classes/plglobals.php +++ b/core/classes/plglobals.php @@ -92,7 +92,7 @@ class PlGlobals */ public function __construct(array $files) { - $this->spoolroot = dirname(dirname(__FILE__)); + $this->spoolroot = dirname(dirname(dirname(__FILE__))); $this->readConfig($files); if (isset($_SERVER) && isset($_SERVER['SERVER_NAME'])) { diff --git a/classes/pliterator.php b/core/classes/pliterator.php similarity index 100% rename from classes/pliterator.php rename to core/classes/pliterator.php diff --git a/classes/pllogger.php b/core/classes/pllogger.php similarity index 100% rename from classes/pllogger.php rename to core/classes/pllogger.php diff --git a/classes/plmailer.php b/core/classes/plmailer.php similarity index 100% rename from classes/plmailer.php rename to core/classes/plmailer.php diff --git a/classes/plmodule.php b/core/classes/plmodule.php similarity index 91% rename from classes/plmodule.php rename to core/classes/plmodule.php index 06e5da8..9d5dc9b 100644 --- a/classes/plmodule.php +++ b/core/classes/plmodule.php @@ -50,7 +50,12 @@ abstract class PLModule public static function factory($modname) { - $mod_path = dirname(__FILE__) . '/../modules/' . $modname . '.php'; + global $globals; + if ($modname == 'core') { + $mod_path = $globals->spoolroot . '/core/modules/' . $modname . '.php'; + } else { + $mod_path = $globals->spoolroot . '/modules/' . $modname . '.php'; + } $class = ucfirst($modname) . 'Module'; require_once $mod_path; diff --git a/classes/plpage.php b/core/classes/plpage.php similarity index 100% rename from classes/plpage.php rename to core/classes/plpage.php diff --git a/classes/plprofiler.php b/core/classes/plprofiler.php similarity index 100% rename from classes/plprofiler.php rename to core/classes/plprofiler.php diff --git a/classes/plsession.php b/core/classes/plsession.php similarity index 100% rename from classes/plsession.php rename to core/classes/plsession.php diff --git a/classes/plset.php b/core/classes/plset.php similarity index 100% rename from classes/plset.php rename to core/classes/plset.php diff --git a/classes/pltableeditor.php b/core/classes/pltableeditor.php similarity index 100% rename from classes/pltableeditor.php rename to core/classes/pltableeditor.php diff --git a/classes/plupload.php b/core/classes/plupload.php similarity index 100% rename from classes/plupload.php rename to core/classes/plupload.php diff --git a/classes/plwizard.php b/core/classes/plwizard.php similarity index 100% rename from classes/plwizard.php rename to core/classes/plwizard.php diff --git a/classes/s.php b/core/classes/s.php similarity index 100% rename from classes/s.php rename to core/classes/s.php diff --git a/classes/varstream.php b/core/classes/varstream.php similarity index 100% rename from classes/varstream.php rename to core/classes/varstream.php diff --git a/classes/xdb.php b/core/classes/xdb.php similarity index 100% rename from classes/xdb.php rename to core/classes/xdb.php diff --git a/classes/xmlrpcclient.php b/core/classes/xmlrpcclient.php similarity index 100% rename from classes/xmlrpcclient.php rename to core/classes/xmlrpcclient.php diff --git a/include/platal.inc.php b/core/include/platal.inc.php similarity index 92% rename from include/platal.inc.php rename to core/include/platal.inc.php index 8402229..2fa6c8b 100644 --- a/include/platal.inc.php +++ b/core/include/platal.inc.php @@ -33,21 +33,18 @@ define('NO_AUTH', 0); define('DO_AUTH', 1); define('NO_HTTPS', 2); -function pl_autoload($cls) +function pl_autoload($cls, array $pathes = array()) { $cls = strtolower($cls); - $path = dirname(dirname(__FILE__)); - if (!@include "$path/classes/$cls.php") { - if (substr($cls, -3, 3) == 'req') { - @include 'validations.inc.php'; - return; - } else if (substr($cls, 0, 6) == 'banana') { - require_once 'banana/banana.inc.php'; - Banana::load(substr($cls, 6)); - return; + $basepath = dirname(dirname(dirname(__FILE__))); + + array_unshift($pathes, 'core/classes', 'classes'); + foreach ($pathes as $path) { + if (@include_once "$basepath/$path/$cls.php") { + return true; } - @include "$cls.inc.php"; } + return false; } pl_autoload('Env'); diff --git a/modules/core.php b/core/modules/core.php similarity index 100% rename from modules/core.php rename to core/modules/core.php diff --git a/include/xnet.inc.php b/include/xnet.inc.php index ce22b5d..823cb7a 100644 --- a/include/xnet.inc.php +++ b/include/xnet.inc.php @@ -23,7 +23,7 @@ define('PL_GLOBALS_CLASS', 'PlatalGlobals'); define('PL_SESSION_CLASS', 'XnetSession'); define('PL_PAGE_CLASS', 'XnetPage'); -require_once('platal.inc.php'); +require_once dirname(dirname(__FILE__)) . '/core/include/platal.inc.php'; require_once('xorg.misc.inc.php'); require_once('globals.inc.php'); require_once('xnet/session.inc.php'); @@ -31,7 +31,17 @@ require_once('xnet/page.inc.php'); function __autoload($cls) { - pl_autoload($cls); + if (!pl_autoload($cls)) { + if (substr($cls, -3, 3) == 'req') { + @include 'validations.inc.php'; + return; + } else if (substr($cls, 0, 6) == 'banana') { + require_once 'banana/banana.inc.php'; + Banana::load(substr($cls, 6)); + return; + } + @include "$cls.inc.php"; + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: diff --git a/include/xorg.inc.php b/include/xorg.inc.php index ed60c7f..849e018 100644 --- a/include/xorg.inc.php +++ b/include/xorg.inc.php @@ -23,14 +23,24 @@ define('PL_GLOBALS_CLASS', 'PlatalGlobals'); define('PL_SESSION_CLASS', 'XorgSession'); define('PL_PAGE_CLASS', 'XorgPage'); -require_once('platal.inc.php'); +require_once dirname(dirname(__FILE__)) . '/core/include/platal.inc.php'; require_once('xorg.misc.inc.php'); require_once('globals.inc.php'); require_once('xorg/session.inc.php'); function __autoload($cls) { - pl_autoload($cls); + if (!pl_autoload($cls)) { + if (substr($cls, -3, 3) == 'req') { + @include 'validations.inc.php'; + return; + } else if (substr($cls, 0, 6) == 'banana') { + require_once 'banana/banana.inc.php'; + Banana::load(substr($cls, 6)); + return; + } + @include "$cls.inc.php"; + } } // {{{ class XorgPage -- 2.1.4