now actually querying the access system for permissions
This commit is contained in:
Thomas E. Horner
parent
b1f6b3b21e
commit
3e59a5f933
|
|
@ -18,94 +18,89 @@
|
||||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
class Gallery_Remote_Controller extends Controller {
|
class Gallery_Remote_Controller extends Controller {
|
||||||
private static $thumb_size = 0;
|
|
||||||
private static $resize_size = 0;
|
|
||||||
|
|
||||||
//XXX access::required("view", $item);
|
|
||||||
|
|
||||||
public function index() {
|
public function index() {
|
||||||
|
|
||||||
$input = Input::instance();
|
$input = Input::instance();
|
||||||
$reply = GalleryRemoteReply::factory(gallery_remote::GR_STAT_SUCCESS);
|
$reply = GalleryRemoteReply::factory(gallery_remote::GR_STAT_SUCCESS);
|
||||||
|
|
||||||
if($this->_check_protocol($input, $reply)) {
|
if($this->_check_protocol($input, $reply)) {
|
||||||
$reply->set('debug_gallery_version', '3.0+'); //XXX
|
$reply->set('debug_gallery_version', gallery::version_string());
|
||||||
$reply->set('debug_user', identity::active_user()->name);
|
$reply->set('debug_user', identity::active_user()->name);
|
||||||
$reply->set('debug_user_type', 'Gallery_User');
|
$reply->set('debug_user_type', 'Gallery_User');
|
||||||
$reply->set('debug_user_already_logged_in', identity::active_user()->id != identity::guest()->id ? '1':'');
|
$reply->set('debug_user_already_logged_in', identity::active_user()->id != identity::guest()->id ? '1':'');
|
||||||
$reply->set('server_version', '2.15');
|
$reply->set('server_version', '2.15');
|
||||||
|
|
||||||
$cmd = trim($input->post('cmd'));
|
$cmd = trim($input->post('cmd'));
|
||||||
if($cmd == 'login') {
|
if($cmd == 'login') {
|
||||||
$this->_login($input, $reply);
|
$this->_login($input, $reply);
|
||||||
}
|
}
|
||||||
else if( self::isloggedin() ) {
|
else if( self::isloggedin() ) {
|
||||||
switch($cmd) {
|
switch($cmd) {
|
||||||
case 'no-op':
|
case 'no-op':
|
||||||
$reply->set('status_text', 'Noop command successful.');
|
$reply->set('status_text', 'Noop command successful.');
|
||||||
$reply->send();
|
$reply->send();
|
||||||
break;
|
break;
|
||||||
case 'fetch-albums':
|
case 'fetch-albums':
|
||||||
case 'fetch-albums-prune':
|
case 'fetch-albums-prune':
|
||||||
$this->_fetch_albums_prune($input, $reply);
|
$this->_fetch_albums_prune($input, $reply);
|
||||||
break;
|
break;
|
||||||
case 'new-album':
|
case 'new-album':
|
||||||
$this->_new_album($input, $reply);
|
$this->_new_album($input, $reply);
|
||||||
break;
|
break;
|
||||||
case 'album-properties':
|
case 'album-properties':
|
||||||
$this->_album_properties($input, $reply);
|
$this->_album_properties($input, $reply);
|
||||||
break;
|
break;
|
||||||
case 'add-item':
|
case 'add-item':
|
||||||
$this->_add_item($input, $reply);
|
$this->_add_item($input, $reply);
|
||||||
break;
|
break;
|
||||||
case 'move-album':
|
case 'move-album':
|
||||||
$this->_move_album($input, $reply);
|
$this->_move_album($input, $reply);
|
||||||
break;
|
break;
|
||||||
case 'increment-view-count':
|
case 'increment-view-count':
|
||||||
$this->_increment_view_count($input, $reply);
|
$this->_increment_view_count($input, $reply);
|
||||||
break;
|
break;
|
||||||
case 'image-properties':
|
case 'image-properties':
|
||||||
$this->_image_properties($input, $reply);
|
$this->_image_properties($input, $reply);
|
||||||
break;
|
break;
|
||||||
case 'fetch-album-images':
|
case 'fetch-album-images':
|
||||||
$this->_fetch_album_images($input, $reply);
|
$this->_fetch_album_images($input, $reply);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$reply->send(gallery_remote::UNKNOWN_CMD);
|
$reply->send(gallery_remote::UNKNOWN_CMD);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reply->send(gallery_remote::LOGIN_MISSING);
|
$reply->send(gallery_remote::LOGIN_MISSING);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function _check_protocol(&$input, &$reply) {
|
private function _check_protocol(&$input, &$reply) {
|
||||||
$version = trim($input->post('protocol_version'));
|
$version = trim($input->post('protocol_version'));
|
||||||
if($version=='') {
|
if($version=='') {
|
||||||
$reply->send(gallery_remote::PROTO_VER_MISSING);
|
$reply->send(gallery_remote::PROTO_VER_MISSING);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if(!is_numeric($version)) {
|
else if(!is_numeric($version)) {
|
||||||
$reply->send(gallery_remote::PROTO_MAJ_FMT_INVAL);
|
$reply->send(gallery_remote::PROTO_MAJ_FMT_INVAL);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if($version<'2') {
|
else if($version<'2') {
|
||||||
$reply->send(gallery_remote::PROTO_MAJ_VER_INVAL);
|
$reply->send(gallery_remote::PROTO_MAJ_VER_INVAL);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if($version<'2.3') {
|
else if($version<'2.3') {
|
||||||
$reply->send(gallery_remote::PROTO_MIN_VER_INVAL);
|
$reply->send(gallery_remote::PROTO_MIN_VER_INVAL);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function isloggedin()
|
private static function isloggedin()
|
||||||
{
|
{
|
||||||
return identity::active_user()->id != identity::guest()->id;
|
return identity::active_user()->id != identity::guest()->id;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function get_mime_type($filename, $mimePath = '/etc') {
|
private static function get_mime_type($filename, $mimePath = '/etc') {
|
||||||
$fileext = substr(strrchr($filename, '.'), 1);
|
$fileext = substr(strrchr($filename, '.'), 1);
|
||||||
|
|
@ -121,162 +116,168 @@ class Gallery_Remote_Controller extends Controller {
|
||||||
return (false); // no match at all
|
return (false); // no match at all
|
||||||
}
|
}
|
||||||
|
|
||||||
private function _login(&$input, &$reply) {
|
private function _login(&$input, &$reply) {
|
||||||
$uname = trim($input->post('uname'));
|
$uname = trim($input->post('uname'));
|
||||||
if (empty($uname)) {
|
if (empty($uname)) {
|
||||||
$reply->send(gallery_remote::LOGIN_MISSING);
|
$reply->send(gallery_remote::LOGIN_MISSING);
|
||||||
} else {
|
} else {
|
||||||
$user = user::lookup_by_name($uname);
|
$user = user::lookup_by_name($uname);
|
||||||
$password = trim($input->post('password'));
|
$password = trim($input->post('password'));
|
||||||
if ($user && user::is_correct_password($user, $password)) {
|
if ($user && user::is_correct_password($user, $password)) {
|
||||||
auth::login($user);
|
auth::login($user);
|
||||||
Session::instance()->regenerate();
|
Session::instance()->regenerate();
|
||||||
|
|
||||||
$reply->set('debug_user', $user->name);
|
$reply->set('debug_user', $user->name);
|
||||||
$reply->set('status_text', 'Login successful.');
|
$reply->set('status_text', 'Login successful.');
|
||||||
$reply->send();
|
$reply->send();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$reply->send(gallery_remote::PASSWD_WRONG);
|
$reply->send(gallery_remote::PASSWD_WRONG);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function _fetch_albums_prune(&$input, &$reply) {
|
private function _fetch_albums_prune(&$input, &$reply) {
|
||||||
$root = item::root();
|
$root = item::root();
|
||||||
$thumb_size = module::get_var('gallery', 'thumb_size');
|
$perms = trim($input->post('no_perms'));
|
||||||
$resize_size = module::get_var('gallery', 'resize_size');
|
$use_permissions = ($perms != 'no');
|
||||||
$count = 0;
|
|
||||||
foreach( $root->descendants(null, null, array(array("type", "=", "album"))) as $item )
|
$thumb_size = module::get_var('gallery', 'thumb_size');
|
||||||
{
|
$resize_size = module::get_var('gallery', 'resize_size');
|
||||||
$count++;
|
$count = 0;
|
||||||
|
foreach( $root->descendants(null, null, array(array("type", "=", "album"))) as $item )
|
||||||
$reply->set('album.name.'.$count, $item->slug);
|
{
|
||||||
$reply->set('album.title.'.$count, $item->title);
|
if(!$use_permissions || access::can('view', $item))
|
||||||
$reply->set('album.summary.'.$count, $item->description);
|
{
|
||||||
$reply->set('album.parent.'.$count, $item->parent()->id == $root->id ? '0' : $item->parent()->name);
|
$count++;
|
||||||
$reply->set('album.resize_size.'.$count, $resize_size);
|
|
||||||
$reply->set('album.max_size.'.$count, '0');
|
$reply->set('album.name.'.$count, $item->slug);
|
||||||
$reply->set('album.thumb_size.'.$count, $thumb_size);
|
$reply->set('album.title.'.$count, $item->title);
|
||||||
$reply->set('album.perms.add.'.$count, 'true'); //XXX
|
$reply->set('album.summary.'.$count, $item->description);
|
||||||
$reply->set('album.perms.write.'.$count, 'true'); //XXX
|
$reply->set('album.parent.'.$count, $item->parent()->id == $root->id ? '0' : $item->parent()->name);
|
||||||
$reply->set('album.perms.del_item.'.$count, 'true'); //XXX
|
$reply->set('album.resize_size.'.$count, $resize_size);
|
||||||
$reply->set('album.perms.del_alb.'.$count, 'true'); //XXX
|
$reply->set('album.max_size.'.$count, '0');
|
||||||
$reply->set('album.perms.create_sub.'.$count, 'true'); //XXX
|
$reply->set('album.thumb_size.'.$count, $thumb_size);
|
||||||
$reply->set('album.info.extrafields.'.$count, '');
|
if($use_permissions) {
|
||||||
}
|
$reply->set('album.perms.add.'.$count, access::can('add', $item) ? 'true':'false');
|
||||||
$reply->set('album_count', $count);
|
$reply->set('album.perms.write.'.$count, access::can('add', $item) ? 'true':'false');
|
||||||
$reply->set('can_create_root', 'yes'); //XXX
|
$reply->set('album.perms.del_item.'.$count, access::can('edit', $item) ? 'true':'false');
|
||||||
$reply->set('status_text', 'Fetch albums successful.');
|
$reply->set('album.perms.del_alb.'.$count, access::can('edit', $item) ? 'true':'false');
|
||||||
$reply->send();
|
$reply->set('album.perms.create_sub.'.$count, access::can('add', $item) ? 'true':'false');
|
||||||
}
|
}
|
||||||
|
$reply->set('album.info.extrafields.'.$count, '');
|
||||||
private function _new_album(&$input, &$reply) {
|
}
|
||||||
$album = trim($input->post('set_albumName'));
|
}
|
||||||
$name = trim($input->post('newAlbumName'));
|
$reply->set('album_count', $count);
|
||||||
$title = trim($input->post('newAlbumTitle'));
|
if($use_permissions) {
|
||||||
$desc = trim($input->post('newAlbumDesc'));
|
$reply->set('can_create_root', access::can('add', $root) ? 'yes':'no');
|
||||||
|
}
|
||||||
|
$reply->set('status_text', 'Fetch albums successful.');
|
||||||
|
$reply->send();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function _new_album(&$input, &$reply) {
|
||||||
|
$album = trim($input->post('set_albumName'));
|
||||||
|
$name = trim($input->post('newAlbumName'));
|
||||||
|
$title = trim($input->post('newAlbumTitle'));
|
||||||
|
$desc = trim($input->post('newAlbumDesc'));
|
||||||
|
|
||||||
if($album=='0') $parent = item::root();
|
if($album=='0') $parent = item::root();
|
||||||
else $parent = ORM::factory("item")->where("slug", "=", $album)->find();
|
else $parent = ORM::factory("item")->where("slug", "=", $album)->find();
|
||||||
|
|
||||||
if(isset($parent) && $parent->loaded() && $parent->id!='') {
|
if(isset($parent) && $parent->loaded() && $parent->id!='') {
|
||||||
$album = ORM::factory('item');
|
$album = ORM::factory('item');
|
||||||
$album->type = 'album';
|
$album->type = 'album';
|
||||||
$album->parent_id = $parent->id;
|
$album->parent_id = $parent->id;
|
||||||
|
|
||||||
$album->name = $name;
|
$album->name = $name;
|
||||||
$album->slug = $name; // <= verification fails if this property has not been set!!!
|
$album->slug = item::convert_filename_to_slug($name); // <= verification fails if this property has not been set!!!
|
||||||
$album->title = $title;
|
$album->title = $title;
|
||||||
$album->title or $album->title = $album->name;
|
$album->title or $album->title = $album->name;
|
||||||
$album->description = $desc;
|
$album->description = $desc;
|
||||||
//$album->owner_id =
|
$album->view_count = 0;
|
||||||
$album->view_count = 0;
|
$album->sort_column = 'weight';
|
||||||
//$album->created = $fields['clicks_date'];
|
$album->sort_order = 'ASC';
|
||||||
$album->sort_column = 'weight';
|
|
||||||
$album->sort_order = 'ASC';
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$album->validate();
|
$album->validate();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$album->save();
|
$album->save();
|
||||||
|
|
||||||
$reply->set('album_name', $album->name);
|
$reply->set('album_name', $album->name);
|
||||||
$reply->set('status_text', 'New album created successfuly.');
|
$reply->set('status_text', 'New album created successfuly.');
|
||||||
$reply->send();
|
$reply->send();
|
||||||
|
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
$reply->set('status_text', t('Failed to save album with name %name.', array('name' => $name)));
|
$reply->set('status_text', t('Failed to save album with name %name.', array('name' => $name)));
|
||||||
$reply->send(gallery_remote::CREATE_ALBUM_FAILED);
|
$reply->send(gallery_remote::CREATE_ALBUM_FAILED);
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (ORM_Validation_Exception $e) {
|
} catch (ORM_Validation_Exception $e) {
|
||||||
$reply->set('status_text', t('Failed to validate album with name %name.', array('name' => $name)));
|
$reply->set('status_text', t('Failed to validate album with name %name.', array('name' => $name)));
|
||||||
$reply->send(gallery_remote::CREATE_ALBUM_FAILED);
|
$reply->send(gallery_remote::CREATE_ALBUM_FAILED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reply->set('status_text', t('Failed to load album with name %name.', array('name' => $album)));
|
$reply->set('status_text', t('Failed to load album with name %name.', array('name' => $album)));
|
||||||
$reply->send(gallery_remote::CREATE_ALBUM_FAILED);
|
$reply->send(gallery_remote::CREATE_ALBUM_FAILED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function _album_properties(&$input, &$reply) {
|
private function _album_properties(&$input, &$reply) {
|
||||||
$album = trim($input->post('set_albumName'));
|
$album = trim($input->post('set_albumName'));
|
||||||
$resize_size = module::get_var('gallery', 'resize_size');
|
$resize_size = module::get_var('gallery', 'resize_size');
|
||||||
|
|
||||||
if($album=='0') $parent = item::root();
|
if($album=='0') $parent = item::root();
|
||||||
else $parent = ORM::factory("item")->where("slug", "=", $album)->find();
|
else $parent = ORM::factory("item")->where("slug", "=", $album)->find();
|
||||||
|
|
||||||
if(isset($parent) && $parent->loaded() && $parent->id!='') {
|
if(isset($parent) && $parent->loaded() && $parent->id!='') {
|
||||||
$reply->set('auto_resize', $resize_size); //XXX
|
$reply->set('auto_resize', $resize_size); //resize size is the same for all g3 albums
|
||||||
$reply->set('max_size', '0'); //XXX
|
$reply->set('max_size', '0'); //not supported by g3
|
||||||
$reply->set('add_to_beginning', 'no'); //XXX
|
$reply->set('add_to_beginning', 'no'); //g3 will add images to the end
|
||||||
$reply->set('extrafields', '');
|
$reply->set('extrafields', '');
|
||||||
$reply->set('title', $parent->title);
|
$reply->set('title', $parent->title);
|
||||||
$reply->set('status_text', 'Album properties queried successfuly.');
|
$reply->set('status_text', 'Album properties queried successfuly.');
|
||||||
$reply->send();
|
$reply->send();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reply->set('status_text', t('Failed to load album with name %name.', array('name' => $album)));
|
$reply->set('status_text', t('Failed to load album with name %name.', array('name' => $album)));
|
||||||
$reply->send(gallery_remote::NO_VIEW_PERMISSION);
|
$reply->send(gallery_remote::NO_VIEW_PERMISSION);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function _add_item(&$input, &$reply) {
|
private function _add_item(&$input, &$reply) {
|
||||||
$album = trim($input->post('set_albumName'));
|
$album = trim($input->post('set_albumName'));
|
||||||
$userfilename = trim($input->post('userfile_name'));
|
$userfilename = trim($input->post('userfile_name'));
|
||||||
$title = trim($input->post('caption'));
|
$title = trim($input->post('caption'));
|
||||||
$forcefilename = trim($input->post('force_filename'));
|
$forcefilename = trim($input->post('force_filename'));
|
||||||
$autorotate = trim($input->post('auto_rotate'));
|
$autorotate = trim($input->post('auto_rotate'));
|
||||||
//print_r($_FILES['userfile']); exit;
|
|
||||||
|
|
||||||
if($album=='0') $parent = item::root();
|
if($album=='0') $parent = item::root();
|
||||||
else $parent = ORM::factory("item")->where("slug", "=", $album)->find();
|
else $parent = ORM::factory("item")->where("slug", "=", $album)->find();
|
||||||
|
|
||||||
if(isset($parent) && $parent->loaded() && $parent->id!='') {
|
if(isset($parent) && $parent->loaded() && $parent->id!='') {
|
||||||
|
|
||||||
//*
|
|
||||||
if(function_exists('mime_content_type'))
|
if(function_exists('mime_content_type'))
|
||||||
$type = mime_content_type($_FILES['userfile']['tmp_name']);
|
$type = mime_content_type($_FILES['userfile']['tmp_name']);
|
||||||
else
|
else
|
||||||
$type = self::get_mime_type($_FILES['userfile']['name']);
|
$type = self::get_mime_type($_FILES['userfile']['name']);
|
||||||
|
|
||||||
if ($type!='' && !in_array($type, array('image/jpeg', 'image/gif', 'image/png'))) {
|
if ($type!='' && !in_array($type, array('image/jpeg', 'image/gif', 'image/png'))) {
|
||||||
$reply->set('status_text', t("'%path' is an unsupported image type '%type'", array('path' => $_FILES['userfile']['tmp_name'], 'type' => $type)));
|
$reply->set('status_text', t("'%path' is an unsupported image type '%type'", array('path' => $_FILES['userfile']['tmp_name'], 'type' => $type)));
|
||||||
$reply->send(gallery_remote::UPLOAD_PHOTO_FAIL);
|
$reply->send(gallery_remote::UPLOAD_PHOTO_FAIL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($forcefilename!='') $filename = $forcefilename;
|
if($forcefilename!='') $filename = $forcefilename;
|
||||||
else if($userfilename!='') $filename = $userfilename;
|
else if($userfilename!='') $filename = $userfilename;
|
||||||
else $filename = $_FILES['userfile']['name'];
|
else $filename = $_FILES['userfile']['name'];
|
||||||
|
|
||||||
$slug = $filename;
|
$slug = $filename;
|
||||||
$pos = strpos($slug, '.');
|
$pos = strpos($slug, '.');
|
||||||
if($pos!==false)
|
if($pos!==false)
|
||||||
$slug = substr($slug, 0, $pos);
|
$slug = substr($slug, 0, $pos);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$item = ORM::factory('item');
|
$item = ORM::factory('item');
|
||||||
|
|
@ -284,134 +285,134 @@ class Gallery_Remote_Controller extends Controller {
|
||||||
$item->parent_id = $parent->id;
|
$item->parent_id = $parent->id;
|
||||||
$item->set_data_file($_FILES['userfile']['tmp_name']);
|
$item->set_data_file($_FILES['userfile']['tmp_name']);
|
||||||
$item->name = $filename;
|
$item->name = $filename;
|
||||||
$item->slug = $slug;
|
$item->slug = item::convert_filename_to_slug($slug);
|
||||||
$item->mime_type = $type;
|
$item->mime_type = $type;
|
||||||
$item->title = $title;
|
$item->title = $title;
|
||||||
$item->title or $item->title = ' '; //don't use $item->name as this clutters up the UI
|
$item->title or $item->title = ' '; //don't use $item->name as this clutters up the UI
|
||||||
//$item->description =
|
//$item->description =
|
||||||
//$item->owner_id =
|
|
||||||
$item->view_count = 0;
|
$item->view_count = 0;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$item->validate();
|
$item->validate();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$item->save();
|
$item->save();
|
||||||
|
|
||||||
$reply->set('item_name', $item->name);
|
$reply->set('item_name', $item->name);
|
||||||
$reply->set('status_text', 'New item created successfuly.');
|
$reply->set('status_text', 'New item created successfuly.');
|
||||||
$reply->send();
|
$reply->send();
|
||||||
|
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
$reply->set('status_text', t('Failed to add item %item.', array('item' => $filename)));
|
$reply->set('status_text', t('Failed to add item %item.', array('item' => $filename)));
|
||||||
$reply->send(gallery_remote::UPLOAD_PHOTO_FAIL); //XXX gallery remote doesn't accept this :(
|
$reply->send(gallery_remote::UPLOAD_PHOTO_FAIL); //FIXME gallery remote ignores this return value and continues to wait
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (ORM_Validation_Exception $e) {
|
} catch (ORM_Validation_Exception $e) {
|
||||||
$validation = $e->validation;
|
$validation = $e->validation;
|
||||||
//print_r($validation->errors()); exit;
|
//print_r($validation->errors()); exit;
|
||||||
$reply->set('status_text', t('Failed to validate item %item: %errors', array('item' => $filename, 'errors' => print_r($validation->errors(),true)) ));
|
$reply->set('status_text', t('Failed to validate item %item: %errors', array('item' => $filename, 'errors' => print_r($validation->errors(),true)) ));
|
||||||
$reply->send(gallery_remote::UPLOAD_PHOTO_FAIL); //XXX gallery remote doesn't accept this :(
|
$reply->send(gallery_remote::UPLOAD_PHOTO_FAIL); //FIXME gallery remote ignores this return value and continues to wait
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
$reply->set('status_text', t("Corrupt image '%path'", array('path' => $_FILES['userfile']['tmp_name'])));
|
$reply->set('status_text', t("Corrupt image '%path'", array('path' => $_FILES['userfile']['tmp_name'])));
|
||||||
$reply->send(gallery_remote::UPLOAD_PHOTO_FAIL); //XXX gallery remote doesn't accept this :(
|
$reply->send(gallery_remote::UPLOAD_PHOTO_FAIL); //FIXME gallery remote ignores this return value and continues to wait
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reply->set('status_text', t('Failed to load album with name %name.', array('name' => $album)));
|
$reply->set('status_text', t('Failed to load album with name %name.', array('name' => $album)));
|
||||||
$reply->send(gallery_remote::UPLOAD_PHOTO_FAIL); //XXX gallery remote doesn't accept this :(
|
$reply->send(gallery_remote::UPLOAD_PHOTO_FAIL); //FIXME gallery remote ignores this return value and continues to wait
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function _move_album(&$input, &$reply) {
|
private function _move_album(&$input, &$reply) {
|
||||||
$name = trim($input->post('set_albumName'));
|
$name = trim($input->post('set_albumName'));
|
||||||
$destination = trim($input->post('set_destalbumName'));
|
$destination = trim($input->post('set_destalbumName'));
|
||||||
|
|
||||||
$album = ORM::factory("item")->where("slug", "=", $name)->find();
|
$album = ORM::factory("item")->where("slug", "=", $name)->find();
|
||||||
|
|
||||||
if($destination=='0') $parent = item::root();
|
if($destination=='0') $parent = item::root();
|
||||||
else $parent = ORM::factory("item")->where("slug", "=", $destination)->find();
|
else $parent = ORM::factory("item")->where("slug", "=", $destination)->find();
|
||||||
|
|
||||||
if(isset($parent) && $parent->loaded() && $parent->id!='' && isset($album) && $album->loaded() && $album->id!='') {
|
if(isset($parent) && $parent->loaded() && $parent->id!='' && isset($album) && $album->loaded() && $album->id!='') {
|
||||||
|
|
||||||
$album->parent_id = $parent->id;
|
$album->parent_id = $parent->id;
|
||||||
try {
|
try {
|
||||||
$album->validate();
|
$album->validate();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$album->save();
|
$album->save();
|
||||||
|
|
||||||
$reply->set('status_text', 'Album moved successfuly.');
|
$reply->set('status_text', 'Album moved successfuly.');
|
||||||
$reply->send();
|
$reply->send();
|
||||||
|
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
$reply->set('status_text', t('Failed to save album with name %name.', array('name' => $name)));
|
$reply->set('status_text', t('Failed to save album with name %name.', array('name' => $name)));
|
||||||
$reply->send(gallery_remote::MOVE_ALBUM_FAILED);
|
$reply->send(gallery_remote::MOVE_ALBUM_FAILED);
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (ORM_Validation_Exception $e) {
|
} catch (ORM_Validation_Exception $e) {
|
||||||
$reply->set('status_text', t('Failed to validate album with name %name.', array('name' => $name)));
|
$reply->set('status_text', t('Failed to validate album with name %name.', array('name' => $name)));
|
||||||
$reply->send(gallery_remote::MOVE_ALBUM_FAILED);
|
$reply->send(gallery_remote::MOVE_ALBUM_FAILED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reply->set('status_text', t('Failed to load album with name %album or destination with name %dest.', array('name' => $name, 'dest' => $destination)));
|
$reply->set('status_text', t('Failed to load album with name %album or destination with name %dest.', array('name' => $name, 'dest' => $destination)));
|
||||||
$reply->send(gallery_remote::MOVE_ALBUM_FAILED);
|
$reply->send(gallery_remote::MOVE_ALBUM_FAILED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function _increment_view_count(&$input, &$reply) {
|
private function _increment_view_count(&$input, &$reply) {
|
||||||
$name = trim($input->post('itemId'));
|
$name = trim($input->post('itemId'));
|
||||||
|
|
||||||
if($name=='0') $item = item::root();
|
if($name=='0') $item = item::root();
|
||||||
else $item = ORM::factory("item")->where("slug", "=", $name)->find();
|
else $item = ORM::factory("item")->where("slug", "=", $name)->find();
|
||||||
|
|
||||||
if(isset($item) && $item->loaded() && $item->id!='') {
|
if(isset($item) && $item->loaded() && $item->id!='') {
|
||||||
|
|
||||||
$item->view_count = $item->view_count + 1;
|
$item->view_count = $item->view_count + 1;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$item->validate();
|
$item->validate();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$item->save();
|
$item->save();
|
||||||
|
|
||||||
$reply->set('item_name', $item->name);
|
$reply->set('item_name', $item->name);
|
||||||
$reply->set('status_text', 'Item view count incremented successfuly.');
|
$reply->set('status_text', 'Item view count incremented successfuly.');
|
||||||
$reply->send();
|
$reply->send();
|
||||||
|
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
$reply->set('status_text', t('Failed to save item %item.', array('item' => $name)));
|
$reply->set('status_text', t('Failed to save item %item.', array('item' => $name)));
|
||||||
$reply->send(gallery_remote::NO_WRITE_PERMISSION);
|
$reply->send(gallery_remote::NO_WRITE_PERMISSION);
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (ORM_Validation_Exception $e) {
|
} catch (ORM_Validation_Exception $e) {
|
||||||
$validation = $e->validation;
|
$validation = $e->validation;
|
||||||
//print_r($validation->errors()); exit;
|
//print_r($validation->errors()); exit;
|
||||||
$reply->set('status_text', t('Failed to validate item %item.', array('item' => $name)).print_r($validation->errors(),true));
|
$reply->set('status_text', t('Failed to validate item %item.', array('item' => $name)).print_r($validation->errors(),true));
|
||||||
$reply->send(gallery_remote::NO_WRITE_PERMISSION);
|
$reply->send(gallery_remote::NO_WRITE_PERMISSION);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reply->set('status_text', t('Failed to load album with name %name.', array('name' => $name)));
|
$reply->set('status_text', t('Failed to load album with name %name.', array('name' => $name)));
|
||||||
$reply->send(gallery_remote::NO_WRITE_PERMISSION);
|
$reply->send(gallery_remote::NO_WRITE_PERMISSION);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function _image_properties(&$input, &$reply) {
|
private function _image_properties(&$input, &$reply) {
|
||||||
$name = trim($input->post('itemId'));
|
$name = trim($input->post('itemId'));
|
||||||
|
|
||||||
if($name=='0') $item = item::root();
|
if($name=='0') $item = item::root();
|
||||||
else $item = ORM::factory("item")->where("slug", "=", $name)->find();
|
else $item = ORM::factory("item")->where("slug", "=", $name)->find();
|
||||||
|
|
||||||
if(isset($item) && $item->loaded() && $item->id!='') {
|
if(isset($item) && $item->loaded() && $item->id!='') {
|
||||||
$reply->set('status_text', 'Item properties queried successfuly.');
|
$info = pathinfo($item->file_path());
|
||||||
|
|
||||||
$reply->set('image.name', $item->slug);
|
$reply->set('status_text', 'Item properties queried successfuly.');
|
||||||
|
$reply->set('image.name', $item->slug);
|
||||||
$reply->set('image.raw_width', $item->width);
|
$reply->set('image.raw_width', $item->width);
|
||||||
$reply->set('image.raw_height', $item->height);
|
$reply->set('image.raw_height', $item->height);
|
||||||
$reply->set('image.raw_filesize', filesize($item->file_path()));
|
$reply->set('image.raw_filesize', filesize($item->file_path()));
|
||||||
|
|
@ -421,104 +422,108 @@ class Gallery_Remote_Controller extends Controller {
|
||||||
$reply->set('image.thumbName', $item->name); //g3 stores resizes and thumbs different than g1
|
$reply->set('image.thumbName', $item->name); //g3 stores resizes and thumbs different than g1
|
||||||
$reply->set('image.thumb_width', $item->thumb_width);
|
$reply->set('image.thumb_width', $item->thumb_width);
|
||||||
$reply->set('image.thumb_height', $item->thumb_height);
|
$reply->set('image.thumb_height', $item->thumb_height);
|
||||||
$reply->set('image.caption', $item->title);
|
$reply->set('image.caption', $item->title);
|
||||||
$reply->set('image.title', $item->title);
|
$reply->set('image.title', $item->title);
|
||||||
//XXX $reply->set('image.forceExtension', '');
|
$reply->set('image.forceExtension', $info['extension']);
|
||||||
$reply->set('image.hidden', 'no'); //XXX
|
$reply->set('image.hidden', access::user_can(identity::guest(), 'view', $item) ? 'no' : 'yes');
|
||||||
$reply->send();
|
$reply->send();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reply->set('status_text', t('Failed to load album with name %name.', array('name' => $name)));
|
$reply->set('status_text', t('Failed to load album with name %name.', array('name' => $name)));
|
||||||
$reply->send(gallery_remote::NO_VIEW_PERMISSION);
|
$reply->send(gallery_remote::NO_VIEW_PERMISSION);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function _fetch_album_images(&$input, &$reply) {
|
private function _fetch_album_images(&$input, &$reply) {
|
||||||
$name = trim($input->post('set_albumName'));
|
$name = trim($input->post('set_albumName'));
|
||||||
$albums = trim($input->post('albums_too')); //yes/no [optional, since 2.13]
|
$albums = trim($input->post('albums_too')); //yes/no [optional, since 2.13]
|
||||||
$random = trim($input->post('random')); //yes/no [optional, G2 since ***]
|
$random = trim($input->post('random')); //yes/no [optional, G2 since ***]
|
||||||
$limit = trim($input->post('limit')); //number-of-images [optional, G2 since ***]
|
$limit = trim($input->post('limit')); //number-of-images [optional, G2 since ***]
|
||||||
$fields = trim($input->post('extrafields')); //yes/no [optional, G2 since 2.12]
|
$fields = trim($input->post('extrafields')); //yes/no [optional, G2 since 2.12]
|
||||||
$sizes = trim($input->post('all_sizes')); //yes/no [optional, G2 since 2.14]
|
$sizes = trim($input->post('all_sizes')); //yes/no [optional, G2 since 2.14]
|
||||||
|
|
||||||
if($name=='0') $album = item::root();
|
if($name=='0') $album = item::root();
|
||||||
$album = ORM::factory("item")->where("slug", "=", $name)->find();
|
$album = ORM::factory("item")->where("slug", "=", $name)->find();
|
||||||
|
|
||||||
if(isset($album) && $album->loaded() && $album->id!='') {
|
if(isset($album) && $album->loaded() && $album->id!='' && access::can('view', $album)) {
|
||||||
|
|
||||||
if($albums!='no') $iterator = ORM::factory("item")->where("parent_id", "=", $album->id)->find_all();
|
if($albums!='no') $iterator = ORM::factory("item")->where("parent_id", "=", $album->id)->find_all();
|
||||||
else $iterator = ORM::factory("item")->where("parent_id", "=", $album->id)->where("type", "<>", "album")->find_all();
|
else $iterator = ORM::factory("item")->where("parent_id", "=", $album->id)->where("type", "<>", "album")->find_all();
|
||||||
|
|
||||||
$reply->set('status_text', 'Album images query successful.');
|
$reply->set('status_text', 'Album images query successful.');
|
||||||
$reply->set('album.caption', $album->title);
|
$reply->set('album.caption', $album->title);
|
||||||
$reply->set('album.extrafields', '');
|
$reply->set('album.extrafields', '');
|
||||||
|
|
||||||
/*
|
/*
|
||||||
$reply->set('image_count', '0');
|
$reply->set('image_count', '0');
|
||||||
$reply->send();
|
$reply->send();
|
||||||
return;
|
return;
|
||||||
//*/
|
//*/
|
||||||
|
|
||||||
$count = 0;
|
$count = 0;
|
||||||
foreach($iterator as $item) {
|
foreach($iterator as $item) {
|
||||||
|
|
||||||
$count++;
|
if(access::can('view', $item)) {
|
||||||
if($item->type != "album") {
|
|
||||||
$reply->set('image.name.'.$count, $item->name);
|
$count++;
|
||||||
//$reply->set('image', print_r($item, true));
|
if($item->type != "album") {
|
||||||
$reply->set('image.raw_width.'.$count, $item->width);
|
$info = pathinfo($item->file_path());
|
||||||
$reply->set('image.raw_height.'.$count, $item->height);
|
|
||||||
$reply->set('image.raw_filesize.'.$count, filesize($item->file_path()));
|
$reply->set('image.name.'.$count, $item->name);
|
||||||
$reply->set('image.resizedName.'.$count, $item->name); //g3 stores resizes and thumbs different than g1
|
$reply->set('image.raw_width.'.$count, $item->width);
|
||||||
$reply->set('image.resized_width.'.$count, $item->resize_width);
|
$reply->set('image.raw_height.'.$count, $item->height);
|
||||||
$reply->set('image.resized_height.'.$count, $item->resize_height);
|
$reply->set('image.raw_filesize.'.$count, filesize($item->file_path()));
|
||||||
//$reply->set('image.resizedNum.'.$count, 'the number of resized versions for this image [since 2.14]');
|
$reply->set('image.resizedName.'.$count, $item->name); //g3 stores resizes and thumbs different than g1
|
||||||
//$reply->set('image.resized.resized-num.name.'.$count, 'filename of the resized-numth resize [G2 since 2.14]');
|
$reply->set('image.resized_width.'.$count, $item->resize_width);
|
||||||
//$reply->set('image.resized.resized-num.width.'.$count, 'the width of the resized-numth resize [G2 since 2.14]');
|
$reply->set('image.resized_height.'.$count, $item->resize_height);
|
||||||
//$reply->set('image.resized.resized-num.height.'.$count, 'the height of the resized-numth resize [G2 since 2.14]');
|
/*
|
||||||
$reply->set('image.thumbName.'.$count, $item->name); //g3 stores resizes and thumbs different than g1
|
$reply->set('image.resizedNum.'.$count, 'the number of resized versions for this image [since 2.14]');
|
||||||
$reply->set('image.thumb_width.'.$count, $item->thumb_width);
|
$reply->set('image.resized.resized-num.name.'.$count, 'filename of the resized-numth resize [G2 since 2.14]');
|
||||||
$reply->set('image.thumb_height.'.$count, $item->thumb_height);
|
$reply->set('image.resized.resized-num.width.'.$count, 'the width of the resized-numth resize [G2 since 2.14]');
|
||||||
|
$reply->set('image.resized.resized-num.height.'.$count, 'the height of the resized-numth resize [G2 since 2.14]');
|
||||||
$reply->set('image.caption.'.$count, $item->title);
|
//*/
|
||||||
$reply->set('image.title.'.$count, $item->title);
|
$reply->set('image.thumbName.'.$count, $item->name); //g3 stores resizes and thumbs different than g1
|
||||||
//$reply->set('image.extrafield.fieldname.'.$count, 'value of the extra field of key fieldname');
|
$reply->set('image.thumb_width.'.$count, $item->thumb_width);
|
||||||
$reply->set('image.clicks.'.$count, $item->view_count);
|
$reply->set('image.thumb_height.'.$count, $item->thumb_height);
|
||||||
//*
|
$reply->set('image.caption.'.$count, $item->title);
|
||||||
$reply->set('image.capturedate.year.'.$count, date("Y", $item->captured));
|
$reply->set('image.title.'.$count, $item->name);
|
||||||
$reply->set('image.capturedate.mon.'.$count, date("m", $item->captured));
|
//$reply->set('image.extrafield.fieldname.'.$count, 'value of the extra field of key fieldname');
|
||||||
$reply->set('image.capturedate.mday.'.$count, date("d", $item->captured));
|
$reply->set('image.clicks.'.$count, $item->view_count);
|
||||||
$reply->set('image.capturedate.hours.'.$count, date("H", $item->captured));
|
$reply->set('image.capturedate.year.'.$count, date("Y", $item->captured));
|
||||||
$reply->set('image.capturedate.minutes.'.$count, date("i", $item->captured));
|
$reply->set('image.capturedate.mon.'.$count, date("m", $item->captured));
|
||||||
$reply->set('image.capturedate.seconds.'.$count, date("s", $item->captured));
|
$reply->set('image.capturedate.mday.'.$count, date("d", $item->captured));
|
||||||
//*/
|
$reply->set('image.capturedate.hours.'.$count, date("H", $item->captured));
|
||||||
//XXX $reply->set('image.forceExtension.'.$count, '');
|
$reply->set('image.capturedate.minutes.'.$count, date("i", $item->captured));
|
||||||
$reply->set('image.hidden.'.$count, 'no'); //XXX
|
$reply->set('image.capturedate.seconds.'.$count, date("s", $item->captured));
|
||||||
}
|
$reply->set('image.forceExtension.'.$count, $info['extension']);
|
||||||
else {
|
$reply->set('image.hidden.'.$count, access::user_can(identity::guest(), 'view', $item) ? 'no' : 'yes');
|
||||||
$reply->set('album.name.'.$count, $item->name);
|
}
|
||||||
|
else {
|
||||||
|
$reply->set('album.name.'.$count, $item->name);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$reply->set('image_count', $count);
|
$reply->set('image_count', $count);
|
||||||
//* The baseurl contains a fully-qualified URL. A URL to each image
|
//* The baseurl contains a fully-qualified URL. A URL to each image
|
||||||
// can be obtained by appending the filename of the image to this.
|
// can be obtained by appending the filename of the image to this.
|
||||||
if(isset($item) && $item->loaded()) {
|
if(isset($item) && $item->loaded()) {
|
||||||
$url = $item->file_url(true);
|
$url = $item->file_url(true);
|
||||||
$pos = strrpos($url, '/');
|
$pos = strrpos($url, '/');
|
||||||
$reply->set('baseurl', ($pos!==false ? substr($url, 0, $pos+1) : $url) );
|
$reply->set('baseurl', ($pos!==false ? substr($url, 0, $pos+1) : $url) );
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reply->set('baseurl', $album->abs_url());
|
$reply->set('baseurl', $album->abs_url());
|
||||||
}
|
}
|
||||||
//*/
|
//*/
|
||||||
$reply->send();
|
$reply->send();
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$reply->set('status_text', t('Failed to load album with name %name.', array('name' => $name)));
|
$reply->set('status_text', t('Failed to load album with name %name.', array('name' => $name)));
|
||||||
$reply->send(gallery_remote::NO_VIEW_PERMISSION);
|
$reply->send(gallery_remote::NO_VIEW_PERMISSION);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Reference in New Issue
Block a user