X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses.php;h=78bafebbf89cbc5e23f319f9d811473ca73c0f6b;hb=4b5f501d3ef327cf8b848a43d3af3643e22ea356;hp=fb00ebf2c094bee6abffbc48eb121b57c2982008;hpb=ff66822b5fb6a92f5dc8af55290ecb89ec7f1aaf;p=shipsimu.git

diff --git a/inc/classes.php b/inc/classes.php
index fb00ebf..78bafeb 100644
--- a/inc/classes.php
+++ b/inc/classes.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Load framework classes first
+ * Load required framework classes first
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0
- * @copyright	Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
  * @license		GNU GPL 3.0 or any newer version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 // Lower framework classes
@@ -30,35 +30,32 @@ $lowerClasses = array(
 );
 
 // Load all classes
-foreach ($lowerClasses as $class) {
+foreach ($lowerClasses as $className) {
 	// Try to load the framework classes
 	try {
-		ClassLoader::getInstance()->loadClasses(sprintf("inc/classes/%s/", $class));
+		ClassLoader::getInstance()->loadClasses(sprintf("inc/classes/%s/", $className));
 	} catch (PathIsNoDirectoryException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Kann Framework-Klassen im Pfad <strong>%s</strong> nicht laden. Reason: <strong>%s</strong>",
-			$class
+		ApplicationEntryPoint::app_die(sprintf("[Main:] Could not load framework classes from path <span class=\"exception_data\">%s</span> for the follwing reason: <span class=\"exception_reason\">%s</span>",
+			$className
 		));
 	} catch (PathIsEmptyException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Kann Framework-Klassen im Pfad <strong>%s</strong> nicht laden. Reason: <strong>%s</strong>",
-			$class
+		ApplicationEntryPoint::app_die(sprintf("[Main:] Could not load framework classes from path <span class=\"exception_data\">%s</span> for the follwing reason: <span class=\"exception_reason\">%s</span>",
+			$className
 		));
 	} catch (PathReadProtectedException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Kann Framework-Klassen im Pfad <strong>%s</strong> nicht laden. Reason: <strong>%s</strong>",
-			$class
+		ApplicationEntryPoint::app_die(sprintf("[Main:] Could not load framework classes from path <span class=\"exception_data\">%s</span> for the follwing reason: <span class=\"exception_reason\">%s</span>",
+			$className
 		));
 	} catch (DirPointerNotOpenedException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Kann Framework-Klassen im Pfad <strong>%s</strong> nicht laden. Reason: <strong>%s</strong>",
-			$class
+		ApplicationEntryPoint::app_die(sprintf("[Main:] Could not load framework classes from path <span class=\"exception_data\">%s</span> for the follwing reason: <span class=\"exception_reason\">%s</span>",
+			$className
 		));
 	}
 }
 
-// Include all classes
-ClassLoader::getInstance()->includeAllClasses();
-
 // Clean up the global namespace
 unset($lowerClasses[3]); // Applications shall not have any middleware
-unset($class);
+unset($className);
 
 ////// Until here the framework classes are loaded //////