GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

* add FIXME for messages that may need i18n.

Browse Source 
* trailing whitespace removed.
This commit is contained in:
Siebrand Mazeland 2010-07-29 13:18:41 +02:00
parent 5813ecada2
commit 312c6b6865
1 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
classes/Safe_DataObject.php
View File

@ -116,6 +116,7 @@ class Safe_DataObject extends DB_DataObject
if ($this->_call($method, $params, $return)) { if ($this->_call($method, $params, $return)) {
return $return; return $return;
} else { } else {
// FIXME: i18n?
throw new Exception('Call to undefined method ' . throw new Exception('Call to undefined method ' .
get_class($this) . '::' . $method); get_class($this) . '::' . $method);
} }
@ -125,7 +126,7 @@ class Safe_DataObject extends DB_DataObject
* Work around memory-leak bugs... * Work around memory-leak bugs...
* Had to copy-paste the whole function in order to patch a couple lines of it. * Had to copy-paste the whole function in order to patch a couple lines of it.
* Would be nice if this code was better factored. * Would be nice if this code was better factored.
* *
* @param optional string name of database to assign / read * @param optional string name of database to assign / read
* @param optional array structure of database, and keys * @param optional array structure of database, and keys
* @param optional array table links * @param optional array table links
@ -136,108 +137,103 @@ class Safe_DataObject extends DB_DataObject
*/ */
function databaseStructure() function databaseStructure()
{ {
global $_DB_DATAOBJECT; global $_DB_DATAOBJECT;
// Assignment code // Assignment code
if ($args = func_get_args()) { if ($args = func_get_args()) {
if (count($args) == 1) { if (count($args) == 1) {
// this returns all the tables and their structure.. // this returns all the tables and their structure..
if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) { if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) {
$this->debug("Loading Generator as databaseStructure called with args",1); $this->debug("Loading Generator as databaseStructure called with args",1);
} }
$x = new DB_DataObject; $x = new DB_DataObject;
$x->_database = $args[0]; $x->_database = $args[0];
$this->_connect(); $this->_connect();
$DB = &$_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]; $DB = &$_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5];
$tables = $DB->getListOf('tables'); $tables = $DB->getListOf('tables');
class_exists('DB_DataObject_Generator') ? '' : class_exists('DB_DataObject_Generator') ? '' :
require_once 'DB/DataObject/Generator.php'; require_once 'DB/DataObject/Generator.php';
foreach($tables as $table) { foreach($tables as $table) {
$y = new DB_DataObject_Generator; $y = new DB_DataObject_Generator;
$y->fillTableSchema($x->_database,$table); $y->fillTableSchema($x->_database,$table);
} }
return $_DB_DATAOBJECT['INI'][$x->_database]; return $_DB_DATAOBJECT['INI'][$x->_database];
} else { } else {
$_DB_DATAOBJECT['INI'][$args[0]] = isset($_DB_DATAOBJECT['INI'][$args[0]]) ? $_DB_DATAOBJECT['INI'][$args[0]] = isset($_DB_DATAOBJECT['INI'][$args[0]]) ?
$_DB_DATAOBJECT['INI'][$args[0]] + $args[1] : $args[1]; $_DB_DATAOBJECT['INI'][$args[0]] + $args[1] : $args[1];
if (isset($args[1])) { if (isset($args[1])) {
$_DB_DATAOBJECT['LINKS'][$args[0]] = isset($_DB_DATAOBJECT['LINKS'][$args[0]]) ? $_DB_DATAOBJECT['LINKS'][$args[0]] = isset($_DB_DATAOBJECT['LINKS'][$args[0]]) ?
$_DB_DATAOBJECT['LINKS'][$args[0]] + $args[2] : $args[2]; $_DB_DATAOBJECT['LINKS'][$args[0]] + $args[2] : $args[2];
} }
return true; return true;
} }
} }
if (!$this->_database) { if (!$this->_database) {
$this->_connect(); $this->_connect();
} }
// loaded already? // loaded already?
if (!empty($_DB_DATAOBJECT['INI'][$this->_database])) { if (!empty($_DB_DATAOBJECT['INI'][$this->_database])) {
// database loaded - but this is table is not available.. // database loaded - but this is table is not available..
if ( if (
empty($_DB_DATAOBJECT['INI'][$this->_database][$this->__table]) empty($_DB_DATAOBJECT['INI'][$this->_database][$this->__table])
&& !empty($_DB_DATAOBJECT['CONFIG']['proxy']) && !empty($_DB_DATAOBJECT['CONFIG']['proxy'])
) { ) {
if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) { if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) {
$this->debug("Loading Generator to fetch Schema",1); $this->debug("Loading Generator to fetch Schema",1);
} }
class_exists('DB_DataObject_Generator') ? '' : class_exists('DB_DataObject_Generator') ? '' :
require_once 'DB/DataObject/Generator.php'; require_once 'DB/DataObject/Generator.php';
$x = new DB_DataObject_Generator; $x = new DB_DataObject_Generator;
$x->fillTableSchema($this->_database,$this->__table); $x->fillTableSchema($this->_database,$this->__table);
} }
return true; return true;
} }
if (empty($_DB_DATAOBJECT['CONFIG'])) { if (empty($_DB_DATAOBJECT['CONFIG'])) {
DB_DataObject::_loadConfig(); DB_DataObject::_loadConfig();
} }
// if you supply this with arguments, then it will take those // if you supply this with arguments, then it will take those
// as the database and links array... // as the database and links array...
$schemas = isset($_DB_DATAOBJECT['CONFIG']['schema_location']) ? $schemas = isset($_DB_DATAOBJECT['CONFIG']['schema_location']) ?
array("{$_DB_DATAOBJECT['CONFIG']['schema_location']}/{$this->_database}.ini") : array("{$_DB_DATAOBJECT['CONFIG']['schema_location']}/{$this->_database}.ini") :
array() ; array() ;
if (isset($_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"])) { if (isset($_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"])) {
$schemas = is_array($_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"]) ? $schemas = is_array($_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"]) ?
$_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"] : $_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"] :
explode(PATH_SEPARATOR,$_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"]); explode(PATH_SEPARATOR,$_DB_DATAOBJECT['CONFIG']["ini_{$this->_database}"]);
} }
/* BEGIN CHANGED FROM UPSTREAM */ /* BEGIN CHANGED FROM UPSTREAM */
$_DB_DATAOBJECT['INI'][$this->_database] = $this->parseIniFiles($schemas); $_DB_DATAOBJECT['INI'][$this->_database] = $this->parseIniFiles($schemas);
/* END CHANGED FROM UPSTREAM */ /* END CHANGED FROM UPSTREAM */
// now have we loaded the structure.. // now have we loaded the structure..
if (!empty($_DB_DATAOBJECT['INI'][$this->_database][$this->__table])) { if (!empty($_DB_DATAOBJECT['INI'][$this->_database][$this->__table])) {
return true; return true;
} }
// - if not try building it.. // - if not try building it..
if (!empty($_DB_DATAOBJECT['CONFIG']['proxy'])) { if (!empty($_DB_DATAOBJECT['CONFIG']['proxy'])) {
class_exists('DB_DataObject_Generator') ? '' : class_exists('DB_DataObject_Generator') ? '' :
require_once 'DB/DataObject/Generator.php'; require_once 'DB/DataObject/Generator.php';
$x = new DB_DataObject_Generator; $x = new DB_DataObject_Generator;
$x->fillTableSchema($this->_database,$this->__table); $x->fillTableSchema($this->_database,$this->__table);
// should this fail!!!??? // should this fail!!!???
@ -245,7 +241,8 @@ class Safe_DataObject extends DB_DataObject
} }
$this->debug("Cant find database schema: {$this->_database}/{$this->__table} \n". $this->debug("Cant find database schema: {$this->_database}/{$this->__table} \n".
"in links file data: " . print_r($_DB_DATAOBJECT['INI'],true),"databaseStructure",5); "in links file data: " . print_r($_DB_DATAOBJECT['INI'],true),"databaseStructure",5);
// we have to die here!! - it causes chaos if we dont (including looping forever!) // we have to die here!! - it causes chaos if we don't (including looping forever!)
// FIXME: i18n?
$this->raiseError( "Unable to load schema for database and table (turn debugging up to 5 for full error message)", DB_DATAOBJECT_ERROR_INVALIDARGS, PEAR_ERROR_DIE); $this->raiseError( "Unable to load schema for database and table (turn debugging up to 5 for full error message)", DB_DATAOBJECT_ERROR_INVALIDARGS, PEAR_ERROR_DIE);
return false; return false;
} }
@ -271,7 +268,7 @@ class Safe_DataObject extends DB_DataObject
if (file_exists($ini) && is_file($ini)) { if (file_exists($ini) && is_file($ini)) {
$data = array_merge($data, parse_ini_file($ini, true)); $data = array_merge($data, parse_ini_file($ini, true));
if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) { if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) {
if (!is_readable ($ini)) { if (!is_readable ($ini)) {
$this->debug("ini file is not readable: $ini","databaseStructure",1); $this->debug("ini file is not readable: $ini","databaseStructure",1);
} else { } else {