Login area extended and misc things changed:

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

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index 0e9070a95c283d83e1422418519baeee0d242976..007550f6bf00bf07563835a5d2a61e5f36f4f2bb 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -77,9 +77,9 @@ class ApplicationSelector extends BaseFrameworkSystem {
        /**
         * Create a prepared instance of ApplicationSelector
         *
        /**
         * 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
         */
        public final static function createApplicationSelector (ManageableLanguage $langInstance, FileIoHandler $fileIOInstance) {
                // Get a new instance


@@ -118,8 +118,8 @@ class ApplicationSelector extends BaseFrameworkSystem {
         * Load the init.php script of an application and append the application
         * instance to $foundApps
         *
         * Load the init.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       $initScript     The FQFN of init.php
+        * @param       $appName                The application's Uni* name

         * @return      void
         */
        private function loadInitScript ($initScript, $appName) {
         * @return      void
         */
        private function loadInitScript ($initScript, $appName) {


@@ -137,10 +137,11 @@ class ApplicationSelector extends BaseFrameworkSystem {
        /**
         * Setter for the selector's template engine instance
         *
        /**
         * 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 +164,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
        }
 
        /**
        }
 
        /**

-        * Method for compatiblity with prepareTemplateEngine()
+        * Method for compatiblity with prepareTemplateInstance()

         *
         * @return      $shortName      This selector's short name
         */
         *
         * @return      $shortName      This selector's short name
         */


@@ -244,17 +245,17 @@ class ApplicationSelector extends BaseFrameworkSystem {
                        $appInstance = $idx->current();
 
                        // Prepare the template engine for the current template
                        $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
 
                        // 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(
                                $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
                        ));
                }
                                'app_instance' => $appInstance
                        ));
                }


@@ -280,13 +281,13 @@ class ApplicationSelector extends BaseFrameworkSystem {
         */
        public function loadSelectorTemplate () {
                // Prepare the template engine
         */
        public function loadSelectorTemplate () {
                // Prepare the template engine

-               $tplEngine = $this->prepareTemplateEngine($this);
+               $templateInstance = $this->prepareTemplateInstance($this);

 
                // Load the selector's template
 
                // 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
 
                // Now store it in the class

-               $this->setSelectorTemplateEngine($tplEngine);
+               $this->setSelectorTemplateEngine($templateInstance);

        }
 
        /**
        }
 
        /**


@@ -302,10 +303,10 @@ class ApplicationSelector extends BaseFrameworkSystem {
         */
        public function insertApplicationTemplates () {
                // First prepare the instance
         */
        public function insertApplicationTemplates () {
                // First prepare the instance

-               $tplEngine = $this->prepareTemplateEngine($this);
+               $templateInstance = $this->prepareTemplateInstance($this);

 
                // Load template which shall later hold all application templates
 
                // 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 = "";
 
                // Add all loaded application templates together
                $dummy = "";