wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some changes to the OpenID DataObjects to make them emit the exact same

Browse Source 
.ini info as what used to be in statusnet.ini before OpenID was pulled
out into a plugin.
This commit is contained in:
Zach Copley 2009-11-26 02:21:23 +00:00
parent 58e1d9a68b
commit e767436176
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/OpenID/User_openid.php
View File

@ -23,26 +23,28 @@ class User_openid extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function table() { function table()
{
global $_DB_DATAOBJECT; $db = $this->getDatabaseConnection();
$dbtype = $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->dsn['phptype']; $dbtype = $db->phptype; // Database type is stored here. Crazy but true.
return array('canonical' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, return array('canonical' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
'display' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, 'display' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
'user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, 'user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL, 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
'modified' => ($dbtype == 'mysql') ? 'modified' => ($dbtype == 'mysql' || $dbtype == 'mysqli') ?
DB_DATAOBJECT_MYSQLTIMESTAMP : DB_DATAOBJECT_MYSQLTIMESTAMP + DB_DATAOBJECT_NOTNULL :
DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
); );
} }
function keys() { function keys()
{
return array('canonical' => 'K', 'display' => 'U'); return array('canonical' => 'K', 'display' => 'U');
} }
static function hasOpenID($user_id) Static function hasOpenID($user_id)
{ {
$oid = new User_openid(); $oid = new User_openid();

15
plugins/OpenID/User_openid_trustroot.php
View File

@ -27,21 +27,22 @@ class User_openid_trustroot extends Memcached_DataObject
return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv); return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv);
} }
function table() { function table()
{
global $_DB_DATAOBJECT; $db = $this->getDatabaseConnection();
$dbtype = $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->dsn['phptype']; $dbtype = $db->phptype; // Database type is stored here. Crazy but true.
return array('trustroot' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, return array('trustroot' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
'user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, 'user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL, 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
'modified' => ($dbtype == 'mysql') ? 'modified' => ($dbtype == 'mysql' || $dbtype == 'mysqli') ?
DB_DATAOBJECT_MYSQLTIMESTAMP : DB_DATAOBJECT_MYSQLTIMESTAMP + DB_DATAOBJECT_NOTNULL :
DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
); );
} }
function keys() { function keys()
{
return array('trustroot' => 'K', 'user_id' => 'K'); return array('trustroot' => 'K', 'user_id' => 'K');
} }