From 49307b1d5278d5a968ab391dd88abb9b9ee06df8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 21 Apr 2008 10:14:43 +0000 Subject: [PATCH] config fix --- .../mxchange/class_ApplicationHelper.php | 2 +- .../main/class_InvalidObjectException.php | 2 +- .../main/class_BaseFrameworkSystem.php | 27 ++++++++++--------- .../main/compressor/class_Bzip2Compressor.php | 2 +- .../main/compressor/class_GzipCompressor.php | 10 +++---- .../main/compressor/class_NullCompressor.php | 12 ++++----- .../main/console/class_ConsoleTools.php | 2 +- .../classes/class_LocalFileDatabase.php | 11 +++++++- .../main/debug/class_DebugConsoleOutput.php | 2 +- .../main/debug/class_DebugErrorLogOutput.php | 2 +- .../main/debug/class_DebugWebOutput.php | 2 +- .../main/extended/class_ObjectLimits.php | 2 +- inc/classes/main/io/class_FileIOStream.php | 2 +- .../io/class_FrameworkDirectoryPointer.php | 2 +- .../io/class_FrameworkFileInputPointer.php | 2 +- .../io/class_FrameworkFileOutputPointer.php | 2 +- .../main/language/class_LanguageSystem.php | 2 +- .../main/output/class_ConsoleOutput.php | 2 +- inc/classes/main/output/class_WebOutput.php | 2 +- .../main/template/class_TemplateEngine.php | 19 ++++++------- .../compressor/class_CompressorChannel.php | 2 +- .../database/class_DatabaseConnection.php | 2 +- .../debug/class_DebugMiddleware.php | 2 +- .../middleware/io/class_FileIOHandler.php | 2 +- inc/config/config-override.php | 3 +++ inc/loader/class_ClassLoader.php | 4 ++- inc/selector.php | 6 ++--- templates/de/code/emergency_exit.ctp | 4 +-- templates/de/code/footer_msg.ctp | 2 +- templates/de/code/header.ctp | 2 +- 30 files changed, 77 insertions(+), 61 deletions(-) diff --git a/application/mxchange/class_ApplicationHelper.php b/application/mxchange/class_ApplicationHelper.php index fc2d9522e2..435d343ed5 100644 --- a/application/mxchange/class_ApplicationHelper.php +++ b/application/mxchange/class_ApplicationHelper.php @@ -70,7 +70,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica parent::constructor(__CLASS__); // Set description - $this->setPartDescr("Application-Helper"); + $this->setObjectDescription("Application-Helper"); // Create an unique ID $this->createUniqueID(); diff --git a/inc/classes/exceptions/main/class_InvalidObjectException.php b/inc/classes/exceptions/main/class_InvalidObjectException.php index 9dca3438d8..76a4a4cb04 100644 --- a/inc/classes/exceptions/main/class_InvalidObjectException.php +++ b/inc/classes/exceptions/main/class_InvalidObjectException.php @@ -34,7 +34,7 @@ class InvalidObjectException extends FrameworkException { $message = sprintf("[%s:%d] Objekte sind nicht erlaubt. (Objekt: %s)", $class->__toString(), $this->getLine(), - $class->getPartDescr() + $class->getObjectDescription() ); // Call parent constructor diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index 8ac8d31fb0..dbf69b14f3 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -61,7 +61,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { /** * A human-readable description for this simulator part */ - private $partDescr = "Namenlose Framework-Einheit"; + private $objectDescription = "Namenlose Framework-Einheit"; /** * The unique ID string for identifying all type of classes @@ -139,6 +139,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { const EXCEPTION_TEMPLATE_ENGINE_UNSUPPORTED = 0x02d; const EXCEPTION_MISSING_LANGUAGE_HANDLER = 0x02e; const EXCEPTION_MISSING_FILE_IO_HANDLER = 0x02f; + const EXCEPTION_MISSING_ELEMENT = 0x030; /** * In the super constructor these system classes shall be ignored or else @@ -187,7 +188,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { } // Destroy all informations about this class but keep some text about it alive - $this->setPartDescr(sprintf("Entferntes Objekt %s", $this->__toString())); + $this->setObjectDescription(sprintf("Entferntes Objekt %s", $this->__toString())); $this->setRealClass("DestructedObject"); $this->resetUniqueID(); } elseif ((defined('DEBUG_DESTRUCTOR')) && (is_object($this->getDebugInstance()))) { @@ -489,7 +490,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { $this->__toString(), md5(sprintf("%s:%s:%s:%s:%s:%s", $this->__toString(), - $this->getPartDescr(), + $this->getObjectDescription(), time(), getenv('REMOTE_ADDR'), getenv('SERVER_ADDR'), @@ -548,14 +549,14 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { /** * Getter for simulator description * - * @return $partDescr The description of this simulation part + * @return $objectDescription The description of this simulation part */ - public final function getPartDescr () { - if ((defined('DEBUG_SYSTEM')) && (is_object($this->getDebugInstance()))) $this->getDebugInstance()->output(sprintf("[%s:] getPartDescr erreicht.
\n", + public final function getObjectDescription () { + if ((defined('DEBUG_SYSTEM')) && (is_object($this->getDebugInstance()))) $this->getDebugInstance()->output(sprintf("[%s:] getObjectDescription erreicht.
\n", $this->__toString() )); - if (isset($this->partDescr)) { - return $this->partDescr; + if (isset($this->objectDescription)) { + return $this->objectDescription; } else { return null; } @@ -564,14 +565,14 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { /** * Setter for simulation part description * - * @param $partDescr The description as string for this simulation part + * @param $objectDescription The description as string for this simulation part * @return void */ - public final function setPartDescr ($partDescr) { - $this->partDescr = (String) $partDescr; + public final function setObjectDescription ($objectDescription) { + $this->objectDescription = (String) $objectDescription; if ((defined('DEBUG_SYSTEM')) && (is_object($this->getDebugInstance()))) $this->getDebugInstance()->output(sprintf("[%s:] Teilbeschreibung wird auf %s gesetzt.
\n", $this->__toString(), - $this->partDescr + $this->objectDescription )); } @@ -597,7 +598,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { ( $this->__toString() == $itemInstance->__toString() ) && ( - $this->getPartDescr() == $itemInstance->getPartDescr() + $this->getObjectDescription() == $itemInstance->getObjectDescription() ) ); } diff --git a/inc/classes/main/compressor/class_Bzip2Compressor.php b/inc/classes/main/compressor/class_Bzip2Compressor.php index c0c475f442..48eb84c6d1 100644 --- a/inc/classes/main/compressor/class_Bzip2Compressor.php +++ b/inc/classes/main/compressor/class_Bzip2Compressor.php @@ -37,7 +37,7 @@ class Bzip2Compressor extends BaseFrameworkSystem implements Compressor { )); // Set description - $this->setPartDescr("BZIP2-Kompressor"); + $this->setObjectDescription("BZIP2-Kompressor"); // Create an unique ID $this->createUniqueID(); diff --git a/inc/classes/main/compressor/class_GzipCompressor.php b/inc/classes/main/compressor/class_GzipCompressor.php index 0caae9f809..9d9fa034bb 100644 --- a/inc/classes/main/compressor/class_GzipCompressor.php +++ b/inc/classes/main/compressor/class_GzipCompressor.php @@ -37,7 +37,7 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor { )); // Set description - $this->setPartDescr("GZIP-Kompressor"); + $this->setObjectDescription("GZIP-Kompressor"); // Create an unique ID $this->createUniqueID(); @@ -75,8 +75,8 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor { /** * GZIP compression stream * - * @param $streamData Mixed non-object stream data - * @return $streamData The compressed stream data + * @param $streamData Mixed non-object stream data + * @return $streamData The compressed stream data * @throws InvalidObjectException If the stream is an object */ public function compressStream ($streamData) { @@ -92,8 +92,8 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor { /** * GZIP decompression stream * - * @param $streamData Mixed non-object stream data - * @return $streamData The decompressed stream data + * @param $streamData Mixed non-object stream data + * @return $streamData The decompressed stream data * @throws InvalidObjectException If the stream is an object */ public function decompressStream ($streamData) { diff --git a/inc/classes/main/compressor/class_NullCompressor.php b/inc/classes/main/compressor/class_NullCompressor.php index 56b2d5f4f8..c432efeb9e 100644 --- a/inc/classes/main/compressor/class_NullCompressor.php +++ b/inc/classes/main/compressor/class_NullCompressor.php @@ -37,7 +37,7 @@ class NullCompressor extends BaseFrameworkSystem implements Compressor { )); // Set description - $this->setPartDescr("Null-Kompressor"); + $this->setObjectDescription("Null-Kompressor"); // Create an unique ID $this->createUniqueID(); @@ -59,8 +59,8 @@ class NullCompressor extends BaseFrameworkSystem implements Compressor { /** * Null compression stream * - * @param $streamData Mixed non-object stream data - * @return $streamData The compressed stream data + * @param $streamData Mixed non-object stream data + * @return $streamData The compressed stream data * @throws InvalidObjectException If the stream is an object */ public function compressStream ($streamData) { @@ -76,8 +76,8 @@ class NullCompressor extends BaseFrameworkSystem implements Compressor { /** * Null decompression stream * - * @param $streamData Mixed non-object stream data - * @return $streamData The decompressed stream data + * @param $streamData Mixed non-object stream data + * @return $streamData The decompressed stream data * @throws InvalidObjectException If the stream is an object */ public function decompressStream ($streamData) { @@ -93,7 +93,7 @@ class NullCompressor extends BaseFrameworkSystem implements Compressor { /** * Getter for the file extension of this compressor * - * @return $string Returns always "bz2" + * @return $string Returns always "null" */ public final function getCompressorExtension () { if ((defined('DEBUG_COMPRESSOR')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:] Dateierweiterung angefordert.
\n", diff --git a/inc/classes/main/console/class_ConsoleTools.php b/inc/classes/main/console/class_ConsoleTools.php index 5ba9ae642c..175102af60 100644 --- a/inc/classes/main/console/class_ConsoleTools.php +++ b/inc/classes/main/console/class_ConsoleTools.php @@ -32,7 +32,7 @@ class ConsoleTools extends BaseFrameworkSystem { parent::constructor(__CLASS__); // Set description - $this->setPartDescr("Console-Tools"); + $this->setObjectDescription("Console-Tools"); // Create an unique ID $this->createUniqueID(); diff --git a/inc/classes/main/database/classes/class_LocalFileDatabase.php b/inc/classes/main/database/classes/class_LocalFileDatabase.php index ea4a8e19e4..3f207c8499 100644 --- a/inc/classes/main/database/classes/class_LocalFileDatabase.php +++ b/inc/classes/main/database/classes/class_LocalFileDatabase.php @@ -55,7 +55,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend parent::constructor(__CLASS__); // Set description - $this->setPartDescr("Dateidatenbankschicht"); + $this->setObjectDescription("Dateidatenbankschicht"); // Create unique ID $this->createUniqueID(); @@ -352,6 +352,15 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend return $this->lastContents; } + /** + * Getter for file extension + * + * @return $fileExtension The array with elements 'header' and 'data'. + */ + public final function getFileExtension () { + return $this->fileExtension; + } + /** * Get cached (last fetched) data from the local file database * diff --git a/inc/classes/main/debug/class_DebugConsoleOutput.php b/inc/classes/main/debug/class_DebugConsoleOutput.php index 82bcd7f1fe..8efe0b56cd 100644 --- a/inc/classes/main/debug/class_DebugConsoleOutput.php +++ b/inc/classes/main/debug/class_DebugConsoleOutput.php @@ -32,7 +32,7 @@ class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger, Output parent::constructor(__CLASS__); // Set description - $this->setPartDescr("Debug-Ausgabe auf Konsole"); + $this->setObjectDescription("Debug-Ausgabe auf Konsole"); // Create an unique ID $this->createUniqueID(); diff --git a/inc/classes/main/debug/class_DebugErrorLogOutput.php b/inc/classes/main/debug/class_DebugErrorLogOutput.php index c8e62936e5..a11a9f7844 100644 --- a/inc/classes/main/debug/class_DebugErrorLogOutput.php +++ b/inc/classes/main/debug/class_DebugErrorLogOutput.php @@ -32,7 +32,7 @@ class DebugErrorLogOutput extends BaseFrameworkSystem implements Debugger, Outpu parent::constructor(__CLASS__); // Set description - $this->setPartDescr("Debug-Ausgabe in error_log()"); + $this->setObjectDescription("Debug-Ausgabe in error_log()"); // Create an unique ID $this->createUniqueID(); diff --git a/inc/classes/main/debug/class_DebugWebOutput.php b/inc/classes/main/debug/class_DebugWebOutput.php index ee3ae81b4c..844605fcd6 100644 --- a/inc/classes/main/debug/class_DebugWebOutput.php +++ b/inc/classes/main/debug/class_DebugWebOutput.php @@ -32,7 +32,7 @@ class DebugWebOutput extends BaseFrameworkSystem implements Debugger, OutputStre parent::constructor(__CLASS__); // Set description - $this->setPartDescr("Debug-Ausgabe auf Konsole"); + $this->setObjectDescription("Debug-Ausgabe auf Konsole"); // Create an unique ID $this->createUniqueID(); diff --git a/inc/classes/main/extended/class_ObjectLimits.php b/inc/classes/main/extended/class_ObjectLimits.php index 91dc519f8a..13a658ac63 100644 --- a/inc/classes/main/extended/class_ObjectLimits.php +++ b/inc/classes/main/extended/class_ObjectLimits.php @@ -39,7 +39,7 @@ class ObjectLimits extends BaseFrameworkSystem { parent::constructor(__CLASS__); // Set part description - $this->setPartDescr("Limitierungsobjekt"); + $this->setObjectDescription("Limitierungsobjekt"); // Create unique ID number $this->createUniqueID(); diff --git a/inc/classes/main/io/class_FileIOStream.php b/inc/classes/main/io/class_FileIOStream.php index 2eedf3c6aa..155774a1bb 100644 --- a/inc/classes/main/io/class_FileIOStream.php +++ b/inc/classes/main/io/class_FileIOStream.php @@ -30,7 +30,7 @@ class FileIOStream extends BaseFrameworkSystem implements FileInputStreamer, Fil parent::constructor(__CLASS__); // Set part description - $this->setPartDescr("Universal Datei-Ein-/Ausgabesystem"); + $this->setObjectDescription("Universal Datei-Ein-/Ausgabesystem"); // Create unique ID $this->createUniqueID(); diff --git a/inc/classes/main/io/class_FrameworkDirectoryPointer.php b/inc/classes/main/io/class_FrameworkDirectoryPointer.php index e8af81719d..f02faf9923 100644 --- a/inc/classes/main/io/class_FrameworkDirectoryPointer.php +++ b/inc/classes/main/io/class_FrameworkDirectoryPointer.php @@ -40,7 +40,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem { parent::constructor(__CLASS__); // Set part description - $this->setPartDescr("Verzeichnis-Handler"); + $this->setObjectDescription("Verzeichnis-Handler"); // Create unique ID $this->createUniqueID(); diff --git a/inc/classes/main/io/class_FrameworkFileInputPointer.php b/inc/classes/main/io/class_FrameworkFileInputPointer.php index 534650ab5a..c66d76d6ec 100644 --- a/inc/classes/main/io/class_FrameworkFileInputPointer.php +++ b/inc/classes/main/io/class_FrameworkFileInputPointer.php @@ -40,7 +40,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem { parent::constructor(__CLASS__); // Set part description - $this->setPartDescr("Dateiausgabe-Handler"); + $this->setObjectDescription("Dateiausgabe-Handler"); // Create unique ID $this->createUniqueID(); diff --git a/inc/classes/main/io/class_FrameworkFileOutputPointer.php b/inc/classes/main/io/class_FrameworkFileOutputPointer.php index 59de4f6639..9705137b60 100644 --- a/inc/classes/main/io/class_FrameworkFileOutputPointer.php +++ b/inc/classes/main/io/class_FrameworkFileOutputPointer.php @@ -40,7 +40,7 @@ class FrameworkFileOutputPointer extends BaseFrameworkSystem { parent::constructor(__CLASS__); // Set part description - $this->setPartDescr("Dateiausgabe-Handler"); + $this->setObjectDescription("Dateiausgabe-Handler"); // Create unique ID $this->createUniqueID(); diff --git a/inc/classes/main/language/class_LanguageSystem.php b/inc/classes/main/language/class_LanguageSystem.php index 419a856580..baac159a95 100644 --- a/inc/classes/main/language/class_LanguageSystem.php +++ b/inc/classes/main/language/class_LanguageSystem.php @@ -53,7 +53,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage { parent::constructor(__CLASS__); // Set part description - $this->setPartDescr("Sprachsystem"); + $this->setObjectDescription("Sprachsystem"); // Create unique ID number $this->createUniqueID(); diff --git a/inc/classes/main/output/class_ConsoleOutput.php b/inc/classes/main/output/class_ConsoleOutput.php index 374c2af4ae..3bf27fcedb 100644 --- a/inc/classes/main/output/class_ConsoleOutput.php +++ b/inc/classes/main/output/class_ConsoleOutput.php @@ -43,7 +43,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer { parent::constructor(__CLASS__); // Set description - $this->setPartDescr("Console-Ausgabe-Handler"); + $this->setObjectDescription("Console-Ausgabe-Handler"); // Create an unique ID $this->createUniqueID(); diff --git a/inc/classes/main/output/class_WebOutput.php b/inc/classes/main/output/class_WebOutput.php index 40d425c70f..27e5c83ddc 100644 --- a/inc/classes/main/output/class_WebOutput.php +++ b/inc/classes/main/output/class_WebOutput.php @@ -38,7 +38,7 @@ class WebOutput extends BaseFrameworkSystem implements OutputStreamer { parent::constructor(__CLASS__); // Set description - $this->setPartDescr("Web-Ausgabe-Handler"); + $this->setObjectDescription("Web-Ausgabe-Handler"); // Create an unique ID $this->createUniqueID(); diff --git a/inc/classes/main/template/class_TemplateEngine.php b/inc/classes/main/template/class_TemplateEngine.php index cc95918414..44f374fc9e 100644 --- a/inc/classes/main/template/class_TemplateEngine.php +++ b/inc/classes/main/template/class_TemplateEngine.php @@ -123,7 +123,7 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate parent::constructor(__CLASS__); // Set part description - $this->setPartDescr("Template-Engine"); + $this->setObjectDescription("Template-Engine"); // Create unique ID number $this->createUniqueID(); @@ -136,16 +136,16 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate /** * Creates an instance of the class TemplateEngine and prepares it for usage * - * @param $basePath The local base path for all templates - * @param $langInstance An instance of LanguageSystem (default) - * @param $ioInstance An instance of FileIOHandler (default, middleware!) + * @param $basePath The local base path for all templates + * @param $langInstance An instance of LanguageSystem (default) + * @param $ioInstance An instance of FileIOHandler (default, middleware!) * @return $tplInstance An instance of TemplateEngine * @throws BasePathIsEmptyException If the provided $basePath is empty * @throws InvalidBasePathStringException If $basePath is no string * @throws BasePathIsNoDirectoryException If $basePath is no - * directory or not found + * directory or not found * @throws BasePathReadProtectedException If $basePath is - * read-protected + * read-protected */ public final static function createTemplateEngine ($basePath, ManageableLanguage $langInstance, FileIOHandler $ioInstance) { // Get a new instance @@ -580,11 +580,11 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate /** * Extract variables from a given raw data stream * - * @param $rawData The raw template data we shall analyze + * @param $rawData The raw template data we shall analyze * @return void * @throws InvalidTemplateVariableNameException If a variable name - * in a template is - * invalid + * in a template is + * invalid */ private function extractVariablesFromRawData ($rawData) { // Cast to string @@ -776,6 +776,7 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate $this->assignVariable($var, $varMatches[3][$key]); } else { // Non-string found so we need some deeper analysis... + // @TODO Unfinished work or don't die here. die("Deeper analysis not yet implemented!"); } diff --git a/inc/classes/middleware/compressor/class_CompressorChannel.php b/inc/classes/middleware/compressor/class_CompressorChannel.php index 5d5017c6e6..8dae607bbf 100644 --- a/inc/classes/middleware/compressor/class_CompressorChannel.php +++ b/inc/classes/middleware/compressor/class_CompressorChannel.php @@ -31,7 +31,7 @@ class CompressorChannel extends BaseMiddleware { parent::constructor(__CLASS__); // Set description - $this->setPartDescr("Komprimierungshandler"); + $this->setObjectDescription("Komprimierungshandler"); // Create an unique ID $this->createUniqueID(); diff --git a/inc/classes/middleware/database/class_DatabaseConnection.php b/inc/classes/middleware/database/class_DatabaseConnection.php index e6adbbe677..d7db9d8697 100644 --- a/inc/classes/middleware/database/class_DatabaseConnection.php +++ b/inc/classes/middleware/database/class_DatabaseConnection.php @@ -37,7 +37,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Li parent::constructor(__CLASS__); // Set description - $this->setPartDescr("Datenbank-Mittelschicht"); + $this->setObjectDescription("Datenbank-Mittelschicht"); // Create an unique ID $this->createUniqueID(); diff --git a/inc/classes/middleware/debug/class_DebugMiddleware.php b/inc/classes/middleware/debug/class_DebugMiddleware.php index 5193532e1e..2cc4882330 100644 --- a/inc/classes/middleware/debug/class_DebugMiddleware.php +++ b/inc/classes/middleware/debug/class_DebugMiddleware.php @@ -44,7 +44,7 @@ class DebugMiddleware extends BaseMiddleware { parent::constructor(__CLASS__); // Set description - $this->setPartDescr("Debug-Ausgabe-Handler"); + $this->setObjectDescription("Debug-Ausgabe-Handler"); // Create an unique ID $this->createUniqueID(); diff --git a/inc/classes/middleware/io/class_FileIOHandler.php b/inc/classes/middleware/io/class_FileIOHandler.php index 7e624cccf7..7e0d35ad52 100644 --- a/inc/classes/middleware/io/class_FileIOHandler.php +++ b/inc/classes/middleware/io/class_FileIOHandler.php @@ -48,7 +48,7 @@ class FileIOHandler extends BaseMiddleware { parent::constructor(__CLASS__); // Set description - $this->setPartDescr("Datei-Ein-/Ausgabe-Handler"); + $this->setObjectDescription("Datei-Ein-/Ausgabe-Handler"); // Create an unique ID $this->createUniqueID(); diff --git a/inc/config/config-override.php b/inc/config/config-override.php index 99b4e66278..dd1ca4a30c 100644 --- a/inc/config/config-override.php +++ b/inc/config/config-override.php @@ -22,6 +22,9 @@ * along with this program. If not, see . */ +// Get the configuration instance +$cfg = FrameworkConfiguration::getInstance(); + // CFG: DEFAULT-APPLICATION $cfg->setConfigEntry("default_application", "mxchange"); diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php index 61e8c216ff..79389f647d 100644 --- a/inc/loader/class_ClassLoader.php +++ b/inc/loader/class_ClassLoader.php @@ -274,15 +274,17 @@ class ClassLoader { // Set new prefix (temporary!) $this->prefix = "config-"; + $this->preLen = strlen($this->prefix); // Set base directory - $basePath = sprintf("%s/inc/config/", PATH); + $basePath = sprintf("%sinc/config/", PATH); // Load all classes from the config directory $this->loadClasses($basePath); // Set the prefix back $this->prefix = $oldPrefix; + $this->preLen = strlen($this->prefix); } } diff --git a/inc/selector.php b/inc/selector.php index 23acabec7e..7af8aa0605 100644 --- a/inc/selector.php +++ b/inc/selector.php @@ -52,11 +52,11 @@ $application = preg_replace('/([^a-z_-])+/i', "", $application); $configAppIncludes = array( sprintf("class_%s", FrameworkConfiguration::getInstance()->readConfig("app_helper_class")), // The ApplicationHelper class "config", // The application's own configuration - "init", // The application initializer - "loader", // The application's class loader + "init", // The application initializer + "loader", // The application's class loader "debug", // Some debugging stuff "exceptions", // The application's own exception handler - "starter", // The application starter (calls entryPoint(), etc.) + "starter", // The application starter (calls entryPoint(), etc.) ); // Load them all (try only) diff --git a/templates/de/code/emergency_exit.ctp b/templates/de/code/emergency_exit.ctp index a16e1cd133..06cbde487f 100644 --- a/templates/de/code/emergency_exit.ctp +++ b/templates/de/code/emergency_exit.ctp @@ -2,9 +2,9 @@ {?header:title="Problem in application framework detected!"?} -{?navigation:nav_row=home;imprint;contact?} +{?navigation?} -
+
$content[message]
diff --git a/templates/de/code/footer_msg.ctp b/templates/de/code/footer_msg.ctp index 309a0fddc6..c67ed0c1c4 100644 --- a/templates/de/code/footer_msg.ctp +++ b/templates/de/code/footer_msg.ctp @@ -1,4 +1,4 @@ -