X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Fclass_ApplicationHelper.php;h=e1af8620c08f25dd4b28a221c31183e4d66d18b4;hb=a18a575e949c09eb7bf7eadd8959ba2963420d35;hp=1c86aa825304c0cbf6a3259a7331fa8d44f45e7b;hpb=d527a312ec4b2983fc0ecda2179ce335c1a5a1f9;p=shipsimu.git

diff --git a/application/ship-simu/class_ApplicationHelper.php b/application/ship-simu/class_ApplicationHelper.php
index 1c86aa8..e1af862 100644
--- a/application/ship-simu/class_ApplicationHelper.php
+++ b/application/ship-simu/class_ApplicationHelper.php
@@ -39,7 +39,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 ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication {
+class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable {
 	/**
 	 * The version number of this application
 	 */
@@ -55,11 +55,6 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	 */
 	private $shortName = "";
 
-	/**
-	 * The name of the master template
-	 */
-	private $masterTemplate = "shipsimu_main";
-
 	/**
 	 * An instance of a controller
 	 */
@@ -78,15 +73,6 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Set description
-		$this->setObjectDescription("Application-Helper");
-
-		// Create an unique ID
-		$this->generateUniqueId();
-
-		// Tidy up a little
-		$this->removeSystemArray();
 	}
 
 	/**
@@ -168,16 +154,20 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	}
 
 	/**
-	 * Getter for master template name
+	 * Builds the master template's name
 	 *
-	 * @return	$masterTemplate		Name of the master template
+	 * @return	$masterTemplateName		Name of the master template
 	 */
-	public final function getMasterTemplate () {
-		return $this->masterTemplate;
+	public function buildMasterTemplateName () {
+		// Get short name and add suffix
+		$masterTemplateName = str_replace("-", "", $this->getAppShortName()) . "_main";
+
+		// Return it
+		return $masterTemplateName;
 	}
 
 	/**
-	 * Launches the ship-simulator game
+	 * Launches the admin area
 	 *
 	 * @return	void
 	 */
@@ -190,14 +180,15 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		$responseType = "web";
 
 		// Do we have another response?
-		if ($requestInstance->isRequestElementSet('response')) {
+		if ($requestInstance->isRequestElementSet('request')) {
 			// Then use it
-			$response = strtolower($requestInstance->getRequestElement('response'));
+			$response = strtolower($requestInstance->getRequestElement('request'));
 			$responseType = $response;
 		} // END - if
 
 		// ... and a new response object
-		$responseInstance = ObjectFactory::createObjectByName(ucfirst($response)."Response", array($this));
+		$responseClass = sprintf("%sResponse", $this->convertToClassName($response));
+		$responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
 
 		// Remember both in this application
 		$this->setRequestInstance($requestInstance);
@@ -212,7 +203,8 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		} // END - if
 
 		// Get a resolver
-		$resolverInstance = ObjectFactory::createObjectByName(ucfirst($responseType)."ControllerResolver", array($commandName, $this));
+		$resolverClass = sprintf("%sControllerResolver", $this->convertToClassName($responseType));
+		$resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
 		// Get a controller instance as well
 		$this->controllerInstance = $resolverInstance->resolveController();
@@ -234,6 +226,17 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 			print("MSG:".$message."<br />\n");
 		} // END - if
 	}
+
+	/**
+	 * Assigns application-depending data
+	 *
+	 * @param	$templateInstance	An instance of a template engine
+	 * @return	void
+	 */
+	public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
+		// Assign charset
+		$templateInstance->assignConfigVariable('header_charset');
+	}
 }
 
 // [EOF]