Change the watermark module to use forge.

Also the watermark file is now stored in varpath.
and the location is stored in the module vars table

2 files changed, 26 insertions, 2 deletions

diff --git a/modules/watermark/helpers/watermark.php b/modules/watermark/helpers/watermark.php
index 94f0f9de..c15e4959 100644
--- a/modules/watermark/helpers/watermark.php
+++ b/modules/watermark/helpers/watermark.php
@@ -19,10 +19,10 @@
  */
 class watermark_Core {
   public static function get_watermark_form() {
-    $form = new Forge("watermark/create", "", "post",
+    $form = new Forge("watermark/load", "", "post",
       array("id" => "gUploadWatermarkForm", "enctype" => "multipart/form-data"));
     $group = $form->group("add_watermark")->label(_("Upload Watermark"));
-    $group->upload("file")->label(true)->rules("allow[jpg,png,gif],size[1M]");
+    $group->upload("file")->label(_("File"))->rules("allow[jpg,png,gif],size[1M]");
     $group->submit(_("Upload"));
     return $form;
   }
diff --git a/modules/watermark/helpers/watermark_block.php b/modules/watermark/helpers/watermark_block.php
new file mode 100644
index 00000000..0751268c
--- /dev/null
+++ b/modules/watermark/helpers/watermark_block.php
@@ -0,0 +1,24 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class watermark_block_Core {
+  public static function head($theme) {
+    return html::script("modules/watermark/js/watermark.js");
+  }
+}