0
@@ -3,6 +3,7 @@ services_authorization: midcom_core_services_authorization_simple
0
 services_templating: midcom_core_services_templating_midgard
0
 services_sessioning: midcom_core_services_sessioning_midgard
0
 services_uimessages: midcom_core_services_uimessages_midgard
0
+cache_directory: __MIDGARDCACHE__/bergietest
0
 enable_benchmark: false
0
 enable_included_list: false
0
 enable_jquery_framework: false

0
@@ -35,13 +35,10 @@ elseif (isset($_MIDCOM))
0
 
0
 if (isset($_MIDCOM))
0
 {
0
-    // Start output buffer so we can do templating
0
-    ob_start();
0
-
0
     $_MIDCOM->templating->template();
0
 
0
     // Read contents from the output buffer and pass to MidCOM rendering
0
-    $_MIDCOM->templating->display(ob_get_clean());
0
+    $_MIDCOM->templating->display();
0
 }
0
 else
0
 {

0
@@ -130,6 +130,7 @@ class midcom_core_services_dispatcher_manual implements midcom_core_services_dis
0
     public function set_route($route_id, array $arguments)
0
     {
0
         $this->route_id = $route_id;
0
+        $_MIDCOM->context->route_id = $this->route_id;
0
         $this->action_arguments = $arguments;
0
     }
0
 

0
@@ -296,6 +296,7 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
                 {
0
                     //echo "DEBUG: simple match route_id:{$route_id}\n";
0
                     $this->route_id = $route_id;
0
+                    $_MIDCOM->context->route_id = $this->route_id;
0
                     return true;
0
                 }
0
                 // Did not match, try next route
0
@@ -318,6 +319,7 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
 
0
             // We have a complete match, setup route_id arguments and return
0
             $this->route_id = $route_id;
0
+            $_MIDCOM->context->route_id = $this->route_id;
0
             // Map variable arguments
0
             foreach ($route_path_matches[1] as $index => $varname)
0
             {

0
@@ -20,14 +20,13 @@ interface midcom_core_services_templating
0
     
0
     /**
0
      * Include the content template based on either global or controller-specific template entry point.
0
-     */
0
-    public function content();
0
+    public function content();*/
0
     
0
     /**
0
      * Show the loaded contents using the template engine
0
      *
0
      * @param string $content Content to display
0
      */
0
-    public function display($content);
0
+    public function display();
0
 }
0
 ?>
0
\ No newline at end of file

0
@@ -16,6 +16,7 @@ class midcom_core_services_templating_midgard implements midcom_core_services_te
0
     private $dispatcher = null;
0
     private $stacks = array();
0
     private $stack_elements = array();
0
+    private $cache_directory = '';
0
 
0
     private $elements_shown = array();
0
 
0
@@ -24,6 +25,37 @@ class midcom_core_services_templating_midgard implements midcom_core_services_te
0
         $this->stacks[0] = array();
0
     }
0
     
0
+    private function get_cache_identifier()
0
+    {
0
+        return "{$_MIDGARD['host']}-{$_MIDGARD['page']}-{$_MIDGARD['style']}-" . $_MIDCOM->context->get_current_context() . "-{$_MIDCOM->context->route_id}";
0
+    }
0
+    
0
+    private function get_cache_directory()
0
+    {
0
+        switch ($_MIDGARD['config']['prefix'])
0
+        {
0
+            case '/usr':
0
+            case '/usr/local':
0
+                return '/var/cache/midgard';
0
+            default:
0
+                return "{$_MIDGARD['config']['prefix']}/var/cache/midgard";
0
+        }
0
+    }
0
+    
0
+    private function prepare_cache()
0
+    {
0
+        $this->cache_directory = str_replace('__MIDGARDCACHE__', $this->get_cache_directory(), $_MIDCOM->configuration->get('cache_directory'));
0
+        if (!file_exists($this->cache_directory))
0
+        {
0
+            mkdir($this->cache_directory, 0777, true);
0
+        }
0
+        
0
+        if (!is_writable($this->cache_directory))
0
+        {
0
+            throw new Exception("Cache directory {$cache_directory} is not writable");
0
+        }
0
+    }
0
+    
0
     public function append_directory($directory)
