Use the correct file request call

[cx.git] / cx / lib / template.php

diff --git a/cx/lib/template.php b/cx/lib/template.php
index e368a2ead46a74436e8e28e3daa50ce052369797..638c6008de3177ce4b07453a5d00907db1ea6ff7 100644 (file)
--- a/cx/lib/template.php
+++ b/cx/lib/template.php
@@ -1,20 +1,69 @@
 <?php
 
-function cx_template_render($class, $name, $variables = []) {
+cx_require('third_party', 'mime', 'mime_types.php');
+
+function cx_template_content_path($class, $path) {
+       $segments = array(CX_PATH, 'templates', $class, 'assets', $path);
+       $path = join(DIRECTORY_SEPARATOR, $segments);
+       return $path;
+}
+
+function cx_template_has_content($class, $path) {
+       return is_file(cx_template_content_path($class, $path));
+}
+
+function cx_template_output_content($class, $path, $cache_age = 30 * 86400) {
+       $full_path = cx_template_content_path($class, $path);
+
+       $extension = pathinfo($path, PATHINFO_EXTENSION);
+
+       if (isset(MIME_REVERSE_MAP[$extension])) {
+               $mime_type = MIME_REVERSE_MAP[$extension][0];
+       } else {
+               $finfo = finfo_open(FILEINFO_MIME_TYPE);
+               $mime_type = finfo_file($finfo, $full_path);
+               //finfo_close($finfo); - Deprecated
+       }
+
+       $file_size = filesize($full_path);
+       $file_modified_time = filemtime($full_path);
+
+       header('Content-Type: ' . $mime_type);
+       header('Content-Length: ' . $file_size);
+       header('Cache-Control: public, max-age=604800');
+       header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $cache_age) . ' GMT');
+       header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $file_modified_time) . ' GMT');
+
+       if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
+               $request_modification = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']);
+               if ($request_modification >= $file_modified_time) {
+                       http_response_code(304);
+                       return;
+               }
+       }
+
+       $fp = fopen($full_path, 'rb');
+       fpassthru($fp);
+       fclose($fp);
+}
+
+function cx_template_render($class, $name, $variables = null) {
        global $cx_template_base, $cx_template_content;
        
        $base_template = null;
 
        $output = '';
        while ($name != null) {
-               $segments = array(CX_PATH, 'templates', $class, $name . '.php');
+               $segments = array(CX_PATH, 'templates', $class, 'pages', $name . '.php');
                $path = join(DIRECTORY_SEPARATOR, $segments);
                
                $base_template = null;
+               $base_template_variables = null;
 
                $cx_template_base_previous = $cx_template_base;
-               $cx_template_base = function($name) use (&$base_template ) {
+               $cx_template_base = function($name, $base_variables) use (&$base_template, &$base_template_variables) {
                        $base_template = $name;
+                       $base_template_variables = $base_variables;
                };
 
                $cx_template_content_previous = $cx_template_content;
@@ -24,7 +73,10 @@ function cx_template_render($class, $name, $variables = []) {
 
                cx_require('lib', 'url.php'); // For templates
 
-               extract($variables);
+               if ($variables != null) {
+                       extract($variables);
+               }
+
                ob_start();
                include($path);
                $output = ob_get_contents();
@@ -34,14 +86,15 @@ function cx_template_render($class, $name, $variables = []) {
                $cx_template_content = $cx_template_content_previous;
 
                $name = $base_template;
+               $variables = $base_template_variables;
        }
 
        return $output;
 }
 
-function cx_template_base($name) {
+function cx_template_base($name, $variables = null) {
        global $cx_template_base;
-       $cx_template_base($name);
+       $cx_template_base($name, $variables);
 }
 
 function cx_template_content() {