home command now loads its template into the master template

diff --git a/.gitattributes b/.gitattributes
index e4a434207631279a1f8093054e6b5b8050556c34..ccc214ee6bd15d94971c9d095f92e25900c50445 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -117,6 +117,7 @@ application/ship-simu/templates/.htaccess -text
 application/ship-simu/templates/de/.htaccess -text
 application/ship-simu/templates/de/code/shipsimu_main.ctp -text
 application/ship-simu/templates/de/html/.htaccess -text
 application/ship-simu/templates/de/.htaccess -text
 application/ship-simu/templates/de/code/shipsimu_main.ctp -text
 application/ship-simu/templates/de/html/.htaccess -text

+application/ship-simu/templates/de/html/home.tpl -text

 application/ship-simu/templates/de/html/selector_ship-simu.tpl -text
 db/.htaccess -text
 devel/.htaccess -text
 application/ship-simu/templates/de/html/selector_ship-simu.tpl -text
 db/.htaccess -text
 devel/.htaccess -text

diff --git a/application/selector/templates/de/code/selector_main.ctp b/application/selector/templates/de/code/selector_main.ctp
index 6e108776aa9ffe474610c311726ae048babaeb10..a834a9bb6bef5b33a904cbec869c41be9d4014cc 100644 (file)
--- a/application/selector/templates/de/code/selector_main.ctp
+++ b/application/selector/templates/de/code/selector_main.ctp
@@ -1,15 +1,15 @@
 <!-- A compileable template for the application selector //-->
 
 <!-- A compileable template for the application selector //-->
 

-{?header:title={--WELCOME_APPLICATION_SELECTOR--}?}
+{?header:title=[--WELCOME_APPLICATION_SELECTOR--]?}

 
 {?navigation:nav_row=home;imprint;contact?}
 
 <div class="selector_header">
 
 {?navigation:nav_row=home;imprint;contact?}
 
 <div class="selector_header">

-       {--HEADER_APPLICATION_SELECTOR--}
+       [--HEADER_APPLICATION_SELECTOR--]

 </div>
 
 <div class="selector_list_apps">
        {?selector_apps?}
 </div>
 
 </div>
 
 <div class="selector_list_apps">
        {?selector_apps?}
 </div>
 

-{?footer_msg:footer_msg={--FOOTER_APPLICATION_SELECTOR--}?}
+{?footer_msg:footer_msg=[--FOOTER_APPLICATION_SELECTOR--]?}

diff --git a/application/ship-simu/templates/de/code/shipsimu_main.ctp b/application/ship-simu/templates/de/code/shipsimu_main.ctp
index 208aa2f668e25b9e3cc2cd5c8ea8e0652c70a6d6..12429ffe425ba041f993ac69bde85a378394ca90 100644 (file)
--- a/application/ship-simu/templates/de/code/shipsimu_main.ctp
+++ b/application/ship-simu/templates/de/code/shipsimu_main.ctp
@@ -1,11 +1,11 @@
 <!-- The compileable main template for the ship simulator //-->
 
 <!-- The compileable main template for the ship simulator //-->
 

-{?header:title={--WELCOME_SHIP_SIMU--}?}
+{?header:title=[--WELCOME_SHIP_SIMU--]?}

 
 {?navigation:nav_row=home;imprint;contact?}
 
 <div class="shipsimu_header">
 
 {?navigation:nav_row=home;imprint;contact?}
 
 <div class="shipsimu_header">

-       {--HEADER_SHIP_SIMU--}
+       [--HEADER_SHIP_SIMU--]

 </div>
 
 <div class="shipsimu_content">
 </div>
 
 <div class="shipsimu_content">


@@ -13,7 +13,7 @@
 </div>
 
 <div class="shipsimu_content">
 </div>
 
 <div class="shipsimu_content">

-       {--FOOTER_SHIP_SIMU--}
+       [--FOOTER_SHIP_SIMU--]

 </div>
 
 </div>
 

-{?footer_msg:footer_msg={--FOOTER_SHIP_SIMU--}?}
+{?footer_msg:footer_msg=[--FOOTER_SHIP_SIMU--]?}

diff --git a/application/ship-simu/templates/de/html/home.tpl b/application/ship-simu/templates/de/html/home.tpl
new file mode 100644 (file)
index 0000000..a7f8e71
--- /dev/null
+++ b/application/ship-simu/templates/de/html/home.tpl
@@ -0,0 +1,7 @@
+<div class="home_content">
+       <div class="content_header">
+               Willkommen zum Schiffsimulator &quot;Ship-Simu&quot;!
+       </div>
+
+       Hier muss noch ein einleitender Text f&uuml;r die Eingangsseite hin (Home!)
+</div>

