Merge branch 'patch-3' into 'stable-3.1'

Till Brehm

2016-07-01 1d87d80fb9eb9a2712e90726a89048f7c03c5995

 server/server.sh

@@ -1,4 +1,5 @@
#!/bin/sh
#!/bin/bash


PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin

@@ -13,8 +14,16 @@
        fi
fi

cd /usr/local/ispconfig/security
/usr/bin/php -q /usr/local/ispconfig/security/check.php

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 \
    -d disable_classes= \
    -d disable_functions= \
    -d open_basedir= \
    /usr/local/ispconfig/security/check.php