Application init phase rewritten, data.php now sets app data

[shipsimu.git] / application / selector / class_ApplicationSelector.php

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index 651b2a4c359a68ed9d62f0ec9f8c5ef2852bd715..f52b50a8fe16b3debf369defca694a9318e0fbc5 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -7,7 +7,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.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
  * @link               http://www.ship-simu.org
  *
@@ -59,12 +59,6 @@ class ApplicationSelector extends BaseFrameworkSystem {
                // Call parent constructor
                parent::__construct(__CLASS__);
 
-               // Set description
-               $this->setObjectDescription("Applikationswechsler");
-
-               // Create unique ID number
-               $this->generateUniqueId();
-
                // Remove system array and thousand seperator
                $this->removeSystemArray();
                $this->removeNumberFormaters();
@@ -77,9 +71,9 @@ class ApplicationSelector extends BaseFrameworkSystem {
        /**
         * Create a prepared instance of ApplicationSelector
         *
-        * @param               $langInstance           The language sub-system: LanguageSystem
-        * @param               $fileIOInstance The file I/O instance
-        * @return              $selInstance            An instance of ApplicationSelector
+        * @param       $langInstance           The language sub-system: LanguageSystem
+        * @param       $fileIOInstance         The file I/O instance
+        * @return      $selInstance            An instance of ApplicationSelector
         */
        public final static function createApplicationSelector (ManageableLanguage $langInstance, FileIoHandler $fileIOInstance) {
                // Get a new instance
@@ -115,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               $appName                The application's Uni* name
+        * @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);
@@ -137,10 +131,11 @@ class ApplicationSelector extends BaseFrameworkSystem {
        /**
         * Setter for the selector's template engine instance
         *
-        * @param               $tplEngine      An instance of TemplateEngine
+        * @param       $templateInstance       An instance of TemplateEngine
+        * @return      void
         */
-       private final function setSelectorTemplateEngine (CompileableTemplate $tplEngine) {
-               $this->selectorTplEngine = $tplEngine;
+       private final function setSelectorTemplateEngine (CompileableTemplate $templateInstance) {
+               $this->selectorTplEngine = $templateInstance;
        }
 
        /**
@@ -163,7 +158,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
        }
 
        /**
-        * Method for compatiblity with prepareTemplateEngine()
+        * Method for compatiblity with prepareTemplateInstance()
         *
         * @return      $shortName      This selector's short name
         */
@@ -192,10 +187,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
         */
        public function readApplicationDirectory () {
                // Generate the base path for all applications
-               $appBasePath = sprintf("%s%s/",
-                       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'));
@@ -203,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);*/
 
@@ -214,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
@@ -244,17 +234,17 @@ class ApplicationSelector extends BaseFrameworkSystem {
                        $appInstance = $idx->current();
 
                        // Prepare the template engine for the current template
-                       $tplEngine = $this->prepareTemplateEngine($appInstance);
+                       $templateInstance = $this->prepareTemplateInstance($appInstance);
 
                        // Try to load the web template
-                       $tplEngine->loadWebTemplate(sprintf("%s_%s",
+                       $templateInstance->loadWebTemplate(sprintf("%s_%s",
                                $this->getConfigInstance()->readConfig('tpl_selector_prefix'),
                                strtolower($appInstance->getAppShortName())
                        ));
 
                        // Remember this template and the application for later usage
                        $this->loadedTemplates->append(array(
-                               'template_class'   => $tplEngine,
+                               'template_class'   => $templateInstance,
                                'app_instance' => $appInstance
                        ));
                }
@@ -280,13 +270,13 @@ class ApplicationSelector extends BaseFrameworkSystem {
         */
        public function loadSelectorTemplate () {
                // Prepare the template engine
-               $tplEngine = $this->prepareTemplateEngine($this);
+               $templateInstance = $this->prepareTemplateInstance($this);
 
                // Load the selector's template
-               $tplEngine->loadCodeTemplate($this->getConfigInstance()->readConfig('selector_main_tpl'));
+               $templateInstance->loadCodeTemplate($this->getConfigInstance()->readConfig('selector_main_tpl'));
 
                // Now store it in the class
-               $this->setSelectorTemplateEngine($tplEngine);
+               $this->setSelectorTemplateEngine($templateInstance);
        }
 
        /**
@@ -302,10 +292,10 @@ class ApplicationSelector extends BaseFrameworkSystem {
         */
        public function insertApplicationTemplates () {
                // First prepare the instance
-               $tplEngine = $this->prepareTemplateEngine($this);
+               $templateInstance = $this->prepareTemplateInstance($this);
 
                // Load template which shall later hold all application templates
-               $tplEngine->loadCodeTemplate($this->getConfigInstance()->readConfig('selector_apps_tpl'));
+               $templateInstance->loadCodeTemplate($this->getConfigInstance()->readConfig('selector_apps_tpl'));
 
                // Add all loaded application templates together
                $dummy = "";