- fixed empty template error

Author: Marius Burkard

interface/lib/classes/tpl.inc.php

@@ -858,14 +858,12 @@ private function _getData ($tmplfile, $do_eval=false, $tmpl_from_string = false)
 
 
 			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*';

server/lib/classes/tpl.inc.php

@@ -858,14 +858,12 @@ private function _getData ($tmplfile, $do_eval=false, $tmpl_from_string = false)
 
 
 			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*';

server/plugins-available/nginx_plugin.inc.php

@@ -1155,19 +1155,21 @@ function update($event_name, $data) {
 		}
 
 		// 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);