X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FGNUsocialPhotos%2FGNUsocialPhotosPlugin.php;h=36956e5b9b3b750a90f15c4aacb691b3826c4526;hb=53e820b46667c2f0e22ffa0a2f91e847a02f4cb8;hp=46c67d5d9604bf0954937c1fa3e61612af003b21;hpb=58d98a4c2b58fc69ddef81c2a0f32c079344e0d9;p=quix0rs-gnu-social.git

diff --git a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
index 46c67d5d96..36956e5b9b 100644
--- a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
+++ b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
@@ -22,6 +22,7 @@
  * @category  Widget
  * @package   GNU Social
  * @author    Ian Denhardt <ian@zenhack.net>
+ * @author    Max Shinn    <trombonechamp@gmail.com>
  * @copyright 2010 Free Software Foundation, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  */
@@ -32,71 +33,138 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
+include_once $dir . '/lib/photolib.php';
+
 class GNUsocialPhotosPlugin extends Plugin
 {
-
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-
-        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;
-        default:
-            break;
-        }
-
-        include_once $dir . '/classes/gnusocialphoto.php';
-        return true;
-    }
-
     function onCheckSchema()
     {
         $schema = Schema::get();
-        $schema->ensureTable('GNUsocialPhoto',
-                                array(new ColumnDef('notice_id', 'integer', null, false, null, true, null, null, true),
-                                      new ColumnDef('path', 'varchar(150)', null, false),
-                                      new ColumnDef('thumb_path', 'varchar(156)', null, false), // 156 = 150 + strlen('thumb.')
-                                      new ColumnDef('owner_id', 'int(11)', null, false)));
+        $schema->ensureTable('GNUsocialPhoto', GNUsocialPhoto::schemaDef());
+        $schema->ensureTable('GNUsocialPhotoAlbum', GNUsocialPhotoAlbum::schemaDef());
     }
 
     function onRouterInitialized($m)
     {
         $m->connect(':nickname/photos', array('action' => 'photos'));
+        $m->connect(':nickname/photos/:albumid', array('action' => 'photos'));
         $m->connect('main/uploadphoto', array('action' => 'photoupload'));
-        common_log(LOG_INFO, "init'd!");
+        $m->connect('photo/:photoid', array('action' => 'photo'));
+        $m->connect('editphoto/:photoid', array('action' => 'editphoto'));
+        return true;
+    }
+
+    function onStartNoticeDistribute($notice)
+    {
+        common_log(LOG_INFO, "event: StartNoticeDistribute");
+        if (GNUsocialPhotoTemp::$tmp) {
+            GNUsocialPhotoTemp::$tmp->notice_id = $notice->id;
+            $photo_id = GNUsocialPhotoTemp::$tmp->insert();
+            if (!$photo_id) {
+                common_log_db_error($photo, 'INSERT', __FILE__);
+                throw new ServerException(_m('Problem saving photo.'));
+            }
+        }
         return true;
     }
 
-    /* function onStartActivityDefaultObjectType(&$notice, &$xs, &$type)
+    function onEndNoticeAsActivity(Notice $stored, Activity $act, Profile $scoped=null)
+    {
+        common_log(LOG_INFO, 'photo plugin: EndNoticeAsActivity');
+        $photo = GNUsocialPhoto::getKV('notice_id', $stored->id);
+        if(!$photo) {
+            common_log(LOG_INFO, 'not a photo.');
+            return true;
+        }
+
+        $act->objects[0]->type = ActivityObject::PHOTO;
+        $act->objects[0]->thumbnail = $photo->thumb_uri;
+        $act->objects[0]->largerImage = $photo->uri;
+        return false;
+    }
+
+
+    function onStartHandleFeedEntry($activity)
     {
-        $photo = GNUsocialPhoto::staticGet('notice_id', $notice->id);
-        if($photo) {
-            $type = ActivityObject::PHOTO;
+        common_log(LOG_INFO, 'photo plugin: onEndAtomPubNewActivity');
+        $oprofile = Ostatus_profile::ensureActorProfile($activity);
+        foreach ($activity->objects as $object) {
+            if($object->type == ActivityObject::PHOTO) {
+                $uri = $object->largerImage;
+                $thumb_uri = $object->thumbnail;
+                $profile_id = $oprofile->profile_id;
+                $source = 'unknown'; // TODO: put something better here.
+
+                common_log(LOG_INFO, 'uri : ' .  $uri);
+                common_log(LOG_INFO, 'thumb_uri : ' . $thumb_uri);
+
+                // It's possible this is validated elsewhere, but I'm not sure and
+                // would rather be safe.
+                $uri = filter_var($uri, FILTER_SANITIZE_URL);
+                $thumb_uri = filter_var($thumb_uri, FILTER_SANITIZE_URL);
+                $uri = filter_var($uri, FILTER_VALIDATE_URL);
+                $thumb_uri = filter_var($thumb_uri, FILTER_VALIDATE_URL);
+
+                if(empty($thumb_uri)) {
+                    // We need a thumbnail, so if we aren't given one, use the actual picture for now.
+                    $thumb_uri = $uri;
+                }
+
+                if (!empty($uri) && !empty($thumb_uri)) {
+                    GNUsocialPhoto::saveNew($profile_id, $thumb_uri, $uri, $source, false);
+                } else {
+                    common_log(LOG_INFO, 'bad URI for photo');
+                }
+                return false;
+            }
         }
-    } */
+        return true;
+    }
 
     function onStartShowNoticeItem($action)
     {
-        common_log(LOG_INFO, 'StartShowNoticeItem: ' . $action->notice->id);
-        $photo = GNUsocialPhoto::staticGet('notice_id', $action->notice->id);
+        $photo = GNUsocialPhoto::getKV('notice_id', $action->notice->id);
         if($photo) { 
-            common_log(LOG_INFO, 'is photo.');
-            $action->out->elementStart('a', array('href' => 'http://' . common_config('site', 'server') . $photo->path));
-            $action->out->element('img', array('src' => 'http://' . common_config('site', 'server') . $photo->thumb_path));
+            $action->out->elementStart('div', 'entry-title');
+            $action->showAuthor();
+            $action->out->elementStart('a', array('href' => $photo->getPageLink()));
+            $action->out->element('img', array('src' => $photo->thumb_uri,
+                                    'width' => 256, 'height' => 192));
             $action->out->elementEnd('a');
+            $action->out->elementEnd('div');
             $action->showNoticeInfo();
             $action->showNoticeOptions();
             return false;
         }
-        common_log(LOG_INFO, 'not photo');
         return true;
+    } 
+
+    /*    function onEndShowNoticeFormData($action)
+    {
+        $link = "/main/uploadphoto";
+        $action->out->element('label', array('for' => 'photofile'),_('Attach'));
+        $action->out->element('input', array('id' => 'photofile',
+                                     'type' => 'file',
+                                     'name' => 'photofile',
+                                     'title' => _('Upload a photo')));
+    }
+    */
+    function onEndPersonalGroupNav(Menu $nav, Profile $target, Profile $scoped=null)
+    {
+      
+        $nav->out->menuItem(common_local_url('photos',
+                           array('nickname' => $nav->action->trimmed('nickname'))), _('Photos'), 
+                           _('Photo gallery'), $nav->action->trimmed('action') == 'photos', 'nav_photos');
+    }
+
+    function onEndShowStyles($action)
+    {
+        $action->cssLink('/plugins/GNUsocialPhotos/res/style.css');
+    }
+
+    function onEndShowScripts($action)
+    {
+        $action->script('plugins/GNUsocialPhotos/res/gnusocialphotos.js');
     }
 }
+