X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;h=8976961e03920bac0183f0a8f4243311655a1ecf;hp=967db1af2ceeb4eadee1e072f1805eee2f3a9611;hb=a96d3c4168f2aacc0150d2e462d9dcb9e7bfb951;hpb=0cd57c3885f00ad77fc599e53ed2f2d5e7ac267f

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 967db1af..8976961e 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -270,19 +270,19 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			$this->setConfigInstance(FrameworkConfiguration::getInstance());
 
 			// Add application helper to our class
-			$this->systemclasses[] = $this->getConfigInstance()->readConfig('app_helper_class');
+			$this->systemclasses[] = $this->getConfigInstance()->getConfigEntry('app_helper_class');
 
 			// Set debug instance
-			$this->setDebugInstance(DebugMiddleware::createDebugMiddleware($this->getConfigInstance()->readConfig('debug_class')));
+			$this->setDebugInstance(DebugMiddleware::createDebugMiddleware($this->getConfigInstance()->getConfigEntry('debug_class')));
 
 			// Get output instance and set it
-			$outputInstance = ObjectFactory::createObjectByConfiguredName('web_engine', array($this->getConfigInstance()->readConfig('web_content_type')));
+			$outputInstance = ObjectFactory::createObjectByConfiguredName('output_class', array($this->getConfigInstance()->getConfigEntry('web_content_type')));
 			$this->setWebOutputInstance($outputInstance);
 
 			// Set the compressor channel
 			$this->setCompressorChannel(CompressorChannel::createCompressorChannel(
-				$this->getConfigInstance()->readConfig('base_path').
-				$this->getConfigInstance()->readConfig('compressor_base_path')
+				$this->getConfigInstance()->getConfigEntry('base_path').
+				$this->getConfigInstance()->getConfigEntry('compressor_base_path')
 			));
 
 			// Initialization done! :D
@@ -590,27 +590,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		return ($this->__toString() == $className);
 	}
 
-	/**
-	 * Stub method (only real cabins shall override it)
-	 *
-	 * @return	boolean	false = is no cabin, true = is a cabin
-	 * @deprecated
-	 */
-	public function isCabin () {
-		return false;
-	}
-
-	/**
-	 * Stub method for tradeable objects
-	 *
-	 * @return	boolean	false = is not tradeable by the Merchant class,
-	 *					true  = is a tradeable object
-	 * @deprecated
-	 */
-	public function isTradeable () {
-		return false;
-	}
-
 	/**
 	 * Formats computer generated price values into human-understandable formats
 	 * with thousand and decimal seperators.
@@ -860,7 +839,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			if ($doPrint === false) die(); // Die here if not printed
 		} else {
 			// Put directly out
-			if ($doPrint) {
+			if ($doPrint === true) {
 				print($message);
 			} else {
 				// DO NOT REWRITE THIS TO app_die() !!!
@@ -968,7 +947,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 					$timeArray = explode(':', $dateTime[1]);
 
 					// Construct the timestamp
-					$readable = sprintf($this->getConfigInstance()->readConfig('german_date_time'),
+					$readable = sprintf($this->getConfigInstance()->getConfigEntry('german_date_time'),
 						$dateArray[0],
 						$dateArray[1],
 						$dateArray[2],