X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fclass_ClassLoader.php;h=eef05549a88553580a4d92e163603a58e7bba084;hb=25a7f5c48d8e5f03ff7777757ec7e2420a5bdb09;hp=06e1b1ddfa9b7071995c9c020397fa8e953a84fa;hpb=2c0148a84570f1a8343fa6b98a279e903b3e4fa2;p=core.git

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 06e1b1dd..eef05549 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, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -53,12 +53,12 @@ class ClassLoader {
 	/**
 	 * Suffix with extension for all class files
 	 */
-	private $prefix = "class_";
+	private $prefix = 'class_';
 
 	/**
 	 * Suffix with extension for all class files
 	 */
-	private $suffix = ".php";
+	private $suffix = '.php';
 
 	/**
 	 * A list for directory names (no leading/trailing slashes!) which not be scanned by the path scanner
@@ -112,7 +112,7 @@ class ClassLoader {
 	 * @param	$configInstance	Configuration class instance
 	 * @return	void
 	 */
-	public final static function createClassLoader (FrameworkConfiguration $configInstance) {
+	public static final function createClassLoader (FrameworkConfiguration $configInstance) {
 		// Get a new instance
 		$loaderInstance = new ClassLoader();
 
@@ -135,8 +135,8 @@ class ClassLoader {
 
 		// Construct the FQFN for the cache
 		if (!defined('DEVELOPER')) {
-			$this->listCacheFQFN  = $this->configInstance->getConfigEntry('local_db_path') . "list-" . $this->configInstance->getConfigEntry('app_name') . ".cache";
-			$this->classCacheFQFN = $this->configInstance->getConfigEntry('local_db_path') . "class-" . $this->configInstance->getConfigEntry('app_name') . ".cache";
+			$this->listCacheFQFN  = $this->configInstance->getConfigEntry('local_db_path') . 'list-' . $this->configInstance->getConfigEntry('app_name') . '.cache';
+			$this->classCacheFQFN = $this->configInstance->getConfigEntry('local_db_path') . 'class-' . $this->configInstance->getConfigEntry('app_name') . '.cache';
 		} // END - if
 
 		// Set suffix and prefix from configuration
@@ -187,7 +187,7 @@ class ClassLoader {
 	 *
 	 * @return	$selfInstance		An instance of this class
 	 */
-	public final static function getInstance () {
+	public static final function getInstance () {
 		// Is the instance there?
 		if (is_null(self::$selfInstance)) {
 			// Get a new one
@@ -205,7 +205,9 @@ class ClassLoader {
 	 */
 	public function __destruct () {
 		// Skip here if dev-mode
-		if (defined('DEVELOPER')) return;
+		if (defined('DEVELOPER')) {
+			return;
+		} // END - if
 
 		// Skip here if already cached
 		if ($this->listCached === false) {
@@ -240,7 +242,7 @@ class ClassLoader {
 		if ($this->listCached === true) {
 			// Abort here
 			return;
-		}
+		} // END - if
 
 		// Directories which our class loader ignores by default while
 		// deep-scanning the directory structure.
@@ -260,7 +262,7 @@ class ClassLoader {
 		// If the basePath is false it is invalid
 		if ($basePath2 === false) {
 			/* @todo: Do not die here. */
-			die("Cannot read {$basePath} !");
+			die('Cannot read ' . $basePath . ' !');
 		} else {
 			// Set base path
 			$basePath = $basePath2;
@@ -274,12 +276,14 @@ class ClassLoader {
 			// Get filename from iterator
 			$fileName = $entry->getFileName();
 
+			// Get the FQFN and add it to our class list
+			$fqfn = $entry->getRealPath();
+
 			// Is this file wanted?
 			//* DEBUG: */ echo "FOUND:{$fileName}<br />\n";
-			if ((!in_array($fileName, $this->ignoreList)) && (substr($fileName, 0, strlen($this->prefix)) == $this->prefix) && (substr($fileName, -strlen($this->suffix), strlen($this->suffix)) == $this->suffix)) {
-				// Get the FQFN and add it to our class list
-				$fqfn = $entry->getRealPath();
+			if ((!in_array($fileName, $this->ignoreList)) && (filesize($fqfn) > 100) && (substr($fileName, 0, strlen($this->prefix)) == $this->prefix) && (substr($fileName, -strlen($this->suffix), strlen($this->suffix)) == $this->suffix)) {
 				//* DEBUG: */ echo "ADD: {$fileName}<br />\n";
+				// Add it to the list
 				$this->classes[$fileName] = $fqfn;
 			} // END - if
 		} // END - foreach