From dea284f5715c8efda8a450ca8fffee6d8e78e83a Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Tue, 18 Nov 2008 16:43:38 -0500
Subject: [PATCH] Improved merge in language editor: - Remove of the file how not exists in master language - Fix the msg show when no file has been created, removed or modified
---
interface/lib/config.inc.php | 45 +++++++++++++++++++--------------------------
1 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 289f578..72ded1f 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -31,7 +31,7 @@
header('Pragma: no-cache');
header('Cache-Control: no-store, no-cache, max-age=0, must-revalidate');
-header('Content-Type: text/html');
+header('Content-Type: text/html; charset=utf-8');
//* TODO: Js caching - pedro
//** Key paramaters
@@ -41,6 +41,17 @@
$conf['app_version'] = '3.0.0';
$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns';
+//** The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes.
+define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../'));
+define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib');
+define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes');
+define('ISPC_WEB_PATH', ISPC_ROOT_PATH.'/web');
+define('ISPC_THEMES_PATH', ISPC_ROOT_PATH.'/web/themes');
+
+define('ISPC_WEB_TEMP_PATH', ISPC_WEB_PATH.'/temp'); // Path for downloads, accessible via browser
+define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache');
+
+define('ISPC_INTERFACE_MODULES_ENABLED', 'mail,sites,dns,tools');
//********************************************************************************
//** Future Code idea - pedro - rfc
@@ -86,18 +97,6 @@
$conf['db_database'] = 'ispconfig3';
}
-
-//** The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes.
-define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../'));
-define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib');
-define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes');
-define('ISPC_WEB_PATH', ISPC_ROOT_PATH.'/web');
-define('ISPC_THEMES_PATH', ISPC_ROOT_PATH.'/web/themes');
-
-define('ISPC_TEMP_PATH', ISPC_ROOT_PATH.'/temp');
-define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache');
-
-
//** Database Settings
/* See above
$conf['db_type'] = 'mysql';
@@ -108,17 +107,6 @@
*/
-$conf['cache_dir'] = ISPC_ROOT_PATH.'/cache';
-
-
-/* pedro notes ? this stuff is REALLY not necessay, can leak everywhere
- Don think this lot is being used so commented out
-define('DB_TYPE', $conf['db_type']);
-define('DB_HOST', $conf['db_host']);
-define('DB_DATABASE',$conf['db_database']);
-define('DB_USER', $conf['db_user']);
-define('DB_PASSWORD', $conf['db_password']);
-*/
//** External programs
//$conf["programs"]["convert"] = "/usr/bin/convert";
@@ -127,8 +115,7 @@
//** Themes
$conf['theme'] = 'default';
-$conf['html_content_encoding'] = 'text/html; charset=iso-8859-1';
-$conf['logo'] = 'themes/default/images/mydnsconfig_logo.gif';
+$conf['html_content_encoding'] = 'text/html; charset=utf-8';
//** Default Language
$conf['language'] = 'en';
@@ -137,6 +124,12 @@
$conf['start_db'] = true;
$conf['start_session'] = true;
+/*
+ Misc.
+*/
+
+$conf["interface_logout_url"] = ""; // example: http://www.domain.tld/
+
//** DNS Settings
--
Gitblit v1.9.1