Merge branch 'master' of git://140.232.178.237/home/ian/public_html/gnu-social

2 files changed, 16 insertions, 8 deletions

diff --git a/plugins/GNUsocialPhotos/actions/photoupload.php b/plugins/GNUsocialPhotos/actions/photoupload.php
index b1b3ec705..a37c8d1ab 100644
--- a/plugins/GNUsocialPhotos/actions/photoupload.php
+++ b/plugins/GNUsocialPhotos/actions/photoupload.php
@@ -114,7 +114,6 @@ class PhotouploadAction extends Action
 
     function uploadPhoto()
     {
-        common_log(LOG_INFO, 'Is this function even getting called?');
         $cur = common_current_user();
         if(empty($cur)) {
             return;
@@ -138,8 +137,15 @@ class PhotouploadAction extends Action
         $uri = 'http://' . common_config('site', 'server') . '/file/' . $filename;
         $thumb_uri = 'http://' . common_config('site', 'server') . '/file/thumb.' . $filename;
         $profile_id = $cur->id;
-		//scorbett: the second arg below should be set to the album ID
-        GNUsocialPhoto::saveNew($profile_id, 0, $thumb_uri, $uri, 'web');
+       
+        // TODO: proper multiple album support 
+        $album = GNUsocialPhotoAlbum::staticGet('profile_id', $profile_id);
+        if(!$album) {
+            $album = GNUsocialPhotoAlbum::newAlbum($profile_id, 'Default');
+            GNUsocialPhoto::saveNew($profile_id, $album->album_id, $thumb_uri, $uri, 'web');
+        } else {
+            GNUsocialPhoto::saveNew($profile_id, $album->album_id, $thumb_uri, $uri, 'web');
+        }
     }
 
 }
diff --git a/plugins/GNUsocialPhotos/classes/gnusocialphotoalbum.php b/plugins/GNUsocialPhotos/classes/gnusocialphotoalbum.php
index 853854e42..13c7663a6 100644
--- a/plugins/GNUsocialPhotos/classes/gnusocialphotoalbum.php
+++ b/plugins/GNUsocialPhotos/classes/gnusocialphotoalbum.php
@@ -69,8 +69,8 @@ class GNUsocialPhotoAlbum extends Memcached_DataObject
 
     function sequenceKey()
     {
-        return array(false, false, false);
-    } 
+        return array('album_id', true, false);
+    }
 
     static function newAlbum($profile_id, $album_name)
     {
@@ -81,14 +81,16 @@ class GNUsocialPhotoAlbum extends Memcached_DataObject
         }
         
         $album = new GNUsocialPhotoAlbum();
-        //TODO: Should autoincrement..
         $album->profile_id = $profile_id;
         $album->album_name = $album_name;
-        
-        if ($album->insert() == false){
+       
+        $album->album_id = $album->insert();
+        if (!$album->album_id){
             common_log_db_error($album, 'INSERT', __FILE__);
             throw new ServerException(_m('Error creating new album.'));
         }
+        common_log(LOG_INFO, 'album_id : ' . $album->album_id);
+        return $album;
     } 
 
 }