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

Merge branch 'fix-openid' into 0.9.x

Browse Source
This commit is contained in:
Zach Copley 2009-11-25 23:33:13 +00:00
commit bd4a613c38
11 changed files with 85 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
classes/Plugin_DataObject.php
View File

@ -1,195 +0,0 @@
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
abstract class Plugin_DataObject extends Memcached_DataObject
{
function table() {
static $table = null;
if($table == null) {
$table = array();
$DB = $this->getDatabaseConnection();
$dbtype = $DB->phptype;
$tableDef = $this->tableDef();
foreach($tableDef->columns as $columnDef){
switch(strtoupper($columnDef->type)) {
/*shamelessly copied from DB_DataObject_Generator*/
case 'INT':
case 'INT2': // postgres
case 'INT4': // postgres
case 'INT8': // postgres
case 'SERIAL4': // postgres
case 'SERIAL8': // postgres
case 'INTEGER':
case 'TINYINT':
case 'SMALLINT':
case 'MEDIUMINT':
case 'BIGINT':
$type = DB_DATAOBJECT_INT;
if ($columnDef->size == 1) {
$type += DB_DATAOBJECT_BOOL;
}
break;
case 'REAL':
case 'DOUBLE':
case 'DOUBLE PRECISION': // double precision (firebird)
case 'FLOAT':
case 'FLOAT4': // real (postgres)
case 'FLOAT8': // double precision (postgres)
case 'DECIMAL':
case 'MONEY': // mssql and maybe others
case 'NUMERIC':
case 'NUMBER': // oci8
$type = DB_DATAOBJECT_INT; // should really by FLOAT!!! / MONEY...
break;
case 'YEAR':
$type = DB_DATAOBJECT_INT;
break;
case 'BIT':
case 'BOOL':
case 'BOOLEAN':
$type = DB_DATAOBJECT_BOOL;
// postgres needs to quote '0'
if ($dbtype == 'pgsql') {
$type += DB_DATAOBJECT_STR;
}
break;
case 'STRING':
case 'CHAR':
case 'VARCHAR':
case 'VARCHAR2':
case 'TINYTEXT':
case 'ENUM':
case 'SET': // not really but oh well
case 'POINT': // mysql geometry stuff - not really string - but will do..
case 'TIMESTAMPTZ': // postgres
case 'BPCHAR': // postgres
case 'INTERVAL': // postgres (eg. '12 days')
case 'CIDR': // postgres IP net spec
case 'INET': // postgres IP
case 'MACADDR': // postgress network Mac address.
case 'INTEGER[]': // postgres type
case 'BOOLEAN[]': // postgres type
$type = DB_DATAOBJECT_STR;
break;
case 'TEXT':
case 'MEDIUMTEXT':
case 'LONGTEXT':
$type = DB_DATAOBJECT_STR + DB_DATAOBJECT_TXT;
break;
case 'DATE':
$type = DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE;
break;
case 'TIME':
$type = DB_DATAOBJECT_STR + DB_DATAOBJECT_TIME;
break;
case 'DATETIME':
$type = DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME;
break;
case 'TIMESTAMP': // do other databases use this???
$type = ($dbtype == 'mysql') ?
DB_DATAOBJECT_MYSQLTIMESTAMP :
DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME;
break;
case 'BLOB': /// these should really be ignored!!!???
case 'TINYBLOB':
case 'MEDIUMBLOB':
case 'LONGBLOB':
case 'CLOB': // oracle character lob support
case 'BYTEA': // postgres blob support..
$type = DB_DATAOBJECT_STR + DB_DATAOBJECT_BLOB;
break;
default:
throw new Exception("Cannot handle datatype: $columnDef->type");
}
if(! $columnDef->nullable) {
$type+=DB_DATAOBJECT_NOTNULL;
}
$table[$columnDef->name]=$type;
}
}
return $table;
}
function keys() {
static $keys = null;
if($keys == null) {
$keys = array();
$tableDef = $this->tableDef();
foreach($tableDef->columns as $columnDef){
if($columnDef->key != null){
$keys[] = $columnDef->name;
}
}
}
return $keys;
}
function sequenceKey() {
static $sequenceKey = null;
if($sequenceKey == null) {
$sequenceKey = array(false,false);
$tableDef = $this->tableDef();
foreach($tableDef->columns as $columnDef){
if($columnDef->key == 'PRI' && $columnDef->auto_increment){
$sequenceKey=array($columnDef->name,true);
}
}
}
return $sequenceKey;
}
/**
* Get the TableDef object that represents the table backing this class
* Ideally, this function would a static function, but PHP doesn't allow
* abstract static functions
* @return TableDef TableDef instance
*/
abstract function tableDef();
}

