From 4bc030979267303b2ff1668c99af0a4e7089824b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20Ka=CC=88ser?= <mail@michelkaeser.ch>
Date: Sun, 17 May 2015 09:03:48 +0200
Subject: [PATCH] ensure the internal PHP scripts work even if system-wide PHP
 settings are set that could affect how ISPConfig would work. See FS#3293

---
 install/tpl/apache_apps_fcgi_starter.master      |  6 +++++-
 install/tpl/apache_ispconfig_fcgi_starter.master |  7 ++++++-
 server/cron.sh                                   |  6 +++++-
 server/scripts/ispconfig_update.sh               |  6 +++++-
 server/scripts/update_from_dev.sh                |  6 +++++-
 server/scripts/update_from_tgz.sh                |  6 +++++-
 server/server.sh                                 | 12 ++++++++++--
 7 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/install/tpl/apache_apps_fcgi_starter.master b/install/tpl/apache_apps_fcgi_starter.master
index 8a26441e68..8ef1cbbc76 100644
--- a/install/tpl/apache_apps_fcgi_starter.master
+++ b/install/tpl/apache_apps_fcgi_starter.master
@@ -3,4 +3,8 @@ PHPRC={fastcgi_phpini_path}
 export PHPRC
 export PHP_FCGI_MAX_REQUESTS=5000
 export PHP_FCGI_CHILDREN=1
-exec {fastcgi_bin} -d magic_quotes_gpc=off
\ No newline at end of file
+exec {fastcgi_bin} -d  \
+    -d disable_classes= \
+    -d disable_functions= \
+    -d magic_quotes_gpc=off \
+    -d open_basedir=
diff --git a/install/tpl/apache_ispconfig_fcgi_starter.master b/install/tpl/apache_ispconfig_fcgi_starter.master
index 240fcccd68..ab7d13f287 100644
--- a/install/tpl/apache_ispconfig_fcgi_starter.master
+++ b/install/tpl/apache_ispconfig_fcgi_starter.master
@@ -3,4 +3,9 @@ PHPRC={fastcgi_phpini_path}
 export PHPRC
 export PHP_FCGI_MAX_REQUESTS=5000
 export PHP_FCGI_CHILDREN=1
-exec {fastcgi_bin} -d magic_quotes_gpc=off -d session.save_path=/usr/local/ispconfig/interface/temp
\ No newline at end of file
+exec {fastcgi_bin} \
+    -d disable_classes= \
+    -d disable_functions= \
+    -d magic_quotes_gpc=off \
+    -d open_basedir= \
+    -d session.save_path=/usr/local/ispconfig/interface/temp
diff --git a/server/cron.sh b/server/cron.sh
index 4aff859c3c..3670e68d46 100644
--- a/server/cron.sh
+++ b/server/cron.sh
@@ -10,4 +10,8 @@ if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then
 fi
 
 cd /usr/local/ispconfig/server
-/usr/bin/php -q /usr/local/ispconfig/server/cron.php
+/usr/bin/php -q \
+    -d disable_classes= \
+    -d disable_functions= \
+    -d open_basedir= \
+    /usr/local/ispconfig/server/cron.php
diff --git a/server/scripts/ispconfig_update.sh b/server/scripts/ispconfig_update.sh
index e3689cf4e6..03c13c9aea 100644
--- a/server/scripts/ispconfig_update.sh
+++ b/server/scripts/ispconfig_update.sh
@@ -1,3 +1,7 @@
 #!/bin/bash
 
-php -q /usr/local/ispconfig/server/scripts/ispconfig_update.php
\ No newline at end of file
+php -q \
+    -d disable_classes= \
+    -d disable_functions= \
+    -d open_basedir= \
+    /usr/local/ispconfig/server/scripts/ispconfig_update.php
diff --git a/server/scripts/update_from_dev.sh b/server/scripts/update_from_dev.sh
index de93fd9672..12f62aac77 100644
--- a/server/scripts/update_from_dev.sh
+++ b/server/scripts/update_from_dev.sh
@@ -4,7 +4,11 @@ cd /tmp
 wget -O ispconfig3-dev.tar.gz "http://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=master"
 tar xzf ispconfig3-dev.tar.gz
 cd ispconfig3.git/install
-php -q update.php
+php -q \
+    -d disable_classes= \
+    -d disable_functions= \
+    -d open_basedir= \
+    update.php
 cd /tmp
 rm -rf /tmp/ispconfig3.git /tmp/ispconfig3-dev.tar.gz
 
diff --git a/server/scripts/update_from_tgz.sh b/server/scripts/update_from_tgz.sh
index 09dddeb299..7d59e404f9 100644
--- a/server/scripts/update_from_tgz.sh
+++ b/server/scripts/update_from_tgz.sh
@@ -12,7 +12,11 @@ if [ -f ISPConfig-3-stable.tar.gz ]
 then
 	tar xvfz ISPConfig-3-stable.tar.gz
 	cd ispconfig3_install/install/
-	php -q update.php
+	php -q \
+    -d disable_classes= \
+    -d disable_functions= \
+    -d open_basedir= \
+    update.php
 	rm -rf /tmp/ispconfig3_install/install
 	rm -f ISPConfig-3-stable.tar.gz
 else
diff --git a/server/server.sh b/server/server.sh
index 2f3d2fbb82..2d05d4f0fd 100755
--- a/server/server.sh
+++ b/server/server.sh
@@ -15,7 +15,15 @@ if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then
 fi
 
 cd /usr/local/ispconfig/server
-/usr/bin/php -q /usr/local/ispconfig/server/server.php
+/usr/bin/php -q \
+    -d disable_classes= \
+    -d disable_functions= \
+    -d open_basedir= \
+    /usr/local/ispconfig/server/server.php
 
 cd /usr/local/ispconfig/security
-/usr/bin/php -q /usr/local/ispconfig/security/check.php
+/usr/bin/php -q \
+    -d disable_classes= \
+    -d disable_functions= \
+    -d open_basedir= \
+    /usr/local/ispconfig/security/check.php
-- 
GitLab