mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

EONE-11 (Bug): fixing install routine (again)

Browse Source
This commit is contained in:
secretr
2010-03-16 13:04:23 +00:00
parent 8ca9a28215
commit 14c3a17ac8
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/e107_class.php
View File

@@ -355,13 +355,14 @@ class e107
* *
* @return 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 // Do some security checks/cleanup, prepare the environment
$this->prepare_request(); $this->prepare_request();
// folder info // folder info
$this->e107_dirs = $e107_paths; //$this->e107_dirs = $e107_paths;
$this->setDirs($e107_paths, $e107_config_override);
// build all paths // build all paths
$this->set_paths(); $this->set_paths();

41
install_.php
View File

@@ -8,10 +8,8 @@
* *
* Installation file * Installation file
* *
* $Source: /cvs_backup/e107_0.8/install_.php,v $ * $URL$
* $Revision$ * $Id$
* $Date$
* $Author$
* *
*/ */
@@ -33,22 +31,24 @@ define('MAKE_INSTALL_LOG', TRUE);
/* Default Options and Paths for Installer */ /* Default Options and Paths for Installer */
$MySQLprefix = 'e107_'; $MySQLprefix = 'e107_';
$HANDLERS_DIRECTORY = "e107_handlers/"; // needed for e107 class init
$ADMIN_DIRECTORY = "e107_admin/"; // Should be safe to disable this - done in e107 class
$FILES_DIRECTORY = "e107_files/"; //$ADMIN_DIRECTORY = "e107_admin/";
$IMAGES_DIRECTORY = "e107_images/"; //$FILES_DIRECTORY = "e107_files/";
$MEDIA_DIRECTORY = "e107_media/"; //$IMAGES_DIRECTORY = "e107_images/";
$THEMES_DIRECTORY = "e107_themes/"; //$MEDIA_DIRECTORY = "e107_media/";
$PLUGINS_DIRECTORY = "e107_plugins/"; //$THEMES_DIRECTORY = "e107_themes/";
$HANDLERS_DIRECTORY = "e107_handlers/"; //$PLUGINS_DIRECTORY = "e107_plugins/";
$LANGUAGES_DIRECTORY = "e107_languages/"; //$HANDLERS_DIRECTORY = "e107_handlers/";
$HELP_DIRECTORY = "e107_docs/help/"; //$LANGUAGES_DIRECTORY = "e107_languages/";
$CACHE_DIRECTORY = "e107_system/cache/"; //$HELP_DIRECTORY = "e107_docs/help/";
$DOWNLOADS_DIRECTORY = "e107_media/files/"; //$CACHE_DIRECTORY = "e107_system/cache/";
$UPLOADS_DIRECTORY = "e107_media/temp/"; //$DOWNLOADS_DIRECTORY = "e107_media/files/";
$LOGS_DIRECTORY = "e107_files/logs"; //$UPLOADS_DIRECTORY = "e107_media/temp/";
$CORE_DIRECTORY = "e107_core/"; //$LOGS_DIRECTORY = "e107_files/logs";
$SYSTEM_DIRECTORY = "e107_system/"; //$CORE_DIRECTORY = "e107_core/";
//$SYSTEM_DIRECTORY = "e107_system/";
/* End configurable variables */ /* 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 = e107::getInstance();
$e107->initInstall($e107_paths, realpath(dirname(__FILE__))); $e107->initInstall($e107_paths, realpath(dirname(__FILE__)));
unset($e107_paths); unset($e107_paths);