From e31ca19a062a114ce251a9eadd183c5df8f5d024 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 26 Dec 2008 04:52:18 +0000
Subject: Added graphics::mark_all_dirty().  The watermark code now marks
 images as dirty if the admin changes the watermark at all.

---
 modules/watermark/controllers/admin_watermarks.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'modules/watermark/controllers')

diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php
index 3fc06c06..733e0589 100644
--- a/modules/watermark/controllers/admin_watermarks.php
+++ b/modules/watermark/controllers/admin_watermarks.php
@@ -38,10 +38,13 @@ class Admin_Watermarks_Controller extends Admin_Controller {
   }
 
   public function edit() {
-    rest::http_content_type(rest::JSON);
     $form = watermark::get_edit_form();
     if ($form->validate()) {
       module::set_var("watermark", "position", $form->edit_watermark->position->value);
+      graphics::mark_all_dirty();
+
+      log::success("watermark", _("Watermark changed"));
+      message::success(_("Watermark changed"));
       print json_encode(
         array("result" => "success",
               "location" => url::site("admin/watermarks")));
@@ -57,7 +60,6 @@ class Admin_Watermarks_Controller extends Admin_Controller {
   }
 
   public function delete() {
-    rest::http_content_type(rest::JSON);
     $form = watermark::get_delete_form();
     if ($form->validate()) {
       if ($name = module::get_var("watermark", "name")) {
@@ -68,6 +70,7 @@ class Admin_Watermarks_Controller extends Admin_Controller {
         module::clear_var("watermark", "height");
         module::clear_var("watermark", "mime_type");
         module::clear_var("watermark", "position");
+        graphics::mark_all_dirty();
 
         log::success("watermark", _("Watermark deleted"));
         message::success(_("Watermark deleted"));
@@ -87,7 +90,6 @@ class Admin_Watermarks_Controller extends Admin_Controller {
   }
 
   public function add() {
-    rest::http_content_type(rest::JSON);
     $form = watermark::get_add_form();
     if ($form->validate()) {
       $file = $_POST["file"];
@@ -108,10 +110,11 @@ class Admin_Watermarks_Controller extends Admin_Controller {
       module::set_var("watermark", "height", $image_info[1]);
       module::set_var("watermark", "mime_type", $image_info["mime"]);
       module::set_var("watermark", "position", $form->add_watermark->position->value);
-      message::success(_("Watermark saved"));
-      log::success("watermark", _("Watermark saved"));
+      graphics::mark_all_dirty();
       @unlink($file);
 
+      message::success(_("Watermark saved"));
+      log::success("watermark", _("Watermark saved"));
       print json_encode(
         array("result" => "success",
               "location" => url::site("admin/watermarks")));
-- 
cgit v1.2.3