From 21e79d43dfff119a2961f0939f4c1d40af2fd0ff Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 24 Mar 2009 04:55:09 +0000
Subject: [PATCH] Launcher scripts rewritten to fit with new core

---
 .gitattributes             |  1 +
 application/hub/data.php   | 51 ++++++++++++++++++++++++++++++++++++++
 application/hub/init.php   | 20 +--------------
 application/hub/loader.php | 26 ++-----------------
 4 files changed, 55 insertions(+), 43 deletions(-)
 create mode 100644 application/hub/data.php

diff --git a/.gitattributes b/.gitattributes
index a4e5913d2..83ebd0c41 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,6 +4,7 @@ application/.htaccess -text
 application/hub/.htaccess -text
 application/hub/class_ApplicationHelper.php -text
 application/hub/config.php -text
+application/hub/data.php -text
 application/hub/debug.php -text
 application/hub/exceptions.php -text
 application/hub/exceptions/.htaccess -text
diff --git a/application/hub/data.php b/application/hub/data.php
new file mode 100644
index 000000000..932d45356
--- /dev/null
+++ b/application/hub/data.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Application data
+ *
+ * Please remember that this include file is being loaded *before* the class
+ * loader is loading classes from "exceptions", "interfaces" and "main"!
+ *
+ * You can prevent adding this application to the selector by uncommenting the
+ * following line:
+ *
+ * if ((isset($this)) && (is_object($this)) && ($this->isClass("ApplicationSelector"))) { return; }
+ *
+ * isset() is required to prevent a warning and is_object() is highly required
+ * when the application itself is requested in URL (hint: index.php?app=your_app)
+ *
+ * @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/>.
+ */
+
+// Get config instance
+$cfg = FrameworkConfiguration::getInstance();
+
+// Get an instance of the helper
+$app = call_user_func_array(
+	array($cfg->readConfig('app_helper_class'), "getInstance"),
+	array()
+);
+
+// Set application name and version
+$app->setAppName("Generic Object Sharing Hub");
+$app->setAppVersion("0.0.0");
+$app->setAppShortName("hub");
+
+// [EOF]
+?>
diff --git a/application/hub/init.php b/application/hub/init.php
index 677a6c67c..312d5aa40 100644
--- a/application/hub/init.php
+++ b/application/hub/init.php
@@ -48,26 +48,8 @@ require($cfg->readConfig('base_path') . "inc/language.php");
 // the inc/database.php script
 require($cfg->readConfig('base_path') . "inc/database.php");
 
-// Generate call-back function
-$callback = sprintf("%s::getInstance",
-	FrameworkConfiguration::getInstance()->readConfig('app_helper_class')
-);
-
-// Get an instance of the helper
-$app = call_user_func_array($callback, array());
-
-// Set application name and version
-$app->setAppName("MXChange Hub");
-$app->setAppVersion("0.0.0");
-$app->setAppShortName("mxhub");
-
 // Get's our IP address
 $_SERVER['SERVER_ADDR'] = ConsoleTools::aquireSelfIPAddress();
 
-// Set instances
-$app->setFileIoInstance($io);
-$app->setLanguageInstance($lang);
-$app->setDatabaseInstance($db);
-
 // [EOF]
-?>
\ No newline at end of file
+?>
diff --git a/application/hub/loader.php b/application/hub/loader.php
index 26a475e43..e2d153d88 100644
--- a/application/hub/loader.php
+++ b/application/hub/loader.php
@@ -27,30 +27,8 @@ $cfg = FrameworkConfiguration::getInstance();
 // Load all classes for the application
 foreach ($lowerClasses as $class) {
 	// Try to load the application classes
-	try {
-		ClassLoader::getInstance()->loadClasses(sprintf("%s/%s/%s", $cfg->readConfig("application_path"), $cfg->readConfig("app_name"), $class));
-	} catch (PathIsNoDirectoryException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Kann Applikationsklassen im Pfad <strong>%s</strong> nicht laden. Reason: <strong>%s</strong>",
-			$class,
-			$e->getMessage()
-		));
-	} catch (PathIsEmptyException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Kann Applikationsklassen im Pfad <strong>%s</strong> nicht laden. Reason: <strong>%s</strong>",
-			$class,
-			$e->getMessage()
-		));
-	} catch (PathReadProtectedException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Kann Applikationsklassen im Pfad <strong>%s</strong> nicht laden. Reason: <strong>%s</strong>",
-			$class,
-			$e->getMessage()
-		));
-	} catch (DirPointerNotOpenedException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Kann Applikationsklassen im Pfad <strong>%s</strong> nicht laden. Reason: <strong>%s</strong>",
-			$class,
-			$e->getMessage()
-		));
-	}
-}
+	ClassLoader::getInstance()->scanClassPath(sprintf("%s/%s/%s", $cfg->readConfig("application_path"), $cfg->readConfig("app_name"), $class));
+} // END - foreach
 
 // Clean up the global namespace
 unset($lowerClasses);
-- 
2.39.5