- Merged language files - Updated version number to 3.0.5.4rc1

Till Brehm

2014-04-03 a08e6c32e70561a3fadbd6062ca02c5f8c94b81d

 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,7 +56,8 @@

//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.3');
define('ISPC_APP_VERSION', '3.0.5.4rc1');
define('DEVSYSTEM', 0);


//** Database
@@ -66,6 +67,8 @@
$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']);
@@ -81,9 +84,12 @@
$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
$conf['ispconfig_log_dir'] = '/var/log/ispconfig';
define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../')); // Main ROOT is the parent directory to this file, ie interface/ or server/. NO trailing slashes.
define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib');
define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes');
@@ -112,10 +118,11 @@
$conf['app_link'] = 'http://www.ispconfig.org/';
$conf['modules_available'] = 'dashboard,admin,mail,sites,monitor,client,dns,help';
$conf['server_id'] = '{server_id}';
$conf['init_scripts'] = '/etc/init.d';


//** 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 
@@ -137,14 +144,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.
@@ -154,7 +165,6 @@
//** Auto Load Modules
$conf['start_db'] = true;
$conf['start_session'] = true;


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