X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fcommands%2Fweb%2Fclass_WebRegisterCommand.php;h=1655a9a132bf81c772fe511b5f8c6f59e60260a5;hb=fdc6a02b5e6c2155cda61fcc345c7583b734ab85;hp=d65c23ecc5df80658fe50a09178384b79cdb1929;hpb=1324b879f1d6d75c95be4a5da9dcdcc8c9a01557;p=core.git

diff --git a/inc/classes/main/commands/web/class_WebRegisterCommand.php b/inc/classes/main/commands/web/class_WebRegisterCommand.php
index d65c23ec..1655a9a1 100644
--- a/inc/classes/main/commands/web/class_WebRegisterCommand.php
+++ b/inc/classes/main/commands/web/class_WebRegisterCommand.php
@@ -2,11 +2,11 @@
 /**
  * A command class for the registration form
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.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
@@ -38,7 +38,7 @@ class WebRegisterCommand extends BaseCommand implements Commandable, Registerabl
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebRegisterCommand (CommandResolver $resolverInstance) {
+	public static final function createWebRegisterCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebRegisterCommand();
 
@@ -61,19 +61,19 @@ class WebRegisterCommand extends BaseCommand implements Commandable, Registerabl
 		Registry::getRegistry()->addInstance('extra', $this);
 
 		// Get the application instance
-		$appInstance = $this->getResolverInstance()->getApplicationInstance();
+		$applicationInstance = $this->getResolverInstance()->getApplicationInstance();
 
 		// Prepare a template instance
-		$templateInstance = $this->prepareTemplateInstance($appInstance);
+		$templateInstance = $this->prepareTemplateInstance($applicationInstance);
 
 		// Assign all the application's data with template variables
-		$templateInstance->assignApplicationData($appInstance);
+		$templateInstance->assignApplicationData($applicationInstance);
 
 		// Assign base URL
 		$templateInstance->assignConfigVariable('base_url');
 
 		// Load the master template
-		$masterTemplate = $appInstance->buildMasterTemplateName();
+		$masterTemplate = $applicationInstance->buildMasterTemplateName();
 
 		// Load header template
 		$templateInstance->loadCodeTemplate('header');
@@ -104,13 +104,13 @@ class WebRegisterCommand extends BaseCommand implements Commandable, Registerabl
 
 		// Construct the menu in every command. We could do this in BaseCommand class. But this means
 		// *every* command has a navigation system and that is want we don't want.
-		$menuInstance = ObjectFactory::createObjectByConfiguredName('register_menu_class', array($appInstance));
+		$menuInstance = ObjectFactory::createObjectByConfiguredName('register_menu_class', array($applicationInstance));
 
 		// Render the menu
 		$menuInstance->renderMenu();
 
 		// Transfer it to the template engine instance
-		$menuInstance->transferToTemplateEngine($templateInstance);
+		$menuInstance->transferContentToTemplateEngine($templateInstance);
 
 		// ... and all variables. This should be merged together in a pattern
 		// to make things easier. A cache mechanism should be added between