Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/lib/config.inc.php

@@ -34,6 +34,7 @@
   header("Pragma: no-cache");
   header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
   header("Content-Type: text/html; charset=utf-8");
   header('X-Content-Type-Options: nosniff');

   ini_set('register_globals', 0);
}
@@ -51,6 +52,7 @@
//** Database
$conf['db_type'] = 'mysql';
$conf['db_host'] = 'localhost';
$conf['db_port'] = 3306;
$conf['db_database'] = 'ispconfig3_305';
$conf['db_user'] = 'root';
$conf['db_password'] = '';
@@ -60,6 +62,7 @@

define('DB_TYPE', $conf['db_type']);
define('DB_HOST', $conf['db_host']);
define('DB_PORT', $conf['db_port']);
define('DB_DATABASE', $conf['db_database']);
define('DB_USER', $conf['db_user']);
define('DB_PASSWORD', $conf['db_password']);
@@ -69,6 +72,7 @@
//** Database settings for the master DB. This setting is only used in multiserver setups
$conf['dbmaster_type']   = 'mysql';
$conf['dbmaster_host']   = '{mysql_master_server_host}';
$conf['dbmaster_port']   = '{mysql_master_server_port}';
$conf['dbmaster_database']  = '{mysql_master_server_database}';
$conf['dbmaster_user']   = '{mysql_master_server_ispconfig_user}';
$conf['dbmaster_password']  = '{mysql_master_server_ispconfig_password}';
@@ -139,6 +143,7 @@
//** Default Language
$conf['language'] = 'en';
$conf['debug_language'] = false;
$conf['language_file_import_enabled'] = true; // Bool value: true / false

//** Default Country
$conf['country'] = 'DE';