Filter classes now ends with _filter in config entry
authorRoland Häder <roland@mxchange.org>
Wed, 1 Oct 2008 21:08:01 +0000 (21:08 +0000)
committerRoland Häder <roland@mxchange.org>
Wed, 1 Oct 2008 21:08:01 +0000 (21:08 +0000)
36 files changed:
application/blog/config.php
application/ship-simu/config.php
application/ship-simu/main/actions/web/class_WebLoginCompanyAction.php
application/ship-simu/main/actions/web/class_WebLoginRefillAction.php
application/ship-simu/main/commands/web/class_WebRefillFormCommand.php
application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php
application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php
application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
application/ship-simu/templates/de/code/block_persona_data.ctp
application/shoutbox/config.php
application/shoutbox/templates/de/code/action_login_logout.ctp
application/shoutbox/templates/de/code/action_login_profile.ctp
application/shoutbox/templates/de/code/confirm_link.ctp
application/shoutbox/templates/de/code/home.ctp
application/shoutbox/templates/de/code/login_failed.ctp
application/shoutbox/templates/de/code/login_form.ctp
application/shoutbox/templates/de/code/logout_done.ctp
application/shoutbox/templates/de/code/register_form.ctp
application/todo/config.php
application/todo/templates/de/code/action_login_logout.ctp
application/todo/templates/de/code/action_login_profile.ctp
application/todo/templates/de/code/confirm_link.ctp
application/todo/templates/de/code/login_failed.ctp
application/todo/templates/de/code/login_form.ctp
application/todo/templates/de/code/logout_done.ctp
application/todo/templates/de/code/register_form.ctp
inc/classes/main/actions/web/class_WebLoginProfileAction.php
inc/classes/main/class_BaseFrameworkSystem.php
inc/classes/main/commands/web/class_WebResendLinkCommand.php
inc/classes/main/controller/captcha/class_ImageCodeCaptchaController.php
inc/classes/main/controller/login/class_WebLoginAreaController.php
inc/classes/main/controller/web/class_WebConfirmController.php
inc/classes/main/controller/web/class_WebDefaultNewsController.php
inc/classes/main/controller/web/class_WebLogoutController.php
inc/config.php

index f06094d..2335879 100644 (file)
@@ -127,35 +127,35 @@ $cfg->setConfigEntry('login_default_action', "welcome");
 // 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);
index f2dc84a..6e60c09 100644 (file)
@@ -127,44 +127,44 @@ $cfg->setConfigEntry('login_default_action', "welcome");
 // 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->setConfigEntry('refill_page_class', "RefillPageFilter");
+$cfg->setConfigEntry('refill_page_filter', "RefillPageFilter");
 
 // CFG: NEWS-HOME-LIMIT
 $cfg->setConfigEntry('news_home_limit', 10);
index 9cce441..edc7e19 100644 (file)
@@ -70,7 +70,7 @@ class WebLoginCompanyAction extends BaseAction implements Commandable, Registera
         */
        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'));
        }
 }
 
index 543d3fe..3120fac 100644 (file)
@@ -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/>.
  */
-class WebLoginMoneyRefillAction extends BaseAction implements Commandable, Registerable {
+class WebLoginRefillAction extends BaseAction implements Commandable, Registerable {
        /**
         * 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
         */
-       public final static function createWebLoginMoneyRefillAction (ActionResolver $resolverInstance) {
+       public final static function createWebLoginRefillAction (ActionResolver $resolverInstance) {
                // Get a new instance
-               $actionInstance = new WebLoginMoneyRefillAction();
+               $actionInstance = new WebLoginRefillAction();
 
                // 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
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
 
                // Is the refill page active?
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_page_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_page_filter'));
        }
 }
 
index 625db1d..25869cf 100644 (file)
@@ -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)
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter'));
 
                // Add user status filter here
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
 
                // Is the refill page active?
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_page_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_page_filter'));
 
                // Verify CAPTCHA code
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_refill_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_refill_verifier_filter'));
 
                // Verify refill request
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_request_validator_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('refill_request_validator_filter'));
        }
 }
 
index b7f9924..4a41fd9 100644 (file)
@@ -98,13 +98,13 @@ class WebShipsimuGuestLoginCommand extends BaseCommand implements Commandable {
         */
        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
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('passwd_guest_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('passwd_guest_verifier_filter'));
 
                // Add CAPTCHA verifier code
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_guest_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_guest_verifier_filter'));
        }
 }
 
index 1bb449a..a9c652e 100644 (file)
@@ -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)
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter'));
 
                // User status filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
 
                // Updated rules accepted
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_filter'));
 
                // Account password validation
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('account_password_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('account_password_filter'));
 
                // Email changed
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_change_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_change_filter'));
 
                // Password changed
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_change_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_change_filter'));
        }
 }
 
index a6afca6..56072d6 100644 (file)
@@ -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)
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_filter'));
 
                // 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
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_is_guest_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_is_guest_filter'));
 
                // Validate if password is set
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_validator_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_validator_filter'));
 
                // Check if rules where accepted
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_filter'));
 
                // Validate CAPTCHA input
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_register_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_register_verifier_filter'));
        }
 }
 