3
classes/statusnet.ini
View File

@ -261,7 +261,6 @@ modified = 384
[login_token__keys] [login_token__keys]
user_id = K user_id = K
token = K
[message] [message]
id = 129 id = 129
@ -543,4 +542,4 @@ created = 142
modified = 384 modified = 384
[user_group__keys] [user_group__keys]
id = N id = N

3
classes/statusnet.links.ini
View File

@ -22,9 +22,6 @@ consumer_key = consumer:consumer_key
[nonce] [nonce]
consumer_key,token = token:consumer_key,token consumer_key,token = token:consumer_key,token
[user_openid]
user_id = user:id
[confirm_address] [confirm_address]
user_id = user:id user_id = user:id

20
lib/schema.php
View File

@ -372,26 +372,6 @@ class Schema
return true; return true;
} }
/**
* Ensures that the table that backs a given
* Plugin_DataObject class exists.
*
* If the table does not yet exist, it will
* create the table. If it does exist, it will
* alter the table to match the column definitions.
*
* @param Plugin_DataObject $dataObjectClass
*
* @return boolean success flag
*/
public function ensureDataObject($dataObjectClass)
{
$obj = new $dataObjectClass();
$tableDef = $obj->tableDef();
return $this->ensureTable($tableDef->name,$tableDef->columns);
}
/** /**
* Ensures that a table exists with the given * Ensures that a table exists with the given
* name and the given column definitions. * name and the given column definitions.

13
plugins/Authentication/AuthenticationPlugin.php
View File

@ -2,7 +2,7 @@
/** /**
* StatusNet, the distributed open-source microblogging tool * StatusNet, the distributed open-source microblogging tool
* *
* Superclass for plugins that do authentication * Superclass for plugins that do authentication and/or authorization
* *
* PHP version 5 * PHP version 5
* *
@ -204,7 +204,16 @@ abstract class AuthenticationPlugin extends Plugin
function onCheckSchema() { function onCheckSchema() {
$schema = Schema::get(); $schema = Schema::get();
$schema->ensureDataObject('User_username'); $schema->ensureTable('user_username',
array(new ColumnDef('provider_name', 'varchar',
'255', false, 'PRI'),
new ColumnDef('username', 'varchar',
'255', false, 'PRI'),
new ColumnDef('user_id', 'integer',
null, false),
new ColumnDef('created', 'datetime',
null, false),
new ColumnDef('modified', 'timestamp')));
return true; return true;
} }

22
plugins/Authentication/User_username.php
View File

@ -2,9 +2,9 @@
/** /**
* Table Definition for user_username * Table Definition for user_username
*/ */
require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
class User_username extends Plugin_DataObject class User_username extends Memcached_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -43,22 +43,4 @@ class User_username extends Plugin_DataObject
return false; return false;
} }
} }
/**
* Get the TableDef object that represents the table backing this class
* @return TableDef TableDef instance
*/
function tableDef()
{
return new TableDef($this->__table,
array(new ColumnDef('provider_name', 'varchar',
'255', false, 'PRI'),
new ColumnDef('username', 'varchar',
'255', false, 'PRI'),
new ColumnDef('user_id', 'integer',
null, false),
new ColumnDef('created', 'datetime',
null, false),
new ColumnDef('modified', 'timestamp')));
}
} }

20
plugins/OpenID/OpenIDPlugin.php
View File

@ -281,8 +281,24 @@ class OpenIDPlugin extends Plugin
function onCheckSchema() { function onCheckSchema() {
$schema = Schema::get(); $schema = Schema::get();
$schema->ensureDataObject('User_openid'); $schema->ensureTable('user_openid',
$schema->ensureDataObject('User_openid_trustroot'); array(new ColumnDef('canonical', 'varchar',
'255', false, 'PRI'),
new ColumnDef('display', 'varchar',
'255', false),
new ColumnDef('user_id', 'integer',
null, false, 'MUL'),
new ColumnDef('created', 'datetime',
null, false),
new ColumnDef('modified', 'timestamp')));
$schema->ensureTable('user_openid_trustroot',
array(new ColumnDef('trustroot', 'varchar',
'255', false, 'PRI'),
new ColumnDef('user_id', 'integer',
null, false, 'PRI'),
new ColumnDef('created', 'datetime',
null, false),
new ColumnDef('modified', 'timestamp')));
return true; return true;
} }

