Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into st...

Till Brehm

2016-06-29 e2a219e2971cbbc048c34470e435df4eea752a82

Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

 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);
        }

 interface/web/themes/default/templates/main_login.tpl.htm

@@ -27,7 +27,7 @@
  <div class="row" style="margin: auto; width:100%;">
        <div class="col-md-4 col-md-offset-4">
            <div class="panel panel-default">
                  <div class="panel-heading" style="background: linear-gradient(to bottom, white, #eef0f2);">
                  <div class="panel-heading" style="background: linear-gradient(to bottom, white, #eef0f2);text-align:center;">
                    <img src="{tmpl_var name='base64_logo_txt'}">
                 </div>
                  <div class="panel-body">