X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;h=2e42a794b12018efe454f560730ca1a54d9e6d3a;hb=ddead341812b4924bc1591780090444c6f58e9a5;hp=88fdae373101f094cd3345eeee3e6d3d4320ded2;hpb=bb1e3a7f36ad3f7fa235c7601586d0caebd71ed1;p=core.git

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 88fdae37..2e42a794 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -243,6 +243,16 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 */
 	private $genericArray = array();
 
+	/**
+	 * Command name
+	 */
+	private $commandName = '';
+
+	/**
+	 * Controller name
+	 */
+	private $controllerName = '';
+
 	/***********************
 	 * Exception codes.... *
 	 ***********************/
@@ -1433,6 +1443,44 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		return $this->listenerInstance;
 	}
 
+	/**
+	 * Setter for command name
+	 *
+	 * @param	$commandName	Last validated command name
+	 * @return	void
+	 */
+	protected final function setCommandName ($commandName) {
+		$this->commandName = $commandName;
+	}
+
+	/**
+	 * Getter for command name
+	 *
+	 * @return	$commandName	Last validated command name
+	 */
+	protected final function getCommandName () {
+		return $this->commandName;
+	}
+
+	/**
+	 * Setter for controller name
+	 *
+	 * @param	$controllerName	Last validated controller name
+	 * @return	void
+	 */
+	protected final function setControllerName ($controllerName) {
+		$this->controllerName = $controllerName;
+	}
+
+	/**
+	 * Getter for controller name
+	 *
+	 * @return	$controllerName	Last validated controller name
+	 */
+	protected final function getControllerName () {
+		return $this->controllerName;
+	}
+
 	/**
 	 * Checks whether an object equals this object. You should overwrite this
 	 * method to implement own equality checks
@@ -1509,7 +1557,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Prepare the template engine (WebTemplateEngine by default) for a given
+	 * Prepare the template engine (HtmlTemplateEngine by default) for a given
 	 * application helper instance (ApplicationHelper by default).
 	 *
 	 * @param		$applicationInstance	An application helper instance or
@@ -1532,7 +1580,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		} // END - if
 
 		// Initialize the template engine
-		$templateInstance = ObjectFactory::createObjectByConfiguredName('web_template_class');
+		$templateInstance = ObjectFactory::createObjectByConfiguredName('html_template_class');
 
 		// Return the prepared instance
 		return $templateInstance;
@@ -1670,7 +1718,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			// Try it
 			try {
 				// Get a debugger instance
-				$debugInstance = DebugMiddleware::createDebugMiddleware(FrameworkConfiguration::getSelfInstance()->getConfigEntry('debug_class'));
+				$debugInstance = DebugMiddleware::createDebugMiddleware(FrameworkConfiguration::getSelfInstance()->getConfigEntry('debug_' . self::getResponseTypeFromSystem() . '_class'));
 			} catch (NullPointerException $e) {
 				// Didn't work, no instance there
 				exit('Cannot create debugInstance! Exception=' . $e->__toString() . ', message=' . $e->getMessage());
@@ -1949,12 +1997,15 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($fieldName.':<pre>'.print_r($fieldArray, TRUE).'</pre>');
 
 		// Convert dashes to underscore
-		$fieldName = $this->convertDashesToUnderscores($fieldName);
+		$fieldName2 = $this->convertDashesToUnderscores($fieldName);
 
 		// Does the field exist?
-		if (isset($fieldArray[$fieldName])) {
+		if ($this->isFieldSet($fieldName)) {
 			// Get it
-			$fieldValue = $fieldArray[$fieldName];
+			$fieldValue = $fieldArray[$fieldName2];
+		} elseif (defined('DEVELOPER')) {
+			// Missing field entry, may require debugging
+			self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']:fieldArray<pre>=' . print_r($fieldArray, TRUE) . '</pre>,fieldName=' . $fieldName . ' not found!');
 		} else {
 			// Missing field entry, may require debugging
 			self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']:fieldName=' . $fieldName . ' not found!');
@@ -1964,6 +2015,37 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		return $fieldValue;
 	}
 
+	/**
+	 * Checks if given field is set
+	 *
+	 * @param	$fieldName	Field name to check
+	 * @return	$isSet		Whether the given field name is set
+	 * @throws	NullPointerException	If the result instance is null
+	 */
+	public function isFieldSet ($fieldName) {
+		// Get result instance
+		$resultInstance = $this->getResultInstance();
+
+		// Is this instance null?
+		if (is_null($resultInstance)) {
+			// Then the user instance is no longer valid (expired cookies?)
+			throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
+		} // END - if
+
+		// Get current array
+		$fieldArray = $resultInstance->current();
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . $this->__toString() . ':' . __LINE__ . '] fieldName=' . $fieldName . ',fieldArray=<pre>'.print_r($fieldArray, TRUE).'</pre>');
+
+		// Convert dashes to underscore
+		$fieldName = $this->convertDashesToUnderscores($fieldName);
+
+		// Determine it
+		$isSet = isset($fieldArray[$fieldName]);
+
+		// Return result
+		return $isSet;
+	}
+
 	/**
 	 * Flushs all pending updates to the database layer
 	 *
@@ -2223,7 +2305,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 *
 	 * @return	$responseType	Analyzed response type
 	 */
-	protected function getResponseTypeFromSystem () {
+	protected static function getResponseTypeFromSystem () {
 		// Default is console
 		$responseType = 'console';