From f43ef975d75a57973886e7f8eabb068d2ac15cc0 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Mon, 16 Jun 2014 12:06:06 -0400
Subject: [PATCH] - Make sure ISPConfig shows the correct error message (instad of an SQL error) when a website is renamed after an alias domain that still exists. - It should be possible to create two websites with the same domain on the same server as long as the IP differs. I therefore changed the serverdomain index of the web_domain table to include the IP address.
---
install/tpl/config.inc.php.master | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index d2517f2..bae6061 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,7 +56,7 @@
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.4');
+define('ISPC_APP_VERSION', '3.0.5.4p1');
define('DEVSYSTEM', 0);
@@ -122,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
@@ -144,13 +144,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