diff --git a/inc/classes/main/commands/local/class_LocalHomeCommand.php b/inc/classes/main/commands/local/class_LocalHomeCommand.php
index c670cb1de84af66c2ac21f3849b348cc5712ed0d..02f0928f844b7e9e7376d59e6437b0330337ceda 100644 (file)
--- a/inc/classes/main/commands/local/class_LocalHomeCommand.php
+++ b/inc/classes/main/commands/local/class_LocalHomeCommand.php
@@ -78,11 +78,23 @@ class LocalHomeCommand extends BaseCommand implements Commandable {
                // Load the master template
                $masterTemplate = $appInstance->getMasterTemplate();
 
                // Load the master template
                $masterTemplate = $appInstance->getMasterTemplate();
 

+               // Load the home template
+               $templateInstance->loadWebTemplate("home");
+
+               // Assign the home template with the master template as a content ... ;)
+               $templateInstance->assignTemplateWithVariable("home", "content");
+

                // Load the master template
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Load the master template
                $templateInstance->loadCodeTemplate($masterTemplate);
 

-               // Load the home template
-               $templateInstance->loadWebTemplate("home");
+               // Compile it...
+               $templateInstance->compileTemplate();
+
+               // ... and all variables. This should be merged together in a pattern
+               // to make things easier. A cache mechanism should be added between
+               // these two calls to cache compiled templates.
+               $templateInstance->compileVariables();
+               die("<pre>".print_r($templateInstance, true)."</pre>");

        }
 }
 
        }
 }
 

diff --git a/inc/classes/main/template/class_TemplateEngine.php b/inc/classes/main/template/class_TemplateEngine.php
index 55bf00059525b4d603d136ac498a710a7c7c2d6f..5f13b6f0611431797112038b13602a13de975037 100644 (file)
--- a/inc/classes/main/template/class_TemplateEngine.php
+++ b/inc/classes/main/template/class_TemplateEngine.php
@@ -194,7 +194,7 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
         * Search for a variable in the stack
         *
         * @param               $var            The variable we are looking for
         * Search for a variable in the stack
         *
         * @param               $var            The variable we are looking for

-        * @return      $idx            FALSE means not found, > 0 means found on a specific index
+        * @return      $idx            FALSE means not found, >=0 means found on a specific index

         */
        private function isVariableAlreadySet ($var) {
                // First everything is not found
         */
        private function isVariableAlreadySet ($var) {
                // First everything is not found


@@ -217,6 +217,33 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                return $found;
        }
 
                return $found;
        }
 

+       /**
+        * Return a content of a variable or null if not found
+        *
+        * @param       $var            The variable we are looking for
+        * @return      $content        Content of the variable or null if not found
+        */
+       private function readVariable ($var) {
+               // First everything is not found
+               $content = null;
+
+               // Now search for it
+               for ($idx = $this->varStack->getIterator(); $idx->valid(); $idx->next()) {
+                       // Get current item
+                       $currEntry = $idx->current();
+
+                       // Is the entry found?
+                       if ($currEntry['name'] == $var) {
+                               // Found!
+                               $content = $currEntry['value'];
+                               break;
+                       }
+               }
+
+               // Return the current position
+               return $content;
+       }
+

        /**
         * Add a variable to the stack
         *
        /**
         * Add a variable to the stack
         *


@@ -623,7 +650,7 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
         * [2] => Array - An array with right part of a match including ":"
         * [3] => Array - An array with right part of a match excluding ":"
         */
         * [2] => Array - An array with right part of a match including ":"
         * [3] => Array - An array with right part of a match excluding ":"
         */

