Resorted...

[shipsimu.git] / inc / classes.php

diff --git a/inc/classes.php b/inc/classes.php
index fb00ebf2c094bee6abffbc48eb121b57c2982008..c37f405088ccae86e698b2a27cc1ab40cedc7f4c 100644 (file)
--- a/inc/classes.php
+++ b/inc/classes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Load framework classes first
+ * Load required framework classes first
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0
@@ -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 <strong>%s</strong> for the follwing reason: <strong>%s</strong>",
+                       $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 <strong>%s</strong> for the follwing reason: <strong>%s</strong>",
+                       $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 <strong>%s</strong> for the follwing reason: <strong>%s</strong>",
+                       $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 <strong>%s</strong> for the follwing reason: <strong>%s</strong>",
+                       $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 //////