eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

extlib/DB/DataObject - Fix PHP 7.3 Warning switch continue -> break

Browse Source 
Also reformatted under PSR norms
This commit is contained in:
Diogo Cordeiro
2019-04-16 00:20:20 +01:00
parent 8305641b20
commit 38f2ecefac
21 changed files with 2313 additions and 2170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
extlib/DB/DataObject/Cast.php
View File

@@ -22,7 +22,7 @@
*/
/**
*
*
* Common usages:
* // blobs
* $data = DB_DataObject_Cast::blob($somefile);
@@ -33,7 +33,7 @@
* $d1 = new DB_DataObject_Cast::date('12/12/2000');
* $d2 = new DB_DataObject_Cast::date(2000,12,30);
* $d3 = new DB_DataObject_Cast::date($d1->year, $d1->month+30, $d1->day+30);
*
*
* // time, datetime.. ?????????
*
* // raw sql????
@@ -42,8 +42,8 @@
*
* // int's/string etc. are proably pretty pointless..!!!!
*
*
* inside DB_DataObject,
*
* inside DB_DataObject,
* if (is_a($v,'db_dataobject_class')) {
* $value .= $v->toString(DB_DATAOBJECT_INT,'mysql');
* }
@@ -52,16 +52,17 @@
*
*
*/
class DB_DataObject_Cast {
*/
class DB_DataObject_Cast
{
/**
* Type of data Stored in the object..
*
* @var string (date|blob|.....?)
* @access public
* @access public
*/
var $type;
public $type;
/**
* Data For date representation
@@ -69,9 +70,9 @@ class DB_DataObject_Cast {
* @var int day/month/year
* @access public
*/
var $day;
var $month;
var $year;
public $day;
public $month;
public $year;
/**
@@ -81,7 +82,7 @@ class DB_DataObject_Cast {
* @access public
*/
var $value;
public $value;
@@ -89,15 +90,16 @@ class DB_DataObject_Cast {
* Blob consructor
*
* create a Cast object from some raw data.. (binary)
*
*
*
*
* @param string (with binary data!)
*
* @return object DB_DataObject_Cast
* @access public
* @access public
*/
function blob($value) {
public function blob($value)
{
$r = new DB_DataObject_Cast;
$r->type = 'blob';
$r->value = $value;
@@ -109,15 +111,16 @@ class DB_DataObject_Cast {
* String consructor (actually use if for ints and everything else!!!
*
* create a Cast object from some string (not binary)
*
*
*
*
* @param string (with binary data!)
*
* @return object DB_DataObject_Cast
* @access public
* @access public
*/
function string($value) {
public function string($value)
{
$r = new DB_DataObject_Cast;
$r->type = 'string';
$r->value = $value;
@@ -128,14 +131,14 @@ class DB_DataObject_Cast {
* SQL constructor (for raw SQL insert)
*
* create a Cast object from some sql
*
*
* @param string (with binary data!)
*
* @return object DB_DataObject_Cast
* @access public
* @access public
*/
function sql($value)
public function sql($value)
{
$r = new DB_DataObject_Cast;
$r->type = 'sql';
@@ -149,7 +152,7 @@ class DB_DataObject_Cast {
*
* create a Cast object from some string (not binary)
* NO VALIDATION DONE, although some crappy re-calcing done!
*
*
* @param vargs... accepts
* dd/mm
* dd/mm/yyyy
@@ -161,22 +164,22 @@ class DB_DataObject_Cast {
*
*
* @return object DB_DataObject_Cast
* @access public
* @access public
*/
function date()
{
public function date()
{
$args = func_get_args();
switch(count($args)) {
switch (count($args)) {
case 0: // no args = today!
$bits = explode('-',date('Y-m-d'));
$bits = explode('-', date('Y-m-d'));
break;
case 1: // one arg = a string
case 1: // one arg = a string
if (strpos($args[0],'/') !== false) {
$bits = array_reverse(explode('/',$args[0]));
if (strpos($args[0], '/') !== false) {
$bits = array_reverse(explode('/', $args[0]));
} else {
$bits = explode('-',$args[0]);
$bits = explode('-', $args[0]);
}
break;
default: // 2 or more..
@@ -196,15 +199,15 @@ class DB_DataObject_Cast {
// fix me if anyone has more time...
if (($bits[0] < 1975) || ($bits[0] > 2030)) {
$oldyear = $bits[0];
$bits = explode('-',date('Y-m-d',mktime(1,1,1,$bits[1],$bits[2],2000)));
$bits = explode('-', date('Y-m-d', mktime(1, 1, 1, $bits[1], $bits[2], 2000)));
$bits[0] = ($bits[0] - 2000) + $oldyear;
} else {
// now mktime
$bits = explode('-',date('Y-m-d',mktime(1,1,1,$bits[1],$bits[2],$bits[0])));
$bits = explode('-', date('Y-m-d', mktime(1, 1, 1, $bits[1], $bits[2], $bits[0])));
}
$r = new DB_DataObject_Cast;
$r->type = 'date';
list($r->year,$r->month,$r->day) = $bits;
list($r->year, $r->month, $r->day) = $bits;
return $r;
}
@@ -216,9 +219,9 @@ class DB_DataObject_Cast {
* @var int hour/minute/second
* @access public
*/
var $hour;
var $minute;
var $second;
public $hour;
public $minute;
public $second;
/**
@@ -227,25 +230,26 @@ class DB_DataObject_Cast {
* create a Cast object from a Date/Time
* Maybe should accept a Date object.!
* NO VALIDATION DONE, although some crappy re-calcing done!
*
*
* @param vargs... accepts
* noargs (now)
* yyyy-mm-dd HH:MM:SS (Iso)
* array(yyyy,mm,dd,HH,MM,SS)
* array(yyyy,mm,dd,HH,MM,SS)
*
*
* @return object DB_DataObject_Cast
* @access public
* @access public
* @author therion 5 at hotmail
*/
function dateTime()
public function dateTime()
{
$args = func_get_args();
switch(count($args)) {
switch (count($args)) {
case 0: // no args = now!
$datetime = date('Y-m-d G:i:s', mktime());
// no break
case 1:
// continue on from 0 args.
if (!isset($datetime)) {
@@ -274,13 +278,12 @@ class DB_DataObject_Cast {
// change the type!
$r->type = 'datetime';
// should we mathematically sort this out..
// should we mathematically sort this out..
// (or just assume that no-one's dumb enough to enter 26:90:90 as a time!
$r->hour = $bits[3];
$r->minute = $bits[4];
$r->second = $bits[5];
return $r;
}
@@ -295,20 +298,21 @@ class DB_DataObject_Cast {
* @param vargs... accepts
* noargs (now)
* HH:MM:SS (Iso)
* array(HH,MM,SS)
* array(HH,MM,SS)
*
*
* @return object DB_DataObject_Cast
* @access public
* @access public
* @author therion 5 at hotmail
*/
function time()
public function time()
{
$args = func_get_args();
switch (count($args)) {
case 0: // no args = now!
$time = date('G:i:s', mktime());
// no break
case 1:
// continue on from 0 args.
if (!isset($time)) {
@@ -333,7 +337,6 @@ class DB_DataObject_Cast {
$r->minute = $bits[1];
$r->second = $bits[2];
return $r;
}
@@ -341,35 +344,35 @@ class DB_DataObject_Cast {
/**
* get the string to use in the SQL statement for this...
*
*
*
* @param int $to Type (DB_DATAOBJECT_*
* @param object $db DB Connection Object
*
*
* @return string
*
* @return string
* @access public
*/
function toString($to=false,$db)
public function toString($to=false, $db)
{
// if $this->type is not set, we are in serious trouble!!!!
// values for to:
$method = 'toStringFrom'.$this->type;
return $this->$method($to,$db);
return $this->$method($to, $db);
}
/**
* get the string to use in the SQL statement from a blob of binary data
* get the string to use in the SQL statement from a blob of binary data
* ** Suppots only blob->postgres::bytea
*
* @param int $to Type (DB_DATAOBJECT_*
* @param object $db DB Connection Object
*
*
* @return string
*
* @return string
* @access public
*/
function toStringFromBlob($to,$db)
public function toStringFromBlob($to, $db)
{
// first weed out invalid casts..
// in blobs can only be cast to blobs.!
@@ -385,7 +388,7 @@ class DB_DataObject_Cast {
return "'".pg_escape_bytea($this->value)."'::bytea";
case 'mysql':
return "'".mysql_real_escape_string($this->value,$db->connection)."'";
return "'".mysql_real_escape_string($this->value, $db->connection)."'";
case 'mysqli':
// this is funny - the parameter order is reversed ;)
@@ -397,7 +400,7 @@ class DB_DataObject_Cast {
case 'mssql':
if(is_numeric($this->value)) {
if (is_numeric($this->value)) {
return $this->value;
}
$unpacked = unpack('H*hex', $this->value);
@@ -408,40 +411,39 @@ class DB_DataObject_Cast {
default:
return PEAR::raiseError("DB_DataObject_Cast cant handle blobs for Database:{$db->dsn['phptype']} Yet");
}
}
/**
* get the string to use in the SQL statement for a blob from a string!
* ** Suppots only string->postgres::bytea
*
*
*
* @param int $to Type (DB_DATAOBJECT_*
* @param object $db DB Connection Object
*
*
* @return string
*
* @return string
* @access public
*/
function toStringFromString($to,$db)
public function toStringFromString($to, $db)
{
// first weed out invalid casts..
// in blobs can only be cast to blobs.!
// perhaps we should support TEXT fields???
//
//
// $to == a string field which is the default type (0)
// so we do not test it here. - we assume that number fields
// will accept a string?? - which is stretching it a bit ...
// should probaly add that test as some point.
// should probaly add that test as some point.
switch ($db->dsn['phptype']) {
case 'pgsql':
return "'".pg_escape_string($this->value)."'::bytea";
case 'mysql':
return "'".mysql_real_escape_string($this->value,$db->connection)."'";
return "'".mysql_real_escape_string($this->value, $db->connection)."'";
case 'mysqli':
@@ -450,37 +452,36 @@ class DB_DataObject_Cast {
case 'mssql':
// copied from the old DB mssql code...?? not sure how safe this is.
return "'" . str_replace(
array("'", "\\\r\n", "\\\n"),
array("''", "\\\\\r\n\r\n", "\\\\\n\n"),
$this->value
array("'", "\\\r\n", "\\\n"),
array("''", "\\\\\r\n\r\n", "\\\\\n\n"),
$this->value
) . "'";
default:
return PEAR::raiseError("DB_DataObject_Cast cant handle blobs for Database:{$db->dsn['phptype']} Yet");
}
}
/**
* get the string to use in the SQL statement for a date
*
*
*
*
*
* @param int $to Type (DB_DATAOBJECT_*
* @param object $db DB Connection Object
*
*
* @return string
*
* @return string
* @access public
*/
function toStringFromDate($to,$db)
public function toStringFromDate($to, $db)
{
// first weed out invalid casts..
// in blobs can only be cast to blobs.!
// perhaps we should support TEXT fields???
//
// perhaps we should support TEXT fields???
//
if (($to !== false) && !($to & DB_DATAOBJECT_DATE)) {
return PEAR::raiseError('Invalid Cast from a DB_DataObject_Cast::string to something other than a date!'.
@@ -491,24 +492,24 @@ class DB_DataObject_Cast {
/**
* get the string to use in the SQL statement for a datetime
*
*
*
*
*
* @param int $to Type (DB_DATAOBJECT_*
* @param object $db DB Connection Object
*
*
* @return string
*
* @return string
* @access public
* @author therion 5 at hotmail
*/
function toStringFromDateTime($to,$db)
public function toStringFromDateTime($to, $db)
{
// first weed out invalid casts..
// in blobs can only be cast to blobs.!
// perhaps we should support TEXT fields???
if (($to !== false) &&
if (($to !== false) &&
!($to & (DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME))) {
return PEAR::raiseError('Invalid Cast from a ' .
' DB_DataObject_Cast::dateTime to something other than a datetime!' .
@@ -519,25 +520,25 @@ class DB_DataObject_Cast {
/**
* get the string to use in the SQL statement for a time
*
*
*
*
*
* @param int $to Type (DB_DATAOBJECT_*
* @param object $db DB Connection Object
*
*
* @return string
*
* @return string
* @access public
* @author therion 5 at hotmail
*/
function toStringFromTime($to,$db)
public function toStringFromTime($to, $db)
{
// first weed out invalid casts..
// in blobs can only be cast to blobs.!
// perhaps we should support TEXT fields???
if (($to !== false) && !($to & DB_DATAOBJECT_TIME)) {
return PEAR::raiseError('Invalid Cast from a' .
return PEAR::raiseError('Invalid Cast from a' .
' DB_DataObject_Cast::time to something other than a time!'.
' (try using native features)');
}
@@ -549,17 +550,13 @@ class DB_DataObject_Cast {
*
* @param int $to Type (DB_DATAOBJECT_*
* @param object $db DB Connection Object
*
*
* @return string
*
* @return string
* @access public
*/
function toStringFromSql($to,$db)
public function toStringFromSql($to, $db)
{
return $this->value;
return $this->value;
}
}

13
extlib/DB/DataObject/Error.php
View File

@@ -38,16 +38,15 @@ class DB_DataObject_Error extends PEAR_Error
*
* @see PEAR_Error
*/
function DB_DataObject_Error($message = '', $code = DB_ERROR, $mode = PEAR_ERROR_RETURN,
$level = E_USER_NOTICE)
{
public function DB_DataObject_Error(
$message = '',
$code = DB_ERROR,
$mode = PEAR_ERROR_RETURN,
$level = E_USER_NOTICE
) {
$this->PEAR_Error('DB_DataObject Error: ' . $message, $code, $mode, $level);
}
// todo : - support code -> message handling, and translated error messages...
}

518
extlib/DB/DataObject/Generator.php
View File

File diff suppressed because it is too large Load Diff

169
extlib/DB/DataObject/Links.php
View File

@@ -23,7 +23,7 @@
/**
*
* Example of how this could be used..
*
*
* The lind method are now in here.
*
* Currenly only supports existing methods, and new 'link()' method
@@ -36,44 +36,44 @@
*
* @package DB_DataObject
*/
class DB_DataObject_Links
class DB_DataObject_Links
{
/**
* @property {DB_DataObject} do DataObject to apply this to.
*/
var $do = false;
/**
* @property {DB_DataObject} do DataObject to apply this to.
*/
public $do = false;
/**
* @property {Array|String} load What to load, 'all' or an array of properties. (default all)
*/
var $load = 'all';
public $load = 'all';
/**
* @property {String|Boolean} scanf use part of column name as resulting
* property name. (default false)
*/
var $scanf = false;
public $scanf = false;
/**
* @property {String|Boolean} printf use column name as sprintf for resulting property name..
* (default %s_link if apply is true, otherwise it is %s)
*/
var $printf = false;
public $printf = false;
/**
* @property {Boolean} cached cache the result, so future queries will use cache rather
* than running the expensive sql query.
*/
var $cached = false;
public $cached = false;
/**
* @property {Boolean} apply apply the result to this object, (default true)
*/
var $apply = true;
public $apply = true;
//------------------------- RETURN ------------------------------------
/**
* @property {Array} links key value associative array of links.
*/
var $links;
public $links;
/**
@@ -83,23 +83,21 @@ class DB_DataObject_Links
* @param {Array} cfg Configuration (basically properties of this object)
*/
function DB_DataObject_Links($do,$cfg= array())
public function DB_DataObject_Links($do, $cfg= array())
{
// check if do is set!!!?
$this->do = $do;
foreach($cfg as $k=>$v) {
foreach ($cfg as $k=>$v) {
$this->$k = $v;
}
}
/**
* return name from related object
*
* The relies on a <dbname>.links.ini file, unless you specify the arguments.
*
*
* you can also use $this->getLink('thisColumnName','otherTable','otherTableColumnName')
*
*
@@ -110,32 +108,26 @@ class DB_DataObject_Links
* @access public
* @return mixed object on success false on failure or '0' when not linked
*/
function getLink($field, $table= false, $link='')
public function getLink($field, $table= false, $link='')
{
static $cache = array();
// GUESS THE LINKED TABLE.. (if found - recursevly call self)
if ($table == false) {
$info = $this->linkInfo($field);
if ($info) {
return $this->getLink($field, $info[0], $link === false ? $info[1] : $link );
return $this->getLink($field, $info[0], $link === false ? $info[1] : $link);
}
// no links defined.. - use borked BC method...
// use the old _ method - this shouldnt happen if called via getLinks()
// use the old _ method - this shouldnt happen if called via getLinks()
if (!($p = strpos($field, '_'))) {
return false;
}
$table = substr($field, 0, $p);
return $this->getLink($field, $table);
}
$tn = is_string($table) ? $table : $table->tableName();
@@ -151,41 +143,40 @@ class DB_DataObject_Links
if (empty($this->do->$field) || $this->do->$field < 0) {
return 0; // no record.
return 0; // no record.
}
if ($this->cached && isset($cache[$tn.':'. $link .':'. $this->do->$field])) {
return $cache[$tn.':'. $link .':'. $this->do->$field];
return $cache[$tn.':'. $link .':'. $this->do->$field];
}
$obj = is_string($table) ? $this->do->factory($tn) : $table;;
$obj = is_string($table) ? $this->do->factory($tn) : $table;
;
if (!is_a($obj,'DB_DataObject')) {
if (!is_a($obj, 'DB_DataObject')) {
$this->do->raiseError(
"getLink:Could not find class for row $field, table $tn",
DB_DATAOBJECT_ERROR_INVALIDCONFIG);
"getLink:Could not find class for row $field, table $tn",
DB_DATAOBJECT_ERROR_INVALIDCONFIG
);
return false;
}
// -1 or 0 -- no referenced record..
$ret = false;
if ($link) {
if ($obj->get($link, $this->do->$field)) {
$ret = $obj;
}
// this really only happens when no link config is set (old BC stuff)
} else if ($obj->get($this->do->$field)) {
// this really only happens when no link config is set (old BC stuff)
} elseif ($obj->get($this->do->$field)) {
$ret= $obj;
}
if ($this->cached) {
$cache[$tn.':'. $link .':'. $this->do->$field] = $ret;
}
return $ret;
}
/**
* get link information for a field or field specification
@@ -195,15 +186,14 @@ class DB_DataObject_Links
* array(2) : 'field', 'table:remote_col' << just like the links.ini def.
* array(3) : 'field', $dataobject, 'remote_col' (handy for joinAdd to do nested joins.)
*
* @param string|array $field or link spec to use.
* @param string|array $field or link spec to use.
* @return (false|array) array of dataobject and linked field or false.
*
*
*/
function linkInfo($field)
public function linkInfo($field)
{
if (is_array($field)) {
if (count($field) == 3) {
// array with 3 args:
@@ -213,37 +203,33 @@ class DB_DataObject_Links
$field[2],
$field[0]
);
}
list($table,$link) = explode(':', $field[1]);
}
list($table, $link) = explode(':', $field[1]);
return array(
$this->do->factory($table),
$link,
$field[0]
);
}
// work out the link.. (classic way)
$links = $this->do->links();
if (empty($links) || !is_array($links)) {
return false;
}
if (!isset($links[$field])) {
return false;
}
list($table,$link) = explode(':', $links[$field]);
list($table, $link) = explode(':', $links[$field]);
//??? needed???
if ($p = strpos($field,".")) {
$field = substr($field,0,$p);
if ($p = strpos($field, ".")) {
$field = substr($field, 0, $p);
}
return array(
@@ -251,10 +237,6 @@ class DB_DataObject_Links
$link,
$field
);
}
@@ -266,25 +248,26 @@ class DB_DataObject_Links
* eg.
* $link->link('company_id') returns getLink for the object
* if nothing is linked (it will return an empty dataObject)
* $link->link('company_id', array(1)) - just sets the
* $link->link('company_id', array(1)) - just sets the
*
* also array as the field speck supports
* $link->link(array('company_id', 'company:id'))
*
*
*
* @param string|array $field the field to fetch or link spec.
* @params array $args the arguments sent to the getter setter
* @return mixed true of false on set, the object on getter.
*
*/
function link($field, $args = array())
public function link($field, $args = array())
{
$info = $this->linkInfo($field);
if (!$info) {
$this->do->raiseError(
"getLink:Could not find link for row $field",
DB_DATAOBJECT_ERROR_INVALIDCONFIG);
"getLink:Could not find link for row $field",
DB_DATAOBJECT_ERROR_INVALIDCONFIG
);
return false;
}
$field = $info[2];
@@ -299,24 +282,20 @@ class DB_DataObject_Links
$ret = $this->getLink($field);
// nothing linked -- return new object..
return ($ret === 0) ? $info[0] : $ret;
}
$assign = is_array($args) ? $args[0] : $args;
// otherwise it's a set call..
if (!is_a($assign , 'DB_DataObject')) {
if (!is_a($assign, 'DB_DataObject')) {
if (is_numeric($assign) && is_integer($assign * 1)) {
if ($assign > 0) {
if (!$info) {
return false;
}
// check that record exists..
if (!$info[0]->get($info[1], $assign )) {
if (!$info[0]->get($info[1], $assign)) {
return false;
}
}
$this->do->$field = $assign ;
@@ -330,8 +309,6 @@ class DB_DataObject_Links
$this->do->$field = $assign->{$info[1]};
return true;
}
/**
* load related objects
@@ -351,7 +328,7 @@ class DB_DataObject_Links
* @return boolean , true on success
*/
function applyLinks($format = '_%s')
public function applyLinks($format = '_%s')
{
// get table will load the options.
@@ -365,19 +342,19 @@ class DB_DataObject_Links
$loaded = array();
if ($links) {
foreach($links as $key => $match) {
list($table,$link) = explode(':', $match);
if ($links) {
foreach ($links as $key => $match) {
list($table, $link) = explode(':', $match);
$k = sprintf($format, str_replace('.', '_', $key));
// makes sure that '.' is the end of the key;
if ($p = strpos($key,'.')) {
$key = substr($key, 0, $p);
if ($p = strpos($key, '.')) {
$key = substr($key, 0, $p);
}
$this->do->$k = $this->getLink($key, $table, $link);
if (is_object($this->do->$k)) {
$loaded[] = $k;
$loaded[] = $k;
}
}
$this->do->_link_loaded = $loaded;
@@ -386,8 +363,8 @@ class DB_DataObject_Links
// this is the autonaming stuff..
// it sends the column name down to getLink and lets that sort it out..
// if there is a links file then it is not used!
// IT IS DEPRECATED!!!! - DO NOT USE
if (!is_null($links)) {
// IT IS DEPRECATED!!!! - DO NOT USE
if (!is_null($links)) {
return false;
}
@@ -400,7 +377,7 @@ class DB_DataObject_Links
$k =sprintf($format, $key);
$this->do->$k = $this->getLink($key);
if (is_object($this->do->$k)) {
$loaded[] = $k;
$loaded[] = $k;
}
}
$this->do->_link_loaded = $loaded;
@@ -413,7 +390,7 @@ class DB_DataObject_Links
* <dbname>.links.ini file configuration (see the introduction on linking for details on this).
*
* You may also use this with all parameters to specify, the column and related table.
*
*
* @access public
* @param string $field- either column or column.xxxxx
* @param string $table (optional) name of table to look up value in
@@ -421,26 +398,23 @@ class DB_DataObject_Links
* @param string $fval (optional)fetchall val DB_DataObject::fetchAll()
* @param string $fval (optional) fetchall method DB_DataObject::fetchAll()
* @return array - array of results (empty array on failure)
*
*
* Example - Getting the related objects
*
*
* $person = new DataObjects_Person;
* $person->get(12);
* $children = $person->getLinkArray('children');
*
*
* echo 'There are ', count($children), ' descendant(s):<br />';
* foreach ($children as $child) {
* echo $child->name, '<br />';
* }
*
*
*/
function getLinkArray($field, $table = null, $fkey = false, $fval = false, $fmethod = false)
public function getLinkArray($field, $table = null, $fkey = false, $fval = false, $fmethod = false)
{
$ret = array();
if (!$table) {
if (!$table) {
$links = $this->do->links();
if (is_array($links)) {
@@ -448,22 +422,20 @@ class DB_DataObject_Links
// failed..
return $ret;
}
list($table,$link) = explode(':',$links[$field]);
return $this->getLinkArray($field,$table);
}
if (!($p = strpos($field,'_'))) {
list($table, $link) = explode(':', $links[$field]);
return $this->getLinkArray($field, $table);
}
if (!($p = strpos($field, '_'))) {
return $ret;
}
return $this->getLinkArray($field,substr($field,0,$p));
return $this->getLinkArray($field, substr($field, 0, $p));
}
$c = $this->do->factory($table);
if (!is_object($c) || !is_a($c,'DB_DataObject')) {
if (!is_object($c) || !is_a($c, 'DB_DataObject')) {
$this->do->raiseError(
"getLinkArray:Could not find class for row $field, table $table",
"getLinkArray:Could not find class for row $field, table $table",
DB_DATAOBJECT_ERROR_INVALIDCONFIG
);
return $ret;
@@ -476,10 +448,7 @@ class DB_DataObject_Links
$ret[] = clone($c);
}
return $ret;
}
}
return $c->fetchAll($fkey, $fval, $fmethod);
}
}
}

11
extlib/DB/DataObject/createTables.php
View File

@@ -19,10 +19,10 @@
// $Id: createTables.php 277015 2009-03-12 05:51:03Z alan_k $
//
// since this version doesnt use overload,
// since this version doesnt use overload,
// and I assume anyone using custom generators should add this..
define('DB_DATAOBJECT_NO_OVERLOAD',1);
define('DB_DATAOBJECT_NO_OVERLOAD', 1);
//require_once 'DB/DataObject/Generator.php';
require_once 'DB/DataObject/Generator.php';
@@ -42,13 +42,13 @@ if (!@$_SERVER['argv'][1]) {
}
$config = parse_ini_file($_SERVER['argv'][1], true);
foreach($config as $class=>$values) {
$options = &PEAR::getStaticProperty($class,'options');
foreach ($config as $class=>$values) {
$options = &PEAR::getStaticProperty($class, 'options');
$options = $values;
}
$options = &PEAR::getStaticProperty('DB_DataObject','options');
$options = &PEAR::getStaticProperty('DB_DataObject', 'options');
if (empty($options)) {
PEAR::raiseError("\nERROR: could not read ini file\n\n", null, PEAR_ERROR_DIE);
exit;
@@ -60,4 +60,3 @@ DB_DataObject::debugLevel(isset($options['debug']) ? $options['debug'] : 1);
$generator = new DB_DataObject_Generator;
$generator->start();