From cc18dcb82d3d61b512530d252ec78465eefab9d2 Mon Sep 17 00:00:00 2001 From: Sean Corbett Date: Sat, 4 Sep 2010 22:14:49 -0400 Subject: [PATCH] Rough draft of the photo album class to control photo ownership / permissions. --- .../GNUsocialPhotos/GNUsocialPhotosPlugin.php | 7 +- .../classes/gnusocialphoto.php | 4 + .../classes/gnusocialphotoalbum.php | 94 +++++++++++++++++++ 3 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 plugins/GNUsocialPhotos/classes/gnusocialphotoalbum.php diff --git a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php index f67cfec341..8aa10c7f70 100644 --- a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php +++ b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php @@ -54,6 +54,7 @@ class GNUsocialPhotosPlugin extends Plugin } include_once $dir . '/classes/gnusocialphoto.php'; + include_once $dir . '/classes/gnusocialphotoalbum.php'; return true; } @@ -63,9 +64,13 @@ class GNUsocialPhotosPlugin extends Plugin $schema->ensureTable('GNUsocialPhoto', array(new ColumnDef('notice_id', 'int(11)', null, false), new ColumnDef('album_id', 'int(11)', null, false), - //new ColumnDef('album_name', 'varchar(30)', null, false), new ColumnDef('uri', 'varchar(512)', null, false), new ColumnDef('thumb_uri', 'varchar(512)', 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))); + } function onRouterInitialized($m) diff --git a/plugins/GNUsocialPhotos/classes/gnusocialphoto.php b/plugins/GNUsocialPhotos/classes/gnusocialphoto.php index 3ff0e494dc..1b5a545878 100644 --- a/plugins/GNUsocialPhotos/classes/gnusocialphoto.php +++ b/plugins/GNUsocialPhotos/classes/gnusocialphoto.php @@ -62,6 +62,10 @@ class GNUsocialPhoto extends Memcached_DataObject return parent::delete(); } */ + + /* + * TODO: Foriegn key on album_id. + */ function table() { return array('notice_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, diff --git a/plugins/GNUsocialPhotos/classes/gnusocialphotoalbum.php b/plugins/GNUsocialPhotos/classes/gnusocialphotoalbum.php new file mode 100644 index 0000000000..853854e428 --- /dev/null +++ b/plugins/GNUsocialPhotos/classes/gnusocialphotoalbum.php @@ -0,0 +1,94 @@ +. + * + * @category Widget + * @package GNU Social + * @author Ian Denhardt + * @author Sean Corbett + * @copyright 2010 Free Software Foundation, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; + +class GNUsocialPhotoAlbum extends Memcached_DataObject +{ + public $__table = 'GNUsocialPhotoAlbum'; + public $album_id; // int(11) -- Unique identifier for the album + public $profile_id; // int(11) -- Profile ID for the owner of the album + public $album_name; // varchar(256) -- Title for this album + + + function staticGet($k,$v=NULL) + { + return Memcached_DataObject::staticGet('GNUsocialPhotoAlbum',$k,$v); + } + + + /* TODO: Primary key on both album_id, profile_id / foriegn key on profile_id */ + function table() + { + return array('album_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, + 'profile_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, + 'album_name' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL); + } + + function keys() + { + return array_keys($this->keyTypes()); + } + + + /* Using album_id as the primary key for now.. */ + function keyTypes() + { + return array('album_id' => 'K'); + } + + function sequenceKey() + { + return array(false, false, false); + } + + static function newAlbum($profile_id, $album_name) + { + //TODO: Should use foreign key instead... + if (!Profile::staticGet('id', $profile_id)){ + //Is this a bit extreme? + throw new ServerException(_m('No such user exists with id ' . $profile_id . ', couldn\'t create album.')); + } + + $album = new GNUsocialPhotoAlbum(); + //TODO: Should autoincrement.. + $album->profile_id = $profile_id; + $album->album_name = $album_name; + + if ($album->insert() == false){ + common_log_db_error($album, 'INSERT', __FILE__); + throw new ServerException(_m('Error creating new album.')); + } + } + +}