mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00
Code Issues Releases Wiki Activity

media path fix

Browse Source
This commit is contained in:
CaMer0n
2009-12-12 11:01:04 +00:00
parent 087c37fafb
commit 4b2b29ef01
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
class2.php
View File

@@ -9,9 +9,9 @@
* General purpose file * General purpose file
* *
* $Source: /cvs_backup/e107_0.8/class2.php,v $ * $Source: /cvs_backup/e107_0.8/class2.php,v $
* $Revision: 1.166 $ * $Revision: 1.167 $
* $Date: 2009-12-09 20:35:57 $ * $Date: 2009-12-12 11:01:03 $
* $Author: e107steved $ * $Author: e107coders $
* *
*/ */
// //
@@ -211,7 +211,7 @@ $tmp = realpath(dirname(__FILE__).'/'.$HANDLERS_DIRECTORY);
e107_require_once($tmp.'/e107_class.php'); e107_require_once($tmp.'/e107_class.php');
unset($tmp); unset($tmp);
$e107_paths = compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'DOWNLOADS_DIRECTORY'); $e107_paths = compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'DOWNLOADS_DIRECTORY', 'MEDIA_DIRECTORY','CACHE_DIRECTORY');
$sql_info = compact('mySQLserver', 'mySQLuser', 'mySQLpassword', 'mySQLdefaultdb', 'mySQLprefix'); $sql_info = compact('mySQLserver', 'mySQLuser', 'mySQLpassword', 'mySQLdefaultdb', 'mySQLprefix');
$e107 = e107::getInstance()->initCore($e107_paths, realpath(dirname(__FILE__)), $sql_info); $e107 = e107::getInstance()->initCore($e107_paths, realpath(dirname(__FILE__)), $sql_info);

10
e107_handlers/e107_class.php
View File

@@ -9,9 +9,9 @@
* e107 Main * e107 Main
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
* $Revision: 1.91 $ * $Revision: 1.92 $
* $Date: 2009-12-10 22:46:45 $ * $Date: 2009-12-12 11:01:03 $
* $Author: secretr $ * $Author: e107coders $
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -235,6 +235,7 @@ class e107
$this->prepare_request(); $this->prepare_request();
// folder info // folder info
$this->e107_dirs = $e107_paths; $this->e107_dirs = $e107_paths;
// mysql connection info // mysql connection info
@@ -1656,7 +1657,6 @@ class e107
define("e_HANDLER", e_BASE.$HANDLERS_DIRECTORY); define("e_HANDLER", e_BASE.$HANDLERS_DIRECTORY);
define("e_LANGUAGEDIR", e_BASE.$LANGUAGES_DIRECTORY); define("e_LANGUAGEDIR", e_BASE.$LANGUAGES_DIRECTORY);
define("e_DOCS", e_BASE.$HELP_DIRECTORY); define("e_DOCS", e_BASE.$HELP_DIRECTORY);
//FIXME need another name
define("e_MEDIA", e_BASE.$MEDIA_DIRECTORY); define("e_MEDIA", e_BASE.$MEDIA_DIRECTORY);
// //
// HTTP absolute paths // HTTP absolute paths
@@ -1668,7 +1668,6 @@ class e107
define("e_FILE_ABS", e_HTTP.$FILES_DIRECTORY); define("e_FILE_ABS", e_HTTP.$FILES_DIRECTORY);
define("e_HANDLER_ABS", e_HTTP.$HANDLERS_DIRECTORY); define("e_HANDLER_ABS", e_HTTP.$HANDLERS_DIRECTORY);
define("e_LANGUAGEDIR_ABS", e_HTTP.$LANGUAGES_DIRECTORY); define("e_LANGUAGEDIR_ABS", e_HTTP.$LANGUAGES_DIRECTORY);
//FIXME Shouldn't be available
define("e_MEDIA_ABS", e_HTTP.$MEDIA_DIRECTORY); define("e_MEDIA_ABS", e_HTTP.$MEDIA_DIRECTORY);
if(isset($_SERVER['DOCUMENT_ROOT'])) if(isset($_SERVER['DOCUMENT_ROOT']))
@@ -1688,7 +1687,6 @@ class e107
} }
else else
{ {
//FIXME need another name
define("e_CACHE", e_MEDIA."cache/"); define("e_CACHE", e_MEDIA."cache/");
} }
/* /*

7
e107_handlers/e_parse_class.php
View File

@@ -9,9 +9,9 @@
* Text processing and parsing functions * Text processing and parsing functions
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
* $Revision: 1.87 $ * $Revision: 1.88 $
* $Date: 2009-12-07 20:48:04 $ * $Date: 2009-12-12 11:01:04 $
* $Author: e107steved $ * $Author: e107coders $
* *
*/ */
if (!defined('e107_INIT')) { exit(); } if (!defined('e107_INIT')) { exit(); }
@@ -1522,7 +1522,6 @@ class e_parse
e_THEME_ABS, e_THEME_ABS,
// e_DOWNLOAD_ABS, //impossible when download is done via php. // e_DOWNLOAD_ABS, //impossible when download is done via php.
e_HANDLER_ABS, e_HANDLER_ABS,
//FIXME Shouldn't be available
e_MEDIA_ABS e_MEDIA_ABS
); );
break; break;