Merged

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

diff --git a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
index a3aed95c0cefd2ac1511a2758f6ed22b5e8749b5..5e0f3f780efb27a3f02dfabee5beb1d9c440ace6 100644 (file)
--- a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
+++ b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
@@ -33,66 +33,28 @@ 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;
-        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)
+    function onRouterInitialized(URLMapper $m)
     {
         $m->connect(':nickname/photos', array('action' => 'photos'));
         $m->connect(':nickname/photos/:albumid', array('action' => 'photos'));
         $m->connect('main/uploadphoto', array('action' => 'photoupload'));
         $m->connect('photo/:photoid', array('action' => 'photo'));
+        $m->connect('editphoto/:photoid', array('action' => 'editphoto'));
         return true;
     }
 
-    function onStartNoticeDistribute($notice)
+    function onStartNoticeDistribute(Notice $notice)
     {
         common_log(LOG_INFO, "event: StartNoticeDistribute");
         if (GNUsocialPhotoTemp::$tmp) {
@@ -106,23 +68,23 @@ class GNUsocialPhotosPlugin extends Plugin
         return true;
     }
 
-    function onEndNoticeAsActivity($notice, &$activity)
+    function onEndNoticeAsActivity(Notice $stored, Activity $act, Profile $scoped=null)
     {
         common_log(LOG_INFO, 'photo plugin: EndNoticeAsActivity');
-        $photo = GNUsocialPhoto::staticGet('notice_id', $notice->id);
+        $photo = GNUsocialPhoto::getKV('notice_id', $stored->id);
         if(!$photo) {
             common_log(LOG_INFO, 'not a photo.');
             return true;
         }
 
-        $activity->objects[0]->type = ActivityObject::PHOTO;
-        $activity->objects[0]->thumbnail = $photo->thumb_uri;
-        $activity->objects[0]->largerImage = $photo->uri;
+        $act->objects[0]->type = ActivityObject::PHOTO;
+        $act->objects[0]->thumbnail = $photo->thumb_uri;
+        $act->objects[0]->largerImage = $photo->uri;
         return false;
     }
 
 
-    function onStartHandleFeedEntry($activity)
+    function onStartHandleFeedEntry(Activity $activity)
     {
         common_log(LOG_INFO, 'photo plugin: onEndAtomPubNewActivity');
         $oprofile = Ostatus_profile::ensureActorProfile($activity);
@@ -159,9 +121,9 @@ class GNUsocialPhotosPlugin extends Plugin
         return true;
     }
 
-    function onStartShowNoticeItem($action)
+    function onStartShowNoticeItem(Action $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();
@@ -187,7 +149,7 @@ class GNUsocialPhotosPlugin extends Plugin
                                      'title' => _('Upload a photo')));
     }
     */
-    function onEndPersonalGroupNav($nav)
+    function onEndPersonalGroupNav(Menu $nav, Profile $target, Profile $scoped=null)
     {
       
         $nav->out->menuItem(common_local_url('photos',
@@ -195,12 +157,12 @@ class GNUsocialPhotosPlugin extends Plugin
                            _('Photo gallery'), $nav->action->trimmed('action') == 'photos', 'nav_photos');
     }
 
-    function onEndShowStyles($action)
+    function onEndShowStyles(Action $action)
     {
         $action->cssLink('/plugins/GNUsocialPhotos/res/style.css');
     }
 
-    function onEndShowScripts($action)
+    function onEndShowScripts(Action $action)
     {
         $action->script('plugins/GNUsocialPhotos/res/gnusocialphotos.js');
     }