]> git.mxchange.org Git - core.git/commitdiff
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 020a78108c6e5626597b9d62070cda57afaf6a7f..cdcec144e92bd15ff5fd39b07ed11ab845fa279a 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 2859d7a3489bea85bfe4607e2dadb5d7d7ce8bbe..ea2df039f83770441b7565385054b03f504d7cfb 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 fafb299a58780fc7fdfd89e83636ab2025a52fcd..ae4a5e69d08e43dd61417cb688a2ff9fcf583a77 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 bdfccd1dac00521502022881648e9f7c920959a2..9f6d71fa27c75dedb62ca3e8d9ce49880942831d 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 89884cc30cc2dffc1d4c10fa850b077e504af49d..bf6ec3e0bcf7655d7010d71f3bd89a6ee2653a0a 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 b6e00764769526a54ea5dac03cbccc387091d300..e302ccb23d6bd61935ac91aa79fe481c22628011 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 1b03c72311fe583f39c0d0069c053740a1e2fa36..da004138ed9f0216082c2a4afea1d9124c13cc3d 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 23b54cab72a89af81342f84da822115fd39d6b23..992c09fbdbeffdbc95369a74ac03e1bde4fea968 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 d206745235e40ccd71c38b86f5b356ca0dc266bb..34a47d02dcf2c09947613c44a83340c5c9450b51 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 0b5ce31099294001468444eda7f8daac25122f09..9e7f247b4bf131264ce6c8e6a7dc0d0ae20a9b55 100644 (file)
@@ -161,29 +161,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        const EXCEPTION_DATABASE_UPDATED_NOT_ALLOWED = 0x039;
        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
         *
