Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

4 files changed, 111 insertions, 37 deletions

diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php
index a76848b04..75e8d2b76 100644
--- a/plugins/Authentication/AuthenticationPlugin.php
+++ b/plugins/Authentication/AuthenticationPlugin.php
@@ -99,6 +99,23 @@ abstract class AuthenticationPlugin extends Plugin
         }
     }
 
+    /**
+    * Internal AutoRegister event handler
+    * @param nickname
+    * @param provider_name
+    * @param user - the newly registered user
+    */
+    function onAutoRegister($nickname, $provider_name, &$user)
+    {
+        if($provider_name == $this->provider_name && $this->autoregistration){
+            $user = $this->autoregister($nickname);
+            if($user){
+                User_username::register($user,$nickname,$this->provider_name);
+                return false;
+            }
+        }
+    }
+
     function onStartCheckPassword($nickname, $password, &$authenticatedUser){
         //map the nickname to a username
         $user_username = new User_username();
@@ -127,13 +144,10 @@ abstract class AuthenticationPlugin extends Plugin
                     }
                 }
             }else{
-                if($this->autoregistration){
-                    $authenticated = $this->checkPassword($nickname, $password);
-                    if($authenticated){
-                        $user = $this->autoregister($nickname);
-                        if($user){
-                            $authenticatedUser = $user;
-                            User_username::register($authenticatedUser,$nickname,$this->provider_name);
+                $authenticated = $this->checkPassword($nickname, $password);
+                if($authenticated){
+                    if(Event::handle('AutoRegister', array($nickname, $this->provider_name, &$authenticatedUser))){
+                        if($authenticatedUser){
                             return false;
                         }
                     }
diff --git a/plugins/FeedSub/FeedSubPlugin.php b/plugins/FeedSub/FeedSubPlugin.php
index 857a9794d..e49e2a648 100644
--- a/plugins/FeedSub/FeedSubPlugin.php
+++ b/plugins/FeedSub/FeedSubPlugin.php
@@ -105,12 +105,11 @@ class FeedSubPlugin extends Plugin
         return true;
     }
 
-    /*
-    // auto increment seems to be broken
     function onCheckSchema() {
+        // warning: the autoincrement doesn't seem to set.
+        // alter table feedinfo change column id id int(11) not null  auto_increment;
         $schema = Schema::get();
-        $schema->ensureDataObject('Feedinfo');
+        $schema->ensureTable('feedinfo', Feedinfo::schemaDef());
         return true;
     }
-    */
 }
diff --git a/plugins/FeedSub/feedinfo.php b/plugins/FeedSub/feedinfo.php
index fff66afe9..b166bd6e1 100644
--- a/plugins/FeedSub/feedinfo.php
+++ b/plugins/FeedSub/feedinfo.php
@@ -31,7 +31,7 @@ class FeedDBException extends FeedSubException
     }
 }
 
-class Feedinfo extends Plugin_DataObject
+class Feedinfo extends Memcached_DataObject
 {
     public $__table = 'feedinfo';
 
@@ -56,34 +56,90 @@ class Feedinfo extends Plugin_DataObject
         return parent::staticGet(__CLASS__, $k, $v);
     }
 
-    function tableDef()
+    /**
+     * return table definition for DB_DataObject
+     *
+     * DB_DataObject needs to know something about the table to manipulate
+     * instances. This method provides all the DB_DataObject needs to know.
+     *
+     * @return array array of column definitions
+     */
+
+    function table()
+    {
+        return array('id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'profile_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'feeduri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'homeuri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'huburi' =>  DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'verify_token' => DB_DATAOBJECT_STR,
+                     'sub_start' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME,
+                     'sub_end' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME,
+                     'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
+                     'lastupdate' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
+    }
+    
+    static function schemaDef()
+    {
+        return array(new ColumnDef('id', 'integer',
+                                   /*size*/ null,
+                                   /*nullable*/ false,
+                                   /*key*/ 'PRI',
+                                   /*default*/ '0',
+                                   /*extra*/ null,
+                                   /*auto_increment*/ true),
+                     new ColumnDef('profile_id', 'integer',
+                                   null, false),
+                     new ColumnDef('feeduri', 'varchar',
+                                   255, false, 'UNI'),
+                     new ColumnDef('homeuri', 'varchar',
+                                   255, false),
+                     new ColumnDef('huburi', 'varchar',
+                                   255, false),
+                     new ColumnDef('verify_token', 'varchar',
+                                   32, true),
+                     new ColumnDef('sub_start', 'datetime',
+                                   null, true),
+                     new ColumnDef('sub_end', 'datetime',
+                                   null, true),
+                     new ColumnDef('created', 'datetime',
+                                   null, false),
+                     new ColumnDef('lastupdate', 'datetime',
+                                   null, false));
+    }
+
+    /**
+     * return key definitions for DB_DataObject
+     *
+     * DB_DataObject needs to know about keys that the table has; this function
+     * defines them.
+     *
+     * @return array key definitions
+     */
+
+    function keys()
     {
-        class_exists('Schema'); // autoload hack
-        // warning: the autoincrement doesn't seem to set.
-        // alter table feedinfo change column id id int(11) not null  auto_increment;
-        return new TableDef($this->__table,
-                            array(new ColumnDef('id', 'integer',
-                                                null, false, 'PRI', '0', null, true),
-                                  new ColumnDef('profile_id', 'integer',
-                                                null, false),
-                                  new ColumnDef('feeduri', 'varchar',
-                                                255, false, 'UNI'),
-                                  new ColumnDef('homeuri', 'varchar',
-                                                255, false),
-                                  new ColumnDef('huburi', 'varchar',
-                                                255, false),
-                                  new ColumnDef('verify_token', 'varchar',
-                                                32, true),
-                                  new ColumnDef('sub_start', 'datetime',
-                                                null, true),
-                                  new ColumnDef('sub_end', 'datetime',
-                                                null, true),
-                                  new ColumnDef('created', 'datetime',
-                                                null, false),
-                                  new ColumnDef('lastupdate', 'datetime',
-                                                null, false)));
+        return array('id' => 'P'); //?
     }
 
+    /**
+     * return key definitions for Memcached_DataObject
+     *
+     * Our caching system uses the same key definitions, but uses a different
+     * method to get them.
+     *
+     * @return array key definitions
+     */
+
+    function keyTypes()
+    {
+        return $this->keys();
+    }
+
+    /**
+     * Fetch the StatusNet-side profile for this feed
+     * @return Profile
+     */
     public function getProfile()
     {
         return Profile::staticGet('id', $this->profile_id);
diff --git a/plugins/MemcachePlugin.php b/plugins/MemcachePlugin.php
index acbec135e..78e2b2406 100644
--- a/plugins/MemcachePlugin.php
+++ b/plugins/MemcachePlugin.php
@@ -156,6 +156,11 @@ class MemcachePlugin extends Plugin
                 }
                 $this->_conn->addServer($host, $port);
             }
+            //Compress items stored in the cache if they're over 2k in size
+            //and the compression would save more than 20%.
+            //Allows the cache to store objects larger than 1MB (if they
+            //compress to less than 1MB), and improves cache memory efficiency.
+            $this->_conn->setCompressThreshold(20000, 0.2);
         }
     }
 }