X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fselector%2Floader.php;h=a6b49bbfe180f51b9669d82d0937080b0418e956;hb=1655bfb47ca0dd174e374d70d1aaad4293346379;hp=46f5bf8a71f40fba930ea5cf0f4d479f1ec04825;hpb=ff66822b5fb6a92f5dc8af55290ecb89ec7f1aaf;p=shipsimu.git

diff --git a/application/selector/loader.php b/application/selector/loader.php
index 46f5bf8..a6b49bb 100644
--- a/application/selector/loader.php
+++ b/application/selector/loader.php
@@ -1,19 +1,34 @@
 <?php
-// The application's class loader
-if (!isset($application)) {
-	// We need this!
-	ApplicationEntryPoint::app_die("[Main:] Interne Variable <strong>application</strong> nicht gefunden!");
-}
+/**
+ * The application's class loader
+ * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @version		0.0.0
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
+ * @license		GNU GPL 3.0 or any newer version
+ * @link		http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/>.
+ */
 
-// Load all classes
-ClassLoader::getInstance()->loadClasses(sprintf("%s/%s/", FrameworkConfiguration::getInstance()->readConfig("application_path"), $application));
+// Get config instance
+$cfg = FrameworkConfiguration::getInstance();
 
-// Include all classes
-ClassLoader::getInstance()->includeAllClasses();
+// Load all classes
+ClassLoader::getInstance()->scanClassPath(sprintf("%s/%s/", $cfg->getConfigEntry('application_path'), $cfg->getConfigEntry('app_name')));
 
 // Clean up the global namespace
 unset($lowerClasses);
-unset($class);
 
 // [EOF]
 ?>