From 8beb039f0b7d23b03f7963c3a56c8dde65af3b6b Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sat, 30 Apr 2016 03:32:35 -0400
Subject: [PATCH] allow underscore in ALIAS name (Fixes: #3866)
---
install/tpl/config.inc.php.master | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index a6abb12..2ba18f3 100644
--- a/install/tpl/config.inc.php.master
+++ b/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,13 +56,14 @@
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.4.1');
+define('ISPC_APP_VERSION', '3.1b1');
define('DEVSYSTEM', 0);
//** Database
$conf['db_type'] = 'mysql';
$conf['db_host'] = '{mysql_server_host}';
+$conf['db_port'] = '{mysql_server_port}';
$conf['db_database'] = '{mysql_server_database}';
$conf['db_user'] = '{mysql_server_ispconfig_user}';
$conf['db_password'] = '{mysql_server_ispconfig_password}';
@@ -72,6 +73,7 @@
define('DB_TYPE',$conf['db_type']);
define('DB_HOST',$conf['db_host']);
+define('DB_PORT',$conf['db_port']);
define('DB_DATABASE',$conf['db_database']);
define('DB_USER',$conf['db_user']);
define('DB_PASSWORD',$conf['db_password']);
@@ -81,6 +83,7 @@
//** Database settings for the master DB. This setting is only used in multiserver setups
$conf['dbmaster_type'] = 'mysql';
$conf['dbmaster_host'] = '{mysql_master_server_host}';
+$conf['dbmaster_port'] = '{mysql_master_server_port}';
$conf['dbmaster_database'] = '{mysql_master_server_database}';
$conf['dbmaster_user'] = '{mysql_master_server_ispconfig_user}';
$conf['dbmaster_password'] = '{mysql_master_server_ispconfig_password}';
@@ -144,13 +147,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.
--
Gitblit v1.9.1