X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fclass_ClassLoader.php;h=b6094879ebab7c5d1cb0d2dcfb662c2c50d414c9;hb=7effdc6aec796a238d3e5d5f59ad45f37743f0d7;hp=775abf6b947e81693c57af3a872c648185480c8c;hpb=2d739818a3217d1e685b2464a7faf08659b0c86f;p=core.git

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 775abf6b..b6094879 100644
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -25,7 +25,7 @@
  * 1.3
  *  - Constructor is now empty and factory method 'createClassLoader' is created
  *  - renamed loadClasses to scanClassPath
- *  - Added initLoader(), $cfgInstance renamed to $configInstance
+ *  - Added initLoader(), $configInstance renamed to $configInstance
  * 1.2
  *  - ClassLoader rewritten to PHP SPL's own RecursiveIteratorIterator class
  * 1.1
@@ -40,11 +40,6 @@ class ClassLoader {
 	 */
 	private static $selfInstance = null;
 
-	/**
-	 * Configuration array
-	 */
-	private $cfg = array();
-
 	/**
 	 * Array with all classes
 	 */
@@ -89,12 +84,12 @@ class ClassLoader {
 	/**
 	 * Filename for the list cache
 	 */
-	private $listCacheFQFN = "";
+	private $listCacheFQFN = '';
 
 	/**
 	 * Cache for class content
 	 */
-	private $classCacheFQFN = "";
+	private $classCacheFQFN = '';
 
 	/**
 	 * Counter for loaded include files
@@ -136,12 +131,12 @@ class ClassLoader {
 	 */
 	protected function initLoader (FrameworkConfiguration $configInstance) {
 		// Set configuration instance
-		$this->cfgInstance = $configInstance;
+		$this->configInstance = $configInstance;
 
 		// Construct the FQFN for the cache
 		if (!defined('DEVELOPER')) {
-			$this->listCacheFQFN  = $this->cfgInstance->readConfig('local_db_path') . "list-" . $this->cfgInstance->readConfig('app_name') . ".cache";
-			$this->classCacheFQFN = $this->cfgInstance->readConfig('local_db_path') . "class-" . $this->cfgInstance->readConfig('app_name') . ".cache";
+			$this->listCacheFQFN  = $this->configInstance->readConfig('local_db_path') . "list-" . $this->configInstance->readConfig('app_name') . ".cache";
+			$this->classCacheFQFN = $this->configInstance->readConfig('local_db_path') . "class-" . $this->configInstance->readConfig('app_name') . ".cache";
 		} // END - if
 
 		// Set suffix and prefix from configuration
@@ -222,7 +217,7 @@ class ClassLoader {
 		// Skip here if already cached
 		if ($this->classesCached === false) {
 			// Generate a full-cache of all classes
-			$cacheContent = "";
+			$cacheContent = '';
 			foreach ($this->loadedClasses as $fqfn) {
 				// Load the file
 				$cacheContent .= file_get_contents($fqfn);
@@ -266,10 +261,10 @@ class ClassLoader {
 
 		// Directories which our class loader ignores by default while
 		// deep-scanning the directory structure.
-		$ignoreList[] = ".";
-		$ignoreList[] = "..";
-		$ignoreList[] = ".htaccess";
-		$ignoreList[] = ".svn";
+		$ignoreList[] = '.';
+		$ignoreList[] = '..';
+		$ignoreList[] = '.htaccess';
+		$ignoreList[] = '.svn';
 
 		// Keep it in class for later usage
 		$this->ignoreList = $ignoreList;
@@ -317,10 +312,10 @@ class ClassLoader {
 		$oldPrefix = $this->prefix;
 
 		// Set new prefix (temporary!)
-		$this->prefix = "config-";
+		$this->prefix = 'config-';
 
 		// Set base directory
-		$basePath = sprintf("%sinc/config/", $this->cfgInstance->readConfig('base_path'));
+		$basePath = $this->configInstance->readConfig('base_path') . 'inc/config/';
 
 		// Load all classes from the config directory
 		$this->scanClassPath($basePath);
@@ -403,7 +398,7 @@ class ClassLoader {
 	 */
 	public function getPrintableIncludeList () {
 		// Prepare the list
-		$includeList = "";
+		$includeList = '';
 		foreach ($this->loadedClasses as $classFile) {
 			$includeList .= basename($classFile)."<br />\n";
 		} // END - foreach