Some template fixes and missing command class added
authorRoland Häder <roland@mxchange.org>
Fri, 21 Aug 2009 22:21:10 +0000 (22:21 +0000)
committerRoland Häder <roland@mxchange.org>
Fri, 21 Aug 2009 22:21:10 +0000 (22:21 +0000)
.gitattributes
application/ship-simu/config.php
application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php [new file with mode: 0644]
application/ship-simu/templates/de/code/action_ship_simu_login_government_training.ctp

index b58a7bd..bc11e79 100644 (file)
@@ -99,6 +99,7 @@ application/ship-simu/main/commands/web/government/.htaccess -text
 application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php -text
 application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php -text
 application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php -text
+application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php -text
 application/ship-simu/main/companies/.htaccess -text
 application/ship-simu/main/companies/class_ShippingCompany.php -text
 application/ship-simu/main/constructions/.htaccess -text
index f83162e..80a53d4 100644 (file)
@@ -169,6 +169,9 @@ $cfg->setConfigEntry('login_area_logout_now_action_url', 'index.php?app={?app_sh
 // CFG: LOGIN-AREA-RETURN-LOGIN-ACTION-URL
 $cfg->setConfigEntry('login_area_return_login_action_url', 'index.php?app={?app_short_name?}&amp;page=login_area');
 
+// CFG: LOGIN-AREA-SHIPSIMU-PROFILE-ACTION-URL
+$cfg->setConfigEntry('login_area_shipsimu_profile_action_url', 'index.php?app={?app_short_name?}&amp;page=login_area&amp;action=profile');
+
 // CFG: LOGOUT_DONE-RELOGIN-ACTION-URL
 $cfg->setConfigEntry('logout_done_relogin_action_url', 'index.php?app={?app_short_name?}&amp;page=login');
 
diff --git a/application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php b/application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php
new file mode 100644 (file)
index 0000000..a399674
--- /dev/null
@@ -0,0 +1,90 @@
+<?php
+/**
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class WebShipsimuGovernmentTrainingCommand extends BaseCommand implements Commandable {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+       }
+
+       /**
+        * Creates an instance of this class
+        *
+        * @param       $resolverInstance       An instance of a command resolver class
+        * @return      $commandInstance        An instance a prepared command class
+        */
+       public final static function createWebShipsimuGovernmentTrainingCommand (CommandResolver $resolverInstance) {
+               // Get new instance
+               $commandInstance = new WebShipsimuGovernmentTrainingCommand();
+
+               // Set the application instance
+               $commandInstance->setResolverInstance($resolverInstance);
+
+               // Return the prepared instance
+               return $commandInstance;
+       }
+
+       /**
+        * Executes the given command 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) {
+               $this->partialStub('Unfinished method.');
+       }
+
+       /**
+        * Adds extra filters to the given controller instance
+        *
+        * @param       $controllerInstance             A controller instance
+        * @param       $requestInstance                An instance of a class with an Requestable interface
+        * @return      void
+        * @todo        Maybe we need some filters here?
+        */
+       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_filter'));
+
+               // Add user status filter here
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
+
+               // Check if government can pay training help
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('government_pays_training_filter'));
+
+               // Verify password
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('account_password_filter'));
+
+               // Verify CAPTCHA code
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_refill_verifier_filter'));
+       }
+}
+
+// [EOF]
+?>
index aafaf04..7c921ff 100644 (file)
@@ -16,20 +16,27 @@ $helperInstance->addFormGroup('password', "Bitte gebe zur Best&auml;tigung dein
 $helperInstance->addFieldText('password', "Derzeitiges Passwort:");
 $helperInstance->addInputPasswordField('password');
 
-// CAPTCHA enabled?
-if ($helperInstance->ifFormSecuredWithCaptcha()) {
-       $helperInstance->addFormGroup('captcha_user', "Die virtuelle Beantragung eines Trainingkursus ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, um den Trainingskursus zu beantragen.");
-       $helperInstance->addCaptcha();
-} // END - if
-
 // 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\">".(int)$helperInstance->getValueField('birth_day').".".(int)$helperInstance->getValueField('birth_month').".".(int)$helperInstance->getValueField('birth_year')."</span>");
 
 // Add link placeholder for profile page
 $helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?shipsimu_profile?}");
 
+// CAPTCHA enabled?
+if ($helperInstance->ifFormSecuredWithCaptcha()) {
+       $helperInstance->addFormGroup('captcha_user', "Die virtuelle Beantragung eines Trainingkursus ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, um den Trainingskursus zu beantragen.");
+       $helperInstance->addCaptcha();
+} // END - if
+
+// 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("Trainingskurs beantragen");
+$helperInstance->addFormNote('data_protection', "Deine Daten werden nach den g&uuml;ltigen Datenschutzgesetzen gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link &quot;Datenschutz&quot;.");
+
 // Flush the finished form
 $helperInstance->flushContent();