Merge branch 'master' into 'master'

Marius Cramer

2014-02-25 0e3e3c99217c80068fe620460c7a331c34fe1b40

 server/server.sh

old mode 100644
new mode 100755
@@ -4,4 +4,14 @@

. /etc/profile

umask 022

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

cd /usr/local/ispconfig/server
/usr/bin/php -q /usr/local/ispconfig/server/server.php