index 83ba7da..51e3bab 100644 (file)
@@ -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
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_class'));
+                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter'));
                                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
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_class'));
+                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_filter'));
                                break;
                }
 
                // Password verifier filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_filter'));
 
                // Add filter for CAPTCHA
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter'));
        }
 }
 
index ec843fd..def6835 100644 (file)
@@ -11,14 +11,14 @@ $helperInstance->flushContent();
 // 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">
-       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">
-       Angemeldet seit: <span class="registered">{?block_registered?}</span>
+       Angemeldet seit: <span id="registered">{?block_registered?}</span>
 </div>
index 8bba746..fa898c0 100644 (file)
@@ -127,35 +127,35 @@ $cfg->setConfigEntry('login_default_action', "welcome");
 // 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);
index 4dd47d9..fcf3d45 100644 (file)
@@ -21,7 +21,7 @@ $helper->flushContent();
 ?>
 <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">
index 1718da2..3babf81 100644 (file)
@@ -28,7 +28,7 @@ if ($helper->ifEmailChangeAllowed()) {
        $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()) {
@@ -88,11 +88,11 @@ if (!$helper->ifRegisterRequiresEmailVerification()) {
 
 // Rules already accepted?
 if ($helper->ifRulesHaveChanged()) {
-       $helper->addFormGroup('rules', "Bitte lese dir die Blogeregeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Blogregeln&quot; an.");
-       $helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Blogregeln:");
+       $helper->addFormGroup('rules', "Bitte lese dir die Shoutbox-Regeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Shoutbox-Regeln&quot; an.");
+       $helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Shoutbox-Regeln:");
        $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");
 }
 
index eaf8060..a399741 100644 (file)
@@ -16,8 +16,8 @@ $helper->flushContent();
 
 <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">
index 67db51c..51644c2 100644 (file)
@@ -1,3 +1,3 @@
 <div id="content_header">
-       Willkommen zur namenlosen Blogging-Software!
+       Willkommen zur namenlosen Shoutbox-Software!
 </div>
index dc67766..f8c9097 100644 (file)
@@ -11,11 +11,11 @@ $helper->flushContent();
 // [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">
-       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>
index ab7b020..68cbe47 100644 (file)
@@ -40,10 +40,10 @@ if ($helper->ifLoginIsEnabled()) {
        // 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
-       $helper->addFormNote('form_deactivated', "Einloggen in diesen Blog ist derzeit administrativ deaktiviert worden. Bitte komme sp&auml;ter noch mal wieder.");
+       $helper->addFormNote('form_deactivated', "Einloggen in diese Shoutbox ist derzeit administrativ deaktiviert worden. Bitte komme sp&auml;ter noch mal wieder.");
        $helper->addFormNote('admin_notice', "Nachricht vom Admin: <span id=\"disabled_reason\">".$this->getConfigInstance()->readConfig('login_disabled_reason')."</span>");
 }
 
index be8a24b..6148981 100644 (file)
@@ -11,7 +11,7 @@ $helper->flushContent();
 // [EOF]
 ?>
 <div id="content_header">
-       Du bist jetzt aus dem Blog ausgeloggt!
+       Du bist jetzt aus der Shoutbox ausgeloggt!
 </div>
 
 <div id="content_body">
index 1e71d98..7314501 100644 (file)
@@ -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&uuml;nschten Nickname und dein Zugangspasswort ein.");
 $helper->addFormSubGroup('username', "Dein Nickname wird erst nach Absenden des Formulares gepr&uuml;ft. Sp&auml;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&auml;ter bauen wir hier noch einen automatischen Test ein, der dir sofort die Passwortst&auml;rke anzeigt.");
 $helper->addFieldText('pass1', "Passwort:");
@@ -23,7 +23,7 @@ if ($helper->ifRegisterRequiresEmailVerification()) {
        $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
@@ -88,8 +88,8 @@ if ($helper->ifRegisterIncludesProfile()) {
 } // END - ask profile data
 
 // Posting-/Kommentarregeln abfragen
-$helper->addFormGroup('rules', "Bitte lese dir die Blogregeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Blogregeln&quot; an.");
-$helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Blogregeln:");
+$helper->addFormGroup('rules', "Bitte lese dir die Shoutbox-Regeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Shoutbox-Regeln&quot; an.");
+$helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Shoutbox-Regeln:");
 $helper->addInputCheckboxField('rules', false);
 
 // Add CAPTCHA?
@@ -102,7 +102,7 @@ if ($helper->ifFormSecuredWithCaptcha()) {
 $helper->addFormGroup('buttons', "Wenn du alle ben&ouml;tigten Felder korrekt ausgef&uuml;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&uuml;ltigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link &quot;Datenschutz&quot;.");
 $helper->flushContent();
 ?>
index 89e52e1..fcbf389 100644 (file)
@@ -127,35 +127,35 @@ $cfg->setConfigEntry('login_default_action', "welcome");
 // 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);
index 4dd47d9..8d96247 100644 (file)
@@ -21,7 +21,7 @@ $helper->flushContent();
 ?>
 <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">
index 7789806..5337a19 100644 (file)
@@ -28,7 +28,7 @@ if ($helper->ifEmailChangeAllowed()) {
        $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()) {
@@ -88,11 +88,11 @@ if (!$helper->ifRegisterRequiresEmailVerification()) {
 
 // Rules already accepted?
 if ($helper->ifRulesHaveChanged()) {
-       $helper->addFormGroup('rules', "Bitte lese dir die Blogeregeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Blogregeln&quot; an.");
-       $helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Blogregeln:");
+       $helper->addFormGroup('rules', "Bitte lese dir die Regeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Regeln&quot; an.");
+       $helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Regeln:");
        $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");
 }
 
index eaf8060..b6fa742 100644 (file)
@@ -16,8 +16,8 @@ $helper->flushContent();
 
 <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">
index dc67766..4255c18 100644 (file)
@@ -11,11 +11,11 @@ $helper->flushContent();
 // [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">
-       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>
index 605c2bb..31e62d1 100644 (file)
@@ -40,10 +40,10 @@ if ($helper->ifLoginIsEnabled()) {
        // 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
-       $helper->addFormNote('form_deactivated', "Einloggen in diesen Blog ist derzeit administrativ deaktiviert worden. Bitte komme sp&auml;ter noch mal wieder.");
+       $helper->addFormNote('form_deactivated', "Einloggen in diesen ToDo-Manager ist derzeit administrativ deaktiviert worden. Bitte komme sp&auml;ter noch mal wieder.");
        $helper->addFormNote('admin_notice', "Nachricht vom Admin: <span id=\"disabled_reason\">".$this->getConfigInstance()->readConfig('login_disabled_reason')."</span>");
 }
 
index be8a24b..4898b72 100644 (file)
@@ -11,7 +11,7 @@ $helper->flushContent();
 // [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">
index f5b53bf..4d82961 100644 (file)
@@ -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&uuml;nschten Nickname und dein Zugangspasswort ein.");
 $helper->addFormSubGroup('username', "Dein Nickname wird erst nach Absenden des Formulares gepr&uuml;ft. Sp&auml;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&auml;ter bauen wir hier noch einen automatischen Test ein, der dir sofort die Passwortst&auml;rke anzeigt.");
 $helper->addFieldText('pass1', "Passwort:");
@@ -23,7 +23,7 @@ if ($helper->ifRegisterRequiresEmailVerification()) {
        $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
@@ -88,8 +88,8 @@ if ($helper->ifRegisterIncludesProfile()) {
 } // END - ask profile data
 
 // Posting-/Kommentarregeln abfragen
-$helper->addFormGroup('rules', "Bitte lese dir die Blogregeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Blogregeln&quot; an.");
-$helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Blogregeln:");
+$helper->addFormGroup('rules', "Bitte lese dir die Regeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Regeln&quot; an.");
+$helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Regeln:");
 $helper->addInputCheckboxField('rules', false);
 
 // Add CAPTCHA?
@@ -102,7 +102,7 @@ if ($helper->ifFormSecuredWithCaptcha()) {
 $helper->addFormGroup('buttons', "Wenn du alle ben&ouml;tigten Felder korrekt ausgef&uuml;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&uuml;ltigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link &quot;Datenschutz&quot;.");
 $helper->flushContent();
 ?>
index 3ed47c0..a7de7e8 100644 (file)
@@ -69,7 +69,7 @@ class WebLoginProfileAction extends BaseAction implements Commandable, Registera
         */
        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'));
        }
 }
 
index 7e461ac..fe43a99 100644 (file)
@@ -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
+        * @deprecated
         */
        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
+        * @deprecated
         */
        public function isTradeable () {
                return false;
index c6ba2a6..596bf89 100644 (file)
@@ -134,7 +134,7 @@ class WebResendLinkCommand extends BaseCommand implements Commandable {
         */
        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'));
        }
 }
 
index e84fca7..a671745 100644 (file)
@@ -46,7 +46,7 @@ class ImageCodeCaptchaController extends BaseController implements Controller {
                $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;
index 1a1900c..4e82ce1 100644 (file)
@@ -46,16 +46,16 @@ class WebLoginAreaController extends BaseController implements Controller {
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // User auth filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter'));
 
                // User update filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_update_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_update_filter'));
 
                // News fetcher filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_filter'));
 
                // 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 */
 
index 64c845d..411c59b 100644 (file)
@@ -47,10 +47,10 @@ class WebConfirmController extends BaseController implements Controller {
                $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;
index 1f6c0cc..d5769e9 100644 (file)
@@ -46,8 +46,8 @@ class WebDefaultNewsController extends BaseController implements 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;
index 00b020a..7d8a9ae 100644 (file)
@@ -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->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter'));
 
                // User status filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
 
                // Return the prepared instance
                return $controllerInstance;
index d50782a..751dc7a 100644 (file)
@@ -170,50 +170,50 @@ $cfg->setConfigEntry('file_input_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");