From 14c3a17ac80b09ebb5ba2d396727a39ec70fd880 Mon Sep 17 00:00:00 2001 From: secretr Date: Tue, 16 Mar 2010 13:04:23 +0000 Subject: [PATCH] EONE-11 (Bug): fixing install routine (again) --- e107_handlers/e107_class.php | 7 +++--- install_.php | 41 ++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index 98d4610da..956ed2c77 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -355,13 +355,14 @@ class e107 * * @return e107 */ - public function initInstall($e107_paths, $e107_root_path) + public function initInstall($e107_paths, $e107_root_path, $e107_config_override = array()) { // Do some security checks/cleanup, prepare the environment $this->prepare_request(); // folder info - $this->e107_dirs = $e107_paths; + //$this->e107_dirs = $e107_paths; + $this->setDirs($e107_paths, $e107_config_override); // build all paths $this->set_paths(); @@ -1106,7 +1107,7 @@ class e107 { return self::getSingleton('comment', true); } - + /** * Retrieve Media handler singleton object * @return comment diff --git a/install_.php b/install_.php index d147e4b66..918aed99f 100644 --- a/install_.php +++ b/install_.php @@ -8,10 +8,8 @@ * * Installation file * -* $Source: /cvs_backup/e107_0.8/install_.php,v $ -* $Revision$ -* $Date$ -* $Author$ +* $URL$ +* $Id$ * */ @@ -33,22 +31,24 @@ define('MAKE_INSTALL_LOG', TRUE); /* Default Options and Paths for Installer */ $MySQLprefix = 'e107_'; +$HANDLERS_DIRECTORY = "e107_handlers/"; // needed for e107 class init -$ADMIN_DIRECTORY = "e107_admin/"; -$FILES_DIRECTORY = "e107_files/"; -$IMAGES_DIRECTORY = "e107_images/"; -$MEDIA_DIRECTORY = "e107_media/"; -$THEMES_DIRECTORY = "e107_themes/"; -$PLUGINS_DIRECTORY = "e107_plugins/"; -$HANDLERS_DIRECTORY = "e107_handlers/"; -$LANGUAGES_DIRECTORY = "e107_languages/"; -$HELP_DIRECTORY = "e107_docs/help/"; -$CACHE_DIRECTORY = "e107_system/cache/"; -$DOWNLOADS_DIRECTORY = "e107_media/files/"; -$UPLOADS_DIRECTORY = "e107_media/temp/"; -$LOGS_DIRECTORY = "e107_files/logs"; -$CORE_DIRECTORY = "e107_core/"; -$SYSTEM_DIRECTORY = "e107_system/"; +// Should be safe to disable this - done in e107 class +//$ADMIN_DIRECTORY = "e107_admin/"; +//$FILES_DIRECTORY = "e107_files/"; +//$IMAGES_DIRECTORY = "e107_images/"; +//$MEDIA_DIRECTORY = "e107_media/"; +//$THEMES_DIRECTORY = "e107_themes/"; +//$PLUGINS_DIRECTORY = "e107_plugins/"; +//$HANDLERS_DIRECTORY = "e107_handlers/"; +//$LANGUAGES_DIRECTORY = "e107_languages/"; +//$HELP_DIRECTORY = "e107_docs/help/"; +//$CACHE_DIRECTORY = "e107_system/cache/"; +//$DOWNLOADS_DIRECTORY = "e107_media/files/"; +//$UPLOADS_DIRECTORY = "e107_media/temp/"; +//$LOGS_DIRECTORY = "e107_files/logs"; +//$CORE_DIRECTORY = "e107_core/"; +//$SYSTEM_DIRECTORY = "e107_system/"; /* End configurable variables */ @@ -155,7 +155,8 @@ function check_class($whatever) } -$e107_paths = compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'CACHE_DIRECTORY', 'DOWNLOADS_DIRECTORY', 'UPLOADS_DIRECTORY', 'MEDIA_DIRECTORY', 'LOGS_DIRECTORY', 'SYSTEM_DIRECTORY', 'CORE_DIRECTORY'); +//$e107_paths = compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'CACHE_DIRECTORY', 'DOWNLOADS_DIRECTORY', 'UPLOADS_DIRECTORY', 'MEDIA_DIRECTORY', 'LOGS_DIRECTORY', 'SYSTEM_DIRECTORY', 'CORE_DIRECTORY'); +$e107_paths = array(); $e107 = e107::getInstance(); $e107->initInstall($e107_paths, realpath(dirname(__FILE__))); unset($e107_paths);