From c719dc0b1dd696e0cd6b51f09ee13c8263375f7c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 07 Sep 2011 05:57:38 -0400
Subject: [PATCH] Fixed a warning in maildrop plugin.
---
interface/lib/config.inc.php | 169 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 112 insertions(+), 57 deletions(-)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 2c01529..0aa84a4 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -1,6 +1,7 @@
<?php
+
/*
-Copyright (c) 2007, Till Brehm, Falko Timme, projektfarm Gmbh
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -27,75 +28,129 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-Header('Pragma: no-cache');
-Header('Cache-Control: no-store, no-cache, max-age=0, must-revalidate');
-Header('Content-Type: text/html');
+//** Web-only
+if( !empty($_SERVER['DOCUMENT_ROOT']) ) {
+
+ Header("Pragma: no-cache");
+ Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
+ Header("Content-Type: text/html; charset=utf-8");
+
+ ini_set('register_globals',0);
+}
+
+//** SVN Revision
+$svn_revision = '$Revision: 1525 $';
+$revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
+
+//** Application
+define('ISPC_APP_TITLE', 'ISPConfig');
+define('ISPC_APP_VERSION', '3.0.2');
-//** Key paramaters
-$conf['app_title'] = 'ISPConfig';
-$conf['app_version'] = '3.0.0';
-$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns';
+//** Database
+$conf['db_type'] = 'mysql';
+$conf['db_host'] = 'localhost';
+$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")
-
-//** Database Settings
-$conf['db_type'] = 'mysql';
-$conf['db_host'] = 'localhost';
-$conf['db_database'] = 'ispconfig3';
-$conf['db_user'] = 'root';
-$conf['db_password'] = '';
-
-
-//** Path Settings (Do not change!)
-$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';
-
-
-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');
-
-define('DB_TYPE', $conf['db_type']);
-define('DB_HOST', $conf['db_host']);
+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']);
+define('DB_USER',$conf['db_user']);
+define('DB_PASSWORD',$conf['db_password']);
+define('DB_CHARSET',$conf['db_charset']);
-//** External programs
-//$conf["programs"]["convert"] = "/usr/bin/convert";
-// ?? WTF ?? pedro
-$conf['programs']['wput'] = $conf['rootpath']."\\tools\\wput\\wput.exe";
+//** 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_database'] = '{mysql_master_server_database}';
+$conf['dbmaster_user'] = '{mysql_master_server_ispconfig_user}';
+$conf['dbmaster_password'] = '{mysql_master_server_ispconfig_password}';
+
+
+//** Paths
+$conf['ispconfig_log_dir'] = '/var/log/ispconfig';
+define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../')); // The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes.
+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');
+
+//** Paths (Do not change!)
+$conf['rootpath'] = substr(dirname(__FILE__),0,-4);
+$conf['fs_div'] = '/'; // File system separator (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';
+
+define('FS_DIV',$conf['fs_div']);
+define('SERVER_ROOT',$conf['rootpath']);
+define('INCLUDE_ROOT',SERVER_ROOT.FS_DIV.'lib');
+define('CLASSES_ROOT',INCLUDE_ROOT.FS_DIV.'classes');
+
+
+//** Server
+$conf['app_title'] = ISPC_APP_TITLE;
+$conf['app_version'] = ISPC_APP_VERSION;
+$conf['app_link'] = 'http://www.howtoforge.com/forums/showthread.php?t=26988';
+$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns,help';
+$conf['server_id'] = '1';
+
+
+//** Interface
+$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools';
+
+//** Demo mode
+/* The demo mode is an option to restrict certain actions in the interface like
+* changing the password of users with sys_userid < 3 etc. to be
+* able to run the ISPConfig interface as online demo. It does not
+* affect the server part. The demo mode should be always set to false
+* on every normal installation
+*/
+$conf['demo_mode'] = false;
+
+
+//** Logging
+$conf['log_file'] = $conf['ispconfig_log_dir'].'/ispconfig.log';
+$conf['log_priority'] = 0; // 0 = Debug, 1 = Warning, 2 = Error
+
+
+//** Allow software package installations
+$conf['software_updates_enabled'] = false;
//** Themes
-$conf['theme'] = 'default';
-$conf['html_content_encoding'] = 'text/html; charset=iso-8859-1';
-$conf['logo'] = 'themes/default/images/mydnsconfig_logo.gif';
+$conf['theme'] = 'default';
+$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
+$conf['logo'] = 'themes/default/images/ispc_logo.png';
+
+//** Templates
+$conf['templates'] = '/usr/local/ispconfig/server/conf';
//** Default Language
-$conf["language"] = 'en';
+$conf['language'] = 'en';
+$conf['debug_language'] = false;
-//** Auto Load Modules
-$conf['start_db'] = true;
-$conf['start_session'] = true;
+//** Default Country
+$conf['country'] = 'DE';
-//** DNS Settings
+//** Misc.
+$conf['interface_logout_url'] = ''; // example: http://www.domain.tld/
-//* Automatically create PTR records?
-$conf['auto_create_ptr'] = 1;
-//* must be set if $conf['auto_create_ptr'] is 1. Don't forget the trailing dot!
-$conf['default_ns'] = 'ns1.example.com.';
-//* Admin email address. Must be set if $conf['auto_create_ptr'] is 1. Replace "@" with ".". Don't forget the trailing dot!
-$conf['default_mbox'] = 'admin.example.com.';
-$conf['default_ttl'] = 86400;
-$conf['default_refresh'] = 28800;
-$conf['default_retry'] = 7200;
-$conf['default_expire'] = 604800;
-$conf['default_minimum_ttl'] = 86400;
-?>
\ No newline at end of file
+//** Auto Load Modules
+$conf['start_db'] = true;
+$conf['start_session'] = true;
+
+
+//** Constants
+define('LOGLEVEL_DEBUG',0);
+define('LOGLEVEL_WARN',1);
+define('LOGLEVEL_ERROR',2);
+
+?>
--
Gitblit v1.9.1