Fix for method in FrameworkConfiguration, removal of unneccessary code
authorRoland Häder <roland@mxchange.org>
Tue, 11 Aug 2009 16:43:10 +0000 (16:43 +0000)
committerRoland Häder <roland@mxchange.org>
Tue, 11 Aug 2009 16:43:10 +0000 (16:43 +0000)
- Fix for wrongly named method 'isConfigEntrySet', must be
  'isConfigurationEntrySet' due to we don't want to use shorted names
- Removed legacy array $systemClasses
- Removed two methods to reduce the call stack

51 files changed:
.gitattributes
inc/classes/interfaces/class_FrameworkInterface.php
inc/classes/interfaces/streams/crypto/class_EncryptableStream.php
inc/classes/main/actions/class_BaseAction.php
inc/classes/main/application/class_BaseApplication.php
inc/classes/main/auth/class_CookieAuth.php
inc/classes/main/cache/class_MemoryCache.php
inc/classes/main/class_
inc/classes/main/class_Base
inc/classes/main/class_BaseFrameworkSystem.php
inc/classes/main/controller/class_BaseController.php
inc/classes/main/criteria/class_BaseCriteria.php
inc/classes/main/crypto/class_CryptoHelper.php
inc/classes/main/database/class_
inc/classes/main/database/class_BaseDatabaseWrapper.php
inc/classes/main/database/databases/class_LocalFileDatabase.php
inc/classes/main/discovery/class_
inc/classes/main/discovery/class_BaseDiscovery.php
inc/classes/main/discovery/payment/class_LocalPaymentDiscovery.php
inc/classes/main/factories/class_BaseFactory.php
inc/classes/main/filter/class_AbstractFilterDecorator.php
inc/classes/main/filter/class_BaseFilter.php
inc/classes/main/filter/class_BaseFilterDecorator.php [new file with mode: 0755]
inc/classes/main/filter/class_FilterChain.php
inc/classes/main/helper/class_BaseHelper.php
inc/classes/main/images/class_BaseImage.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/mailer/class_BaseMailer.php
inc/classes/main/menu/class_BaseMenu.php
inc/classes/main/points/class_UserPoints.php
inc/classes/main/reader/class_ConsoleNewsReader.php
inc/classes/main/reader/class_DefaultNewsReader.php
inc/classes/main/registration/class_BaseRegistration.php
inc/classes/main/registry/class_Registry.php
inc/classes/main/request/class_BaseRequest.php
inc/classes/main/resolver/class_BaseResolver.php
inc/classes/main/response/class_BaseResponse.php
inc/classes/main/result/class_DatabaseResult.php
inc/classes/main/rng/class_RandomNumberGenerator.php
inc/classes/main/streams/class_BaseStream.php
inc/classes/main/streams/crypto/class_NullCryptoStream.php
inc/classes/main/template/class_BaseTemplateEngine.php
inc/classes/main/user/class_BaseUser.php
inc/classes/middleware/class_BaseMiddleware.php
inc/classes/third_party/api/primusportal/class_PrimeraApi.php
inc/classes/third_party/api/wernisportal/class_WernisApi.php
inc/config/class_FrameworkConfiguration.php

index 020a781..cdcec14 100644 (file)
@@ -331,6 +331,7 @@ inc/classes/main/filter/checkboxes/class_RulesAcceptedFilter.php -text
 inc/classes/main/filter/class_ -text
 inc/classes/main/filter/class_AbstractFilterDecorator.php -text
 inc/classes/main/filter/class_BaseFilter.php -text
+inc/classes/main/filter/class_BaseFilterDecorator.php -text
 inc/classes/main/filter/class_FilterChain.php -text
 inc/classes/main/filter/crypto/.htaccess -text
 inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php -text
index 2859d7a..ea2df03 100644 (file)
@@ -8,6 +8,7 @@
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
+ * @todo               Find a better name for this interface
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
index fafb299..ae4a5e6 100644 (file)
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface EncryptableStream extends Streamable {
+       /**
+        * Encrypt the string with fixed salt
+        *
+        * @param       $str            The unencrypted string
+        * @return      $encrypted      Encrypted string
+        */
+       function encryptStream ($str);
+
+       /**
+        * Decrypt the string with fixed salt
+        *
+        * @param       $encrypted      Encrypted string
+        * @return      $str            The unencrypted string
+        */
+       function decryptStream ($encrypted);
 }
 
 //
