Filter classes now ends with _filter in config entry

diff --git a/application/blog/config.php b/application/blog/config.php
index f06094d50d4d7f8c46ed6a789dac134e63da7f90..23358796e1270f48d8cf04dba909fa65d9037f7d 100644 (file)
--- a/application/blog/config.php
+++ b/application/blog/config.php
@@ -127,35 +127,35 @@ $cfg->setConfigEntry('login_default_action', "welcome");
 // CFG: NEWS-READER-CLASS
 $cfg->setConfigEntry('news_reader_class', "DefaultNewsReader");
 
 // CFG: NEWS-READER-CLASS
 $cfg->setConfigEntry('news_reader_class', "DefaultNewsReader");
 

-// CFG: NEWS-DOWNLOAD-CLASS
-$cfg->setConfigEntry('news_download_class', "NewsDownloadFilter");
+// CFG: NEWS-DOWNLOAD-FILTER
+$cfg->setConfigEntry('news_download_filter', "NewsDownloadFilter");

 
 

-// CFG: NEWS-PROCESS-CLASS
-$cfg->setConfigEntry('news_process_class', "NewsProcessFilter");
+// CFG: NEWS-PROCESS-FILTER
+$cfg->setConfigEntry('news_process_filter', "NewsProcessFilter");

 
 

-// CFG: USER-AUTH-CLASS
-$cfg->setConfigEntry('user_auth_class', "UserAuthFilter");
+// CFG: USER-AUTH-FILTER
+$cfg->setConfigEntry('user_auth_filter', "UserAuthFilter");

 
 

-// CFG: USER-UPDATE-CLASS
-$cfg->setConfigEntry('user_update_class', "UserUpdateFilter");
+// CFG: USER-UPDATE-FILTER
+$cfg->setConfigEntry('user_update_filter', "UserUpdateFilter");

 
 

-// CFG: USER-STATUS-CONFIRMED-CLASS
-$cfg->setConfigEntry('user_status_confirmed_class', "UserStatusConfimedUpdateFilter");
+// CFG: USER-STATUS-CONFIRMED-FILTER
+$cfg->setConfigEntry('user_status_confirmed_filter', "UserStatusConfimedUpdateFilter");

 
 

-// CFG: CAPTCHA-ENCRYPT-VALIDATOR-CLASS
-$cfg->setConfigEntry('captcha_encrypt_validator_class', "CaptchaEncryptFilter");
+// CFG: CAPTCHA-ENCRYPT-VALIDATOR-FILTER
+$cfg->setConfigEntry('captcha_encrypt_validator_filter', "CaptchaEncryptFilter");

 
 

