plugins onAutoload now only overloads if necessary (extlibs etc.)

[quix0rs-gnu-social.git] / plugins / GNUsocialProfileExtensions / GNUsocialProfileExtensionsPlugin.php

diff --git a/plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php b/plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php
index 27bf19336a6d354add10c62ad8368e914292159f..bfdcf3e42db05315c2be9c9d8122db1703e2097f 100644 (file)
--- a/plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php
+++ b/plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php
@@ -30,46 +30,16 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
+include_once $dir . '/lib/profiletools.php';
+
 class GNUsocialProfileExtensionsPlugin extends Plugin
 {
 
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-
-        switch ($cls)
-        {
-        case 'BioAction':
-        case 'NewresponseAction':
-            include_once $dir . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            break;
-        case 'ProfilefieldsAdminPanelAction':
-            include_once $dir . '/actions/' . strtolower(mb_substr($cls, 0, -16)) . '.php';
-            break;
-        default:
-            break;
-        }
-        include_once $dir . '/classes/GNUsocialProfileExtensionField.php';
-        include_once $dir . '/classes/GNUsocialProfileExtensionResponse.php';
-        include_once $dir . '/lib/profiletools.php';
-        include_once $dir . '/lib/noticetree.php';
-        return true;
-    }
-
     function onCheckSchema()
     {
         $schema = Schema::get();
-        $schema->ensureTable('GNUsocialProfileExtensionField',
-                                array(new ColumnDef('id', 'int(11)', null, false, 'PRI', null, null, true),
-                                      new ColumnDef('systemname', 'varchar(64)', null, false),
-                                      new ColumnDef('title', 'varchar(256)', null, false),
-                                      new ColumnDef('description', 'text', null, false),
-                                      new ColumnDef('type', 'varchar(256)', null, false)));
-        $schema->ensureTable('GNUsocialProfileExtensionResponse',
-                                array(new ColumnDef('id', 'int(11)', null, false, 'PRI', null, null, true),
-                                      new ColumnDef('extension_id', 'int(11)', null, false),
-                                      new ColumnDef('profile_id', 'int(11)', null, false),
-                                      new ColumnDef('value', 'text', null, false)));
+        $schema->ensureTable('GNUsocialProfileExtensionField', GNUsocialProfileExtensionField::schemaDef());
+        $schema->ensureTable('GNUsocialProfileExtensionResponse', GNUsocialProfileExtensionResponse::schemaDef());
                                           
     }
 
@@ -171,7 +141,15 @@ class GNUsocialProfileExtensionsPlugin extends Plugin
     //Why the heck is this shoved into this plugin!?!?  It deserves its own!
     function onShowStreamNoticeList($notice, $action, &$pnl)
     {
-        $pnl = new NoticeTree($notice, $action);
+        //TODO: This function is called after the notices in $notice are superfluously retrieved in showstream.php
+        $newnotice = new Notice();
+        $newnotice->profile_id = $action->user->id;
+        $newnotice->orderBy('modified DESC');
+        $newnotice->whereAdd('reply_to IS NULL');
+        $newnotice->limit(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+        $newnotice->find();
+
+        $pnl = new NoticeTree($newnotice, $action);
         return false;
     }