Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-07-05 3cc04cc5219bfd72d83b58d2f6ae83092e0c9fb6

 install/lib/installer_base.lib.php

@@ -1691,7 +1691,7 @@
      if(!@is_dir($conf['ispconfig_log_dir'].'/httpd')) mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);

      if(is_file('/etc/suphp/suphp.conf')) {
         replaceLine('/etc/suphp/suphp.conf', 'php=php:/usr/bin', 'x-httpd-suphp="php:/usr/bin/php-cgi"', 0);
         replaceLine('/etc/suphp/suphp.conf', 'php="php:/usr/bin', 'x-httpd-suphp="php:/usr/bin/php-cgi"', 0);
         //replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
         replaceLine('/etc/suphp/suphp.conf', 'umask=0077', 'umask=0022', 0);
      }