format fixes

[phpgitweb.git] / htdocs / lib / ContentProvider.class.php

diff --git a/htdocs/lib/ContentProvider.class.php b/htdocs/lib/ContentProvider.class.php
index a32a37fb95d92a2593e5e730ca13b74b2dc4cfe9..0fc9685b54c27f3b73ee29460506ee183f2b43c7 100644 (file)
--- a/htdocs/lib/ContentProvider.class.php
+++ b/htdocs/lib/ContentProvider.class.php
@@ -17,13 +17,13 @@
  */
 
 class ContentProvider {
-    private static $template_cache = array();
+       private static $template_cache = array();
        private static $overall_content = array();
        
        private $template, $subtemplate;
        private $content = array();
        
-    public function __construct($template, $subtemplate, $content = null) {
+       public function __construct($template, $subtemplate, $content = null) {
                $this->template = $template;
                $this->subtemplate = $subtemplate;
                
@@ -31,7 +31,7 @@ class ContentProvider {
                        $this->content = $content;
                }
        }
-    
+       
        public function set($name, $value) {
                $this->content[strtolower($name)] = $value;
        }
@@ -81,6 +81,9 @@ class ContentProvider {
                case "rendertime":
                        $rep = "%rendertime%"; //gets replaced later
                        break;
+               case "template_path":
+                       $rep = 'templates/'.(GitConfig::TEMPLATE_NAME ? GitConfig::TEMPLATE_NAME : 'default');
+                       break;
                default:
                        if(array_key_exists($var, $this->content)) {
                                $rep = $this->resolve_content($this->content[$var]);
@@ -112,7 +115,9 @@ class ContentProvider {
                else {
                        $template_html = $this->load_template($this->template, $subtemplate);
                }
-               $template_html = preg_replace_callback('/%([^%]*)%/', array($this, "replace_placeholder"), $template_html);
+               $template_html = preg_replace('/([\r\n]*)$/mD', '', $template_html);
+               $template_html = preg_replace_callback('/%([^%\n]*)%/', array($this, "replace_placeholder"), $template_html);
+               $template_html = preg_replace_callback('/%([^%\n]*)%/', array($this, "replace_placeholder"), $template_html);
                
                return $template_html;
        }