-// CFG: CAPTCHA-GUEST-VERIFIER-CLASS
-$cfg->setConfigEntry('captcha_guest_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-GUEST-VERIFIER-FILTER
+$cfg->setConfigEntry('captcha_guest_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CAPTCHA-USER-VERIFIER-CLASS
-$cfg->setConfigEntry('captcha_user_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-USER-VERIFIER-FILTER
+$cfg->setConfigEntry('captcha_user_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CAPTCHA-REGISTER-VERIFIER-CLASS
-$cfg->setConfigEntry('captcha_register_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-REGISTER-VERIFIER-FILTER
+$cfg->setConfigEntry('captcha_register_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CONFIRM-CODE-VALIDATOR-CLASS
-$cfg->setConfigEntry('confirm_code_verifier_class', "ConfirmCodeVerifierFilter");
+// CFG: CONFIRM-CODE-VALIDATOR-FILTER
+$cfg->setConfigEntry('confirm_code_verifier_filter', "ConfirmCodeVerifierFilter");

 
 // CFG: NEWS-HOME-LIMIT
 $cfg->setConfigEntry('news_home_limit', 10);
 
 // CFG: NEWS-HOME-LIMIT
 $cfg->setConfigEntry('news_home_limit', 10);

diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php
index f2dc84a7311632111053db85df431af50802ae4b..6e60c09bed3579f4da10a8e64828c6a0242c13f1 100644 (file)
--- a/application/ship-simu/config.php
+++ b/application/ship-simu/config.php
@@ -127,44 +127,44 @@ $cfg->setConfigEntry('login_default_action', "welcome");
 // CFG: NEWS-READER-CLASS
 $cfg->setConfigEntry('news_reader_class', "DefaultNewsReader");
 
 // CFG: NEWS-READER-CLASS
 $cfg->setConfigEntry('news_reader_class', "DefaultNewsReader");
 

-// CFG: NEWS-DOWNLOAD-CLASS
-$cfg->setConfigEntry('news_download_class', "NewsDownloadFilter");
+// CFG: NEWS-DOWNLOAD-FILTER
+$cfg->setConfigEntry('news_download_filter', "NewsDownloadFilter");

 
 

-// CFG: NEWS-PROCESS-CLASS
-$cfg->setConfigEntry('news_process_class', "NewsProcessFilter");
+// CFG: NEWS-PROCESS-FILTER
+$cfg->setConfigEntry('news_process_filter', "NewsProcessFilter");

 
 

-// CFG: USER-AUTH-CLASS
-$cfg->setConfigEntry('user_auth_class', "UserAuthFilter");
+// CFG: USER-AUTH-FILTER
+$cfg->setConfigEntry('user_auth_filter', "UserAuthFilter");

 
 

-// CFG: USER-UPDATE-CLASS
-$cfg->setConfigEntry('user_update_class', "UserUpdateFilter");
+// CFG: USER-UPDATE-FILTER
+$cfg->setConfigEntry('user_update_filter', "UserUpdateFilter");

 
 

-// CFG: USER-STATUS-CONFIRMED-CLASS
-$cfg->setConfigEntry('user_status_confirmed_class', "UserStatusConfimedUpdateFilter");
+// CFG: USER-STATUS-CONFIRMED-FILTER
+$cfg->setConfigEntry('user_status_confirmed_filter', "UserStatusConfimedUpdateFilter");

 
 

-// CFG: CAPTCHA-ENCRYPT-VALIDATOR-CLASS
-$cfg->setConfigEntry('captcha_encrypt_validator_class', "CaptchaEncryptFilter");
+// CFG: CAPTCHA-ENCRYPT-VALIDATOR-FILTER
+$cfg->setConfigEntry('captcha_encrypt_validator_filter', "CaptchaEncryptFilter");

 
 

-// CFG: REFILL-REQUEST-VALIDATOR-CLASS
-$cfg->setConfigEntry('refill_request_validator_class', "RefillRequestValidatorFilter");
+// CFG: REFILL-REQUEST-VALIDATOR-FILTER
+$cfg->setConfigEntry('refill_request_validator_filter', "RefillRequestValidatorFilter");

 
 

-// CFG: CAPTCHA-GUEST-VERIFIER-CLASS
-$cfg->setConfigEntry('captcha_guest_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-GUEST-VERIFIER-FILTER
+$cfg->setConfigEntry('captcha_guest_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CAPTCHA-USER-VERIFIER-CLASS
-$cfg->setConfigEntry('captcha_user_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-USER-VERIFIER-FILTER
+$cfg->setConfigEntry('captcha_user_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CAPTCHA-REGISTER-VERIFIER-CLASS
-$cfg->setConfigEntry('captcha_register_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-REGISTER-VERIFIER-FILTER
+$cfg->setConfigEntry('captcha_register_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CAPTCHA-REFILL-VERFIER-CLASS
-$cfg->setConfigEntry('captcha_refill_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-REFILL-VERFIER-FILTER
+$cfg->setConfigEntry('captcha_refill_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CONFIRM-CODE-VALIDATOR-CLASS
-$cfg->setConfigEntry('confirm_code_verifier_class', "ConfirmCodeVerifierFilter");
+// CFG: CONFIRM-CODE-VALIDATOR-FILTER
+$cfg->setConfigEntry('confirm_code_verifier_filter', "ConfirmCodeVerifierFilter");

 
 // CFG: REFILL-PAGE-FILTER
 
 // CFG: REFILL-PAGE-FILTER

-$cfg->setConfigEntry('refill_page_class', "RefillPageFilter");
+$cfg->setConfigEntry('refill_page_filter', "RefillPageFilter");

 
 // CFG: NEWS-HOME-LIMIT
 $cfg->setConfigEntry('news_home_limit', 10);
 
 // CFG: NEWS-HOME-LIMIT
 $cfg->setConfigEntry('news_home_limit', 10);

diff --git a/application/ship-simu/main/actions/web/class_WebLoginCompanyAction.php b/application/ship-simu/main/actions/web/class_WebLoginCompanyAction.php
index 9cce441c861195ec8b76eb44bff261d748ed36f5..edc7e19713cdb095e7f9cad1b0f7284580b44430 100644 (file)
--- a/application/ship-simu/main/actions/web/class_WebLoginCompanyAction.php
+++ b/application/ship-simu/main/actions/web/class_WebLoginCompanyAction.php
@@ -70,7 +70,7 @@ class WebLoginCompanyAction extends BaseAction implements Commandable, Registera
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user status filter here
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user status filter here

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));

        }
 }
 
        }
 }
 

diff --git a/application/ship-simu/main/actions/web/class_WebLoginRefillAction.php b/application/ship-simu/main/actions/web/class_WebLoginRefillAction.php
index 543d3fe3313706a0347c28924515bea65d5c8376..3120fac0c00aa89023e2ff8b4ae281c923396a0a 100644 (file)
--- a/application/ship-simu/main/actions/web/class_WebLoginRefillAction.php
+++ b/application/ship-simu/main/actions/web/class_WebLoginRefillAction.php
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
  * 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 WebLoginMoneyRefillAction extends BaseAction implements Commandable, Registerable {
+class WebLoginRefillAction extends BaseAction implements Commandable, Registerable {

        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *


@@ -38,9 +38,9 @@ class WebLoginMoneyRefillAction extends BaseAction implements Commandable, Regis
         * @param       $resolverInstance       An instance of an action resolver
         * @return      $actionInstance         An instance of this action class
         */
         * @param       $resolverInstance       An instance of an action resolver
         * @return      $actionInstance         An instance of this action class
         */

-       public final static function createWebLoginMoneyRefillAction (ActionResolver $resolverInstance) {
+       public final static function createWebLoginRefillAction (ActionResolver $resolverInstance) {

                // Get a new instance
                // Get a new instance

-               $actionInstance = new WebLoginMoneyRefillAction();
+               $actionInstance = new WebLoginRefillAction();

 
                // Set the resolver instance
                $actionInstance->setResolverInstance($resolverInstance);
 
                // Set the resolver instance
                $actionInstance->setResolverInstance($resolverInstance);


@@ -70,10 +70,10 @@ class WebLoginMoneyRefillAction extends BaseAction implements Commandable, Regis
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user status filter here
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user status filter here

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));

 
                // Is the refill page active?
 
                // Is the refill page active?

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_page_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_page_filter'));

        }
 }
 
        }
 }
 

diff --git a/application/ship-simu/main/commands/web/class_WebRefillFormCommand.php b/application/ship-simu/main/commands/web/class_WebRefillFormCommand.php
index 625db1d8772a9a46dbf776858a35edd578641c92..25869cf249f0c39811760840d886979d6b198f15 100644 (file)
--- a/application/ship-simu/main/commands/web/class_WebRefillFormCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebRefillFormCommand.php
@@ -74,19 +74,19 @@ class WebRefillFormCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user auth filter (we don't need an update of the user here because it will be redirected)
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user auth filter (we don't need an update of the user here because it will be redirected)

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter'));

 
                // Add user status filter here
 
                // Add user status filter here

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));

 
                // Is the refill page active?
 
                // Is the refill page active?

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_page_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_page_filter'));

 
                // Verify CAPTCHA code
 
                // Verify CAPTCHA code

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_refill_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_refill_verifier_filter'));

 
                // Verify refill request
 
                // Verify refill request

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_request_validator_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_request_validator_filter'));

        }
 }
 
        }
 }
 

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php
index b7f99246be5a3068a77d2ac580aba3271185786f..4a41fd954adc948bfbf31ddda64bd4619ac0ac74 100644 (file)
--- a/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php
@@ -98,13 +98,13 @@ class WebShipsimuGuestLoginCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add username verifier filter
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add username verifier filter

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_guest_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_guest_verifier_filter'));

 
                // Add password verifier filter
 
                // Add password verifier filter

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('passwd_guest_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('passwd_guest_verifier_filter'));

 
                // Add CAPTCHA verifier code
 
                // Add CAPTCHA verifier code

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_guest_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_guest_verifier_filter'));

        }
 }
 
        }
 }
 

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php
index 1bb449a5e025c75c4d7ab6de6bfbf30a3158ba3b..a9c652e0237ebd448a997bcbca3b06b6fb3cd1ba 100644 (file)
--- a/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php
@@ -122,22 +122,22 @@ class WebShipsimuProfileCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user auth filter (we don't need an update of the user here because it will be redirected)
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user auth filter (we don't need an update of the user here because it will be redirected)

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter'));

 
                // User status filter
 
                // User status filter

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));

 
                // Updated rules accepted
 
                // Updated rules accepted

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_filter'));

 
                // Account password validation
 
                // Account password validation

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('account_password_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('account_password_filter'));

 
                // Email changed
 
                // Email changed

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_change_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_change_filter'));

 
                // Password changed
 
                // Password changed

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_change_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_change_filter'));

        }
 }
 
        }
 }
 

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
index a6afca66befcfdcf1aaecca27fe326636c9f1cb9..56072d6df9f1b98e99637aec709a4e31ad6610e8 100644 (file)
--- a/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
@@ -95,22 +95,22 @@ class WebShipsimuRegisterCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Validate email address (if configured: check on double email addresses)
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Validate email address (if configured: check on double email addresses)

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_filter'));

 
                // Validate username and check if it does not exist
 
                // Validate username and check if it does not exist

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_validator_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_validator_filter'));

 
                // Validate if username is "guest" and not taken
 
                // Validate if username is "guest" and not taken

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_is_guest_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_is_guest_filter'));

 
                // Validate if password is set
 
                // Validate if password is set

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_validator_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_validator_filter'));

 
                // Check if rules where accepted
 
                // Check if rules where accepted

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_filter'));

 
                // Validate CAPTCHA input
 
                // Validate CAPTCHA input

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_register_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_register_verifier_filter'));

        }
 }
 
        }
 }
 

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
index 83ba7da6d383480f1740e9232971e7b5da88fad6..51e3bab5ecc1cf8b8812795ac8409b65b4f9c608 100644 (file)
--- a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
@@ -100,23 +100,23 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable {
                // Which login type do we have?
                switch ($this->getConfigInstance()->readConfig('login_type')) {
                        case "username": // Login via username
                // Which login type do we have?
                switch ($this->getConfigInstance()->readConfig('login_type')) {
                        case "username": // Login via username

-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_class'));
+                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter'));

                                break;
 
                        case "email": // Login via email
                                break;
 
                        case "email": // Login via email

-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_class'));
+                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_filter'));

                                break;
 
                        default: // Wether username or email is set
                                break;
 
                        default: // Wether username or email is set

-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_class'));
+                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_filter'));

                                break;
                }
 
                // Password verifier filter
                                break;
                }
 
                // Password verifier filter

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_filter'));

 
                // Add filter for CAPTCHA
 
                // Add filter for CAPTCHA

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter'));

        }
 }
 
        }
 }
 

