From 0732d32f508045da40fe9df607b9ef20ce2d198f Mon Sep 17 00:00:00 2001
From: xaver <xaver@ispconfig3>
Date: Tue, 06 Mar 2012 10:03:23 -0500
Subject: [PATCH] join fix - disappered in commit + Switch traffic joins, because its faster - Tested in a productive system (MySQL 5.1) as query few tausend domains 1-3 sec for Webtraffic sort, faster SQL = faster and MySQL 5.5 is much faster with joins (standard is not sorted with slow traffic querys) -> slowest part is coping the tables into temp -> more tweeks on cache... -> faster by heavy use
---
install/tpl/config.inc.php.master | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 205b2bf..1ac3c1e 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.3');
+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,6 +84,8 @@
$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 +122,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
@@ -143,10 +148,10 @@
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf['logo'] = 'themes/default/images/ispc_logo.png';
-
-//** Default Language
+//** Default Language and Timezone
$conf['language'] = '{language}';
$conf['debug_language'] = false;
+$conf['timezone'] = '{timezone}';
//** Misc.
@@ -156,7 +161,6 @@
//** Auto Load Modules
$conf['start_db'] = true;
$conf['start_session'] = true;
-
//** Constants
define('LOGLEVEL_DEBUG',0);
--
Gitblit v1.9.1