From 7de9c4d3213536399c1b4eb794f9e668f4084752 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 26 May 2016 10:03:50 -0400
Subject: [PATCH] Issue #3872: Fixed syntax incompatibility with old PHP versions.
---
server/plugins-available/nginx_plugin.inc.php | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 1c5247d..ff9af43 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -741,9 +741,9 @@
}
// get the primitive folder for document_root and the filesystem, will need it later.
- $df_output=exec("df -T $document_root|awk 'END{print \$2,\$NF}'");
- $file_system = explode(" ", $df_output)[0];
- $primitive_root = explode(" ", $df_output)[1];
+ $df_output=explode(" ", exec("df -T $document_root|awk 'END{print \$2,\$NF}'"));
+ $file_system = $df_output[0];
+ $primitive_root = $df_output[1];
if ( in_array($file_system , array('ext2','ext3','ext4'), true) ) {
exec('setquota -u '. $username . ' ' . $blocks_soft . ' ' . $blocks_hard . ' 0 0 -a &> /dev/null');
@@ -1312,8 +1312,9 @@
$app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
$success = false;
- if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
- $success = $this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme");
+ $letsencrypt = array_shift( split("\n", `which letsencrypt /root/.local/share/letsencrypt/bin/letsencrypt`) );
+ if(is_executable($letsencrypt)) {
+ $success = $this->_exec($letsencrypt . " auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme");
}
if(!$success) {
// error issuing cert
--
Gitblit v1.9.1