openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 4db5e1efa8da366bcc727aa9654f8bc92e8facb7
parent 8ce7edd6c46dd563955d7c9bf25ffa9466f89d9c
Author: Jan Dankert <devnull@localhost>
Date:   Sat, 13 Jan 2018 01:15:00 +0100

Unnötige Konstanten rausgeworfen.

Diffstat:
modules/cms-core/Dispatcher.class.php | 7+------
modules/cms-core/init.php | 15+++------------
2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/modules/cms-core/Dispatcher.class.php b/modules/cms-core/Dispatcher.class.php @@ -73,11 +73,6 @@ class Dispatcher define('FILE_SEP', $conf['interface']['file_separator']); - define('TEMPLATE_DIR', OR_THEMES_DIR . $conf['interface']['theme'] . '/templates'); - define('CSS_DIR', OR_THEMES_DIR . $conf['interface']['theme'] . '/css'); - define('IMAGE_DIR', OR_THEMES_DIR . $conf['interface']['theme'] . '/images'); - - // Is this a POST request? $this->isAction = $_SERVER['REQUEST_METHOD'] == 'POST'; @@ -269,7 +264,7 @@ class Dispatcher if (!class_exists($actionClassNameWithNamespace)) { // Laden der Action-Klasse. - require_once(OR_ACTIONCLASSES_DIR . '/' . $actionClassName . '.class.php'); + require_once(__DIR__. '/action/' . $actionClassName . '.class.php'); } // Erzeugen der Action-Klasse diff --git a/modules/cms-core/init.php b/modules/cms-core/init.php @@ -21,7 +21,6 @@ define('PHP_EXT' ,'php' ); define('IMG_EXT' ,'.gif' ); define('IMG_ICON_EXT' ,'.png' ); -define('MAX_FOLDER_DEPTH',5 ); define('OR_VERSION' ,'1.1-snapshot' ); define('OR_TITLE' ,'OpenRat CMS'); @@ -38,16 +37,11 @@ define('OR_TYPE_URL' ,'url' ); define( 'CMS_ROOT_DIR',__DIR__.'/../../'); define('OR_MODULES_DIR' ,CMS_ROOT_DIR.'modules/'); -define('OR_ACTIONCLASSES_DIR' ,OR_MODULES_DIR.'cms-core/action/' ); -define('OR_OBJECTCLASSES_DIR' ,OR_MODULES_DIR.'cms-core/model/' ); -define('OR_LANGUAGE_DIR' ,CMS_ROOT_DIR.'language/' ); -define('OR_DBCLASSES_DIR' ,CMS_ROOT_DIR.'db/' ); define('OR_DYNAMICCLASSES_DIR',OR_MODULES_DIR.'cms-macros/macro/' ); -define('OR_TEXTCLASSES_DIR' ,OR_MODULES_DIR.'wikiparser/' ); -define('OR_PREFERENCES_DIR' ,CMS_ROOT_DIR.'config/'); -define('OR_CONFIG_DIR' ,OR_PREFERENCES_DIR ); +define('OR_SERVICECLASSES_DIR',OR_MODULES_DIR.'util/' ); +define('OR_AUTHCLASSES_DIR' ,OR_MODULES_DIR.'cms-core/auth/' ); define('OR_TMP_DIR' ,CMS_ROOT_DIR.'tmp/' ); -define('OR_CONTROLLER_FILE' ,'dispatcher'); + define('START_TIME' ,time() ); define('REQUEST_ID' ,'req'.time().rand() ); @@ -73,9 +67,6 @@ define('REQ_PARAM_TEMPLATE_ID' ,'templateid' ); define('REQ_PARAM_DATABASE_ID' ,'dbid' ); define('REQ_PARAM_TARGET' ,'target' ); -define('OR_SERVICECLASSES_DIR',OR_MODULES_DIR.'util/' ); -define('OR_AUTHCLASSES_DIR' ,OR_MODULES_DIR.'cms-core/auth/' ); - /** * Wandelt jeden Fehler in eine ErrorException um.