public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

added bugfixes for latest gallery changes

Browse Source
This commit is contained in:
Thomas E. Horner 2012-08-08 00:51:03 +02:00
parent e952c1002e
commit cd089cb36c
1 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
3.0/modules/remote/controllers/gallery_remote.php
View File

@ -116,6 +116,10 @@ class Gallery_Remote_Controller extends Controller {
return (false); // no match at all return (false); // no match at all
} }
private static function decode($input) {
return html_entity_decode(trim($input), ENT_COMPAT, 'UTF-8');
}
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)) {
@ -145,7 +149,7 @@ class Gallery_Remote_Controller extends Controller {
$thumb_size = module::get_var('gallery', 'thumb_size'); $thumb_size = module::get_var('gallery', 'thumb_size');
$resize_size = module::get_var('gallery', 'resize_size'); $resize_size = module::get_var('gallery', 'resize_size');
//* <FIXME duplication> //* <FIXME duplication>
$count = 1; $count = 1;
$item = &$root; $item = &$root;
$reply->set('album.name.'.$count, $item->id); $reply->set('album.name.'.$count, $item->id);
@ -198,9 +202,9 @@ class Gallery_Remote_Controller extends Controller {
private function _new_album(&$input, &$reply) { private function _new_album(&$input, &$reply) {
$album = trim($input->post('set_albumName')); $album = trim($input->post('set_albumName'));
$name = trim($input->post('newAlbumName')); $name = $this->decode($input->post('newAlbumName'));
$title = trim($input->post('newAlbumTitle')); $title = $this->decode($input->post('newAlbumTitle'));
$desc = trim($input->post('newAlbumDesc')); $desc = $this->decode($input->post('newAlbumDesc'));
if($album=='0') $parent = item::root(); if($album=='0') $parent = item::root();
else $parent = ORM::factory("item")->where("id", "=", $album)->find(); else $parent = ORM::factory("item")->where("id", "=", $album)->find();
@ -269,9 +273,9 @@ class Gallery_Remote_Controller extends Controller {
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 = $this->decode($input->post('userfile_name'));
$title = trim($input->post('caption')); $title = $this->decode($input->post('caption'));
$forcefilename = trim($input->post('force_filename')); $forcefilename = $this->decode($input->post('force_filename'));
$autorotate = trim($input->post('auto_rotate')); $autorotate = trim($input->post('auto_rotate'));
if($album=='0') $parent = item::root(); if($album=='0') $parent = item::root();
@ -288,13 +292,13 @@ class Gallery_Remote_Controller extends Controller {
/* <any ugly idea is welcome here> */ /* <any ugly idea is welcome here> */
if($type=='') if($type=='')
{ {
if(function_exists('getimagesize')) { if(function_exists('getimagesize')) {
$size = getimagesize($_FILES['userfile']['tmp_name']); $size = getimagesize($_FILES['userfile']['tmp_name']);
$type = $size['mime']; $type = $size['mime'];
} }
else if(function_exists('exif_imagetype') && function_exists('image_type_to_mime_type')) { else if(function_exists('exif_imagetype') && function_exists('image_type_to_mime_type')) {
$type = image_type_to_mime_type(exif_imagetype($_FILES['userfile']['tmp_name'])); $type = image_type_to_mime_type(exif_imagetype($_FILES['userfile']['tmp_name']));
} }
} }
/* </any ugly idea is welcome here> */ /* </any ugly idea is welcome here> */
@ -314,6 +318,18 @@ class Gallery_Remote_Controller extends Controller {
if($pos!==false) if($pos!==false)
$slug = substr($slug, 0, $pos); $slug = substr($slug, 0, $pos);
//*/ fix for a gallery remote bug...
$filename = str_replace('.JPG.jpeg', '.jpeg', $filename);
//*/
//*/ suddenly gallery fails because the uploaded(!) file (of cause!) doesn't contain a file extension
if(strpos($_FILES['userfile']['tmp_name'], '.')===false) {
$moveto = $_FILES['userfile']['tmp_name'].'.'.substr($type, strpos($type, '/')+1);
rename($_FILES['userfile']['tmp_name'], $moveto);
$_FILES['userfile']['tmp_name'] = $moveto;
}
//*/
try { try {
$item = ORM::factory('item'); $item = ORM::factory('item');
$item->type = 'photo'; $item->type = 'photo';
@ -337,7 +353,14 @@ class Gallery_Remote_Controller extends Controller {
$reply->set('status_text', 'New item created successfuly.'); $reply->set('status_text', 'New item created successfuly.');
$reply->send(); $reply->send();
} catch (Exception $e) { }
catch (ORM_Validation_Exception $e) {
$validation = $e->validation;
//print_r($validation->errors()); exit;
$reply->set('status_text', t('Failed to validate item %item: %errors', array('item' => $filename, 'errors' => str_replace("\n", ' ', print_r($validation->errors(),true))) ));
$reply->send(gallery_remote::UPLOAD_PHOTO_FAIL); //FIXME gallery remote ignores this return value and continues to wait
}
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); //FIXME gallery remote ignores this return value and continues to wait $reply->send(gallery_remote::UPLOAD_PHOTO_FAIL); //FIXME gallery remote ignores this return value and continues to wait
} }