index bdfccd1..9f6d71f 100644 (file)
@@ -33,10 +33,6 @@ class BaseAction extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 }
 
index 89884cc..bf6ec3e 100644 (file)
@@ -32,10 +32,6 @@ class BaseApplication extends BaseFrameworkSystem {
                // Call parent constructor
                parent::__construct($className);
 
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-
                // Get registry instance
                $registryInstance = Registry::getRegistry();
 
index b6e0076..e302ccb 100644 (file)
@@ -30,10 +30,6 @@ class CookieAuth extends BaseFrameworkSystem implements Authorizeable, Registera
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 1b03c72..da00413 100644 (file)
@@ -35,10 +35,6 @@ class MemoryCache extends BaseFrameworkSystem implements Cacheable {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 23b54ca..992c09f 100644 (file)
@@ -30,10 +30,6 @@ class  extends BaseFrameworkSystem {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 }
 
index d206745..34a47d0 100644 (file)
@@ -31,10 +31,6 @@ class Base??? extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 }
 
index 0b5ce31..9e7f247 100644 (file)
@@ -162,29 +162,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        const EXCEPTION_FILTER_CHAIN_INTERCEPTED     = 0x040;
 
        /**
-        * In the super constructor these system classes shall be ignored or else
-        * we would get an endless calling loop.
-        *
-        *---------------------------------------------------------------------*
-        * ATTENTION: IF YOU REMOVE ONE OF THEM YOU WILL RUN YOUR SERVER IN AN *
-        * ENDLESS LOOP !!!                                                    *
-        *---------------------------------------------------------------------*
-        */
-       private $systemClasses = array(
-               'DebugMiddleware',                              // Debug middleware output sub-system
-               'Registry',                                             // Object registry
-               'ObjectFactory',                                // Object factory
-               'DebugWebOutput',                               // Debug web output sub-system
-               'WebOutput',                                    // Web output sub-system
-               'CompressorChannel',                    // Compressor sub-system
-               'DebugConsoleOutput',                   // Debug console output sub-system
-               'DebugErrorLogOutput',                  // Debug error_log() output sub-system
-               'FrameworkDirectoryPointer',    // Directory handler sub-system
-               'NullCompressor',                               // Null compressor
-               'Bzip2Compressor',                              // BZIP2 compressor
-               'GzipCompressor',                               // GZIP compressor
-       );
-       /**
         * Protected super constructor
         *
         * @param       $className      Name of the class
@@ -274,33 +251,8 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         * @return      void
         */
        private final function initInstance () {
-               // Is this a system class?
-               if (!in_array($this->__toString(), $this->systemClasses)) {
-                       // Set configuration instance
-                       $this->setConfigInstance(FrameworkConfiguration::getInstance());
-
-                       // Add application helper to our class
-                       $this->systemclasses[] = $this->getConfigInstance()->getConfigEntry('app_helper_class');
-
-                       // Set debug instance
-                       $this->setDebugInstance(DebugMiddleware::createDebugMiddleware($this->getConfigInstance()->getConfigEntry('debug_class')));
-
-                       // Get output instance and set it
-                       $outputInstance = ObjectFactory::createObjectByConfiguredName('output_class', array($this->getConfigInstance()->getConfigEntry('web_content_type')));
-                       $this->setWebOutputInstance($outputInstance);
-
-                       // Set the compressor channel
-                       $this->setCompressorChannel(CompressorChannel::createCompressorChannel(
-                               $this->getConfigInstance()->getConfigEntry('base_path').
-                               $this->getConfigInstance()->getConfigEntry('compressor_base_path')
-                       ));
-
-                       // Initialization done! :D
-                       Registry::isInitialized('OK');
-               } elseif ($this->__toString() == 'DebugMiddleware') {
-                       // Set configuration instance
-                       $this->setConfigInstance(FrameworkConfiguration::getInstance());
-               }
+               // Set configuration instance
+               $this->setConfigInstance(FrameworkConfiguration::getInstance());
        }
 
        /**
@@ -591,13 +543,22 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        }
 
        /**
-        * Compare class name of this and given class name
+        * Checks wether an object equals this object. You should overwrite this
+        * method to implement own equality checks
         *
-        * @param               $className      The class name as string from the other class
-        * @return      boolean The result of comparing both class names
+        * @param       $objectInstance         An instance of a FrameworkInterface object
+        * @return      $equals                         Wether both objects equals
         */
-       public final function isClass ($className) {
-               return ($this->__toString() == $className);
+       public function equals (FrameworkInterface $objectInstance) {
+               // Now test it
+               $equals = ((
+                       $this->__toString() == $objectInstance->__toString()
+               ) && (
+                       $this->hashCode() == $objectInstance->hashCode()
+               ));
+
+               // Return the result
+               return $result;
        }
 
        /**
@@ -630,16 +591,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        }
 
        /**
-        * Removes number formating characters
-        *
-        * @return      void
-        */
-       public final function removeNumberFormaters () {
-               unset($this->thousands);
-               unset($this->decimals);
-       }
-
-       /**
         * Private getter for language instance
         *
         * @return      $langInstance   An instance to the language sub-system
@@ -661,15 +612,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        }
 
        /**
-        * Remove the $systemClasses array from memory
-        *
-        * @return      void
-        */
-       public final function removeSystemArray () {
-               unset($this->systemClasses);
-       }
-
-       /**
         * Appends a trailing slash to a string
         *
         * @param       $str            A string (maybe) without trailing slash
@@ -716,7 +658,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         * @throws              NullPointerException    If the discovered application
         *                                                                              instance is still null
         */
-       protected function prepareTemplateInstance (BaseFrameworkSystem $appInstance=null) {
+       protected function prepareTemplateInstance (FrameworkInterface $appInstance=null) {
                // Is the application instance set?
                if (is_null($appInstance)) {
                        // Get the current instance
index 9e1c43e..7839ea0 100644 (file)
@@ -42,10 +42,6 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
                // Call parent constructor
                parent::__construct($className);
 
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-
                // Initialize both filter chains
                $this->initFilterChain('pre');
                $this->initFilterChain('post');
index 6b870c4..67f9918 100644 (file)
@@ -36,10 +36,6 @@ class BaseCriteria extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index c135b18..cbac7d7 100644 (file)
@@ -54,10 +54,6 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index e80a4b8..0fa9de4 100644 (file)
@@ -31,10 +31,6 @@ class  extends BaseDatabaseFrontend {
        protected function __construct($class = __CLASS__) {
                // Call parent constructor
                parent::__construct($class);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 }
 
index 8d999f1..5e7099e 100644 (file)
@@ -43,10 +43,6 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem {
 
                // Initialize the cache instance
                $this->initCacheInstance();
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 2d4929c..d4c45e9 100644 (file)
@@ -86,10 +86,6 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
        protected function __construct() {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 18fd375..4aeb610 100644 (file)
@@ -32,10 +32,6 @@ class ???Discovery extends BaseDiscovery implements Discoverable {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 40c67d8..4429cf6 100644 (file)
@@ -36,10 +36,6 @@ class BaseDiscovery extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 175756e..e2530e8 100644 (file)
@@ -32,10 +32,6 @@ class LocalPaymentDiscovery extends BaseDiscovery implements Discoverable, Regis
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index e897950..5c4187f 100644 (file)
  */
 class BaseFactory extends BaseFrameworkSystem {
        /**
-        * An instance of the real factory class
-        */
-       private $realFactoryInstance = null;
-
-       /**
         * Protected constructor
         *
         * @param       $className      Name of the real class (not BaseFactory)
@@ -36,29 +31,6 @@ class BaseFactory extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-
-       /**
-        * Setter for the *real* factory instance
-        *
-        * @param       $realFactoryInstance    An instance of the real factory class
-        * @return      void
-        */
-       public final function setRealFactoryInstance (BaseFrameworkSystem $realFactoryInstance) {
-               $this->realFactoryInstance = $realFactoryInstance;
-       }
-
-       /**
-        * Getter for the *real* factory instance
-        *
-        * @return      $realFactoryInstance    An instance of the real factory class
-        */
-       protected final function getRealFactoryInstance () {
-               return $this->realFactoryInstance;
        }
 }
 
index 1d739c6..adae8d1 100644 (file)
@@ -1,87 +1,4 @@
 <?php
-/**
- * An abstract filter decorator for decorating filters with other filters
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-abstract class AbstractFilterDecorator extends BaseFrameworkSystem implements Filterable {
-       /**
-        * The decorated filter instance
-        */
-       private $filterInstance = null;
-
-       /**
-        * Protected constructor
-        *
-        * @param       $className      Name of the real class' name
-        * @return      void
-        */
-       protected function __construct ($className) {
-               // Call parent constructor
-               parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-
-       /**
-        * Setter for the decorated filter instance
-        *
-        * @param       $filterInstance         An instance of a filter
-        * @return      void
-        */
-       protected final function setFilterInstance (Filterable $filterInstance) {
-               $this->filterInstance = $filterInstance;
-       }
-
-       /**
-        * Getter for the decorated filter instance
-        *
-        * @return      $filterInstance         An instance of a filter
-        */
-       protected final function getFilterInstance () {
-               return $this->filterInstance;
-       }
-
-       /**
-        * Execute the inner filter
-        *
-        * @param       $requestInstance        An instance of a request class
-        * @param       $responseInstance       An instance of a response class
-        * @return      void
-        */
-       public final function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               $this->getFilterInstance()->execute($requestInstance, $responseInstance);
-       }
-
-
-       /**
-        * Do the execution of the filter
-        *
-        * @param       $requestInstance        An instance of a request class
-        * @param       $responseInstance       An instance of a response class
-        * @return      void
-        */
-       abstract public function doExecute (Requestable $requestInstance, Responseable $responseInstance);
-}
-
-// [EOF]
+// @DEPRECATED
+die("Use BaseFilterDecorator instead.");
 ?>
index 9b9385d..b47bf9c 100644 (file)
@@ -34,10 +34,6 @@ class BaseFilter extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 }
 
diff --git a/inc/classes/main/filter/class_BaseFilterDecorator.php b/inc/classes/main/filter/class_BaseFilterDecorator.php
new file mode 100755 (executable)
index 0000000..57a30ca
--- /dev/null
@@ -0,0 +1,83 @@
+<?php
+/**
+ * A general filter decorator for decorating filters with other filters
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class BaseFilterDecorator extends BaseFrameworkSystem implements Filterable {
+       /**
+        * The decorated filter instance
+        */
+       private $filterInstance = null;
+
+       /**
+        * Protected constructor
+        *
+        * @param       $className      Name of the real class' name
+        * @return      void
+        */
+       protected function __construct ($className) {
+               // Call parent constructor
+               parent::__construct($className);
+       }
+
+       /**
+        * Setter for the decorated filter instance
+        *
+        * @param       $filterInstance         An instance of a filter
+        * @return      void
+        */
+       protected final function setFilterInstance (Filterable $filterInstance) {
+               $this->filterInstance = $filterInstance;
+       }
+
+       /**
+        * Getter for the decorated filter instance
+        *
+        * @return      $filterInstance         An instance of a filter
+        */
+       protected final function getFilterInstance () {
+               return $this->filterInstance;
+       }
+
+       /**
+        * Execute the inner filter
+        *
+        * @param       $requestInstance        An instance of a request class
+        * @param       $responseInstance       An instance of a response class
+        * @return      void
+        */
+       public final function execute (Requestable $requestInstance, Responseable $responseInstance) {
+               $this->getFilterInstance()->execute($requestInstance, $responseInstance);
+       }
+
+
+       /**
+        * Do the execution of the filter
+        *
+        * @param       $requestInstance        An instance of a request class
+        * @param       $responseInstance       An instance of a response class
+        * @return      void
+        */
+       abstract public function doExecute (Requestable $requestInstance, Responseable $responseInstance);
+}
+
+// [EOF]
+?>
index 41fdad2..8b31760 100644 (file)
@@ -35,10 +35,6 @@ class FilterChain extends BaseFrameworkSystem {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index c07ff5b..c79ccf1 100644 (file)
@@ -76,10 +76,6 @@ class BaseHelper extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index e15738f..27d768c 100644 (file)
@@ -89,10 +89,6 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 457c51f..a9b12df 100644 (file)
@@ -48,10 +48,6 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean-up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index d6249db..98fe305 100644 (file)
@@ -38,10 +38,6 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean-up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index f96b361..7f4466c 100644 (file)
@@ -40,10 +40,6 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean-up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index af22866..8ea8a0d 100644 (file)
@@ -38,10 +38,6 @@ class FrameworkFileOutputPointer extends BaseFrameworkSystem {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean-up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 30e9778..867a3af 100644 (file)
@@ -51,10 +51,6 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 08f66fc..76ab283 100644 (file)
@@ -41,10 +41,6 @@ class BaseMailer extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 4c7c18c..2dc8149 100644 (file)
@@ -31,10 +31,6 @@ class BaseMenu extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 }
 
index 1fb9532..0e913d4 100644 (file)
@@ -35,10 +35,6 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 662609a..54150ca 100644 (file)
@@ -30,10 +30,6 @@ class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index c15ee30..ae2d6d6 100644 (file)
@@ -30,10 +30,6 @@ class DefaultNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 55f42ca..341eeba 100644 (file)
@@ -41,10 +41,6 @@ class BaseRegistration extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 075432c..876f7e3 100644 (file)
@@ -46,10 +46,6 @@ class Registry extends BaseFrameworkSystem implements Register {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 9364112..2bc5b05 100644 (file)
@@ -43,10 +43,6 @@ class BaseRequest extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 80ec323..d15ef31 100644 (file)
@@ -41,10 +41,6 @@ class BaseResolver extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index c7990d7..c48d9ef 100644 (file)
@@ -64,10 +64,6 @@ class BaseResponse extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 1140a90..3e8df69 100644 (file)
@@ -64,10 +64,6 @@ class DatabaseResult extends BaseFrameworkSystem implements SearchableResult, Up
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 857478f..760f6f8 100644 (file)
@@ -56,10 +56,6 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
        protected function __construct ($className = __CLASS__) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index e226545..dccae11 100644 (file)
@@ -31,10 +31,6 @@ class BaseStream extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 }
 
index 864a896..33ffdb8 100644 (file)
@@ -45,6 +45,34 @@ class NullCryptoStream extends BaseStream implements EncryptableStream {
                // Return the instance
                return $streamInstance;
        }
+
+       /**
+        * Encrypt the string with fixed salt
+        *
+        * @param       $str            The unencrypted string
+        * @return      $encrypted      Encrypted string
+        */
+       public function encryptStream ($str) {
+               // Just handle it over
+               $encrypted = (string) $str;
+
+               // Return it
+               return $encrypted;
+       }
+
+       /**
+        * Decrypt the string with fixed salt
+        *
+        * @param       $encrypted      Encrypted string
+        * @return      $str            The unencrypted string
+        */
+       function decryptStream ($encrypted) {
+               // Just handle it over
+               $str = (string) $encrypted;
+
+               // Return it
+               return $str;
+       }
 }
 
 // [EOF]
index 19e0643..71d3bb2 100644 (file)
@@ -145,10 +145,6 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 60ed235..5de1249 100644 (file)
@@ -51,10 +51,6 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index a404f9b..e098bd1 100644 (file)
@@ -31,10 +31,6 @@ class BaseMiddleware extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 }
 
index 1f7036e..5e65150 100644 (file)
@@ -125,17 +125,13 @@ class PrimeraApi extends BaseFrameworkSystem {
                // Call parent constructor
                parent::__construct();
 
-               // Clean up a little
-               $this->removeSystemArray();
-               $this->removeNumberFormaters();
-
                // Set data (DEPRECATED!)
                $this->username = $PPUsername;
                $this->password = $PPPassword;
        }
 
        /**
-        * Anfrage senden und Rückgabecode in Variable speichern
+        * Anfrage senden und Rueckgabecode in Variable speichern
         */
        function queryApi ( $data = array() ) {
                $fp = fsockopen($this->host, 80, $this->errno, $this->_err);
@@ -144,7 +140,7 @@ class PrimeraApi extends BaseFrameworkSystem {
                $data["PrimusInterface_Username"] = base64_encode($this->username);
                $data["PrimusInterface_Password"] = base64_encode(md5($this->password));
 
-               // POST-Daten übermitteln:
+               // POST-Daten uebermitteln:
                $data = http_build_query($data, '', '&');
 
                fputs($fp, "POST {$this->path}HTTP/1.1\r\n");
index 4fe08f4..9ea8e54 100644 (file)
@@ -70,10 +70,6 @@ class WernisApi extends BaseFrameworkSystem {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
index 283ad69..c96e851 100644 (file)
@@ -163,7 +163,7 @@ class FrameworkConfiguration implements Registerable {
                if (empty($cfgEntry)) {
                        // Entry is empty
                        throw new ConfigEntryIsEmptyException($this, self::EXCEPTION_CONFIG_ENTRY_IS_EMPTY);
-               } elseif (!$this->isConfigEntrySet($cfgEntry)) {
+               } elseif (!$this->isConfigurationEntrySet($cfgEntry)) {
                        // Entry was not found!
                        throw new ConfigEntryNotFoundException(array(__CLASS__, $cfgEntry), self::EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND);
                }