From ebd0e986ed11f2a34fb58cdd33efbfab192083ad Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 22 Apr 2016 05:26:17 -0400
Subject: [PATCH] Added PHP 7 check in installer and updater.

---
 server/cron_daily.sh |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/server/cron_daily.sh b/server/cron_daily.sh
index 77a0a2f..9ffedae 100644
--- a/server/cron_daily.sh
+++ b/server/cron_daily.sh
@@ -1,5 +1,16 @@
-#!/bin/bash
+#!/bin/sh
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
 
-/usr/bin/php -q /usr/local/ispconfig/server/cron_daily.php
\ No newline at end of file
+if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then
+        PHPINIOWNER=`stat -c %U /usr/local/ispconfig/server/lib/php.ini`
+        if [ $PHPINIOWNER == 'root' ] || [ $PHPINIOWNER == 'ispconfig'  ]; then
+                export PHPRC=/usr/local/ispconfig/server/lib
+        fi
+fi
+
+/usr/bin/php -q /usr/local/ispconfig/server/cron_daily.php
+
+if [ -f /usr/local/ispconfig/server/cron_daily_billing.sh ]; then
+        /usr/local/ispconfig/server/cron_daily_billing.sh
+fi

--
Gitblit v1.9.1