diff --git a/application/ship-simu/templates/de/code/block_persona_data.ctp b/application/ship-simu/templates/de/code/block_persona_data.ctp
index ec843fd1fc3427d0f4278d67d99324fb11ac28c0..def6835801782bef41271f64e3d33addf87ab030 100644 (file)
--- a/application/ship-simu/templates/de/code/block_persona_data.ctp
+++ b/application/ship-simu/templates/de/code/block_persona_data.ctp
@@ -11,14 +11,14 @@ $helperInstance->flushContent();
 // End of PHP commands
 ?>
 <div class="user_name_div">
 // End of PHP commands
 ?>
 <div class="user_name_div">

-       Spielername: <span class="user_name">{?block_username?}</span>
+       Spielername: <span id="user_name">{?block_username?}</span>

 </div>
 <div class="user_status_div">
 </div>
 <div class="user_status_div">

-       Spielerstatus: <span class="user_status">{?block_user_status?}</span>
+       Spielerstatus: <span id="user_status">{?block_user_status?}</span>

 </div>
 <div class="user_profile_div">
        {?profile_link?}
 </div>
 <div class="user_registered_div">
 </div>
 <div class="user_profile_div">
        {?profile_link?}
 </div>
 <div class="user_registered_div">

-       Angemeldet seit: <span class="registered">{?block_registered?}</span>
+       Angemeldet seit: <span id="registered">{?block_registered?}</span>

 </div>
 </div>

diff --git a/application/shoutbox/config.php b/application/shoutbox/config.php
index 8bba746b8c6a063bb0318d2eb469749e3459f296..fa898c037c40e4693f8a4e9ebf003336a9bee38b 100644 (file)
--- a/application/shoutbox/config.php
+++ b/application/shoutbox/config.php
@@ -127,35 +127,35 @@ $cfg->setConfigEntry('login_default_action', "welcome");
 // CFG: NEWS-READER-CLASS
 $cfg->setConfigEntry('news_reader_class', "DefaultNewsReader");
 
 // CFG: NEWS-READER-CLASS
 $cfg->setConfigEntry('news_reader_class', "DefaultNewsReader");
 

-// CFG: NEWS-DOWNLOAD-CLASS
-$cfg->setConfigEntry('news_download_class', "NewsDownloadFilter");
+// CFG: NEWS-DOWNLOAD-FILTER
+$cfg->setConfigEntry('news_download_filter', "NewsDownloadFilter");

 
 

-// CFG: NEWS-PROCESS-CLASS
-$cfg->setConfigEntry('news_process_class', "NewsProcessFilter");
+// CFG: NEWS-PROCESS-FILTER
+$cfg->setConfigEntry('news_process_filter', "NewsProcessFilter");

 
 

-// CFG: USER-AUTH-CLASS
-$cfg->setConfigEntry('user_auth_class', "UserAuthFilter");
+// CFG: USER-AUTH-FILTER
+$cfg->setConfigEntry('user_auth_filter', "UserAuthFilter");

 
 

-// CFG: USER-UPDATE-CLASS
-$cfg->setConfigEntry('user_update_class', "UserUpdateFilter");
+// CFG: USER-UPDATE-FILTER
+$cfg->setConfigEntry('user_update_filter', "UserUpdateFilter");

 
 

-// CFG: USER-STATUS-CONFIRMED-CLASS
-$cfg->setConfigEntry('user_status_confirmed_class', "UserStatusConfimedUpdateFilter");
+// CFG: USER-STATUS-CONFIRMED-FILTER
+$cfg->setConfigEntry('user_status_confirmed_filter', "UserStatusConfimedUpdateFilter");

 
 

-// CFG: CAPTCHA-ENCRYPT-VALIDATOR-CLASS
-$cfg->setConfigEntry('captcha_encrypt_validator_class', "CaptchaEncryptFilter");
+// CFG: CAPTCHA-ENCRYPT-VALIDATOR-FILTER
+$cfg->setConfigEntry('captcha_encrypt_validator_filter', "CaptchaEncryptFilter");

 
 

