Filteres rewritten, birthday added, some fixes:
authorRoland Häder <roland@mxchange.org>
Tue, 18 Nov 2008 17:32:21 +0000 (17:32 +0000)
committerRoland Häder <roland@mxchange.org>
Tue, 18 Nov 2008 17:32:21 +0000 (17:32 +0000)
- Birthday (day and month as 2-digit number and year as 4-digit number) added
- All filters now extends the BaseFilter class
- Typo (Startuphilfe -> Starthilfe) fixed
- Minor improvements

33 files changed:
.gitattributes
application/admin/templates/de/code/action_admin_login_profile.ctp
application/admin/templates/de/code/login_form.ctp
application/blog/templates/de/code/action_blog_login_profile.ctp
application/blog/templates/de/code/login_form.ctp
application/ship-simu/config.php
application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php
application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysStartupHelpFilter.php
application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysTrainingFilter.php
application/ship-simu/main/filter/page/class_RefillPageFilter.php
application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php
application/ship-simu/main/filter/verifier/.htaccess [new file with mode: 0644]
application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php [new file with mode: 0644]
application/ship-simu/templates/de/code/action_ship_simu_login_goverment_startup_help.ctp
application/ship-simu/templates/de/code/action_ship_simu_login_profile.ctp
application/ship-simu/templates/de/code/action_ship_simu_login_refill.ctp
application/ship-simu/templates/de/code/login_form.ctp
application/ship-simu/templates/de/code/register_form.ctp
application/shoutbox/templates/de/code/action_shoutbox_login_profile.ctp
application/shoutbox/templates/de/code/login_form.ctp
application/todo/templates/de/code/action_todo_login_profile.ctp
application/todo/templates/de/code/login_form.ctp
inc/classes/main/filter/change/class_EmailChangeFilter.php
inc/classes/main/filter/change/class_PasswordChangeFilter.php
inc/classes/main/filter/class_
inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php
inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php
inc/classes/main/filter/update/class_UserUpdateFilter.php
inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php
inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
inc/classes/main/helper/web/class_BaseWebHelper.php

index ca83c33a7f86aeb194704d505d7c61d30de13432..0754e3cea2a1e6c4a61e618966d3c2094aec504f 100644 (file)
@@ -218,6 +218,8 @@ application/ship-simu/main/filter/page/.htaccess -text
 application/ship-simu/main/filter/page/class_RefillPageFilter.php -text
 application/ship-simu/main/filter/validator/.htaccess -text
 application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php -text
 application/ship-simu/main/filter/page/class_RefillPageFilter.php -text
 application/ship-simu/main/filter/validator/.htaccess -text
 application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php -text
+application/ship-simu/main/filter/verifier/.htaccess -text
+application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php -text
 application/ship-simu/main/goverment/.htaccess -text
 application/ship-simu/main/goverment/class_SimplifiedGoverment.php -text
 application/ship-simu/main/login/.htaccess -text
 application/ship-simu/main/goverment/.htaccess -text
 application/ship-simu/main/goverment/class_SimplifiedGoverment.php -text
 application/ship-simu/main/login/.htaccess -text
index a506218bdaf4b02e11f4621206cc79f58810af72..8957cf9027aa5d20d7216109553e4129d2f37789 100644 (file)
@@ -16,7 +16,7 @@ $helper->addFieldText('pass2', "Neues Passwort, Wiederholung:");
 $helper->addInputPasswordField('pass2');
 
 // Display current email
 $helper->addInputPasswordField('pass2');
 
 // Display current email