@@ -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;
        }
 
        /**
@@ -629,16 +590,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                return $price;
        }
 
-       /**
-        * Removes number formating characters
-        *
-        * @return      void
-        */
-       public final function removeNumberFormaters () {
-               unset($this->thousands);
-               unset($this->decimals);
-       }
-
        /**
         * Private getter for language instance
         *
@@ -660,15 +611,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                Registry::getRegistry()->addInstance('language', $langInstance);
        }
 
-       /**
-        * Remove the $systemClasses array from memory
-        *
-        * @return      void
-        */
-       public final function removeSystemArray () {
-               unset($this->systemClasses);
-       }
-
        /**
         * Appends a trailing slash to a string
         *
@@ -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 9e1c43e0b419c51f9a2744df22a6a50c552972ef..7839ea02dda3c72391101c3c5bf63d7cafda022c 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 6b870c4150f842d809903205e475e7ef15b60de8..67f9918e463242b059ad9e0c053d25bee8780aaa 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 c135b18971cdf4bb0f75d154d24d5c212765b678..cbac7d7b19c641db64f24128b09abe2f007f0f21 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 e80a4b8a97b376cd74cbcea97655a3aa7f372d7b..0fa9de49bc659177814300e412142c3e11869b3b 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 8d999f13b3ffb6fd6824655562fb2480646abf76..5e7099e73490316f48fe9b9cc0df58e65b16bac8 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 2d4929c80273157a75fa9b143d66484711c2e270..d4c45e972eaa9b04c03f8de6b5e3fcc190597c26 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 18fd375c797c78fe881b4961278964793485bef5..4aeb610f9d4829d12bfa050b0c8d170f8cf437cc 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 40c67d8db375f4d5a6cf1e0b3a8d4cfae71f1739..4429cf68819174f05a5f47cdee5445d2d4c1015d 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 175756ea2cd39e13d573d8eea50e9fefd05c137e..e2530e81e0b675ba8321ae1da7db48080d3519db 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 e897950fcd74f25d8a7c7d0ccd4f4431a66defde..5c4187f9d854ba87ac42a97599b37d7c9eaba724 100644 (file)
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class BaseFactory extends BaseFrameworkSystem {
-       /**
-        * An instance of the real factory class
-        */
-       private $realFactoryInstance = null;
-
        /**
         * Protected constructor
         *
@@ -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 1d739c6b8af0b4e6fac6b87351ee64d755e42e9f..adae8d1998d4e0fce2a1b1709d0e0617aead0b21 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 9b9385d8d7b9bc2af0570b3b1488db905308043a..b47bf9c9965a66f00874f766bea5957c5ac0fa27 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 41fdad226c77535c7ba8a8ee60fe55ca6e2fe409..8b31760dc0d298bb61726a47b33d1ed2a9927b74 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 c07ff5bbf945c577d4bbe420c165aca3aee41671..c79ccf14b82907ff25ee3dae3397ed611a4f5fdd 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 e15738f422be1b85f483a836bcf06baf48c01dc4..27d768cc5ac5b5cf86c8aa3f440d330102895194 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 457c51f6d155782c8fddb55320fd2616d1bdf736..a9b12dfe876d21b7836f715f5dde3c1c7cf4eb91 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 d6249dbb72c1585c2ef33f0030273123a3e2daa2..98fe305abe1bfd7f8a33e5f759efa6d79c16bf06 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 f96b36152818081279746061728bab1ea1bbb4db..7f4466cea10ccb407f36d84d7e16e272d2469c7c 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 af2286605ab2bb4e6889e201f7b00dee6619fdca..8ea8a0d189dba6f7e07539ead08f5e13019f8c04 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 30e97786dc686a6f9ac75e123104bae1353ee391..867a3af7ef9c4120fead33df8df10e57f574908e 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 08f66fc4cf56563d4d777be4b0a43caff6a20a1a..76ab283686d96130ac20dbdfa40354664ffded74 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 4c7c18c025a8d68e48c946cbb120a784a3f3c354..2dc81496736bd87562d263955fd552d6fbb6e3cd 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 1fb953268b8303693f7af557df7773240311e012..0e913d4e88d2232dbad9d75ab7eea435d63bb4c6 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 662609a8267a3899cbae80973368c313b950355a..54150ca71e1d6194b73b709037203a917fb05dae 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 c15ee30a5ab61af2b62e0d9c19a6b92e76255592..ae2d6d67ce0e64d760da5cecc752a97ee8b92316 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 55f42cab9fd15f902704959fcfacd8c5b9545ee6..341eeba61e457032fa3050f2c1c12a3e3e83d03a 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 075432c05ff10bfef6fbdb966db99a7c719b885b..876f7e380edb6d5be4cbb2a8fea963d6aae70cad 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 9364112c5b31c22a7881a593f6a64c8b36b89ce2..2bc5b0599fd4cb5b81535a14ca65a6d0a87e692d 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 80ec323ccc5b007403dc9316fe334ff1dab998ca..d15ef3108cb0ba5d43d9ddb23090819c94a1d3ef 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 c7990d7f08315223f3671724473508e2040cff6b..c48d9efccf25ae5f85590685e4e8eb92773eed9b 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 1140a90e4791c6de26c294c3b05e0f4ae9b4a1ac..3e8df6993a27995977c22f0276629aa090fcb781 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 857478fb61069df8fc1ac2fd0064940820f60a2d..760f6f87d4d40c70a559403f8fd003e9fb642d76 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 e226545a11863b7596788345d1b1c0ea5d064e2e..dccae1151bd16a00332f78bbbf41f6b930192b38 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 864a896a106d8f30bba7ba6f89993b7b67251aa7..33ffdb82a4f860dbc4c82a8c52d9fea234a3b5d5 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 19e06431c0600b5d99f2af2929ff7f451da4bb4f..71d3bb2c23231ca265ab5d30bc061d3bff042a93 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 60ed235556800cbdd19c8442487a15254b6fd379..5de1249a2781c0aa2ce2af4d7ece77ffa3e8f9fd 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 a404f9bf0b15db585a52f211446729941684e208..e098bd12e7a2fd401e53bc432a8d7203e0473fa8 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 1f7036e935da2eff22abf71c1bb44e64ef931463..5e65150063802f4708ace184a2f5a763dfe9d173 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 4fe08f45b5f90828b883aeba4253e54ac735916d..9ea8e54b01be8d70695225e4b88834f0a6a9820f 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 283ad69a95b8cd8333345a77a2e519d9e2f65a79..c96e851961f113ab1b420f4f95a94635f08b1077 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);
                }