GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
Sean Corbett 2010-09-05 13:20:46 -04:00
parent 3b0e5ae94a fc131c2fb6
commit 2f06e29042
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/GNUsocialPhotos/actions/photoupload.php
View File

@ -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');
}
}
}

12
plugins/GNUsocialPhotos/classes/gnusocialphotoalbum.php
View File

@ -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;
}
}