From 255dcdb94ece8f37df700b8a144bcd4ff1194815 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Thu, 20 Oct 2011 07:47:29 -0400 Subject: [PATCH] Fixed: FS#1777 - AWStats: In months with two digits (10, 11, 12) order is broken => 1,10,11,12,2,3...9 --- install/tpl/config.inc.php.master | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master index cddd97b..99d4402 100644 --- a/install/tpl/config.inc.php.master +++ b/install/tpl/config.inc.php.master @@ -56,7 +56,8 @@ //** Application define('ISPC_APP_TITLE', 'ISPConfig'); -define('ISPC_APP_VERSION', '3.0.3'); +define('ISPC_APP_VERSION', '3.0.4'); +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 @@ -141,7 +148,6 @@ $conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ... $conf['logo'] = 'themes/default/images/ispc_logo.png'; - //** Default Language $conf['language'] = '{language}'; $conf['debug_language'] = false; @@ -154,7 +160,6 @@ //** Auto Load Modules $conf['start_db'] = true; $conf['start_session'] = true; - //** Constants define('LOGLEVEL_DEBUG',0); -- Gitblit v1.9.1