-// CFG: CAPTCHA-GUEST-VERIFIER-CLASS
-$cfg->setConfigEntry('captcha_guest_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-GUEST-VERIFIER-FILTER
+$cfg->setConfigEntry('captcha_guest_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CAPTCHA-USER-VERIFIER-CLASS
-$cfg->setConfigEntry('captcha_user_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-USER-VERIFIER-FILTER
+$cfg->setConfigEntry('captcha_user_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CAPTCHA-REGISTER-VERIFIER-CLASS
-$cfg->setConfigEntry('captcha_register_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-REGISTER-VERIFIER-FILTER
+$cfg->setConfigEntry('captcha_register_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CONFIRM-CODE-VALIDATOR-CLASS
-$cfg->setConfigEntry('confirm_code_verifier_class', "ConfirmCodeVerifierFilter");
+// CFG: CONFIRM-CODE-VALIDATOR-FILTER
+$cfg->setConfigEntry('confirm_code_verifier_filter', "ConfirmCodeVerifierFilter");

 
 // CFG: NEWS-HOME-LIMIT
 $cfg->setConfigEntry('news_home_limit', 10);
 
 // CFG: NEWS-HOME-LIMIT
 $cfg->setConfigEntry('news_home_limit', 10);

diff --git a/application/shoutbox/templates/de/code/action_login_logout.ctp b/application/shoutbox/templates/de/code/action_login_logout.ctp
index 4dd47d9625b7e7058e423d627a6874e74620beed..fcf3d4512159522b1ace8f03dfd77d1a20a3f589 100644 (file)
--- a/application/shoutbox/templates/de/code/action_login_logout.ctp
+++ b/application/shoutbox/templates/de/code/action_login_logout.ctp
@@ -21,7 +21,7 @@ $helper->flushContent();
 ?>
 <div id="logout_box">
        <div id="logout_header">
 ?>
 <div id="logout_box">
        <div id="logout_header">

-               Willst du dich wirklich aus dem Blog aussloggen?
+               Willst du dich wirklich aus der Shoutbox aussloggen?

        </div>
 
        <div id="logout_links">
        </div>
 
        <div id="logout_links">

diff --git a/application/shoutbox/templates/de/code/action_login_profile.ctp b/application/shoutbox/templates/de/code/action_login_profile.ctp
index 1718da2d928b703e41a565e2f69112a416078b20..3babf81a1da54141478bf0b9da52d5d6522d8b79 100644 (file)
--- a/application/shoutbox/templates/de/code/action_login_profile.ctp
+++ b/application/shoutbox/templates/de/code/action_login_profile.ctp
@@ -28,7 +28,7 @@ if ($helper->ifEmailChangeAllowed()) {
        $helper->addInputTextField('email2');
 
        if ($helper->ifEmailMustBeUnique()) {
        $helper->addInputTextField('email2');
 
        if ($helper->ifEmailMustBeUnique()) {

-               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Blog verwendet worden sein.");
+               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal in der Shoutbox verwendet worden sein.");

        } // END - Unique email addresses
 
        if ($helper->ifEmailChangeRequireConfirmation()) {
        } // END - Unique email addresses
 
        if ($helper->ifEmailChangeRequireConfirmation()) {


@@ -88,11 +88,11 @@ if (!$helper->ifRegisterRequiresEmailVerification()) {
 
 // Rules already accepted?
 if ($helper->ifRulesHaveChanged()) {
 
 // Rules already accepted?
 if ($helper->ifRulesHaveChanged()) {

-       $helper->addFormGroup('rules', "Bitte lese dir die Blogeregeln gut durch und kreuze dann "Ja, ich akzeptiere die aktuellen Blogregeln" an.");
-       $helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Blogregeln:");
+       $helper->addFormGroup('rules', "Bitte lese dir die Shoutbox-Regeln gut durch und kreuze dann "Ja, ich akzeptiere die aktuellen Shoutbox-Regeln" an.");
+       $helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Shoutbox-Regeln:");

        $helper->addInputCheckboxField('rules', false);
 } else {
        $helper->addInputCheckboxField('rules', false);
 } else {

-       $helper->addFormNote('rules_accepted', "Du hast die aktuellen Blogregeln akzeptiert. Vielen Dank!");
+       $helper->addFormNote('rules_accepted', "Du hast die aktuellen Shoutbox-Regeln akzeptiert. Vielen Dank!");

        $helper->addInputHiddenField('rules', "1");
 }
 
        $helper->addInputHiddenField('rules', "1");
 }
 

diff --git a/application/shoutbox/templates/de/code/confirm_link.ctp b/application/shoutbox/templates/de/code/confirm_link.ctp
index eaf8060723cffd9ef4f039766c40bdaa0946b820..a399741e3af6e3fa26556764bcbe5c4239601f85 100644 (file)
--- a/application/shoutbox/templates/de/code/confirm_link.ctp
+++ b/application/shoutbox/templates/de/code/confirm_link.ctp
@@ -16,8 +16,8 @@ $helper->flushContent();
 
 <div id="content_body">
        Hallo <span class="data_username">{?username?}</span>! Du hast heute deine
 
 <div id="content_body">
        Hallo <span class="data_username">{?username?}</span>! Du hast heute deine

-       Email-Addresse best&auml;tigt, wodurch alle Blogfunktionen entsperrt
-       worden sind. Viel Spass beim Bloggen!
+       Email-Addresse best&auml;tigt, wodurch alle Shoutbox-Funktionen entsperrt
+       worden sind. Viel Spass beim Chatten!

 </div>
 
 <div id="content_footer">
 </div>
 
 <div id="content_footer">

diff --git a/application/shoutbox/templates/de/code/home.ctp b/application/shoutbox/templates/de/code/home.ctp
index 67db51ca5f132d9f0b85f2d6336b1f30b65f417f..51644c286b787b7ca171142c4c63c17eb3b3c652 100644 (file)
--- a/application/shoutbox/templates/de/code/home.ctp
+++ b/application/shoutbox/templates/de/code/home.ctp
@@ -1,3 +1,3 @@
 <div id="content_header">
 <div id="content_header">

-       Willkommen zur namenlosen Blogging-Software!
+       Willkommen zur namenlosen Shoutbox-Software!

 </div>
 </div>

diff --git a/application/shoutbox/templates/de/code/login_failed.ctp b/application/shoutbox/templates/de/code/login_failed.ctp
index dc67766febefac81569e651aef8fd13965b4a423..f8c909774dea19eb507b9874e4102e4216125e02 100644 (file)
--- a/application/shoutbox/templates/de/code/login_failed.ctp
+++ b/application/shoutbox/templates/de/code/login_failed.ctp
@@ -11,11 +11,11 @@ $helper->flushContent();
 // [EOF]
 ?>
 <div id="content_header">
 // [EOF]
 ?>
 <div id="content_header">

-       Du bist nicht mehr im Blog eingeloggt!
+       Du bist nicht mehr in der Shoutbox eingeloggt!

 </div>
 
 <div id="content_body">
 </div>
 
 <div id="content_body">

-       Du bist nicht mehr im {?app_full_name?} Blog eingeloggt. Dies kann verschiedene Gr&uuml;nde haben:
+       Du bist nicht mehr in der {?app_full_name?} Shoutbox eingeloggt. Dies kann verschiedene Gr&uuml;nde haben:

 
        <ol id="login_failed_list">
                <li>Dein Browser nimmt keine Cookies an.</li>
 
        <ol id="login_failed_list">
                <li>Dein Browser nimmt keine Cookies an.</li>

diff --git a/application/shoutbox/templates/de/code/login_form.ctp b/application/shoutbox/templates/de/code/login_form.ctp
index ab7b02003f5e96ef824d8567d6889e3bdda861e3..68cbe473b652a0ae68ca8ef35b852455d53147cf 100644 (file)
--- a/application/shoutbox/templates/de/code/login_form.ctp
+++ b/application/shoutbox/templates/de/code/login_form.ctp
@@ -40,10 +40,10 @@ if ($helper->ifLoginIsEnabled()) {
        // Submit buttons
        $helper->addFormGroup('buttons_user', "Alles richtig eingegeben?");
        $helper->addInputResetButton("Formular leeren");
        // Submit buttons
        $helper->addFormGroup('buttons_user', "Alles richtig eingegeben?");
        $helper->addInputResetButton("Formular leeren");

-       $helper->addInputSubmitButton("Zum Blog einloggen");
+       $helper->addInputSubmitButton("Zur Shoutbox einloggen");

 } else {
        // Formular deaktiviert
 } else {
        // Formular deaktiviert

-       $helper->addFormNote('form_deactivated', "Einloggen in diesen Blog ist derzeit administrativ deaktiviert worden. Bitte komme später noch mal wieder.");
+       $helper->addFormNote('form_deactivated', "Einloggen in diese Shoutbox ist derzeit administrativ deaktiviert worden. Bitte komme später noch mal wieder.");

        $helper->addFormNote('admin_notice', "Nachricht vom Admin: <span id=\"disabled_reason\">".$this->getConfigInstance()->readConfig('login_disabled_reason')."</span>");
 }
 
        $helper->addFormNote('admin_notice', "Nachricht vom Admin: <span id=\"disabled_reason\">".$this->getConfigInstance()->readConfig('login_disabled_reason')."</span>");
 }
 

diff --git a/application/shoutbox/templates/de/code/logout_done.ctp b/application/shoutbox/templates/de/code/logout_done.ctp
index be8a24b434d116301db2c63cf94b7236edeadb32..614898134ab3eaf6711ca6585b354140432bc430 100644 (file)
--- a/application/shoutbox/templates/de/code/logout_done.ctp
+++ b/application/shoutbox/templates/de/code/logout_done.ctp
@@ -11,7 +11,7 @@ $helper->flushContent();
 // [EOF]
 ?>
 <div id="content_header">
 // [EOF]
 ?>
 <div id="content_header">

-       Du bist jetzt aus dem Blog ausgeloggt!
+       Du bist jetzt aus der Shoutbox ausgeloggt!

 </div>
 
 <div id="content_body">
 </div>
 
 <div id="content_body">

diff --git a/application/shoutbox/templates/de/code/register_form.ctp b/application/shoutbox/templates/de/code/register_form.ctp
index 1e71d98ebd8dccbca565f97f3db1c178844b4e43..7314501968f6273207daff14c92e89e79a9308fe 100644 (file)
--- a/application/shoutbox/templates/de/code/register_form.ctp
+++ b/application/shoutbox/templates/de/code/register_form.ctp
@@ -7,7 +7,7 @@ $helper = WebFormHelper::createWebFormHelper($this, 'shoutbox_register');
 // Always ask at least for nickname and password
 $helper->addFormGroup('login', "Bitte gebe hier gewünschten Nickname und dein Zugangspasswort ein.");
 $helper->addFormSubGroup('username', "Dein Nickname wird erst nach Absenden des Formulares geprüft. Später bauen wir dann einen automatischen Test ein, der dir sofort zeigt, ob der Nickname bereits vergeben ist.");
 // Always ask at least for nickname and password
 $helper->addFormGroup('login', "Bitte gebe hier gewünschten Nickname und dein Zugangspasswort ein.");
 $helper->addFormSubGroup('username', "Dein Nickname wird erst nach Absenden des Formulares geprüft. Später bauen wir dann einen automatischen Test ein, der dir sofort zeigt, ob der Nickname bereits vergeben ist.");

-$helper->addFieldText('username', "Nickname im Blog:");
+$helper->addFieldText('username', "Nickname in Shoutbox:");

 $helper->addInputTextField('username');
 $helper->addFormSubGroup('pass', "Dein Passwort sollte nicht zu leicht erratbar sein. Später bauen wir hier noch einen automatischen Test ein, der dir sofort die Passwortstärke anzeigt.");
 $helper->addFieldText('pass1', "Passwort:");
 $helper->addInputTextField('username');
 $helper->addFormSubGroup('pass', "Dein Passwort sollte nicht zu leicht erratbar sein. Später bauen wir hier noch einen automatischen Test ein, der dir sofort die Passwortstärke anzeigt.");
 $helper->addFieldText('pass1', "Passwort:");


@@ -23,7 +23,7 @@ if ($helper->ifRegisterRequiresEmailVerification()) {
        $helper->addInputTextField('email2');
 
        if ($helper->ifEmailMustBeUnique()) {
        $helper->addInputTextField('email2');
 
        if ($helper->ifEmailMustBeUnique()) {

-               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Blog verwendet worden sein.");
+               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal in der Shoutbox verwendet worden sein.");

        } // END - Unique email addresses
 
 } // END - email verification
        } // END - Unique email addresses
 
 } // END - email verification


@@ -88,8 +88,8 @@ if ($helper->ifRegisterIncludesProfile()) {
 } // END - ask profile data
 
 // Posting-/Kommentarregeln abfragen
 } // END - ask profile data
 
 // Posting-/Kommentarregeln abfragen

-$helper->addFormGroup('rules', "Bitte lese dir die Blogregeln gut durch und kreuze dann "Ja, ich akzeptiere die aktuellen Blogregeln" an.");
-$helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Blogregeln:");
+$helper->addFormGroup('rules', "Bitte lese dir die Shoutbox-Regeln gut durch und kreuze dann "Ja, ich akzeptiere die aktuellen Shoutbox-Regeln" an.");
+$helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Shoutbox-Regeln:");

 $helper->addInputCheckboxField('rules', false);
 
 // Add CAPTCHA?
 $helper->addInputCheckboxField('rules', false);
 
 // Add CAPTCHA?


@@ -102,7 +102,7 @@ if ($helper->ifFormSecuredWithCaptcha()) {
 $helper->addFormGroup('buttons', "Wenn du alle benötigten Felder korrekt ausgefüt hast, kannst du die Anmeldung abschliessen.");
 
 $helper->addInputResetButton("Alles nochmal eingeben");
 $helper->addFormGroup('buttons', "Wenn du alle benötigten Felder korrekt ausgefüt hast, kannst du die Anmeldung abschliessen.");
 
 $helper->addInputResetButton("Alles nochmal eingeben");

-$helper->addInputSubmitButton("Anmeldung zum Blog abschliessen");
+$helper->addInputSubmitButton("Anmeldung zur Shoutbox abschliessen");

 $helper->addFormNote('data_protection', "Deine Daten werden nach den gültigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link "Datenschutz".");
 $helper->flushContent();
 ?>
 $helper->addFormNote('data_protection', "Deine Daten werden nach den gültigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link "Datenschutz".");
 $helper->flushContent();
 ?>

diff --git a/application/todo/config.php b/application/todo/config.php
index 89e52e1053138ae6eb33bc6c0a1cefba6072d122..fcbf3897f4a1f2fdfb7f9ab0fbe1e92df4bda19f 100644 (file)
--- a/application/todo/config.php
+++ b/application/todo/config.php
@@ -127,35 +127,35 @@ $cfg->setConfigEntry('login_default_action', "welcome");
 // CFG: NEWS-READER-CLASS
 $cfg->setConfigEntry('news_reader_class', "DefaultNewsReader");
 
 // CFG: NEWS-READER-CLASS
 $cfg->setConfigEntry('news_reader_class', "DefaultNewsReader");
 

-// CFG: NEWS-DOWNLOAD-CLASS
-$cfg->setConfigEntry('news_download_class', "NewsDownloadFilter");
+// CFG: NEWS-DOWNLOAD-FILTER
+$cfg->setConfigEntry('news_download_filter', "NewsDownloadFilter");

 
 

-// CFG: NEWS-PROCESS-CLASS
-$cfg->setConfigEntry('news_process_class', "NewsProcessFilter");
+// CFG: NEWS-PROCESS-FILTER
+$cfg->setConfigEntry('news_process_filter', "NewsProcessFilter");

 
 

-// CFG: USER-AUTH-CLASS
-$cfg->setConfigEntry('user_auth_class', "UserAuthFilter");
+// CFG: USER-AUTH-FILTER
+$cfg->setConfigEntry('user_auth_filter', "UserAuthFilter");

 
 

-// CFG: USER-UPDATE-CLASS
-$cfg->setConfigEntry('user_update_class', "UserUpdateFilter");
+// CFG: USER-UPDATE-FILTER
+$cfg->setConfigEntry('user_update_filter', "UserUpdateFilter");

 
 

-// CFG: USER-STATUS-CONFIRMED-CLASS
-$cfg->setConfigEntry('user_status_confirmed_class', "UserStatusConfimedUpdateFilter");
+// CFG: USER-STATUS-CONFIRMED-FILTER
+$cfg->setConfigEntry('user_status_confirmed_filter', "UserStatusConfimedUpdateFilter");

 
 

-// CFG: CAPTCHA-ENCRYPT-VALIDATOR-CLASS
-$cfg->setConfigEntry('captcha_encrypt_validator_class', "CaptchaEncryptFilter");
+// CFG: CAPTCHA-ENCRYPT-VALIDATOR-FILTER
+$cfg->setConfigEntry('captcha_encrypt_validator_filter', "CaptchaEncryptFilter");

 
 

-// CFG: CAPTCHA-GUEST-VERIFIER-CLASS
-$cfg->setConfigEntry('captcha_guest_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-GUEST-VERIFIER-FILTER
+$cfg->setConfigEntry('captcha_guest_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CAPTCHA-USER-VERIFIER-CLASS
-$cfg->setConfigEntry('captcha_user_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-USER-VERIFIER-FILTER
+$cfg->setConfigEntry('captcha_user_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CAPTCHA-REGISTER-VERIFIER-CLASS
-$cfg->setConfigEntry('captcha_register_verifier_class', "GraphicalCodeCaptchaVerifierFilter");
+// CFG: CAPTCHA-REGISTER-VERIFIER-FILTER
+$cfg->setConfigEntry('captcha_register_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");

 
 

-// CFG: CONFIRM-CODE-VALIDATOR-CLASS
-$cfg->setConfigEntry('confirm_code_verifier_class', "ConfirmCodeVerifierFilter");
+// CFG: CONFIRM-CODE-VALIDATOR-FILTER
+$cfg->setConfigEntry('confirm_code_verifier_filter', "ConfirmCodeVerifierFilter");

 
 // CFG: NEWS-HOME-LIMIT
 $cfg->setConfigEntry('news_home_limit', 10);
 
 // CFG: NEWS-HOME-LIMIT
 $cfg->setConfigEntry('news_home_limit', 10);

diff --git a/application/todo/templates/de/code/action_login_logout.ctp b/application/todo/templates/de/code/action_login_logout.ctp
index 4dd47d9625b7e7058e423d627a6874e74620beed..8d96247c4ec59926b62d09a617541d292216f958 100644 (file)
--- a/application/todo/templates/de/code/action_login_logout.ctp
+++ b/application/todo/templates/de/code/action_login_logout.ctp
@@ -21,7 +21,7 @@ $helper->flushContent();
 ?>
 <div id="logout_box">
        <div id="logout_header">
 ?>
 <div id="logout_box">
        <div id="logout_header">

-               Willst du dich wirklich aus dem Blog aussloggen?
+               Willst du dich wirklich aus dem ToDo-Manager aussloggen?

        </div>
 
        <div id="logout_links">
        </div>
 
        <div id="logout_links">

diff --git a/application/todo/templates/de/code/action_login_profile.ctp b/application/todo/templates/de/code/action_login_profile.ctp
index 77898066f638d7c391fa050d4369bd8c835d80cd..5337a196ec81ebad2c85d78c6b29bab68f3dccc5 100644 (file)
--- a/application/todo/templates/de/code/action_login_profile.ctp
+++ b/application/todo/templates/de/code/action_login_profile.ctp
@@ -28,7 +28,7 @@ if ($helper->ifEmailChangeAllowed()) {
        $helper->addInputTextField('email2');
 
        if ($helper->ifEmailMustBeUnique()) {
        $helper->addInputTextField('email2');
 
        if ($helper->ifEmailMustBeUnique()) {

-               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Blog verwendet worden sein.");
+               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im ToDo-Manager verwendet worden sein.");

        } // END - Unique email addresses
 
        if ($helper->ifEmailChangeRequireConfirmation()) {
        } // END - Unique email addresses
 
        if ($helper->ifEmailChangeRequireConfirmation()) {


@@ -88,11 +88,11 @@ if (!$helper->ifRegisterRequiresEmailVerification()) {
 
 // Rules already accepted?
 if ($helper->ifRulesHaveChanged()) {
 
 // Rules already accepted?
 if ($helper->ifRulesHaveChanged()) {

-       $helper->addFormGroup('rules', "Bitte lese dir die Blogeregeln gut durch und kreuze dann "Ja, ich akzeptiere die aktuellen Blogregeln" an.");
-       $helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Blogregeln:");
+       $helper->addFormGroup('rules', "Bitte lese dir die Regeln gut durch und kreuze dann "Ja, ich akzeptiere die aktuellen Regeln" an.");
+       $helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Regeln:");

        $helper->addInputCheckboxField('rules', false);
 } else {
        $helper->addInputCheckboxField('rules', false);
 } else {

-       $helper->addFormNote('rules_accepted', "Du hast die aktuellen Blogregeln akzeptiert. Vielen Dank!");
+       $helper->addFormNote('rules_accepted', "Du hast die aktuellen Regeln akzeptiert. Vielen Dank!");

        $helper->addInputHiddenField('rules', "1");
 }
 
        $helper->addInputHiddenField('rules', "1");
 }
 

diff --git a/application/todo/templates/de/code/confirm_link.ctp b/application/todo/templates/de/code/confirm_link.ctp
index eaf8060723cffd9ef4f039766c40bdaa0946b820..b6fa7424eae1083a208f5087b186d73fd16e5a00 100644 (file)
--- a/application/todo/templates/de/code/confirm_link.ctp
+++ b/application/todo/templates/de/code/confirm_link.ctp
@@ -16,8 +16,8 @@ $helper->flushContent();
 
 <div id="content_body">
        Hallo <span class="data_username">{?username?}</span>! Du hast heute deine
 
 <div id="content_body">
        Hallo <span class="data_username">{?username?}</span>! Du hast heute deine

-       Email-Addresse best&auml;tigt, wodurch alle Blogfunktionen entsperrt
-       worden sind. Viel Spass beim Bloggen!
+       Email-Addresse best&auml;tigt, wodurch alle ToDo-Managerfunktionen entsperrt
+       worden sind.

 </div>
 
 <div id="content_footer">
 </div>
 
 <div id="content_footer">

diff --git a/application/todo/templates/de/code/login_failed.ctp b/application/todo/templates/de/code/login_failed.ctp
index dc67766febefac81569e651aef8fd13965b4a423..4255c189136ff5900f85d02d181bbde1b5548fb7 100644 (file)
--- a/application/todo/templates/de/code/login_failed.ctp
+++ b/application/todo/templates/de/code/login_failed.ctp
@@ -11,11 +11,11 @@ $helper->flushContent();
 // [EOF]
 ?>
 <div id="content_header">
 // [EOF]
 ?>
 <div id="content_header">

-       Du bist nicht mehr im Blog eingeloggt!
+       Du bist nicht mehr im ToDo-Manager eingeloggt!

 </div>
 
 <div id="content_body">
 </div>
 
 <div id="content_body">

-       Du bist nicht mehr im {?app_full_name?} Blog eingeloggt. Dies kann verschiedene Gr&uuml;nde haben:
+       Du bist nicht mehr im {?app_full_name?} ToDo-Manager eingeloggt. Dies kann verschiedene Gr&uuml;nde haben:

 
        <ol id="login_failed_list">
                <li>Dein Browser nimmt keine Cookies an.</li>
 
        <ol id="login_failed_list">
                <li>Dein Browser nimmt keine Cookies an.</li>

diff --git a/application/todo/templates/de/code/login_form.ctp b/application/todo/templates/de/code/login_form.ctp
index 605c2bbe3d799966296b25125f3cc819b88c99ba..31e62d141ed5c716b53ab9d58823b7f48c6bd590 100644 (file)
--- a/application/todo/templates/de/code/login_form.ctp
+++ b/application/todo/templates/de/code/login_form.ctp
@@ -40,10 +40,10 @@ if ($helper->ifLoginIsEnabled()) {
        // Submit buttons
        $helper->addFormGroup('buttons_user', "Alles richtig eingegeben?");
        $helper->addInputResetButton("Formular leeren");
        // Submit buttons
        $helper->addFormGroup('buttons_user', "Alles richtig eingegeben?");
        $helper->addInputResetButton("Formular leeren");

-       $helper->addInputSubmitButton("Zum Blog einloggen");
+       $helper->addInputSubmitButton("Zum ToDo-Manager einloggen");

 } else {
        // Formular deaktiviert
 } else {
        // Formular deaktiviert

-       $helper->addFormNote('form_deactivated', "Einloggen in diesen Blog ist derzeit administrativ deaktiviert worden. Bitte komme später noch mal wieder.");
+       $helper->addFormNote('form_deactivated', "Einloggen in diesen ToDo-Manager ist derzeit administrativ deaktiviert worden. Bitte komme später noch mal wieder.");

        $helper->addFormNote('admin_notice', "Nachricht vom Admin: <span id=\"disabled_reason\">".$this->getConfigInstance()->readConfig('login_disabled_reason')."</span>");
 }
 
        $helper->addFormNote('admin_notice', "Nachricht vom Admin: <span id=\"disabled_reason\">".$this->getConfigInstance()->readConfig('login_disabled_reason')."</span>");
 }
 

diff --git a/application/todo/templates/de/code/logout_done.ctp b/application/todo/templates/de/code/logout_done.ctp
index be8a24b434d116301db2c63cf94b7236edeadb32..4898b72b0d3303ca7427e93d4e2e1b8c408bc75f 100644 (file)
--- a/application/todo/templates/de/code/logout_done.ctp
+++ b/application/todo/templates/de/code/logout_done.ctp
@@ -11,7 +11,7 @@ $helper->flushContent();
 // [EOF]
 ?>
 <div id="content_header">
 // [EOF]
 ?>
 <div id="content_header">

-       Du bist jetzt aus dem Blog ausgeloggt!
+       Du bist jetzt aus dem ToDo-Manager ausgeloggt!

 </div>
 
 <div id="content_body">
 </div>
 
 <div id="content_body">

diff --git a/application/todo/templates/de/code/register_form.ctp b/application/todo/templates/de/code/register_form.ctp
index f5b53bf50a2a72d5cdf4e567f218b43acd4e5d38..4d8296119227f56b747e9521846316b634e60023 100644 (file)
--- a/application/todo/templates/de/code/register_form.ctp
+++ b/application/todo/templates/de/code/register_form.ctp
@@ -7,7 +7,7 @@ $helper = WebFormHelper::createWebFormHelper($this, 'todo_register');
 // Always ask at least for nickname and password
 $helper->addFormGroup('login', "Bitte gebe hier gewünschten Nickname und dein Zugangspasswort ein.");
 $helper->addFormSubGroup('username', "Dein Nickname wird erst nach Absenden des Formulares geprüft. Später bauen wir dann einen automatischen Test ein, der dir sofort zeigt, ob der Nickname bereits vergeben ist.");
 // Always ask at least for nickname and password
 $helper->addFormGroup('login', "Bitte gebe hier gewünschten Nickname und dein Zugangspasswort ein.");
 $helper->addFormSubGroup('username', "Dein Nickname wird erst nach Absenden des Formulares geprüft. Später bauen wir dann einen automatischen Test ein, der dir sofort zeigt, ob der Nickname bereits vergeben ist.");

-$helper->addFieldText('username', "Nickname im Blog:");
+$helper->addFieldText('username', "Nickname im ToDo-Manager:");

 $helper->addInputTextField('username');
 $helper->addFormSubGroup('pass', "Dein Passwort sollte nicht zu leicht erratbar sein. Später bauen wir hier noch einen automatischen Test ein, der dir sofort die Passwortstärke anzeigt.");
 $helper->addFieldText('pass1', "Passwort:");
 $helper->addInputTextField('username');
 $helper->addFormSubGroup('pass', "Dein Passwort sollte nicht zu leicht erratbar sein. Später bauen wir hier noch einen automatischen Test ein, der dir sofort die Passwortstärke anzeigt.");
 $helper->addFieldText('pass1', "Passwort:");


@@ -23,7 +23,7 @@ if ($helper->ifRegisterRequiresEmailVerification()) {
        $helper->addInputTextField('email2');
 
        if ($helper->ifEmailMustBeUnique()) {
        $helper->addInputTextField('email2');
 
        if ($helper->ifEmailMustBeUnique()) {

-               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Blog verwendet worden sein.");
+               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im ToDo-Manager verwendet worden sein.");

        } // END - Unique email addresses
 
 } // END - email verification
        } // END - Unique email addresses
 
 } // END - email verification


@@ -88,8 +88,8 @@ if ($helper->ifRegisterIncludesProfile()) {
 } // END - ask profile data
 
 // Posting-/Kommentarregeln abfragen
 } // END - ask profile data
 
 // Posting-/Kommentarregeln abfragen

-$helper->addFormGroup('rules', "Bitte lese dir die Blogregeln gut durch und kreuze dann "Ja, ich akzeptiere die aktuellen Blogregeln" an.");
-$helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Blogregeln:");
+$helper->addFormGroup('rules', "Bitte lese dir die Regeln gut durch und kreuze dann "Ja, ich akzeptiere die aktuellen Regeln" an.");
+$helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Regeln:");

 $helper->addInputCheckboxField('rules', false);
 
 // Add CAPTCHA?
 $helper->addInputCheckboxField('rules', false);
 
 // Add CAPTCHA?


@@ -102,7 +102,7 @@ if ($helper->ifFormSecuredWithCaptcha()) {
 $helper->addFormGroup('buttons', "Wenn du alle benötigten Felder korrekt ausgefüt hast, kannst du die Anmeldung abschliessen.");
 
 $helper->addInputResetButton("Alles nochmal eingeben");
 $helper->addFormGroup('buttons', "Wenn du alle benötigten Felder korrekt ausgefüt hast, kannst du die Anmeldung abschliessen.");
 
 $helper->addInputResetButton("Alles nochmal eingeben");

-$helper->addInputSubmitButton("Anmeldung zum Blog abschliessen");
+$helper->addInputSubmitButton("Anmeldung zum ToDo-Manager abschliessen");

 $helper->addFormNote('data_protection', "Deine Daten werden nach den gültigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link "Datenschutz".");
 $helper->flushContent();
 ?>
 $helper->addFormNote('data_protection', "Deine Daten werden nach den gültigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link "Datenschutz".");
 $helper->flushContent();
 ?>

diff --git a/inc/classes/main/actions/web/class_WebLoginProfileAction.php b/inc/classes/main/actions/web/class_WebLoginProfileAction.php
index 3ed47c0a8d062c6dcc1a762670463f5b1f401d04..a7de7e8c78048484d6da7ab80debc8afc4627c9c 100644 (file)
--- a/inc/classes/main/actions/web/class_WebLoginProfileAction.php
+++ b/inc/classes/main/actions/web/class_WebLoginProfileAction.php
@@ -69,7 +69,7 @@ class WebLoginProfileAction extends BaseAction implements Commandable, Registera
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user status filter here
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user status filter here

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));

        }
 }
 
        }
 }
 

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 7e461ac820071fde42e846ae1b7f2e79adf211be..fe43a998f59c533aec830aef70c7d0f908f9bc22 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -571,6 +571,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         * Stub method (only real cabins shall override it)
         *
         * @return      boolean false = is no cabin, true = is a cabin
         * Stub method (only real cabins shall override it)
         *
         * @return      boolean false = is no cabin, true = is a cabin

+        * @deprecated

         */
        public function isCabin () {
                return false;
         */
        public function isCabin () {
                return false;


@@ -581,6 +582,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         *
         * @return      boolean false = is not tradeable by the Merchant class,
         *                                      true  = is a tradeable object
         *
         * @return      boolean false = is not tradeable by the Merchant class,
         *                                      true  = is a tradeable object

+        * @deprecated

         */
        public function isTradeable () {
                return false;
         */
        public function isTradeable () {
                return false;

diff --git a/inc/classes/main/commands/web/class_WebResendLinkCommand.php b/inc/classes/main/commands/web/class_WebResendLinkCommand.php
index c6ba2a6c825fae30852167d326c488bc1f075ff4..596bf89488c6bda2e680a276fd6065d843c01628 100644 (file)
--- a/inc/classes/main/commands/web/class_WebResendLinkCommand.php
+++ b/inc/classes/main/commands/web/class_WebResendLinkCommand.php
@@ -134,7 +134,7 @@ class WebResendLinkCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Filter for checking if account is unconfirmed
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Filter for checking if account is unconfirmed

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_unconfirmed_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_unconfirmed_filter'));

        }
 }
 
        }
 }
 

diff --git a/inc/classes/main/controller/captcha/class_ImageCodeCaptchaController.php b/inc/classes/main/controller/captcha/class_ImageCodeCaptchaController.php
index e84fca7a34d20cf73021acb3064d66d5229ebdde..a6717456eea3c92666725b80435bfd49e121b789 100644 (file)
--- a/inc/classes/main/controller/captcha/class_ImageCodeCaptchaController.php
+++ b/inc/classes/main/controller/captcha/class_ImageCodeCaptchaController.php
@@ -46,7 +46,7 @@ class ImageCodeCaptchaController extends BaseController implements Controller {
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Add filter for checking the "encrypt" string
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Add filter for checking the "encrypt" string

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_encrypt_validator_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_encrypt_validator_filter'));

 
                // Return the prepared instance
                return $controllerInstance;
 
                // Return the prepared instance
                return $controllerInstance;

diff --git a/inc/classes/main/controller/login/class_WebLoginAreaController.php b/inc/classes/main/controller/login/class_WebLoginAreaController.php
index 1a1900c3692c141fe04fb1a5ddb224542a84135f..4e82ce10a808eed445b076600426eead9e6cd0eb 100644 (file)
--- a/inc/classes/main/controller/login/class_WebLoginAreaController.php
+++ b/inc/classes/main/controller/login/class_WebLoginAreaController.php
@@ -46,16 +46,16 @@ class WebLoginAreaController extends BaseController implements Controller {
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // User auth filter
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // User auth filter

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter'));

 
                // User update filter
 
                // User update filter

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_update_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_update_filter'));

 
                // News fetcher filter
 
                // News fetcher filter

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_filter'));

 
                // News proccess/display-preparation
 
                // News proccess/display-preparation

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_filter'));

 
                /* @todo: Add some filters to this controller */
 
 
                /* @todo: Add some filters to this controller */
 

diff --git a/inc/classes/main/controller/web/class_WebConfirmController.php b/inc/classes/main/controller/web/class_WebConfirmController.php
index 64c845d01911ae57930e40b38cb2d92d62633ea0..411c59ba7990e6558ee07f5f5a23b7f9179248cd 100644 (file)
--- a/inc/classes/main/controller/web/class_WebConfirmController.php
+++ b/inc/classes/main/controller/web/class_WebConfirmController.php
@@ -47,10 +47,10 @@ class WebConfirmController extends BaseController implements Controller {
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Add filters for handling confirmation code and username
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Add filters for handling confirmation code and username

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_class'));
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_unconfirmed_class'));
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('confirm_code_verifier_class'));
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_confirmed_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_unconfirmed_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('confirm_code_verifier_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_confirmed_filter'));

 
                // Return the prepared instance
                return $controllerInstance;
 
                // Return the prepared instance
                return $controllerInstance;

diff --git a/inc/classes/main/controller/web/class_WebDefaultNewsController.php b/inc/classes/main/controller/web/class_WebDefaultNewsController.php
index 1f6c0cc28a69f3988f70f1bfb5904464b9f56fd3..d5769e9a20b0017e6b22c17e0a049902c789064e 100644 (file)
--- a/inc/classes/main/controller/web/class_WebDefaultNewsController.php
+++ b/inc/classes/main/controller/web/class_WebDefaultNewsController.php
@@ -46,8 +46,8 @@ class WebDefaultNewsController extends BaseController implements Controller {
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Add news filters to this controller
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Add news filters to this controller

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_class'));
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_filter'));

 
                // Return the prepared instance
                return $controllerInstance;
 
                // Return the prepared instance
                return $controllerInstance;

diff --git a/inc/classes/main/controller/web/class_WebLogoutController.php b/inc/classes/main/controller/web/class_WebLogoutController.php
index 00b020a1df617047b3f646c0af2e1e8afd8a7dd1..7d8a9aeef7a2cc7162fc526c1061da77e194ff75 100644 (file)
--- a/inc/classes/main/controller/web/class_WebLogoutController.php
+++ b/inc/classes/main/controller/web/class_WebLogoutController.php
@@ -47,10 +47,10 @@ class WebLogoutController extends BaseController implements Controller {
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Add user auth filter (we don't need an update of the user here because it will be redirected)
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Add user auth filter (we don't need an update of the user here because it will be redirected)

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter'));

 
                // User status filter
 
                // User status filter

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));

 
                // Return the prepared instance
                return $controllerInstance;
 
                // Return the prepared instance
                return $controllerInstance;

diff --git a/inc/config.php b/inc/config.php
index d50782a1daac0c90a0eb5d57dd1d1ec9749ee8fe..751dc7a8661d13c6a2a1979ae0cf745287b7c523 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -170,50 +170,50 @@ $cfg->setConfigEntry('file_input_class', "FileIoStream");
 // CFG: FILE-OUTPUT-STREAM
 $cfg->setConfigEntry('file_output_class', "FileIoStream");
 
 // CFG: FILE-OUTPUT-STREAM
 $cfg->setConfigEntry('file_output_class', "FileIoStream");
 

-// CFG: EMAIL-VALIDATOR
-$cfg->setConfigEntry('email_validator_class', "EmailValidatorFilter");
+// CFG: EMAIL-VALIDATOR-FILTER
+$cfg->setConfigEntry('email_validator_filter', "EmailValidatorFilter");

 
 

-// CFG: USERNAME-VALIDATOR
-$cfg->setConfigEntry('username_validator_class', "UserNameValidatorFilter");
+// CFG: USERNAME-VALIDATOR-FILTER
+$cfg->setConfigEntry('username_validator_filter', "UserNameValidatorFilter");

 
 

-// CFG: USERNAME-IS-GUEST
-$cfg->setConfigEntry('username_is_guest_class', "UserNameIsGuestFilter");
+// CFG: USERNAME-IS-GUEST-FILTER
+$cfg->setConfigEntry('username_is_guest_filter', "UserNameIsGuestFilter");

 
 

-// CFG: PASSWORD-VALIDATOR
-$cfg->setConfigEntry('password_validator_class', "PasswordValidatorFilter");
+// CFG: PASSWORD-VALIDATOR-FILTER
+$cfg->setConfigEntry('password_validator_filter', "PasswordValidatorFilter");

 
 

-// CFG: RULES-ACCEPTED-CLASS
-$cfg->setConfigEntry('rules_accepted_class', "RulesAcceptedFilter");
+// CFG: RULES-ACCEPTED-FILTER
+$cfg->setConfigEntry('rules_accepted_filter', "RulesAcceptedFilter");

 
 

-// CFG: USERNAME-VERIFIER-CLASS
-$cfg->setConfigEntry('username_verifier_class', "UserNameVerifierFilter");
+// CFG: USERNAME-VERIFIER-FILTER
+$cfg->setConfigEntry('username_verifier_filter', "UserNameVerifierFilter");

 
 

-// CFG: USER-GUEST-VERIFIER-CLASS
-$cfg->setConfigEntry('user_guest_verifier_class', "UserGuestVerifierFilter");
+// CFG: USER-GUEST-VERIFIER-FILTER
+$cfg->setConfigEntry('user_guest_verifier_filter', "UserGuestVerifierFilter");

 
 

-// CFG: EMAIL-VERIFIER
-$cfg->setConfigEntry('email_verifier_class', "EmailVerifierFilter");
+// CFG: EMAIL-VERIFIER-FILTER
+$cfg->setConfigEntry('email_verifier_filter', "EmailVerifierFilter");

 
 

-// CFG: PASSWORD-VERIFIER-CLASS
-$cfg->setConfigEntry('password_verifier_class', "PasswordVerifierFilter");
+// CFG: PASSWORD-VERIFIER-FILTER
+$cfg->setConfigEntry('password_verifier_filter', "PasswordVerifierFilter");

 
 

-// CFG: PASSWD-GUEST-VERIFIER-CLASS
-$cfg->setConfigEntry('passwd_guest_verifier_class', "PasswordGuestVerifierFilter");
+// CFG: PASSWD-GUEST-VERIFIER-FILTER
+$cfg->setConfigEntry('passwd_guest_verifier_filter', "PasswordGuestVerifierFilter");

 
 

-// CFG: EMAIL-CHANGE-CLASS
-$cfg->setConfigEntry('email_change_class', "EmailChangeFilter");
+// CFG: EMAIL-CHANGE-FILTER
+$cfg->setConfigEntry('email_change_filter', "EmailChangeFilter");

 
 

-// CFG: PASSWORD-CHANGE-CLASS
-$cfg->setConfigEntry('password_change_class', "PasswordChangeFilter");
+// CFG: PASSWORD-CHANGE-FILTER
+$cfg->setConfigEntry('password_change_filter', "PasswordChangeFilter");

 
 

-// CFG: ACCOUNT-PASSWORD-CLASS
-$cfg->setConfigEntry('account_password_class', "AccountPasswordVerifierFilter");
+// CFG: ACCOUNT-PASSWORD-FILTER
+$cfg->setConfigEntry('account_password_filter', "AccountPasswordVerifierFilter");

 
 

-// CFG: USER-STATUS-CLASS
-$cfg->setConfigEntry('user_status_class', "UserStatusVerifierFilter");
+// CFG: USER-STATUS-FILTER
+$cfg->setConfigEntry('user_status_filter', "UserStatusVerifierFilter");

 
 

-// CFG: USER-UNCONFIRMED-CLASS
-$cfg->setConfigEntry('user_unconfirmed_class', "UserUnconfirmedVerifierFilter");
+// CFG: USER-UNCONFIRMED-FILTER
+$cfg->setConfigEntry('user_unconfirmed_filter', "UserUnconfirmedVerifierFilter");

 
 // CFG: CRYPTO-CLASS
 $cfg->setConfigEntry('crypto_class', "CryptoHelper");
 
 // CFG: CRYPTO-CLASS
 $cfg->setConfigEntry('crypto_class', "CryptoHelper");