Updating all Memcached_DataObject extended classes to Managed_DataObject

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

diff --git a/plugins/GNUsocialPhotos/classes/gnusocialphoto.php b/plugins/GNUsocialPhotos/classes/gnusocialphoto.php
index 5e6a63b44caebaa0dd369de7f5032fe2d986d063..3898d42994d299cc868827c28eb711341f374f80 100644 (file)
--- a/plugins/GNUsocialPhotos/classes/gnusocialphoto.php
+++ b/plugins/GNUsocialPhotos/classes/gnusocialphoto.php
@@ -32,26 +32,16 @@ if (!defined('STATUSNET')) {
 
 require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
 
-class GNUsocialPhoto extends Memcached_DataObject
+class GNUsocialPhoto extends Managed_DataObject
 {
     public $__table = 'GNUsocialPhoto';
+    public $id;         // int(11)
     public $notice_id;  // int(11)
     public $album_id;   // int(11)
     public $uri;        // varchar(512)
     public $thumb_uri;  // varchar(512)
        public $title;      // varchar(512)
        public $photo_description; // text
-    
-
-    /**
-     *
-     * k key
-     * v value
-     */
-    function staticGet($k,$v=NULL)
-    {
-        return Memcached_DataObject::staticGet('GNUsocialPhoto',$k,$v);
-    }
 
 /*    function delete()
     {
@@ -70,12 +60,13 @@ class GNUsocialPhoto extends Memcached_DataObject
      */
     function table()
     {
-        return array('notice_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+        return array('id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'notice_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
                      'album_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
                      'uri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
                      'thumb_uri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
                      'title' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
-                     'photo_description' => DB_DATAOBJECT_TXT + DB_DATAOBJECT_NOTNULL);
+                     'photo_description' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL);
     }
     
     function keys()
@@ -100,7 +91,7 @@ class GNUsocialPhoto extends Memcached_DataObject
         $photo->uri = $uri;
                $photo->album_id = $album_id;
                if(!empty($title)) $photo->title = $title;
-               if(!empty($photo_description)) $photo->photo_description = $photo_description;
+               if(!empty($photo_description)) $photo->photo_description = (string)$photo_description;
 
         if($insert_now) {
             $notice = Notice::saveNew($profile_id, $uri, $source);
@@ -116,6 +107,10 @@ class GNUsocialPhoto extends Memcached_DataObject
         }
     }
 
+    function getPageLink()
+    {
+        return '/photo/' . $this->id;
+    }
 
     /*
      * TODO: -Sanitize input