X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fselector%2Fclass_ApplicationSelector.php;h=f52b50a8fe16b3debf369defca694a9318e0fbc5;hp=1f664a66f85adec338d7057d5166523ddf77d34e;hb=21a25cc77b1108c7e33d4ce55b1a85970b355de2;hpb=a2cc983f5fe910115d25800c258875a3919fb143

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index 1f664a6..f52b50a 100644
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -109,18 +109,18 @@ class ApplicationSelector extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Load the init.php script of an application and append the application
+	 * Load the data.php script of an application and append the application
 	 * instance to $foundApps
 	 *
-	 * @param	$initScript	The FQFN of init.php
+	 * @param	$appData		The FQFN of data.php
 	 * @param	$appName		The application's Uni* name
 	 * @return	void
 	 */
-	private function loadInitScript ($initScript, $appName) {
+	private function loadApplicationData ($appData, $appName) {
 		// Is it a file and readable?
-		if ((is_file($initScript)) && (is_readable($initScript))) {
+		if ((is_file($appData)) && (is_readable($appData))) {
 			// Then include it
-			include ($initScript);
+			include ($appData);
 
 			// Add the current instance to the list
 			$this->foundApps->append($app);
@@ -187,10 +187,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
 	 */
 	public function readApplicationDirectory () {
 		// Generate the base path for all applications
-		$appBasePath = sprintf("%s%s/",
-			$this->getConfigInstance()->readConfig('base_path'),
-			$this->getConfigInstance()->readConfig('application_path')
-		);
+		$appBasePath = $this->getConfigInstance()->readConfig('application_path');
 
 		// Add the selector path to the ignore list
 		$this->addDirIgnoreList($this->getConfigInstance()->readConfig('selector_path'));
@@ -198,7 +195,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
 		// Get a directory pointer for the application path
 		$dirInstance = FrameworkDirectoryPointer::createFrameworkDirectoryPointer($appBasePath);
 
-		// Backup and remove the 'app' from global name space
+		// Backup and remove the 'app' from local name space
 		/*$appBackup = $app;
 		unset($app);*/
 
@@ -209,15 +206,13 @@ class ApplicationSelector extends BaseFrameworkSystem {
 
 			// Is this a readable directory? (files will be ignored silently)
 			if ((is_dir($fqfn)) && (is_readable($fqfn))) {
-				// Then get the init.php script for analyzing
-				$initScript = sprintf("%s/init%s", $fqfn, $this->getConfigInstance()->readConfig('php_extension'));
+				// Then get the data.php script for analyzing
+				$appData = sprintf("%s/data.php", $fqfn);
 
-				// Load the application's init.php script and append the
+				// Load the application's data.php script and append the
 				// application to the ArrayObject
-				$this->loadInitScript($initScript, $appName);
-
-			} // END - if ((is_dir(...
-
+				$this->loadApplicationData($appData, $appName);
+			} // END - if
 		} // END - while
 
 		// Close directory pointer