0
     {
0
         if (!file_exists($directory))
0
@@ -174,9 +206,10 @@ class midcom_core_services_templating_midgard implements midcom_core_services_te
0
     {
0
         if (is_array($element))
0
         {
0
+            // Element is array in the preg_replace_callback case (evaluating element includes)
0
             $element = $element[1];
0
         }
0
-
0
+        
0
         $stack = $_MIDCOM->context->get_current_context();
0
         if (!isset($this->stacks[$stack]))
0
         {
0
@@ -188,6 +221,11 @@ class midcom_core_services_templating_midgard implements midcom_core_services_te
0
             $this->stack_elements[$stack] = array();
0
         }
0
         
0
+        if ($element == 'content')
0
+        {
0
+            $element = $_MIDCOM->context->content_entry_point;
0
+        }
0
+        
0
         if (isset($this->stack_elements[$stack][$element]))
0
         {
0
             return $this->stack_elements[$stack][$element];
0
@@ -219,7 +257,7 @@ class midcom_core_services_templating_midgard implements midcom_core_services_te
0
                 
0
                 $this->stack_elements[$stack][$element] = $element_content;
0
                 
0
-                eval('?>' . preg_replace_callback("/<\\(([a-zA-Z0-9 _-]+)\\)>/", array($this, 'get_element'), $this->stack_elements[$stack][$element]));
0
+                return preg_replace_callback("/<\\(([a-zA-Z0-9 _-]+)\\)>/", array($this, 'get_element'), $this->stack_elements[$stack][$element]);
0
             }
0
         }
0
         
0
@@ -325,10 +363,8 @@ class midcom_core_services_templating_midgard implements midcom_core_services_te
0
         $_MIDCOM->context->create();
0
         $data = $this->dynamic_call($component_name, $route_id, $arguments, false);
0
         
0
-        ob_start();
0
-        $this->content();
0
-
0
-        $this->display(ob_get_clean());
0
+        $this->template('content_entry_point');
0
+        $this->display();
0
         
0
         $_MIDCOM->context->delete();
0
     }
0
@@ -336,17 +372,17 @@ class midcom_core_services_templating_midgard implements midcom_core_services_te
0
     /**
0
      * Include the template based on either global or controller-specific template entry point.
0
      */    
0
-    public function template()
0
+    public function template($element_identifier = 'template_entry_point')
0
     {
0
-        $this->get_element($_MIDCOM->context->template_entry_point);
0
-    }
0
-    
0
-    /**
0
-     * Include the content template based on either global or controller-specific template entry point.
0
-     */
0
-    public function content()
0
-    {
0
-        $this->get_element($_MIDCOM->context->content_entry_point);
0
+        $this->prepare_cache();
0
+        $cache_file = $this->cache_directory . '/' . $this->get_cache_identifier() . '.php';
0
+        
0
+        if (file_exists($cache_file))
0
+        {
0
+            return;
0
+        }
0
+        
0
+        file_put_contents($cache_file, $this->get_element($_MIDCOM->context->$element_identifier));
0
     }
0
     
0
     /**
0
@@ -354,10 +390,15 @@ class midcom_core_services_templating_midgard implements midcom_core_services_te
0
      *
0
      * @param string $content Content to display
0
      */
0
-    public function display($content)
0
+    public function display()
0
     {
0
         $data = $_MIDCOM->context->get();
0
 
0
+        $cache_file = $this->cache_directory . '/' . $this->get_cache_identifier() . '.php';
0
+        ob_start();
0
+        include($cache_file);
0
+        $content = ob_get_clean();
0
+
0
         switch ($data['template_engine'])
0
         {
0
             case 'tal':
0
@@ -372,7 +413,7 @@ class midcom_core_services_templating_midgard implements midcom_core_services_te
0
                     $_MIDCOM->timer->setMarker('post-require');
0
                 }
0
                 
0
-                $tal = new PHPTAL();
0
+                $tal = new PHPTAL($this->get_cache_identifier());
0
 
0
                 $tal->show_toolbar = false;
0
                 if (   isset($_MIDCOM->toolbar)

0
@@ -95,7 +95,7 @@
0
 
0
             <div id="content">
0
                 <div class="main">
0
-                    <?php $_MIDCOM->templating->content(); ?>
0
+                    <(content)>
0
                 </div>
0
             </div>
0