Refill page now books points (unfinished, need redirect!)

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

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index 0d366b78a6b812b3f844369496b1690062cb8787..071da88440a24b8a69b6c2369f5b59836ba8cdfc 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -2,9 +2,6 @@
 /**
  * The application selector class.
  *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
@@ -35,11 +32,6 @@ class ApplicationSelector extends BaseFrameworkSystem {
         */
        private $loadedTemplates = null;
 
-       /**
-        * The application selector's own template engine handler
-        */
-       private $selectorTplEngine = null;
-
        /**
         * A list of items we shall ignore while reading from directories
         */
@@ -109,44 +101,24 @@ 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);
-
                } // END - if ((is_file(...
        }
 
-       /**
-        * Setter for the selector's template engine instance
-        *
-        * @param       $templateInstance       An instance of TemplateEngine
-        * @return      void
-        */
-       private final function setSelectorTemplateEngine (CompileableTemplate $templateInstance) {
-               $this->selectorTplEngine = $templateInstance;
-       }
-
-       /**
-        * Getter for the selector's template engine instance
-        *
-        * @return      $selectTplEngine        The selector's template engine
-        */
-       private final function getSelectorTemplateEngine () {
-               return $this->selectorTplEngine;
-       }
-
        /**
         * Getter for the $loadedTemplates array object
         *
@@ -175,8 +147,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
         */
        public function addDirIgnoreList ($ignoreItem) {
                // Cast and add it
-               $ignoreItem = (string) $ignoreItem;
-               $this->dirIgnoreList[] = $ignoreItem;
+               $this->dirIgnoreList[] = (string) $ignoreItem;
        }
 
        /**
@@ -195,10 +166,6 @@ class ApplicationSelector extends BaseFrameworkSystem {
                // Get a directory pointer for the application path
                $dirInstance = FrameworkDirectoryPointer::createFrameworkDirectoryPointer($appBasePath);
 
-               // Backup and remove the 'app' from local name space
-               /*$appBackup = $app;
-               unset($app);*/
-
                // Read all directories&files except some parts
                while ($appName = $dirInstance->readDirectoryExcept($this->dirIgnoreList)) {
                        // Generate FQFN for the application name (or better directory name)
@@ -206,22 +173,17 @@ 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.php", $fqfn);
+                               // 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
                $dirInstance->closeDirectory();
-
-               // Restore old 'app' from backup
-               //$app = $appBackup;
        }
 
        /**
@@ -277,8 +239,8 @@ class ApplicationSelector extends BaseFrameworkSystem {
                // Load the selector's template
                $templateInstance->loadCodeTemplate($this->getConfigInstance()->readConfig('selector_main_tpl'));
 
-               // Now store it in the class
-               $this->setSelectorTemplateEngine($templateInstance);
+               // Now store it in the class, we need this later on final compilation of available applications
+               $this->setTemplateInstance($templateInstance);
        }
 
        /**
@@ -291,6 +253,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
         *                                                                              unexpected count of elements
         * @throws      MissingArrayElementsException   If $curr is missing expected
         *                                                                                      array elements
+        * @todo        Finish handling all applications here
         */
        public function insertApplicationTemplates () {
                // First prepare the instance
@@ -319,8 +282,9 @@ class ApplicationSelector extends BaseFrameworkSystem {
                                // Expected entries missing
                                throw new MissingArrayElementsException(array($this, "curr", array("template_class", "app_instance")), self::EXCEPTION_ARRAY_ELEMENTS_MISSING);
                        }
-                       die("<pre>".print_r($curr, true)."</pre>");
 
+                       // Debug output
+                       die(__METHOD__."()<pre>".print_r($curr, true)."</pre>");
                } // END - for
        }
 }