A lot debug messages removed, mailer with stubs added, resend link basicly finished...

[shipsimu.git] / inc / classes / main / template / class_TemplateEngine.php

diff --git a/inc/classes/main/template/class_TemplateEngine.php b/inc/classes/main/template/class_TemplateEngine.php
index 7bbf2e1750b1025a6678e539e9209b7e594cefb0..23ac8b4a0fa35e4749feb8b00e9acbf8edf789c4 100644 (file)
--- a/inc/classes/main/template/class_TemplateEngine.php
+++ b/inc/classes/main/template/class_TemplateEngine.php
@@ -600,8 +600,8 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                        foreach ($variableMatches[3] as $key=>$var) {
                                // Try to assign it, empty strings are being ignored
                                $this->assignTemplateVariable($variableMatches[1][$key], $var);
-                       }
-               }
+                       } // END - foreach
+               } // END - if
        }
 
        /**
@@ -649,6 +649,9 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                                                // Remember this template for recursion detection
                                                // RECURSIVE PROTECTION!
                                                $this->loadedTemplates[] = $template;
+                                       } catch (FileIsMissingException $e) {
+                                               // Even this is not done... :/
+                                               $this->rawTemplates[] = $template;
                                        } catch (FilePointerNotOpenedException $e) {
                                                // Even this is not done... :/
                                                $this->rawTemplates[] = $template;
@@ -752,6 +755,9 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                                        // Remember this template for recursion detection
                                        // RECURSIVE PROTECTION!
                                        $this->loadedTemplates[] = $template;
+                               } catch (FileIsMissingException $e) {
+                                       // This template was never found. We silently ignore it
+                                       unset($this->rawTemplates[$key]);
                                } catch (FilePointerNotOpenedException $e) {
                                        // This template was never found. We silently ignore it
                                        unset($this->rawTemplates[$key]);
@@ -765,6 +771,7 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
         *
         * @param               $varMatches     An array full of variable/value pairs.
         * @return      void
+        * @todo        Unfinished work or don't die here.
         */
        private function assignAllVariables (array $varMatches) {
                // Search for all variables
@@ -782,7 +789,6 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                                $this->assignVariable($var, $varMatches[3][$key]);
                        } elseif (!empty($varMatches[2][$key])) {
                                // Non-string found so we need some deeper analysis...
-                               /* @TODO Unfinished work or don't die here. */
                                die("Deeper analysis not yet implemented!");
                        }
 
@@ -946,6 +952,7 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
         * Compile all variables by inserting their respective values
         *
         * @return      void
+        * @todo        Make this code some nicer...
         */
        public final function compileVariables () {
                // Initialize the $content array
@@ -986,7 +993,6 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                        );
 
                        // This loop does remove the backslashes (\) in PHP parameters
-                       /* @TODO Make this some nicer... */
                        while (strpos($eval, "<?") !== false) {
                                // Get left part before "<?"
                                $evalLeft = substr($eval, 0, strpos($eval, "<?"));
@@ -1012,21 +1018,28 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                        } // END - while
 
                        // Prepare PHP code for eval() command
+                       $evalLength = strlen($eval);
                        $eval = str_replace(
                                "<%php", "\";",
                                str_replace(
-                                       "%>", "\$result .= \"", $eval
+                                       "%>", "\n\$result .= \"", $eval
                                )
                        );
 
-                       // Debug message
-                       if ((defined('DEBUG_EVAL')) && (is_object($this->getDebugInstance()))) $this->getDebugInstance()->output(sprintf("[%s:] Constructed PHP command: <pre><em>%s</em></pre><br />\n",
-                               $this->__toString(),
-                               htmlentities($eval)
-                       ));
+                       // Did something change?
+                       if (strlen($eval) != $eval) {
+                               // Run the constructed command. This will "compile" all variables in
+                               @eval($eval);
+                       } // END - if
 
-                       // Run the constructed command. This will "compile" all variables in
-                       eval($eval);
+                       // Goes something wrong?
+                       if (!isset($result)) {
+                               // Output eval command
+                               $this->debugOutput(sprintf("Failed eval() code: <pre>%s</pre>", $this->markupCode($eval, true)), true);
+
+                               // Output backtrace here
+                               $this->debugBacktrace();
+                       } // END - if
 
                        // Set raw template data
                        $this->setRawTemplateData($result);
@@ -1114,15 +1127,8 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                                $this->getTemplateType()
                        );
 
-                       if ((is_object($this->getDebugInstance())) && (method_exists($this->getDebugInstance(), 'output'))) {
-                               // Use debug output handler
-                               $this->getDebugInstance()->output($msg);
-                               die();
-                       } else {
-                               // Put directly out
-                               // DO NOT REWRITE THIS TO app_die() !!!
-                               die($msg);
-                       }
+                       // Write the problem to the world...
+                       $this->debugOutput($msg);
                        break;
                }
        }