41
plugins/OpenID/User_openid.php
View File

@ -2,9 +2,9 @@
/** /**
* Table Definition for user_openid * Table Definition for user_openid
*/ */
require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
class User_openid extends Plugin_DataObject class User_openid extends Memcached_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -23,6 +23,25 @@ class User_openid extends Plugin_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() {
global $_DB_DATAOBJECT;
$dbtype = $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->dsn['phptype'];
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 :
DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
);
}
function keys() {
return array('canonical' => 'K', 'display' => 'U');
}
static function hasOpenID($user_id) static function hasOpenID($user_id)
{ {
$oid = new User_openid(); $oid = new User_openid();
@ -33,22 +52,4 @@ class User_openid extends Plugin_DataObject
return ($cnt > 0); return ($cnt > 0);
} }
/**
* Get the TableDef object that represents the table backing this class
* @return TableDef TableDef instance
*/
function tableDef()
{
return new TableDef($this->__table,
array(new ColumnDef('canonical', 'varchar',
'255', false, 'PRI'),
new ColumnDef('display', 'varchar',
'255', false),
new ColumnDef('user_id', 'integer',
null, false, 'MUL'),
new ColumnDef('created', 'datetime',
null, false),
new ColumnDef('modified', 'timestamp')));
}
} }

37
plugins/OpenID/User_openid_trustroot.php
View File

@ -2,9 +2,9 @@
/** /**
* Table Definition for user_openid_trustroot * Table Definition for user_openid_trustroot
*/ */
require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
class User_openid_trustroot extends Plugin_DataObject class User_openid_trustroot extends Memcached_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -21,25 +21,28 @@ class User_openid_trustroot extends Plugin_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 &pkeyGet($kv) function &pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv); return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv);
} }
/** function table() {
* Get the TableDef object that represents the table backing this class
* @return TableDef TableDef instance global $_DB_DATAOBJECT;
*/ $dbtype = $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->dsn['phptype'];
function tableDef()
{ return array('trustroot' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
return new TableDef($this->__table, 'user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
array(new ColumnDef('trustroot', 'varchar', 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
'255', false, 'PRI'), 'modified' => ($dbtype == 'mysql') ?
new ColumnDef('user_id', 'integer', DB_DATAOBJECT_MYSQLTIMESTAMP :
null, false, 'PRI'), DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
new ColumnDef('created', 'datetime', );
null, false),
new ColumnDef('modified', 'timestamp')));
} }
function keys() {
return array('trustroot' => 'K', 'user_id' => 'K');
}
} }

11
plugins/UserFlag/UserFlagPlugin.php
View File

@ -48,7 +48,16 @@ class UserFlagPlugin extends Plugin
$schema = Schema::get(); $schema = Schema::get();
// For storing user-submitted flags on profiles // For storing user-submitted flags on profiles
$schema->ensureDataObject('User_flag_profile');
$schema->ensureTable('user_flag_profile',
array(new ColumnDef('profile_id', 'integer', null,
false, 'PRI'),
new ColumnDef('user_id', 'integer', null,
false, 'PRI'),
new ColumnDef('created', 'datetime', null,
false, 'MUL'),
new ColumnDef('cleared', 'datetime', null,
true, 'MUL')));
return true; return true;
} }

21
plugins/UserFlag/User_flag_profile.php
View File

@ -21,9 +21,9 @@ if (!defined('STATUSNET')) {
exit(1); exit(1);
} }
require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
class User_flag_profile extends Plugin_DataObject class User_flag_profile extends Memcached_DataObject
{ {
###START_AUTOCODE ###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */ /* the code below is auto generated do not remove the above tag */
@ -65,21 +65,4 @@ class User_flag_profile extends Plugin_DataObject
return !empty($ufp); return !empty($ufp);
} }
/**
* Get the TableDef object that represents the table backing this class
* @return TableDef TableDef instance
*/
function tableDef()
{
return new TableDef($this->__table,
array(new ColumnDef('profile_id', 'integer', null,
false, 'PRI'),
new ColumnDef('user_id', 'integer', null,
false, 'PRI'),
new ColumnDef('created', 'datetime', null,
false, 'MUL'),
new ColumnDef('cleared', 'datetime', null,
true, 'MUL')));
}
} }