From fe9a23f542bc56c1c0b6dc30257418e38ff7bd3a Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Sat, 08 Jun 2013 18:57:40 -0400
Subject: [PATCH] - Fixed FS#2936 - Please check and limit username input length.

---
 interface/lib/config.inc.php |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index c920304..3cd1723 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -45,6 +45,7 @@
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
 define('ISPC_APP_VERSION', '3.0.2');
+define('DEVSYSTEM', 0);
 
 
 //** Database
@@ -54,6 +55,8 @@
 $conf['db_user'] = 'root';
 $conf['db_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']);
@@ -69,9 +72,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__).'/../')); // The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes.
 define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib');
 define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes');
@@ -125,13 +131,18 @@
 //** Themes
 $conf['theme'] = 'default';
 $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';
 
+//** Templates
+$conf['templates'] = '/usr/local/ispconfig/server/conf';
 
 //** Default Language
 $conf['language'] = 'en';
 $conf['debug_language'] = false;
 
+//** Default Country
+$conf['country'] = 'DE';
+
 
 //** Misc.
 $conf['interface_logout_url'] = ''; // example: http://www.domain.tld/

--
Gitblit v1.9.1