From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
interface/lib/config.inc.php | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 84a15e6..3cd1723 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -45,15 +45,18 @@
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.2');
+define('DEVSYSTEM', 0);
//** Database
$conf['db_type'] = 'mysql';
$conf['db_host'] = 'localhost';
-$conf['db_database'] = 'ispconfig3_stable';
+$conf['db_database'] = 'ispconfig3';
$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,6 +72,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
@@ -126,13 +131,19 @@
//** 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