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

[quix0rs-gnu-social.git] / plugins / GNUsocialPhotos / GNUsocialPhotosPlugin.php

diff --git a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
index 499d376fcce5f5e26beabf61f11bd09206fc0ede..235155192780191ff80e794cbb2546439882c248 100644 (file)
--- a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
+++ b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
@@ -33,58 +33,15 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
+include_once $dir . '/lib/photolib.php';
+
 class GNUsocialPhotosPlugin extends Plugin
 {
-
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-
-        include_once $dir . '/lib/tempphoto.php';
-        include_once $dir . '/lib/photonav.php';
-        switch ($cls)
-        {
-        case 'PhotosAction':
-            include_once $dir . '/lib/photolib.php';
-            include_once $dir . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            break;
-        case 'PhotouploadAction':
-            include_once $dir . '/lib/photolib.php';
-            include_once $dir . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            break;
-        case 'PhotoAction':
-            include_once $dir . '/lib/photolib.php';
-            include_once $dir . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            break;
-        case 'EditphotoAction':
-            include_once $dir . '/lib/photolib.php';
-            include_once $dir . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            break;
-        default:
-            break;
-        }
-        include_once $dir . '/classes/gnusocialphoto.php';
-        include_once $dir . '/classes/gnusocialphotoalbum.php';
-        return true;
-    }
-
     function onCheckSchema()
     {
         $schema = Schema::get();
-        $schema->ensureTable('GNUsocialPhoto',
-                                array(new ColumnDef('id', 'int(11)', null, false, 'PRI', null, null, true),
-                                      new ColumnDef('notice_id', 'int(11)', null, false),
-                                      new ColumnDef('album_id', 'int(11)', null, false),
-                                      new ColumnDef('uri', 'varchar(512)', null, false),
-                                      new ColumnDef('thumb_uri', 'varchar(512)', null, false),
-                                      new ColumnDef('title', 'varchar(512)', null, false),
-                                      new ColumnDef('photo_description', 'text', null, false)));
-        $schema->ensureTable('GNUsocialPhotoAlbum',
-                                array(new ColumnDef('album_id', 'int(11)', null, false, 'PRI', null, null, true),
-                                      new ColumnDef('profile_id', 'int(11)', null, false),
-                                      new ColumnDef('album_name', 'varchar(256)', null, false),
-                                      new ColumnDef('album_description', 'text', null, false)));
-                                          
+        $schema->ensureTable('GNUsocialPhoto', GNUsocialPhoto::schemaDef());
+        $schema->ensureTable('GNUsocialPhotoAlbum', GNUsocialPhotoAlbum::schemaDef());
     }
 
     function onRouterInitialized($m)
@@ -114,7 +71,7 @@ class GNUsocialPhotosPlugin extends Plugin
     function onEndNoticeAsActivity($notice, &$activity)
     {
         common_log(LOG_INFO, 'photo plugin: EndNoticeAsActivity');
-        $photo = GNUsocialPhoto::staticGet('notice_id', $notice->id);
+        $photo = GNUsocialPhoto::getKV('notice_id', $notice->id);
         if(!$photo) {
             common_log(LOG_INFO, 'not a photo.');
             return true;
@@ -166,7 +123,7 @@ class GNUsocialPhotosPlugin extends Plugin
 
     function onStartShowNoticeItem($action)
     {
-        $photo = GNUsocialPhoto::staticGet('notice_id', $action->notice->id);
+        $photo = GNUsocialPhoto::getKV('notice_id', $action->notice->id);
         if($photo) { 
             $action->out->elementStart('div', 'entry-title');
             $action->showAuthor();