Merge branch 'stable-3.1'

Marius Burkard

2016-02-10 88c307b0ef30a94ea5e9b52a1f9078bf04033d29

Merge branch 'stable-3.1'

 docs/autoinstall_samples/autoinstall.conf_sample.php

 docs/autoinstall_samples/autoinstall.ini.sample

 install/dist/lib/gentoo.lib.php

@@ -775,6 +775,10 @@
            $content = str_replace('{fpm_socket}', $fpm_socket, $content);
            $content = str_replace('{cgi_socket}', $cgi_socket, $content);

            // SSL in apps vhost is off by default. Might change later.
            $content = str_replace('{ssl_on}', 'off', $content);
            $content = str_replace('{ssl_comment}', '#', $content);
			
            wf($vhost_conf_dir.'/apps.vhost', $content);

            // PHP-FPM

 install/install.php

@@ -208,7 +208,7 @@
    }

    //* Initialize the MySQL server connection
    if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
    if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
        $conf['mysql']['host'] = $tmp_mysql_server_host;
        $conf['mysql']['port'] = $tmp_mysql_server_port;
        $conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
@@ -217,7 +217,7 @@
        $conf['mysql']['charset'] = $tmp_mysql_server_charset;
        $finished = true;
    } else {
        swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_error());
        swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_connect_error());
    }
} while ($finished == false);
unset($finished);
@@ -553,7 +553,7 @@
            $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database');

            //* Initialize the MySQL server connection
            if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
            if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
                $conf['mysql']['master_host'] = $tmp_mysql_server_host;
                $conf['mysql']['master_port'] = $tmp_mysql_server_port;
                $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
@@ -561,7 +561,7 @@
                $conf['mysql']['master_database'] = $tmp_mysql_server_database;
                $finished = true;
            } else {
                swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
                swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
            }
        } while ($finished == false);
        unset($finished);

 install/lib/installer_base.lib.php

@@ -2075,6 +2075,10 @@
            }
            $content = str_replace('{use_tcp}', $use_tcp, $content);
            $content = str_replace('{use_socket}', $use_socket, $content);
			
            // SSL in apps vhost is off by default. Might change later.
            $content = str_replace('{ssl_on}', 'off', $content);
            $content = str_replace('{ssl_comment}', '#', $content);

            wf($vhost_conf_dir.'/apps.vhost', $content);


 install/tpl/mysql-virtual_outgoing_bcc.cf

 install/tpl/mysql-virtual_outgoing_bcc.cf.master

 install/update.php

@@ -229,7 +229,7 @@
    if(@mysqli_connect($conf["mysql"]["host"], $conf["mysql"]["admin_user"], $conf["mysql"]["admin_password"])) {
        $finished = true;
    } else {
        swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
        swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
        $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password'],'mysql_root_password');
    }
} while ($finished == false);
@@ -255,7 +255,7 @@
        $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database');

        //* Initialize the MySQL server connection
        if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
        if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
            $conf['mysql']['master_host'] = $tmp_mysql_server_host;
            $conf['mysql']['master_port'] = $tmp_mysql_server_port;
            $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
@@ -263,7 +263,7 @@
            $conf['mysql']['master_database'] = $tmp_mysql_server_database;
            $finished = true;
        } else {
            swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
            swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
        }
    } while ($finished == false);
    unset($finished);

 interface/lib/classes/plugin_directive_snippets.inc.php

 interface/web/client/lib/lang/en_client_message_template.lng

 interface/web/client/lib/lang/en_client_message_template_list.lng

 interface/web/client/templates/message_template_list.htm

 interface/web/dashboard/lib/lang/bg_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/br_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/cz_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/el_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/en_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/es_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/fi_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/hu_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/id_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/it_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/ja_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/nl_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/pl_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/pt_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/ru_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/se_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/sk_dashlet_invoice_client_settings.lng

 interface/web/dashboard/lib/lang/tr_dashlet_invoice_client_settings.lng

 interface/web/js/scrigo.js.php

@@ -153,9 +153,9 @@
    var maxLength = minLength + 5;
    var length = getRandomInt(minLength, maxLength);
    
    var alphachars = "abcdefghijklmnopqrstuvwxyz";
    var upperchars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
    var numchars = "1234567890";
    var alphachars = "abcdefghijkmnopqrstuvwxyz";
    var upperchars = "ABCDEFGHJKLMNPQRSTUVWXYZ";
    var numchars = "23456789";
    var specialchars = "!@#_";
    
    if(num_special == undefined) num_special = 0;

 interface/web/sites/lib/lang/bg_web_directive_snippets.lng

 interface/web/sites/lib/lang/br_web_directive_snippets.lng

 interface/web/sites/lib/lang/cz_web_directive_snippets.lng

 interface/web/sites/lib/lang/el_web_directive_snippets.lng

 interface/web/sites/lib/lang/en_web_directive_snippets.lng

 interface/web/sites/lib/lang/es_web_directive_snippets.lng

 interface/web/sites/lib/lang/fi_web_directive_snippets.lng

 interface/web/sites/lib/lang/hu_web_directive_snippets.lng

 interface/web/sites/lib/lang/id_web_directive_snippets.lng

 interface/web/sites/lib/lang/it_web_directive_snippets.lng

 interface/web/sites/lib/lang/ja_web_directive_snippets.lng

 interface/web/sites/lib/lang/nl_web_directive_snippets.lng

 interface/web/sites/lib/lang/pl_web_directive_snippets.lng

 interface/web/sites/lib/lang/pt_web_directive_snippets.lng

 interface/web/sites/lib/lang/ru_web_directive_snippets.lng

 interface/web/sites/lib/lang/se_web_directive_snippets.lng

 interface/web/sites/lib/lang/sk_web_directive_snippets.lng

 interface/web/sites/lib/lang/tr_web_directive_snippets.lng

 interface/web/sites/templates/web_directive_snippets.htm

 server/conf/hhvm_monit.master

 server/lib/classes/cron.d/100-monitor_clamav_log.inc.php

@@ -129,7 +129,7 @@
        $clamav_outdated_warning = false;
        $clamav_bytecode_updated = false;
        foreach ($lastLog as $line) {
            if (stristr($line,'outdated')) {
            if (stristr($line,"Can't download daily.cvd from")) {
                $clamav_outdated_warning = true;
            }
            if(stristr($line,'main.cld is up to date')) {

 server/lib/classes/cron.d/550-bind_dnssec.inc.php

 server/lib/classes/db_mysql.inc.php

@@ -558,7 +558,7 @@
        /* Connect to the database */
        $link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
        if (!$link) {
            $app->log('Unable to connect to the database'.mysqli_error($link), LOGLEVEL_DEBUG);
            $app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_DEBUG);
            return;
        }
        /* Get database-size from information_schema */

 server/plugins-available/software_update_plugin.inc.php

@@ -248,7 +248,7 @@
            //* Connect to the database
            $link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
            if (!$link) {
                $app->log('Unable to connect to the database'.mysqli_error($link), LOGLEVEL_ERROR);
                $app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_ERROR);
                return;
            }