From b73666e77df4b6ad62044bd8e38054700bb8da60 Mon Sep 17 00:00:00 2001 From: rWatcher Date: Mon, 3 Aug 2009 13:58:03 +0800 Subject: [PATCH 1/2] Better error handling and support for moving items to different parent albums. Signed-off-by: Bharat Mediratta --- .../keeporiginal/controllers/keeporiginal.php | 54 +++++++++++-------- .../helpers/keeporiginal_event.php | 35 +++++++++--- 2 files changed, 59 insertions(+), 30 deletions(-) diff --git a/modules/keeporiginal/controllers/keeporiginal.php b/modules/keeporiginal/controllers/keeporiginal.php index b364db75..a365a969 100644 --- a/modules/keeporiginal/controllers/keeporiginal.php +++ b/modules/keeporiginal/controllers/keeporiginal.php @@ -32,31 +32,41 @@ class keeporiginal_Controller extends Controller { // Make sure the current item is a photo and that an original exists. if ($item->is_photo() && file_exists($original_image)) { + // Delete the modified version of the photo. + @unlink($item->file_path()); - // Delete the modified version and move the original over in place of it. - unlink($item->file_path()); - rename($original_image, $item->file_path()); + // Copy the original image back over, display an error message if the copy fails. + if (@rename($original_image, $item->file_path())) { + // Re-generate the items resize and thumbnail. + $item_data = model_cache::get("item", $id); + $item_data->resize_dirty= 1; + $item_data->thumb_dirty= 1; + $item_data->save(); + graphics::generate($item_data); - // Re-generate the items resize and thumbnail. - $item_data = model_cache::get("item", $id); - $item_data->resize_dirty= 1; - $item_data->thumb_dirty= 1; - $item_data->save(); - graphics::generate($item_data); - - // If the item is the thumbnail for the parent album, - // fix the parent's thumbnail as well. - $parent = $item_data->parent(); - if ($parent->album_cover_item_id == $item_data->id) { - copy($item_data->thumb_path(), $parent->thumb_path()); - $parent->thumb_width = $item_data->thumb_width; - $parent->thumb_height = $item_data->thumb_height; - $parent->save(); + // If the item is the thumbnail for the parent album, + // fix the parent's thumbnail as well. + $parent = $item_data->parent(); + if ($parent->album_cover_item_id == $item_data->id) { + copy($item_data->thumb_path(), $parent->thumb_path()); + $parent->thumb_width = $item_data->thumb_width; + $parent->thumb_height = $item_data->thumb_height; + $parent->save(); + } + + // Display a success message and redirect to the items page. + message::success(t("Your original image has been restored.")); + url::redirect($item->url()); + + } else { + // Display an error message if the copy failed. + message::error(t("Image restore failed!")); + url::redirect($item->url()); } - - // Display a success message and redirect to the items page. - message::success(t("Your Original Image Has Been Restored.")); - url::redirect($item->url()); + } else { + // Display an error message if there is not an original photo. + message::error(t("Image restore failed!")); + url::redirect($item->url()); } } } diff --git a/modules/keeporiginal/helpers/keeporiginal_event.php b/modules/keeporiginal/helpers/keeporiginal_event.php index 1d9647da..e0fec0b6 100644 --- a/modules/keeporiginal/helpers/keeporiginal_event.php +++ b/modules/keeporiginal/helpers/keeporiginal_event.php @@ -26,19 +26,22 @@ class keeporiginal_event_Core { // Figure out where the original copy should be stashed at. $temp_path = str_replace(VARPATH . "albums/", "", $input_file); $original_image = VARPATH . "original/" . $temp_path; - $individual_dirs = split("[/\]", $temp_path); + $individual_dirs = split("[/\]", "original/" . $temp_path); // If any original file does not already exist, then create a folder structure // similar to that found in VARPATH/albums/ and copy the photo over before // rotating it. if (!file_exists($original_image)) { - $new_img_path = VARPATH . "original/"; + $new_img_path = VARPATH; for($i = 0; $i < count($individual_dirs)-1; $i++) { $new_img_path = $new_img_path . "/" . $individual_dirs[$i]; if(!file_exists($new_img_path)) { @mkdir($new_img_path); } } - copy($input_file, $original_image); + if (!@copy($input_file, $original_image)) { + // If the copy failed, display an error message. + message::error(t("Your original image was not backed up!")); + } } } } @@ -48,7 +51,7 @@ class keeporiginal_event_Core { if ($item->is_photo()) { $original_file = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $item->file_path()); if (file_exists($original_file)) { - unlink($original_file); + @unlink($original_file); } } @@ -71,24 +74,40 @@ class keeporiginal_event_Core { $old_original = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $old->file_path()); $new_original = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $new->file_path()); if (file_exists($old_original)) { - rename($old_original, $new_original); + @rename($old_original, $new_original); } } } } - static function site_menu($menu, $theme) { + static function item_moved($item, $old_parent) { + // When moving an item, check and see if a corresponding file exists + // in VARPATH/original/. If so, move that item to a similar directory + // in original as well. + if ($item->is_photo() || $item->is_album()) { + $old_item_path = $old_parent->file_path() . "/" . $item->name; + if ($item->file_path() != $old_item_path) { + $old_original = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $old_item_path); + $new_original = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $item->file_path()); + if (file_exists($old_original)) { + @rename($old_original, $new_original); + } + } + } + } + + static function site_menu($menu, $theme) { // Create a menu option to restore the original photo. $item = $theme->item(); if ((access::can("view", $item)) && (access::can("edit", $item))) { $original_image = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $item->file_path()); - if ($item->is_photo() && file_exists($original_image)) { + if ($item->is_photo() && file_exists($original_image)) { $menu->get("options_menu") ->append(Menu::factory("link") ->id("restore") - ->label("Restore Original") + ->label("Restore original") ->css_id("gKeepOriginalLink") ->url(url::site("keeporiginal/restore/" . $item->id))); } From a7fa56d1e5652533ebb87f2e61c2b84405e83ba0 Mon Sep 17 00:00:00 2001 From: rWatcher Date: Tue, 4 Aug 2009 12:54:16 +0800 Subject: [PATCH 2/2] Initial Commit of BatchTag module. Signed-off-by: Bharat Mediratta --- modules/batchtag/controllers/batchtag.php | 54 +++++++++++++++++++ .../batchtag/helpers/batchtag_installer.php | 27 ++++++++++ modules/batchtag/helpers/batchtag_theme.php | 49 +++++++++++++++++ modules/batchtag/module.info | 3 ++ .../batchtag/views/batchtag_block.html.php | 2 + 5 files changed, 135 insertions(+) create mode 100644 modules/batchtag/controllers/batchtag.php create mode 100644 modules/batchtag/helpers/batchtag_installer.php create mode 100644 modules/batchtag/helpers/batchtag_theme.php create mode 100644 modules/batchtag/module.info create mode 100644 modules/batchtag/views/batchtag_block.html.php diff --git a/modules/batchtag/controllers/batchtag.php b/modules/batchtag/controllers/batchtag.php new file mode 100644 index 00000000..fc17f594 --- /dev/null +++ b/modules/batchtag/controllers/batchtag.php @@ -0,0 +1,54 @@ +where("parent_id", $this->input->post("item_id")) + ->where("type !=", "album") + ->find_all(); + + // Loop through each item in the album and make sure the user has + // access to view and edit it. + foreach ($children as $child) { + if (access::can("view", $child) && access::can("edit", $child)) { + + // Assuming the user can view/edit the current item, loop + // through each tag that was submitted and apply it to + // the current item. + foreach (split(",", $this->input->post("name")) as $tag_name) { + $tag_name = trim($tag_name); + if ($tag_name) { + tag::add($child, $tag_name); + } + } + } + } + + // Redirect back to the album. + $item = ORM::factory("item", $this->input->post("item_id")); + url::redirect(url::abs_site("{$item->type}s/{$item->id}")); + } +} diff --git a/modules/batchtag/helpers/batchtag_installer.php b/modules/batchtag/helpers/batchtag_installer.php new file mode 100644 index 00000000..0a24b58c --- /dev/null +++ b/modules/batchtag/helpers/batchtag_installer.php @@ -0,0 +1,27 @@ +item(); + + // Only display the form in albums that the user has edit permission in. + if ($item->is_album() && access::can("edit", $item)) { + + // Make a new sidebar block. + $block = new Block(); + $block->css_id = "gBatchTag"; + $block->title = t("Batch Tag"); + $block->content = new View("batchtag_block.html"); + + // Make a new form to place in the sidebar block. + $form = new Forge("batchtag/tagitems", "", "post", + array("id" => "gBatchTagForm")); + $label = t("Tag everything in this album:"); + $group = $form->group("add_tag")->label("Add Tag"); + $group->input("name")->label($label)->rules("required|length[1,64]"); + $group->hidden("item_id")->value($item->id); + $group->submit("")->value(t("Add Tag")); + $block->content->form = $form; + + // Display the block. + return $block; + } + } +} \ No newline at end of file diff --git a/modules/batchtag/module.info b/modules/batchtag/module.info new file mode 100644 index 00000000..398147ac --- /dev/null +++ b/modules/batchtag/module.info @@ -0,0 +1,3 @@ +name = BatchTag +description = Automatically apply a tag to the entire contents of an album. +version = 1 diff --git a/modules/batchtag/views/batchtag_block.html.php b/modules/batchtag/views/batchtag_block.html.php new file mode 100644 index 00000000..4993189e --- /dev/null +++ b/modules/batchtag/views/batchtag_block.html.php @@ -0,0 +1,2 @@ + + \ No newline at end of file