Merge branch 'stable-3.1'

Marius Burkard

2016-07-01 49441bdd0f3ff75d5092d5b832b97ea722a66363

 install/tpl/config.inc.php.master

@@ -1,6 +1,6 @@
<?php
/*
Copyright (c) 2007 - 2010, Till Brehm, projektfarm Gmbh
Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
@@ -56,19 +56,24 @@

//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.3');
define('ISPC_APP_VERSION', '3.1dev');
define('DEVSYSTEM', 0);


//** Database
$conf['db_type'] = 'mysql';
$conf['db_host'] = '{mysql_server_host}';
$conf['db_port'] = '{mysql_server_port}';
$conf['db_database'] = '{mysql_server_database}';
$conf['db_user'] = '{mysql_server_ispconfig_user}';
$conf['db_password'] = '{mysql_server_ispconfig_password}';
$conf['db_charset'] = 'utf8'; // same charset as html-charset - (HTML --> MYSQL: "utf-8" --> "utf8", "iso-8859-1" --> "latin1")
$conf['db_new_link'] = false;
$conf['db_client_flags'] = 0;

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']);
@@ -78,9 +83,12 @@
//** 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}';
$conf['dbmaster_new_link']       = false;
$conf['dbmaster_client_flags']    = 0;


//** Paths
@@ -117,7 +125,7 @@


//** Interface
$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools';
$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools,help';

//** Demo mode
/* The demo mode is an option to restrict certain actions in the interface like 
@@ -139,14 +147,18 @@


//** Themes
$conf['theme'] = 'default';
$conf['theme'] = '{theme}';
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf['logo'] = 'themes/default/images/ispc_logo.png';
$conf['logo'] = 'themes/default/images/header_logo.png';


//** Default Language
//** Default Language and Timezone
$conf['language'] = '{language}';
$conf['debug_language'] = false;
$conf['language_file_import_enabled'] = {language_file_import_enabled}; // Bool value: true / false

//* Complete timezone list: http://php.net/manual/en/timezones.php
$conf['timezone'] = '{timezone}';


//** Misc.
@@ -156,7 +168,6 @@
//** Auto Load Modules
$conf['start_db'] = true;
$conf['start_session'] = true;


//** Constants
define('LOGLEVEL_DEBUG',0);