From 0087708f74b36dbbfb5567f01f38c3aabf9e4bba Mon Sep 17 00:00:00 2001
From: oliver <oliver@ispconfig3>
Date: Mon, 27 Aug 2007 15:24:20 +0000
Subject: [PATCH] 1.) fixed a bug in the updater 2.) included missing
configurations in config.inc.php.master 3.) disabled header & ini_set for
shell actions in config.inc.php.master
---
install/tpl/config.inc.php.master | 30 ++++++++++++++++++++++++++----
install/update.php | 1 +
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index c9f998a158..313e6b3298 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -27,16 +27,38 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
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']) ) {
-ini_set('register_globals',0);
+ Header("Pragma: no-cache");
+ Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
+ Header("Content-Type: text/html");
+
+ ini_set('register_globals',0);
+}
$conf["app_title"] = "ISPConfig";
$conf["app_version"] = "3.0.0";
$conf["modules_available"] = "admin,mail,sites,monitor,client,dns";
+//** 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_TEMP_PATH', ISPC_ROOT_PATH.'/temp');
+define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache');
+
+
/*
Server variables
*/
diff --git a/install/update.php b/install/update.php
index 57daca2c2c..3159fe3207 100644
--- a/install/update.php
+++ b/install/update.php
@@ -32,6 +32,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
ISPConfig 3 installer.
*/
+
// Include the library with the basic installer functions
require_once('lib/install.lib.php');
--
GitLab