X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=application%2Fselector%2Fclass_ApplicationHelper.php;h=e1af8620c08f25dd4b28a221c31183e4d66d18b4;hb=7cdeddaeac97fca7b039d527e8145c3c9e5e4117;hp=aa297ccd41068a2b2bd17c879b97a74459ea59f1;hpb=ec23e72b16433ac136817f3ea78697fb70236e4a;p=shipsimu.git

diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php
index aa297cc..e1af862 100644
--- a/application/selector/class_ApplicationHelper.php
+++ b/application/selector/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
 	 */
@@ -51,14 +51,14 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	private $appName = "";
 
 	/**
-	 * The short uni*-like name of this application
+	 * The short uni*-like name for this application
 	 */
 	private $shortName = "";
 
 	/**
-	 * Name of the master template
+	 * An instance of a controller
 	 */
-	private $masterTemplate = "";
+	private $controllerInstance = null;
 
 	/**
 	 * An instance of this class
@@ -73,10 +73,6 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Tidy up a little
-		$this->removeSystemArray();
-		$this->removeNumberFormaters();
 	}
 
 	/**
@@ -97,7 +93,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	/**
 	 * Getter for the version number
 	 *
-	 * @return	$appVersion	The application's version number
+	 * @return	$appVersion		The application's version number
 	 */
 	public final function getAppVersion () {
 		return $this->appVersion;
@@ -106,7 +102,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	/**
 	 * Setter for the version number
 	 *
-	 * @param	$appVersion	The application's version number
+	 * @param	$appVersion		The application's version number
 	 * @return	void
 	 */
 	public final function setAppVersion ($appVersion) {
@@ -158,35 +154,63 @@ 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;
 	}
 
 	/**
-	 * Launcher for the application selector
+	 * Launches the admin area
 	 *
 	 * @return	void
-	 * @see		ApplicationSelector
 	 */
 	public final function entryPoint () {
-		// Get a prepared instance of ApplicationSelector
-		$selInstance = ApplicationSelector::createApplicationSelector(LanguageSystem::getInstance(), FileIoHandler::getInstance());
+		// Create a new request object
+		$requestInstance = ObjectFactory::createObjectByName('HttpRequest');
+
+		// Default response is HTTP (HTML page) and type is "Web"
+		$response = "http";
+		$responseType = "web";
+
+		// Do we have another response?
+		if ($requestInstance->isRequestElementSet('request')) {
+			// Then use it
+			$response = strtolower($requestInstance->getRequestElement('request'));
+			$responseType = $response;
+		} // END - if
+
+		// ... and a new response object
+		$responseClass = sprintf("%sResponse", $this->convertToClassName($response));
+		$responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
+
+		// Remember both in this application
+		$this->setRequestInstance($requestInstance);
+		$this->setResponseInstance($responseInstance);
+
+		// Get the parameter from the request
+		$commandName = $requestInstance->getRequestElement('page');
 
-		// Remove the ignore list from the object
-		$selInstance->removeDirIgnoreList();
+		// If it is null then get default command
+		if (is_null($commandName)) {
+			$commandName = $responseInstance->getDefaultCommand();
+		} // END - if
 
-		// Next load all templates for the respective short app names
-		$selInstance->loadApplicationTemplates();
+		// Get a resolver
+		$resolverClass = sprintf("%sControllerResolver", $this->convertToClassName($responseType));
+		$resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
-		// Then load the selector's own template
-		$selInstance->loadSelectorTemplate();
+		// Get a controller instance as well
+		$this->controllerInstance = $resolverInstance->resolveController();
 
-		// Insert all application templates
-		$selInstance->insertApplicationTemplates();
+		// Handle the request
+		$this->controllerInstance->handleRequest($requestInstance, $responseInstance);
 	}
 
 	/**
@@ -197,7 +221,21 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	 * @return	void
 	 */
 	public function handleFatalMessages (array $messageList) {
-		die("<pre>".print_r($messageList, true)."</pre>");
+		// Walk through all messages
+		foreach ($messageList as $message) {
+			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');
 	}
 }