From 67d99a763eb9f44d3ef4fd334d1293ae8ccd847e Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:43:19 -0400
Subject: [PATCH] - fixed empty template error
---
server/plugins-available/nginx_plugin.inc.php | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 8daff10..23bca9b 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -1155,19 +1155,21 @@
}
// 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);
@@ -2757,6 +2759,7 @@
}
}
+ $custom_session_save_path = false;
if($custom_php_ini_settings != ''){
// Make sure we only have Unix linebreaks
$custom_php_ini_settings = str_replace("\r\n", "\n", $custom_php_ini_settings);
@@ -2772,6 +2775,7 @@
$value = trim($value);
if($value != ''){
$key = trim($key);
+ if($key == 'session.save_path') $custom_session_save_path = true;
switch (strtolower($value)) {
case '0':
// PHP-FPM might complain about invalid boolean value if you use 0
@@ -2793,6 +2797,8 @@
}
}
+ $tpl->setVar('custom_session_save_path', ($custom_session_save_path ? 'y' : 'n'));
+
$tpl->setLoop('custom_php_ini_settings', $final_php_ini_settings);
$app->system->file_put_contents($pool_dir.$pool_name.'.conf', $tpl->grab());
--
Gitblit v1.9.1