From 0d68e92162476cc6b9e4c17fcfd0ae06bc8538c4 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Wed, 05 Feb 2014 03:34:25 -0500 Subject: [PATCH] Fixed: FS#3318 - Check if there is a problem with bcc email addresses in email class --- server/plugins-available/nginx_plugin.inc.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 2e93944..b563387 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -693,7 +693,7 @@ if($web_config['security_level'] == 20) { $app->system->chmod($data['new']['document_root'], 0755); - $app->system->chmod($data['new']['document_root'].'/web', 0710); + $app->system->chmod($data['new']['document_root'].'/web', 0711); //$app->system->chmod($data['new']['document_root'].'/webdav',0710); $app->system->chmod($data['new']['document_root'].'/private', 0710); $app->system->chmod($data['new']['document_root'].'/ssl', 0755); @@ -1041,8 +1041,9 @@ $nginx_directives = str_replace("\r", "\n", $nginx_directives); $nginx_directive_lines = explode("\n", $nginx_directives); if(is_array($nginx_directive_lines) && !empty($nginx_directive_lines)){ + $trans = array('{DOCROOT}' => $vhost_data['web_document_root_www'], '{FASTCGIPASS}' => 'fastcgi_pass '.($data['new']['php_fpm_use_socket'] == 'y'? 'unix:'.$fpm_socket : '127.0.0.1:'.$vhost_data['fpm_port']).';'); foreach($nginx_directive_lines as $nginx_directive_line){ - $final_nginx_directives[] = array('nginx_directive' => $nginx_directive_line); + $final_nginx_directives[] = array('nginx_directive' => strtr($nginx_directive_line, $trans)); } } $tpl->setLoop('nginx_directives', $final_nginx_directives); -- Gitblit v1.9.1