From 67d99a763eb9f44d3ef4fd334d1293ae8ccd847e Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 16:43:19 +0200
Subject: [PATCH] - fixed empty template error
---
interface/lib/classes/tpl.inc.php | 6 ++--
server/lib/classes/tpl.inc.php | 6 ++--
server/plugins-available/nginx_plugin.inc.php | 28 ++++++++++---------
3 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/interface/lib/classes/tpl.inc.php b/interface/lib/classes/tpl.inc.php
index 928c215e20..2104cf61a5 100644
--- a/interface/lib/classes/tpl.inc.php
+++ b/interface/lib/classes/tpl.inc.php
@@ -858,14 +858,12 @@ if (!defined('vlibTemplateClassLoaded')) {
if($this->_cache && $this->_checkCache($tmplfile, $tmpl_from_string)) { //* cache exists so lets use it
- $data = fread($fp = fopen($this->_cachefile, 'r'), filesize($this->_cachefile));
- fclose($fp);
+ $data = file_get_contents($this->_cachefile);
} else { //* no cache lets parse the file
if($tmpl_from_string == true) {
$data = $tmplfile;
} else {
- $data = fread($fp = fopen($tmplfile, 'r'), filesize($tmplfile));
- fclose($fp);
+ $data = file_get_contents($tmplfile);
}
$regex = '/(<|<\/|{|{\/|<!--|<!--\/){1}\s*';
diff --git a/server/lib/classes/tpl.inc.php b/server/lib/classes/tpl.inc.php
index 5e595f69fe..70dc2e783c 100644
--- a/server/lib/classes/tpl.inc.php
+++ b/server/lib/classes/tpl.inc.php
@@ -858,14 +858,12 @@ if (!defined('vlibTemplateClassLoaded')) {
if($this->_cache && $this->_checkCache($tmplfile, $tmpl_from_string)) { //* cache exists so lets use it
- $data = fread($fp = fopen($this->_cachefile, 'r'), filesize($this->_cachefile));
- fclose($fp);
+ $data = file_get_contents($this->_cachefile);
} else { //* no cache lets parse the file
if($tmpl_from_string == true) {
$data = $tmplfile;
} else {
- $data = fread($fp = fopen($tmplfile, 'r'), filesize($tmplfile));
- fclose($fp);
+ $data = file_get_contents($tmplfile);
}
$regex = '/(<|<\/|{|{\/|<!--|<!--\/){1}\s*';
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index c2b2abf886..23bca9b3dd 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -1155,19 +1155,21 @@ class nginx_plugin {
}
// use vLib for template logic
- $nginx_directives_new = '';
- $ngx_conf_tpl = new tpl();
- $ngx_conf_tpl_tmp_file = tempnam($conf['temppath'], "ngx");
- file_put_contents($ngx_conf_tpl_tmp_file, $nginx_directives);
- $ngx_conf_tpl->newTemplate($ngx_conf_tpl_tmp_file);
- $ngx_conf_tpl->setVar('use_tcp', $use_tcp);
- $ngx_conf_tpl->setVar('use_socket', $use_socket);
- $ngx_conf_tpl->setVar('fpm_socket', $fpm_socket);
- $ngx_conf_tpl->setVar($vhost_data);
- $nginx_directives_new = $ngx_conf_tpl->grab();
- if(is_file($ngx_conf_tpl_tmp_file)) unlink($ngx_conf_tpl_tmp_file);
- if($nginx_directives_new != '') $nginx_directives = $nginx_directives_new;
- unset($nginx_directives_new);
+ if(trim($nginx_directives) != '') {
+ $nginx_directives_new = '';
+ $ngx_conf_tpl = new tpl();
+ $ngx_conf_tpl_tmp_file = tempnam($conf['temppath'], "ngx");
+ file_put_contents($ngx_conf_tpl_tmp_file, $nginx_directives);
+ $ngx_conf_tpl->newTemplate($ngx_conf_tpl_tmp_file);
+ $ngx_conf_tpl->setVar('use_tcp', $use_tcp);
+ $ngx_conf_tpl->setVar('use_socket', $use_socket);
+ $ngx_conf_tpl->setVar('fpm_socket', $fpm_socket);
+ $ngx_conf_tpl->setVar($vhost_data);
+ $nginx_directives_new = $ngx_conf_tpl->grab();
+ if(is_file($ngx_conf_tpl_tmp_file)) unlink($ngx_conf_tpl_tmp_file);
+ if($nginx_directives_new != '') $nginx_directives = $nginx_directives_new;
+ unset($nginx_directives_new);
+ }
// Make sure we only have Unix linebreaks
$nginx_directives = str_replace("\r\n", "\n", $nginx_directives);
--
GitLab