From a59e37372507bcdf32df82eeac36bedfc41e9415 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 05 Nov 2008 04:40:15 -0500
Subject: [PATCH] Added apache dirctives variable to SSL vhost too.
---
interface/lib/config.inc.php | 60 ++++++++++++++++++++++--------------------------------------
1 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index efe42f9..101edf5 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -31,14 +31,27 @@
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
+define('ISPC_APP_TITLE', 'ISPConfig');
$conf['app_title'] = 'ISPConfig';
+define('ISPC_APP_VERSION', '3.0.0');
$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');
//********************************************************************************
//** Future Code idea - pedro - rfc
@@ -84,21 +97,6 @@
$conf['db_database'] = 'ispconfig3';
}
-/* Dynamic constants are another technique as well as key files as constants.
- The base root directory is the interface/ directory which is the top level for php
- From this eveything else is be defined underneath as constants
- The constants are directory paths with no trailing /
- This should do away with the $conf['rootpath'] etc
- The $conf['fs_div'] is unnecessary if only / is used, will work on windoze also
-
-*/
-//** The main ROOT is the parent directory to this file, ie interface
-define('ISPC_ROOT', realpath('../'));
-define('ISPC_CLASS_PATH', ISPC_ROOT.'/lib/classes');
-define('ISPC_TEMP_PATH', ISPC_ROOT.'/temp');
-define('ISPC_CACHE_PATH', ISPC_ROOT.'/cache');
-//<< End pedro rfc block
-
//** Database Settings
/* See above
$conf['db_type'] = 'mysql';
@@ -108,35 +106,15 @@
$conf['db_database'] = 'ispconfig3';
*/
-$conf['rootpath'] = substr(dirname(__FILE__),0,-4);
-$conf['fs_div'] = '/'; // File system divider, \\ on windows and / on linux and unix
-$conf['classpath'] = $conf['rootpath'].$conf['fs_div'].'lib'.$conf['fs_div'].'classes';
-$conf['temppath'] = $conf['rootpath'].$conf['fs_div'].'temp';
-// predro notes: not sure this is the right thing ?
-$conf['cache_dir'] = $conf['rootpath'].$conf['fs_div'].'/cache';
-
-define('DIR_TRENNER', $conf['fs_div']);
-define('SERVER_ROOT', $conf['rootpath']);
-define('INCLUDE_ROOT', SERVER_ROOT.DIR_TRENNER.'lib');
-define('CLASSES_ROOT', INCLUDE_ROOT.DIR_TRENNER.'classes');
-
-/* pedro notes ? this stuff is REALLY not necessay, can leak everywhere */
-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";
-$conf['programs']['wput'] = $conf['rootpath']."\\tools\\wput\\wput.exe";
+$conf['programs']['wput'] = ISPC_ROOT_PATH."\\tools\\wput\\wput.exe";
//** 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';
@@ -145,6 +123,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