Packager script for latest dev version added, misc fixes, captcha verifier filter...

[shipsimu.git] / inc / classes / main / class_BaseFrameworkSystem.php

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 3c1b5fc9ac8c38e5fd09e5d9629e0d8322c6a599..fa862a188522d40dc4e04b27a2137f35bee7d01c 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -203,17 +203,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         */
        public function __destruct() {
                // Is this object already destroyed?
-               if ($this->__toString() != "DestructedObject") {
-                       // Debug message
-                       if ((defined('DEBUG_DESTRUCTOR')) && (is_object($this->getDebugInstance()))) {
-                               $this->getDebugInstance()->output(sprintf("[%s:] Das Objekt <strong>%s</strong> wird zerst&ouml;rt.",
-                                       __CLASS__, $this->__toString()
-                               ));
-                       } // END - if
-
+               if ($this->__toString() != 'DestructedObject') {
                        // Destroy all informations about this class but keep some text about it alive
-                       $this->setObjectDescription(sprintf("Entferntes Objekt <em>%s</em>", $this->__toString()));
-                       $this->setRealClass("DestructedObject");
+                       $this->setObjectDescription(sprintf("Removed object <em>%s</em>", $this->__toString()));
+                       $this->setRealClass('DestructedObject');
                        $this->resetUniqueID();
                } elseif ((defined('DEBUG_DESTRUCTOR')) && (is_object($this->getDebugInstance()))) {
                        // Already destructed object
@@ -319,8 +312,8 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                        )));
 
                        // Initialization done! :D
-                       Registry::isInitialized("OK");
-               } elseif ($this->__toString() == "DebugMiddleware") {
+                       Registry::isInitialized('OK');
+               } elseif ($this->__toString() == 'DebugMiddleware') {
                        // Set configuration instance
                        $this->setConfigInstance(FrameworkConfiguration::createFrameworkConfiguration());
                }
@@ -849,10 +842,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         * The left part of the ID shall always be a valid class name and the
         * right part an ID number.
         *
-        * @return      $pfn            The file name with a prepended path name
-        * @throws      NoArrayCreatedException If explode() fails to create an array
+        * @return      $pfn    The file name with a prepended path name
+        * @throws      NoArrayCreatedException         If explode() fails to create an array
         * @throws      InvalidArrayCountException      If the array contains less or
-        *                                                                      more than two elements
+        *                                                                              more than two elements
         */
        public final function getPathFileNameFromObject () {
                // Get the main object's unique ID. We use this as a path/filename combination
@@ -864,10 +857,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                // Are there two elements? Index 0 is the path, 1 the file name + global extension
                if (!is_array($pathFile)) {
                        // No array found
-                       throw new NoArrayCreatedException(array($this, "pathFile"), self::EXCEPTION_ARRAY_EXPECTED);
+                       throw new NoArrayCreatedException(array($this, 'pathFile'), self::EXCEPTION_ARRAY_EXPECTED);
                } elseif (count($pathFile) != 2) {
                        // Invalid ID returned!
-                       throw new InvalidArrayCountException(array($this, "pathFile", count($pathFile), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
+                       throw new InvalidArrayCountException(array($this, 'pathFile', count($pathFile), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
                }
 
                // Auto-append missing trailing slash