-$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span id=\"displayed_field\">".$helper->getValueField('email')."</span>");
+$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span class=\"persona_data\">".$helper->getValueField('email')."</span>");
 
 // Only for changing email address
 if ($helper->ifEmailChangeAllowed()) {
 
 // Only for changing email address
 if ($helper->ifEmailChangeAllowed()) {
index 700f88f99ca6a1185c7d14d9dc1e87c246b2c48f..688dc125f42f693e9fad085294b7952cefbd8bd1 100644 (file)
@@ -33,7 +33,7 @@ if ($helper->ifLoginIsEnabled()) {
 
        // CAPTCHA enabled?
        if ($helper->ifFormSecuredWithCaptcha()) {
 
        // CAPTCHA enabled?
        if ($helper->ifFormSecuredWithCaptcha()) {
-               $helper->addFormGroup('captcha_user', "Unser Benuzter-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
+               $helper->addFormGroup('captcha_user', "Das Benutzer-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
                $helper->addCaptcha();
        } // END - if
 
                $helper->addCaptcha();
        } // END - if
 
index c76abd364a6b3083afb43c29a836d27da49b11db..7a44b9a4feb0cdea2abb229505d06342d0557dd8 100644 (file)
@@ -16,7 +16,7 @@ $helper->addFieldText('pass2', "Neues Passwort, Wiederholung:");
 $helper->addInputPasswordField('pass2');
 
 // Display current email
 $helper->addInputPasswordField('pass2');
 
 // Display current email
-$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span id=\"displayed_field\">".$helper->getValueField('email')."</span>");
+$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span class=\"persona_data\">".$helper->getValueField('email')."</span>");
 
 // Only for changing email address
 if ($helper->ifEmailChangeAllowed()) {
 
 // Only for changing email address
 if ($helper->ifEmailChangeAllowed()) {
index de32aa580f3b919f26b90392bbcfafc7cdf8787a..44492aca6a0e2538a8d479cec50205067274bd95 100644 (file)
@@ -33,7 +33,7 @@ if ($helper->ifLoginIsEnabled()) {
 
        // CAPTCHA enabled?
        if ($helper->ifFormSecuredWithCaptcha()) {
 
        // CAPTCHA enabled?
        if ($helper->ifFormSecuredWithCaptcha()) {
-               $helper->addFormGroup('captcha_user', "Unser Benuzter-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
+               $helper->addFormGroup('captcha_user', "Das Benutzer-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
                $helper->addCaptcha();
        } // END - if
 
                $helper->addCaptcha();
        } // END - if
 
index baf84707acad2d7751a09968d788a9f1a9e5a070..5c18fdc8afbff9048cb6ba94ecce75beaf104e45 100644 (file)
@@ -58,6 +58,9 @@ $cfg->setConfigEntry('register_personal_data', "Y");
 // CFG: REGISTER-EMAIL-UNIQUE
 $cfg->setConfigEntry('register_email_unique', "Y");
 
 // CFG: REGISTER-EMAIL-UNIQUE
 $cfg->setConfigEntry('register_email_unique', "Y");
 
+// CFG: PROFILE-INCLUDES-BIRTHDAY
+$cfg->setConfigEntry('profile_includes_birthday', "Y");
+
 // CFG: CHAT-ENABLED-ICQ
 $cfg->setConfigEntry('chat_enabled_icq', "Y");
 
 // CFG: CHAT-ENABLED-ICQ
 $cfg->setConfigEntry('chat_enabled_icq', "Y");
 
@@ -196,6 +199,12 @@ $cfg->setConfigEntry('captcha_profile_verifier_filter', "GraphicalCodeCaptchaVer
 // CFG: CONFIRM-CODE-VERIFIER-FILTER
 $cfg->setConfigEntry('confirm_code_verifier_filter', "ConfirmCodeVerifierFilter");
 
 // CFG: CONFIRM-CODE-VERIFIER-FILTER
 $cfg->setConfigEntry('confirm_code_verifier_filter', "ConfirmCodeVerifierFilter");
 
+// CFG: BIRTHDAY-REGISTER-VERIFIER-FILTER
+$cfg->setConfigEntry('birthday_register_verifier_filter', "BirthdayVerifierFilter");
+
+// CFG: BIRTHDAY-PROFILE-VERIFIER-FILTER
+$cfg->setConfigEntry('birthday_profile_verifier_filter', "BirthdayVerifierFilter");
+
 // CFG: REFILL-PAGE-FILTER
 $cfg->setConfigEntry('refill_page_filter', "RefillPageFilter");
 
 // CFG: REFILL-PAGE-FILTER
 $cfg->setConfigEntry('refill_page_filter', "RefillPageFilter");
 
@@ -268,8 +277,11 @@ $cfg->setConfigEntry('shipsimu_guest_login_captcha', "GraphicalCodeCaptcha");
 // CFG: SHIPSIMU-PROFILE-CAPTCHA
 $cfg->setConfigEntry('shipsimu_profile_captcha', "GraphicalCodeCaptcha");
 
 // CFG: SHIPSIMU-PROFILE-CAPTCHA
 $cfg->setConfigEntry('shipsimu_profile_captcha', "GraphicalCodeCaptcha");
 
-// CFG: REFILL-FORM-CAPTCHA
-$cfg->setConfigEntry('refill_form_captcha', "GraphicalCodeCaptcha");
+// CFG: SHIPSIMU-REFILL-CAPTCHA
+$cfg->setConfigEntry('shipsimu_refill_captcha', "GraphicalCodeCaptcha");
+
+// CFG: SHIPSIMU-GOVERMENT-STARTUP-CAPTCHA
+$cfg->setConfigEntry('shipsimu_goverment_startup_captcha', "GraphicalCodeCaptcha");
 
 // CFG: CAPTCHA-STRING-LENGTH
 $cfg->setConfigEntry('captcha_string_length', 5);
 
 // CFG: CAPTCHA-STRING-LENGTH
 $cfg->setConfigEntry('captcha_string_length', 5);
@@ -292,8 +304,11 @@ $cfg->setConfigEntry('shipsimu_guest_login_captcha_secured', "Y");
 // CFG: SHIPSIMU-PROFILE-CAPTCHA-SECURED
 $cfg->setConfigEntry('shipsimu_profile_captcha_secured', "Y");
 
 // CFG: SHIPSIMU-PROFILE-CAPTCHA-SECURED
 $cfg->setConfigEntry('shipsimu_profile_captcha_secured', "Y");
 
-// CFG: REFILL-FORM-CAPTCHA-SECURED
-$cfg->setConfigEntry('refill_form_captcha_secured', "Y");
+// CFG: SHIPSIMU-REFILL-CAPTCHA-SECURED
+$cfg->setConfigEntry('shipsimu_refill_captcha_secured', "Y");
+
+// CFG: SHIPSIMU-GOVERMENT-STARTUP-CAPTCHA-SECURED
+$cfg->setConfigEntry('shipsimu_goverment_startup_captcha_secured', "Y");
 
 // CFG: BLOCK-SHOWS-REGISTRATION
 $cfg->setConfigEntry('block_shows_registration', "Y");
 
 // CFG: BLOCK-SHOWS-REGISTRATION
 $cfg->setConfigEntry('block_shows_registration', "Y");
index e8aff7d0e414ee3527f558763b068205d04bf5e1..3d66614de3c8278a4e23dc9d164a3e2401792bbf 100644 (file)
@@ -136,6 +136,9 @@ class WebShipsimuProfileCommand extends BaseCommand implements Commandable {
                // Validate CAPTCHA input
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_profile_verifier_filter'));
 
                // Validate CAPTCHA input
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_profile_verifier_filter'));
 
+               // Validate birthday input
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('birthday_profile_verifier_filter'));
+
                // Email changed
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_change_filter'));
 
                // Email changed
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_change_filter'));
 
index 56072d6df9f1b98e99637aec709a4e31ad6610e8..c47c4a6b73983825b8615d4699e06781b3a0acfe 100644 (file)
@@ -111,6 +111,9 @@ class WebShipsimuRegisterCommand extends BaseCommand implements Commandable {
 
                // Validate CAPTCHA input
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_register_verifier_filter'));
 
                // Validate CAPTCHA input
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_register_verifier_filter'));
+
+               // Validate birthday
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('birthday_register_verifier_filter'));
        }
 }
 
        }
 }
 
index 3d02ad9a5d843922f7e519f6177d9b69d1eef799..6917edcc2b5c2568ab393a6b7e8301645681d578 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/>.
  */
  * 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 ShipSimuGovermentPaysStartupHelpFilter extends BaseFrameworkSystem implements Filterable {
+class ShipSimuGovermentPaysStartupHelpFilter extends BaseFilter implements Filterable {
        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *
@@ -30,10 +30,6 @@ class ShipSimuGovermentPaysStartupHelpFilter extends BaseFrameworkSystem impleme
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
        }
 
        /**
@@ -62,7 +58,7 @@ class ShipSimuGovermentPaysStartupHelpFilter extends BaseFrameworkSystem impleme
                $userInstance = Registry::getRegistry()->getInstance('user');
 
                // Now simply check for it
                $userInstance = Registry::getRegistry()->getInstance('user');
 
                // Now simply check for it
-               if (($userInstance instanceof ManageableMember) || ($userInstance->ifGovermentPaysStartupHelp() === false)) {
+               if ((!$userInstance instanceof ManageableMember) || ($userInstance->ifGovermentPaysStartupHelp() === false)) {
                        // Request is invalid
                        $requestInstance->requestIsValid(false);
 
                        // Request is invalid
                        $requestInstance->requestIsValid(false);
 
index 466059c7c9b22ca8972ad1180f4bcd6d51b6b457..b8b8dd82a7af39510606758f87eebd18d7db1ae2 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/>.
  */
  * 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 ShipSimuGovermentPaysTrainingFilter extends BaseFrameworkSystem implements Filterable {
+class ShipSimuGovermentPaysTrainingFilter extends BaseFilter implements Filterable {
        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *
@@ -30,10 +30,6 @@ class ShipSimuGovermentPaysTrainingFilter extends BaseFrameworkSystem implements
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
        }
 
        /**
index 448605b1f9602c5c1470d6ad65489770ba5083f2..c87f21eecd8aefb872e5128d052dd52ec20224f1 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/>.
  */
  * 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 RefillPageFilter extends BaseFrameworkSystem implements Filterable {
+class RefillPageFilter extends BaseFilter implements Filterable {
        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *
@@ -30,10 +30,6 @@ class RefillPageFilter extends BaseFrameworkSystem implements Filterable {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
        }
 
        /**
index 06643e08e69ef4ae8dfcc66a5cca519096fd6456..c33f5e2309b49d9f05ba6d79337fecfd20fe6a50 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/>.
  */
  * 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 RefillRequestValidatorFilter extends BaseFrameworkSystem implements Filterable {
+class RefillRequestValidatorFilter extends BaseFilter implements Filterable {
        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *
@@ -30,10 +30,6 @@ class RefillRequestValidatorFilter extends BaseFrameworkSystem implements Filter
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
        }
 
        /**
diff --git a/application/ship-simu/main/filter/verifier/.htaccess b/application/ship-simu/main/filter/verifier/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
@@ -0,0 +1 @@
+Deny from all
diff --git a/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php b/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php
new file mode 100644 (file)
index 0000000..cc15989
--- /dev/null
@@ -0,0 +1,63 @@
+<?php
+/**
+ * A verifier filter for birthday data
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class BirthdayVerifierFilter extends BaseFilter implements Filterable {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+       }
+
+       /**
+        * Creates an instance of this filter class
+        *
+        * @return      $filterInstance         An instance of this filter class
+        */
+       public final static function createBirthdayVerifierFilter () {
+               // Get a new instance
+               $filterInstance = new BirthdayVerifierFilter();
+
+               // Return the instance
+               return $filterInstance;
+       }
+
+       /**
+        * Executes the filter with given request and response objects
+        *
+        * @param       $requestInstance        An instance of a class with an Requestable interface
+        * @param       $responseInstance       An instance of a class with an Responseable interface
+        * @return      void
+        * @todo        0% done
+        */
+       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
+               // Implement this!
+               $this->partialStub("Please implement this method.");
+       }
+}
+
+// [EOF]
+?>
index 23e41928d323fa63ac797c01c6363b29a8556dbb..26b5ece14ea316a0a312764b2d6a5be396487302 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Get form helper instance
 <?php
 // Get form helper instance
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_startup_form'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_goverment_startup'));
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');
 
 // Prefetch user instance
 $helperInstance->prefetchValueInstance('user');
@@ -8,17 +8,55 @@ $helperInstance->prefetchValueInstance('user');
 // Add main form group
 $helperInstance->addFormNote('reality_warning', "WARNUNG: Bitte dieses Formular nicht mit echten Angaben ausf&uuml;llen!");
 
 // Add main form group
 $helperInstance->addFormNote('reality_warning', "WARNUNG: Bitte dieses Formular nicht mit echten Angaben ausf&uuml;llen!");
 
+// Add group for personal data
+$helperInstance->addFormGroup('persona_data', "Deine pers&ouml;nliche Daten, die f&uuml;r die Beantragung n&ouml;tig sind:");
+
+// Display email, surname and family name
+$helperInstance->addFormNote('surname', "Vorname: <span class=\"persona_data\">".$helperInstance->getValueField('surname')."</span>");
+$helperInstance->addFormNote('family', "Nachname: <span class=\"persona_data\">".$helperInstance->getValueField('family')."</span>");
+$helperInstance->addFormNote('email', "Email-Adresse: <span class=\"persona_data\">".$helperInstance->getValueField('email')."</span>");
+$helperInstance->addFormNote('birthday', "Geburtstag: <span class=\"persona_data\">".$helperInstance->getValueField('birth_day').".".$helperInstance->getValueField('birth_month').".".$helperInstance->getValueField('birth_year')."</span>");
+
+// Add link placeholder for profile page
+$helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?shipsimu_profile_link?}");
+
+// CAPTCHA enabled?
+if ($helperInstance->ifFormSecuredWithCaptcha()) {
+       $helperInstance->addFormGroup('captcha_user', "Die virtuelle Beantragung von Starthilfe ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du die Starthilfe beantragen kannst.");
+       $helperInstance->addCaptcha();
+} // END - if
+
+// Ask again for current account password
+$helperInstance->addFormGroup('password', "Bitte gebe zur Best&auml;tigung dein derzeitiges Passwort ein.");
+$helperInstance->addFieldText('password', "Derzeitiges Passwort:");
+$helperInstance->addInputPasswordField('password');
+
+// Final notices
+$helperInstance->addFormGroup('buttons', "Sind alle Daten nun korrekt eingegeben? Dann sende sie mit einem Klick einfach ab!");
+$helperInstance->addInputResetButton("Alles nochmal eingeben");
+$helperInstance->addInputSubmitButton("Starthilfe beantragen");
+$helperInstance->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;.");
+
 // Flush the finished form
 $helperInstance->flushContent();
 
 // Flush the finished form
 $helperInstance->flushContent();
 
+// Get link helper for profile link
+$linkInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'shipsimu_profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
+
+// Add action
+$linkInstance->addActionLinkById('profile', 'goto_profile_link');
+
+// Flush the finished form
+$linkInstance->flushContent();
+
 // [EOC]
 ?>
 <div id="goverment_frame">
        <div id="goverment_header">
 // [EOC]
 ?>
 <div id="goverment_frame">
        <div id="goverment_header">
-               Virtuelle Beantragung von Startuphilfe
+               Virtuelle Beantragung von Starthilfe
        </div>
 
        <div id="goverment_form">
        </div>
 
        <div id="goverment_form">
-               {?shipsimu_startup_form?}
+               {?shipsimu_goverment_startup?}
        </div>
 </div>
        </div>
 </div>
index 6ec1ff2c3066f129ac7f9910639a14e34352a832..c55cab785d7fd7cf47a1848cdb79852d1c747ebd 100644 (file)
@@ -50,6 +50,16 @@ if ($helperInstance->ifRegisterIncludesPersonaData()) {
        $helperInstance->addInputTextFieldWithDefault('street');
        $helperInstance->addFieldText('city', "Wohnort:");
        $helperInstance->addInputTextFieldWithDefault('city');
        $helperInstance->addInputTextFieldWithDefault('street');
        $helperInstance->addFieldText('city', "Wohnort:");
        $helperInstance->addInputTextFieldWithDefault('city');
+
+       // Include birthday?
+       if ($helperInstance->ifProfileIncludesBirthDay()) {
+               $helperInstance->addFormSubGroup('birthday', "Verrate uns doch dein Geburtsdatum, als Dankesch&ouml;n erh&auml;lst du interessante Pr&auml;mien - ausschliesslich per Email - zum Geburtstag zugesandt! G&uuml;ltiges Format: TT.MM.JJJJ");
+               $helperInstance->addInputTextField('birth_day');
+               $helperInstance->addFieldText('birth_day', ".");
+               $helperInstance->addInputTextField('birth_month');
+               $helperInstance->addFieldText('birth_day', ".");
+               $helperInstance->addInputTextField('birth_year');
+       } // END - if
 } // END - if
 
 // Add sub group for zip code
 } // END - if
 
 // Add sub group for zip code
@@ -106,7 +116,7 @@ if ($helperInstance->ifRulesHaveChanged()) {
 
 // CAPTCHA enabled?
 if ($helperInstance->ifFormSecuredWithCaptcha()) {
 
 // CAPTCHA enabled?
 if ($helperInstance->ifFormSecuredWithCaptcha()) {
-       $helperInstance->addFormGroup('captcha_user', "Unser Benuzter-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
+       $helperInstance->addFormGroup('captcha_user', "Das &Auml;ndern von Profildaten ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit deine &Auml;nderungen gespeichert werden k&ouml;nnen.");
        $helperInstance->addCaptcha();
 } // END - if
 
        $helperInstance->addCaptcha();
 } // END - if
 
index 4bca46db4a90a5852b035412ff3918e00282b588..84c29c078850ef05bc027374457887c711369e5a 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Neue Helper-Instanz holen
 <?php
 // Neue Helper-Instanz holen
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'refill_form'));
+$helperInstance = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shipsimu_refill'));
 
 // Pre-fetch payment types
 $helperInstance->prefetchValueInstance('payments');
 
 // Pre-fetch payment types
 $helperInstance->prefetchValueInstance('payments');
@@ -55,6 +55,6 @@ $helperInstance->flushContent();
                Jetzt dein {?currency?}-Konto aufladen!
        </div>
        <div class="content_body">
                Jetzt dein {?currency?}-Konto aufladen!
        </div>
        <div class="content_body">
-               {?refill_form?}
+               {?shipsimu_refill?}
        </div>
 </div>
        </div>
 </div>
index f493423f79f7e704eb87ea2f8ce22701f9d733b0..560b79fdb24778ac15df2865179894b41a060175 100644 (file)
@@ -33,7 +33,7 @@ if ($helperInstance->ifLoginIsEnabled()) {
 
        // CAPTCHA enabled?
        if ($helperInstance->ifFormSecuredWithCaptcha()) {
 
        // CAPTCHA enabled?
        if ($helperInstance->ifFormSecuredWithCaptcha()) {
-               $helperInstance->addFormGroup('captcha_user', "Unser Benuzter-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
+               $helperInstance->addFormGroup('captcha_user', "Das Benutzer-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
                $helperInstance->addCaptcha();
        } // END - if
 
                $helperInstance->addCaptcha();
        } // END - if
 
index 5426b38b3efd696b6a91d5eb9448506f15345ee6..8fc6549bdfdb80a3b305ca2f5c45fc1e44bacc8c 100644 (file)
@@ -15,6 +15,7 @@ $helperInstance->addInputPasswordField('pass1');
 $helperInstance->addFieldText('pass2', "Passwortwiederholung:");
 $helperInstance->addInputPasswordField('pass2');
 
 $helperInstance->addFieldText('pass2', "Passwortwiederholung:");
 $helperInstance->addInputPasswordField('pass2');
 
+// Does this registration require an email?
 if ($helperInstance->ifRegisterRequiresEmailVerification()) {
        $helperInstance->addFormGroup('email', "Bitte gebe deine Email zweimal (ein zweites Mal zur Best&auml;tigung) ein, damit wir dir deinen Freischaltlink zusenden k&ouml;nnen.");
        $helperInstance->addFieldText('email1', "Email-Adresse:");
 if ($helperInstance->ifRegisterRequiresEmailVerification()) {
        $helperInstance->addFormGroup('email', "Bitte gebe deine Email zweimal (ein zweites Mal zur Best&auml;tigung) ein, damit wir dir deinen Freischaltlink zusenden k&ouml;nnen.");
        $helperInstance->addFieldText('email1', "Email-Adresse:");
@@ -22,12 +23,13 @@ if ($helperInstance->ifRegisterRequiresEmailVerification()) {
        $helperInstance->addFieldText('email2', "Wiederholung Email-Adresse:");
        $helperInstance->addInputTextField('email2');
 
        $helperInstance->addFieldText('email2', "Wiederholung Email-Adresse:");
        $helperInstance->addInputTextField('email2');
 
+       // Must the email address be unique in this system?
        if ($helperInstance->ifEmailMustBeUnique()) {
                $helperInstance->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein.");
        if ($helperInstance->ifEmailMustBeUnique()) {
                $helperInstance->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein.");
-       } // END - Unique email addresses
-
-} // END - email verification
+       } // END - if
+} // END - if
 
 
+// Shall we also ask some personal data to complete the profile?
 if ($helperInstance->ifRegisterIncludesProfile()) {
        $helperInstance->addFormGroup('profile', "Hier kannst du zus&auml;tzlich deine Profildaten vorweg eingeben, du kannst sie aber auch nach dem Login vervollst&auml;ndigen!");
 
 if ($helperInstance->ifRegisterIncludesProfile()) {
        $helperInstance->addFormGroup('profile', "Hier kannst du zus&auml;tzlich deine Profildaten vorweg eingeben, du kannst sie aber auch nach dem Login vervollst&auml;ndigen!");
 
@@ -35,7 +37,12 @@ if ($helperInstance->ifRegisterIncludesProfile()) {
                $helperInstance->addFormSubGroup('email', "Die Angabe deiner Email-Adresse ist nur dann n&ouml;tig, wenn du auch Email-Benachrichtigungen (<span id=\"add_note\">*1</span>) haben m&ouml;chtest.");
                $helperInstance->addFieldText('email1', "Email-Adresse:");
                $helperInstance->addInputTextField('email1');
                $helperInstance->addFormSubGroup('email', "Die Angabe deiner Email-Adresse ist nur dann n&ouml;tig, wenn du auch Email-Benachrichtigungen (<span id=\"add_note\">*1</span>) haben m&ouml;chtest.");
                $helperInstance->addFieldText('email1', "Email-Adresse:");
                $helperInstance->addInputTextField('email1');
-       } // END - No email verification
+
+               // Must the email address be unique in this system?
+               if ($helperInstance->ifEmailMustBeUnique()) {
+                       $helperInstance->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein.");
+               } // END - if
+       } // END - if
 
        // Persoenliche Daten mit in der Anmeldung abfragen?
        if ($helperInstance->ifRegisterIncludesPersonaData()) {
 
        // Persoenliche Daten mit in der Anmeldung abfragen?
        if ($helperInstance->ifRegisterIncludesPersonaData()) {
@@ -48,7 +55,17 @@ if ($helperInstance->ifRegisterIncludesProfile()) {
                $helperInstance->addInputTextField('street');
                $helperInstance->addFieldText('city', "Wohnort:");
                $helperInstance->addInputTextField('city');
                $helperInstance->addInputTextField('street');
                $helperInstance->addFieldText('city', "Wohnort:");
                $helperInstance->addInputTextField('city');
-       } // END - Persona data
+
+               // Include birthday?
+               if ($helperInstance->ifProfileIncludesBirthDay()) {
+                       $helperInstance->addFormSubGroup('birthday', "Verrate uns doch dein Geburtsdatum, als Dankesch&ouml;n erh&auml;lst du interessante Pr&auml;mien - ausschliesslich per Email - zum Geburtstag zugesandt! G&uuml;ltiges Format: TT.MM.JJJJ");
+                       $helperInstance->addInputTextField('birth_day');
+                       $helperInstance->addFieldText('birth_day', ".");
+                       $helperInstance->addInputTextField('birth_month');
+                       $helperInstance->addFieldText('birth_day', ".");
+                       $helperInstance->addInputTextField('birth_year');
+               } // END - if
+       } // END - if
 
        $helperInstance->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
        $helperInstance->addFieldText('zip', "Postleitzahl:");
 
        $helperInstance->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
        $helperInstance->addFieldText('zip', "Postleitzahl:");
index 85367c462bb3893c76d158fd3d4e1e6053be9de9..dd27e8a90d7bccc38c7075af79c3ba7f3da74634 100644 (file)
@@ -16,7 +16,7 @@ $helper->addFieldText('pass2', "Neues Passwort, Wiederholung:");
 $helper->addInputPasswordField('pass2');
 
 // Display current email
 $helper->addInputPasswordField('pass2');
 
 // Display current email
-$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span id=\"displayed_field\">".$helper->getValueField('email')."</span>");
+$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span class=\"persona_data\">".$helper->getValueField('email')."</span>");
 
 // Only for changing email address
 if ($helper->ifEmailChangeAllowed()) {
 
 // Only for changing email address
 if ($helper->ifEmailChangeAllowed()) {
index f6ca6fb85d257a282fee65b96b5b845743a42d5f..f3dc1f16f138180fb9475bbe2775464d788fb05a 100644 (file)
@@ -33,7 +33,7 @@ if ($helper->ifLoginIsEnabled()) {
 
        // CAPTCHA enabled?
        if ($helper->ifFormSecuredWithCaptcha()) {
 
        // CAPTCHA enabled?
        if ($helper->ifFormSecuredWithCaptcha()) {
-               $helper->addFormGroup('captcha_user', "Unser Benuzter-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
+               $helper->addFormGroup('captcha_user', "Das Benutzer-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
                $helper->addCaptcha();
        } // END - if
 
                $helper->addCaptcha();
        } // END - if
 
index ee4f27013d6fcd9909f509f127ebc9427a5365f4..6853ae4519ce603cdf3432006684a954c145c990 100644 (file)
@@ -16,7 +16,7 @@ $helper->addFieldText('pass2', "Neues Passwort, Wiederholung:");
 $helper->addInputPasswordField('pass2');
 
 // Display current email
 $helper->addInputPasswordField('pass2');
 
 // Display current email
-$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span id=\"displayed_field\">".$helper->getValueField('email')."</span>");
+$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span class=\"persona_data\">".$helper->getValueField('email')."</span>");
 
 // Only for changing email address
 if ($helper->ifEmailChangeAllowed()) {
 
 // Only for changing email address
 if ($helper->ifEmailChangeAllowed()) {
index 683145bb812ced53d6b8f04c4061e7a2e98b3f93..f9ed4805ae5ea29b83f29f798dcbb03a06895890 100644 (file)
@@ -33,7 +33,7 @@ if ($helper->ifLoginIsEnabled()) {
 
        // CAPTCHA enabled?
        if ($helper->ifFormSecuredWithCaptcha()) {
 
        // CAPTCHA enabled?
        if ($helper->ifFormSecuredWithCaptcha()) {
-               $helper->addFormGroup('captcha_user', "Unser Benuzter-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
+               $helper->addFormGroup('captcha_user', "Das Benutzer-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
                $helper->addCaptcha();
        } // END - if
 
                $helper->addCaptcha();
        } // END - if
 
index d213a22336eb84da1e6b6472f594a6e81fbebaae..276119cda7d29e0397b7e7ec4cb04bc6fe638d96 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/>.
  */
  * 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 EmailChangeFilter extends BaseFrameworkSystem implements Filterable {
+class EmailChangeFilter extends BaseFilter implements Filterable {
        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *
index 5a604fd4732d0df35b826db0c79df75450b5bca1..d1da065f40ecf687021a176472a8aca22a36d7b0 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/>.
  */
  * 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 PasswordChangeFilter extends BaseFrameworkSystem implements Filterable {
+class PasswordChangeFilter extends BaseFilter implements Filterable {
        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *
index 4aff5132a1362edf52e2e151f0fd68a69f8bbd4b..c24976216569451819e9aa71e32d07f47787f338 100644 (file)
@@ -30,10 +30,6 @@ class ???Filter extends BaseFrameworkSystem implements Filterable {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
        }
 
        /**
index 01774b7cff7102f24648cbc259fffb58ec3f3f1f..6abe368cd356c569777372f8675f002492c923d7 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/>.
  */
  * 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 CaptchaEncryptFilter extends BaseFrameworkSystem implements Filterable {
+class CaptchaEncryptFilter extends BaseFilter implements Filterable {
        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *
index 2f12e5b075662dcef24b84d740bd21c35533ade4..38fb46e18be6520454bbac5b47b98981e008ece3 100644 (file)
@@ -23,7 +23,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 PaymentDiscoveryFilter extends BaseFrameworkSystem implements Filterable {
+class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
        /**
         * Action name for payment discovery
         */
        /**
         * Action name for payment discovery
         */
@@ -37,10 +37,6 @@ class PaymentDiscoveryFilter extends BaseFrameworkSystem implements Filterable {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
        }
 
        /**
index 7e301484ca5dca78e7eebd2cdb46dd5f8f5af4aa..b9ac082a5fcfce3ab5f6ca9cfafcfdafc53b6e9b 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/>.
  */
  * 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 UserStatusConfimedUpdateFilter extends BaseFrameworkSystem implements Filterable {
+class UserStatusConfimedUpdateFilter extends BaseFilter implements Filterable {
        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *
index be0c9a8bf7f74cd5cee0f919c68c55728c87f99d..c55989cef3034eb6dd7b5ee8f60ce58396b1d648 100644 (file)
@@ -22,7 +22,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 UserUpdateFilter extends BaseFrameworkSystem implements Filterable {
+class UserUpdateFilter extends BaseFilter implements Filterable {
        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *
index d2d53d83bf30816d55f7c0159b6cea7665d4938a..6722d529c95207077d7c07d7191d57f3c882ca4a 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/>.
  */
  * 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 UserStatusVerifierFilter extends BaseFrameworkSystem implements Filterable {
+class UserStatusVerifierFilter extends BaseFilter implements Filterable {
        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *
index fd5bb60b269ed74b5c847b241fc1fef8639137ec..f2982ede19eac0fb31902ca014fcd596da11d802 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/>.
  */
  * 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 UserUnconfirmedVerifierFilter extends BaseFrameworkSystem implements Filterable {
+class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *
index 19b5be3d85f46a04222ecec06db4552e9b948702..0da3e0a103f26a09b07ed7a2a71488de776c4024 100644 (file)
@@ -64,6 +64,16 @@ class BaseWebHelper extends BaseHelper {
                return $required;
        }
 
                return $required;
        }
 
+       /**
+        * Checks wether for birthday shall be asked
+        *
+        * @return      $required       Wether birthday shall be asked
+        */
+       public function ifProfileIncludesBirthDay () {
+               $required = ($this->getConfigInstance()->readConfig('profile_includes_birthday') === "Y");
+               return $required;
+       }
+
        /**
         * Checks wether email addresses can only be once used
         *
        /**
         * Checks wether email addresses can only be once used
         *