2 files changed, 17 insertions, 5 deletions
diff --git a/modules/watermark/helpers/watermark.php b/modules/watermark/helpers/watermark.php
index 9fb03ecd..6d8da35a 100644
--- a/modules/watermark/helpers/watermark.php
+++ b/modules/watermark/helpers/watermark.php
@@ -19,14 +19,14 @@
  */
 class watermark_Core {
   public static function get_watermark_form() {
-    $form = new Forge("admin/watermark/load", "", "post",
-      array("id" => "gUploadWatermarkForm", "enctype" => "multipart/form-data"));
+    $form = new Forge("admin/watermarks", "", "post");
     $group = $form->group("add_watermark")->label(_("Upload Watermark"));
-    $group->upload("file")->label(_("Watermark"))->rules("allow[jpg,png,gif],size[1M]");
+    $group->upload("file")->label(_("Watermark"))->rules("allow[jpg,png,gif]|size[1MB]|required");
+    $group->submit(_("Upload"));
     return $form;
   }
 
-  public static function get_watermark_postion_form($position="southeast") {
+  public static function get_watermark_position_form($position="southeast") {
     $form = new Forge("admin/watermark/position", "", "post");
     $group = $form->group("watermark_position")->label(_("Update Position"));
     $group->dropdown("position")->label(_("Watermark Position"))
diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php
index e06e52cf..360ac72a 100644
--- a/modules/watermark/helpers/watermark_installer.php
+++ b/modules/watermark/helpers/watermark_installer.php
@@ -22,13 +22,25 @@ class watermark_installer {
     $db = Database::instance();
     $version = module::get_version("watermark");
     if ($version == 0) {
+      $db->query("CREATE TABLE IF NOT EXISTS `watermarks` (
+          `id` int(9) NOT NULL auto_increment,
+          `name` varchar(32) NOT NULL,
+          `width` int(9) NOT NULL,
+          `height` int(9) NOT NULL,
+          `mime_type` varchar(64) default NULL,
+          PRIMARY KEY (`id`),
+          UNIQUE KEY(`name`))
+        ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+
       module::set_version("watermark", 1);
-      module::set_var("watermark", "watermark_image_path", "");
       module::set_var("watermark", "watermark_position", "southeast");
+      @mkdir(VARPATH . "modules/watermark");
     }
   }
 
   public static function uninstall() {
     module::delete("watermark");
+    Database::instance()->query("DROP TABLE `watermarks`");
+    dir::unlink(VARPATH . "modules/watermark");
   }
 }