Copyright upgraded to 2010

[core.git] / inc / classes / main / filter / crypto / class_CaptchaEncryptFilter.php

diff --git a/inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php b/inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php
index 3a20eb2929e248358629cb47a37f7e704f8dec07..0c47850d421a531a7fc6439f6de59f2d0f4358c5 100644 (file)
--- a/inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php
+++ b/inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -35,16 +35,12 @@ class CaptchaEncryptFilter extends BaseFilter implements Filterable {
        /**
         * Creates an instance of this filter class
         *
-        * @param       $controllerInstance             An instance of a Controller class
         * @return      $filterInstance                 An instance of this filter class
         */
-       public final static function createCaptchaEncryptFilter (Controller $controllerInstance) {
+       public final static function createCaptchaEncryptFilter () {
                // Get a new instance
                $filterInstance = new CaptchaEncryptFilter();
 
-               // Set the controller
-               $filterInstance->setControllerInstance($controllerInstance);
-
                // Return the instance
                return $filterInstance;
        }
@@ -71,13 +67,13 @@ class CaptchaEncryptFilter extends BaseFilter implements Filterable {
                } // END - if
 
                // Decode it fully
-               $encryptDecoded = base64_decode(str_replace(" ", "+", urldecode($encryptRequest)));
+               $encryptDecoded = base64_decode(str_replace(' ', '+', urldecode($encryptRequest)));
 
                // Get a crypto helper and decrypt the string
                $decryptedString = ObjectFactory::createObjectByConfiguredName('crypto_class')->decryptString($encryptDecoded);
 
                // Is it the expected length?
-               if (strlen($decryptedString) != $this->getConfigInstance()->readConfig('captcha_string_length')) {
+               if (strlen($decryptedString) != $this->getConfigInstance()->getConfigEntry('captcha_string_length')) {
                        // Not found, so request is invalid
                        $requestInstance->requestIsValid(false);