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

Issue #73 - more array storage cleanup. And useful deprecated message.

Browse Source
This commit is contained in:
Cameron
2013-02-26 19:53:49 -08:00
parent 117d0e8deb
commit 2f85528ce0
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_handlers/arraystorage_class.php
View File

@@ -6,18 +6,12 @@
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
*
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/arraystorage_class.php,v $
* $Revision$
* $Date$
* $Author$
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
/** /**
* Allows Storage of arrays without use of serialize functions * DEPRECATED: Allows Storage of arrays without use of serialize functions
* *
*/ */
class ArrayData { class ArrayData {
@@ -26,8 +20,16 @@ class ArrayData {
function __construct() function __construct()
{ {
// DO Not translate - debug info only. // DO Not translate - debug info only.
e107::getMessage()->addDebug("Deprecated ArrayStorage Class in use. Please remove references to arraystorage_class.php and use e107::getArrayStorage(); instead.");
if(E107_DEBUG_LEVEL > 0)
{
$dep = debug_backtrace();
foreach($dep as $d)
{
e107::getMessage()->addDebug("Deprecated ArrayStorage Class called by ".str_replace(e_ROOT,"",$d['file'])." on line ".$d['line']);
}
e107::getMessage()->addDebug("Please remove references to <b>arraystorage_class.php</b> and use e107::getArrayStorage(); instead.");
}
} }
/** /**
* Return a string containg exported array data. * Return a string containg exported array data.

11
e107_handlers/e107_class.php
View File

@@ -2673,13 +2673,14 @@ class e107
// Absolute file-path of directory containing class2.php // Absolute file-path of directory containing class2.php
// define("e_ROOT", realpath(dirname(__FILE__)."/../")."/"); // define("e_ROOT", realpath(dirname(__FILE__)."/../")."/");
// TODO - We need new way to do this, this file could be located under the web root!
$e_ROOT = realpath(dirname(__FILE__)."/../"); // Works in Windows, fails on Linux. $e_ROOT = realpath(dirname(__FILE__)."/../");
if ((substr($e_ROOT,-1) != '/') && (substr($e_ROOT,-1) != '\\')) if ((substr($e_ROOT,-1) != '/') && (substr($e_ROOT,-1) != '\\') )
{ {
$e_ROOT .= '/'; $e_ROOT .= (strpos($e_ROOT,':\\')!==false) ? '\\' : '/'; // Should be functioning correctly on both windows and Linux now.
} }
define('e_ROOT', $e_ROOT); // Specified format gives trailing slash already (at least on Windows)
define('e_ROOT',$e_ROOT);
$this->relative_base_path = (!self::isCli()) ? $path : e_ROOT; $this->relative_base_path = (!self::isCli()) ? $path : e_ROOT;
$this->http_path = "http://{$_SERVER['HTTP_HOST']}{$this->server_path}"; $this->http_path = "http://{$_SERVER['HTTP_HOST']}{$this->server_path}";

8
e107_handlers/userclass_class.php
View File

@@ -23,7 +23,6 @@
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
require_once(e_HANDLER.'arraystorage_class.php');
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_userclass.php'); include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_userclass.php');
@@ -123,10 +122,11 @@ class user_class
$this->class_tree = array(); $this->class_tree = array();
$this->class_parents = array(); $this->class_parents = array();
$array = new ArrayData;
if ($temp = $e107->ecache->retrieve_sys(UC_CACHE_TAG)) if ($temp = $e107->ecache->retrieve_sys(UC_CACHE_TAG))
{ {
$this->class_tree = $array->ReadArray($temp); $this->class_tree = e107::getArrayStorage()->read($temp);
unset($temp); unset($temp);
} }
else else
@@ -167,7 +167,7 @@ class user_class
} }
} }
$userCache = $array->WriteArray($this->class_tree, FALSE); $userCache = e107::getArrayStorage()->write($this->class_tree, FALSE);
$e107->ecache->set_sys(UC_CACHE_TAG,$userCache); $e107->ecache->set_sys(UC_CACHE_TAG,$userCache);
unset($userCache); unset($userCache);
} }

2
e107_plugins/pdf/admin_pdf_config.php
View File

@@ -26,8 +26,6 @@ require_once(e_HANDLER.'form_handler.php');
$rs = new form; $rs = new form;
//e107_require_once(e_HANDLER.'arraystorage_class.php');
//$eArrayStorage = new ArrayData();
unset($text); unset($text);
include_lan(e_PLUGIN.'pdf/languages/English_admin_pdf.php'); include_lan(e_PLUGIN.'pdf/languages/English_admin_pdf.php');

4
e107_web/utilities/resetcore.php
View File

@@ -89,8 +89,8 @@ define('e_CORE', $siteRoot.'core/'); // @TODO: Allow for override
define('e107_INIT', TRUE); define('e107_INIT', TRUE);
require_once('../../'.$HANDLERS_DIRECTORY.'arraystorage_class.php'); require_once('../../'.$HANDLERS_DIRECTORY.'core_functions.php');
$eArrayStorage = new ArrayData(); $eArrayStorage = new e_array();
?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">