-       private function analyzeTemplate ($templateMatches) {
+       private function analyzeTemplate (array $templateMatches) {

                // Backup raw template data
                $backup = $this->getRawTemplateData();
 
                // Backup raw template data
                $backup = $this->getRawTemplateData();
 


@@ -647,8 +674,17 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                                        // RECURSIVE PROTECTION!
                                        $this->loadedTemplates[] = $template;
                                } catch (FilePointerNotOpenedException $e) {
                                        // RECURSIVE PROTECTION!
                                        $this->loadedTemplates[] = $template;
                                } catch (FilePointerNotOpenedException $e) {

-                                       // Template not found!
-                                       $this->rawTemplates[] = $template;
+                                       // Template not found, but maybe variable assigned?
+                                       if ($this->isVariableAlreadySet($template) !== false) {
+                                               // Use that content here
+                                               $this->loadedRawData[$template] = $this->readVariable($template);
+
+                                               // Recursive protection:
+                                               $this->loadedTemplates[] = $template;
+                                       } else {
+                                               // Even this is not done... :/
+                                               $this->rawTemplates[] = $template;
+                                       }

                                }
 
                        } // if ((!isset( ...
                                }
 
                        } // if ((!isset( ...


@@ -701,7 +737,7 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
         * @param               $templateMatches        See method analyzeTemplate()
         * @return      void
         */
         * @param               $templateMatches        See method analyzeTemplate()
         * @return      void
         */

-       private function insertAllTemplates ($templateMatches) {
+       private function insertAllTemplates (array $templateMatches) {

                // Run through all loaded codes
                foreach ($this->loadedRawData as $template => $code) {
 
                // Run through all loaded codes
                foreach ($this->loadedRawData as $template => $code) {
 


@@ -760,7 +796,7 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
         * @param               $varMatches     An array full of variable/value pairs.
         * @return      void
         */
         * @param               $varMatches     An array full of variable/value pairs.
         * @return      void
         */

-       private function assignAllVariables ($varMatches) {
+       private function assignAllVariables (array $varMatches) {

                // Search for all variables
                foreach ($varMatches[1] as $key=>$var) {
 
                // Search for all variables
                foreach ($varMatches[1] as $key=>$var) {
 


@@ -788,7 +824,7 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
         * @param               $templateMatches        See method analyzeTemplate() for details
         * @return      void
         */
         * @param               $templateMatches        See method analyzeTemplate() for details
         * @return      void
         */

-       private function compileRawTemplateData ($templateMatches) {
+       private function compileRawTemplateData (array $templateMatches) {

                // Are some code-templates found which we need to compile?
                if (count($this->loadedRawData) > 0) {
 
                // Are some code-templates found which we need to compile?
                if (count($this->loadedRawData) > 0) {
 


@@ -800,9 +836,8 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
 
                                // Lookup the matching variable data
                                if (isset($templateMatches[3][$foundIndex])) {
 
                                // Lookup the matching variable data
                                if (isset($templateMatches[3][$foundIndex])) {

-

                                        // Split it up with another reg. exp. into variable=value pairs
                                        // Split it up with another reg. exp. into variable=value pairs

-                                       @preg_match_all($this->regExpVarValue, $templateMatches[3][$foundIndex], $varMatches);
+                                       preg_match_all($this->regExpVarValue, $templateMatches[3][$foundIndex], $varMatches);

 
                                        // Assign all variables
                                        $this->assignAllVariables($varMatches);
 
                                        // Assign all variables
                                        $this->assignAllVariables($varMatches);


@@ -951,7 +986,7 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                $this->extractVariablesFromRawData($rawData);
 
                // Search for code-tags which are {? ?}
                $this->extractVariablesFromRawData($rawData);
 
                // Search for code-tags which are {? ?}

-               @preg_match_all($this->regExpCodeTags, $rawData, $templateMatches);
+               preg_match_all($this->regExpCodeTags, $rawData, $templateMatches);

 
                // Analyze the matches array
                if ((is_array($templateMatches)) && (count($templateMatches) == 4) && (count($templateMatches[0]) > 0)) {
 
                // Analyze the matches array
                if ((is_array($templateMatches)) && (count($templateMatches) == 4) && (count($templateMatches[0]) > 0)) {


@@ -1044,6 +1079,24 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                // Return the requested instance
                return $this->helpers[$helperName];
        }
                // Return the requested instance
                return $this->helpers[$helperName];
        }

+
+       /**
+        * Assigns the last loaded raw template content with a given variable
+        *
+        * @param       $templateName   Name of the template we want to assign
+        * @param       $variableName   Name of the variable we want to assign
+        * @return      void
+        */
+       public function assignTemplateWithVariable ($templateName, $variableName) {
+               // Get the content from last loaded raw template
+               $content = $this->getRawTemplateData();
+
+               // Assign the variable
+               $this->assignVariable($variableName, $content);
+
+               // Purge raw content
+               $this->setRawTemplateData("");
+       }

 }
 
 // [EOF]
 }
 
 // [EOF]