summaryrefslogtreecommitdiff
path: root/plugins/Authentication
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-11-25 13:38:59 -0800
committerZach Copley <zach@status.net>2009-11-25 13:38:59 -0800
commit8acc1587b1cd4f6fc78bbedb88f414cd18efa942 (patch)
tree26a1b17a252cca0e91686af9faa5bef202828448 /plugins/Authentication
parent88d41988679b6188095d20b8bbfdf016e3f2d605 (diff)
Revert "Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them"
This reverts commit a373d07ae00b878f47970f2e4a7d86c6ec3a65cf. Conflicts: classes/statusnet.ini lib/schema.php plugins/Authentication/AuthenticationPlugin.php plugins/OpenID/OpenIDPlugin.php plugins/UserFlag/UserFlagPlugin.php
Diffstat (limited to 'plugins/Authentication')
-rw-r--r--plugins/Authentication/AuthenticationPlugin.php13
-rw-r--r--plugins/Authentication/User_username.php22
2 files changed, 13 insertions, 22 deletions
diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php
index cd1de1149..a76848b04 100644
--- a/plugins/Authentication/AuthenticationPlugin.php
+++ b/plugins/Authentication/AuthenticationPlugin.php
@@ -2,7 +2,7 @@
/**
* 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
*
@@ -204,7 +204,16 @@ abstract class AuthenticationPlugin extends Plugin
function onCheckSchema() {
$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;
}
diff --git a/plugins/Authentication/User_username.php b/plugins/Authentication/User_username.php
index 6826f2681..f30f60d83 100644
--- a/plugins/Authentication/User_username.php
+++ b/plugins/Authentication/User_username.php
@@ -2,9 +2,9 @@
/**
* 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
/* the code below is auto generated do not remove the above tag */
@@ -43,22 +43,4 @@ class User_username extends Plugin_DataObject
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')));
- }
}