summaryrefslogtreecommitdiff
path: root/plugins/OpenID
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-11-26 02:21:23 +0000
committerZach Copley <zach@status.net>2009-11-26 02:21:23 +0000
commit2d25f288a7bebedd6c2eaf08081bccdbc9107d36 (patch)
tree8dc030302b979410cf98d73048ece46a7c1ef682 /plugins/OpenID
parenta1f87f415a2fcc393c07a633423e2ce299256a18 (diff)
Some changes to the OpenID DataObjects to make them emit the exact same
.ini info as what used to be in statusnet.ini before OpenID was pulled out into a plugin.
Diffstat (limited to 'plugins/OpenID')
-rw-r--r--plugins/OpenID/User_openid.php16
-rw-r--r--plugins/OpenID/User_openid_trustroot.php15
2 files changed, 17 insertions, 14 deletions
diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php
index c24a1ee9a..801b49ecc 100644
--- a/plugins/OpenID/User_openid.php
+++ b/plugins/OpenID/User_openid.php
@@ -23,26 +23,28 @@ class User_openid extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
- function table() {
+ function table()
+ {
- global $_DB_DATAOBJECT;
- $dbtype = $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->dsn['phptype'];
+ $db = $this->getDatabaseConnection();
+ $dbtype = $db->phptype; // Database type is stored here. Crazy but true.
return array('canonical' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
'display' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
'user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
- 'modified' => ($dbtype == 'mysql') ?
- DB_DATAOBJECT_MYSQLTIMESTAMP :
+ 'modified' => ($dbtype == 'mysql' || $dbtype == 'mysqli') ?
+ DB_DATAOBJECT_MYSQLTIMESTAMP + DB_DATAOBJECT_NOTNULL :
DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
);
}
- function keys() {
+ function keys()
+ {
return array('canonical' => 'K', 'display' => 'U');
}
- static function hasOpenID($user_id)
+ Static function hasOpenID($user_id)
{
$oid = new User_openid();
diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php
index ecf625ab4..44288945b 100644
--- a/plugins/OpenID/User_openid_trustroot.php
+++ b/plugins/OpenID/User_openid_trustroot.php
@@ -27,21 +27,22 @@ class User_openid_trustroot extends Memcached_DataObject
return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv);
}
- function table() {
-
- global $_DB_DATAOBJECT;
- $dbtype = $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->dsn['phptype'];
+ function table()
+ {
+ $db = $this->getDatabaseConnection();
+ $dbtype = $db->phptype; // Database type is stored here. Crazy but true.
return array('trustroot' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
'user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
- 'modified' => ($dbtype == 'mysql') ?
- DB_DATAOBJECT_MYSQLTIMESTAMP :
+ 'modified' => ($dbtype == 'mysql' || $dbtype == 'mysqli') ?
+ DB_DATAOBJECT_MYSQLTIMESTAMP + DB_DATAOBJECT_NOTNULL :
DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
);
}
- function keys() {
+ function keys()
+ {
return array('trustroot' => 'K', 'user_id' => 'K');
}