config fix
authorRoland Häder <roland@mxchange.org>
Mon, 21 Apr 2008 10:14:43 +0000 (10:14 +0000)
committerRoland Häder <roland@mxchange.org>
Mon, 21 Apr 2008 10:14:43 +0000 (10:14 +0000)
30 files changed:
application/mxchange/class_ApplicationHelper.php
inc/classes/exceptions/main/class_InvalidObjectException.php
inc/classes/main/class_BaseFrameworkSystem.php
inc/classes/main/compressor/class_Bzip2Compressor.php
inc/classes/main/compressor/class_GzipCompressor.php
inc/classes/main/compressor/class_NullCompressor.php
inc/classes/main/console/class_ConsoleTools.php
inc/classes/main/database/classes/class_LocalFileDatabase.php
inc/classes/main/debug/class_DebugConsoleOutput.php
inc/classes/main/debug/class_DebugErrorLogOutput.php
inc/classes/main/debug/class_DebugWebOutput.php
inc/classes/main/extended/class_ObjectLimits.php
inc/classes/main/io/class_FileIOStream.php
inc/classes/main/io/class_FrameworkDirectoryPointer.php
inc/classes/main/io/class_FrameworkFileInputPointer.php
inc/classes/main/io/class_FrameworkFileOutputPointer.php
inc/classes/main/language/class_LanguageSystem.php
inc/classes/main/output/class_ConsoleOutput.php
inc/classes/main/output/class_WebOutput.php
inc/classes/main/template/class_TemplateEngine.php
inc/classes/middleware/compressor/class_CompressorChannel.php
inc/classes/middleware/database/class_DatabaseConnection.php
inc/classes/middleware/debug/class_DebugMiddleware.php
inc/classes/middleware/io/class_FileIOHandler.php
inc/config/config-override.php
inc/loader/class_ClassLoader.php
inc/selector.php
templates/de/code/emergency_exit.ctp
templates/de/code/footer_msg.ctp
templates/de/code/header.ctp

index fc2d952..435d343 100644 (file)
@@ -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();
index 9dca343..76a4a4c 100644 (file)
@@ -34,7 +34,7 @@ class InvalidObjectException extends FrameworkException {
                $message = sprintf("[%s:%d] Objekte sind nicht erlaubt. (Objekt: <u>%s</u>)",
                        $class->__toString(),
                        $this->getLine(),
-                       $class->getPartDescr()
+                       $class->getObjectDescription()
                );
 
                // Call parent constructor
index 8ac8d31..dbf69b1 100644 (file)
@@ -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 <em>%s</em>", $this->__toString()));
+                       $this->setObjectDescription(sprintf("Entferntes Objekt <em>%s</em>", $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.<br />\n",
+       public final function getObjectDescription () {
+               if ((defined('DEBUG_SYSTEM')) && (is_object($this->getDebugInstance()))) $this->getDebugInstance()->output(sprintf("[%s:] getObjectDescription erreicht.<br />\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 <strong>%s</strong> gesetzt.<br />\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()
                        )
                );
        }
index c0c475f..48eb84c 100644 (file)
@@ -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();
index 0caae9f..9d9fa03 100644 (file)
@@ -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) {
index 56b2d5f..c432efe 100644 (file)
@@ -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.<br />\n",
index 5ba9ae6..175102a 100644 (file)
@@ -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();
index ea4a8e1..3f207c8 100644 (file)
@@ -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();
@@ -353,6 +353,15 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
        }
 
        /**
+        * 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
         *
         * @param               $uniqueID               The ID number for looking up the data
index 82bcd7f..8efe0b5 100644 (file)
@@ -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();
index c8e6293..a11a9f7 100644 (file)
@@ -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();
index ee3ae81..844605f 100644 (file)
@@ -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();
index 91dc519..13a658a 100644 (file)
@@ -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();
index 2eedf3c..155774a 100644 (file)
@@ -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();
index e8af817..f02faf9 100644 (file)
@@ -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();
index 534650a..c66d76d 100644 (file)
@@ -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();
index 59de4f6..9705137 100644 (file)
@@ -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();
index 419a856..baac159 100644 (file)
@@ -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();
index 374c2af..3bf27fc 100644 (file)
@@ -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();
index 40d425c..27e5c83 100644 (file)
@@ -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();
index cc95918..44f374f 100644 (file)
@@ -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!");
                        }
 
index 5d5017c..8dae607 100644 (file)
@@ -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();
index e6adbbe..d7db9d8 100644 (file)
@@ -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();
index 5193532..2cc4882 100644 (file)
@@ -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();
index 7e624cc..7e0d35a 100644 (file)
@@ -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();
index 99b4e66..dd1ca4a 100644 (file)
@@ -22,6 +22,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// Get the configuration instance
+$cfg = FrameworkConfiguration::getInstance();
+
 // CFG: DEFAULT-APPLICATION
 $cfg->setConfigEntry("default_application", "mxchange");
 
index 61e8c21..79389f6 100644 (file)
@@ -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);
        }
 }
 
index 23acabe..7af8aa0 100644 (file)
@@ -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)
index a16e1cd..06cbde4 100644 (file)
@@ -2,9 +2,9 @@
 
 {?header:title="Problem in application framework detected!"?}
 
-{?navigation:nav_row=home;imprint;contact?}
+{?navigation?}
 
-       <div class="emergency_exit message_box">
+       <div id="emergency_exit message_box">
                $content[message]
        </div>
 
index 309a0fd..c67ed0c 100644 (file)
@@ -1,4 +1,4 @@
-       <div class="footer_message message_box">
+       <div id="footer_message message_box">
                $content[footer_msg]
        </div>
 
index 1faab5b..2b2457d 100644 (file)
@@ -17,4 +17,4 @@
 </head>
 
 <body>
-<div class="masterbox">
+<div id="masterbox">