1 files changed, 13 insertions, 15 deletions
diff --git a/modules/watermark/controllers/watermark.php b/modules/watermark/controllers/watermark.php
index cd294c6c..4bf90401 100644
--- a/modules/watermark/controllers/watermark.php
+++ b/modules/watermark/controllers/watermark.php
@@ -19,22 +19,20 @@
  */
 class Watermark_Controller extends Controller {
   public function load() {
-    $form = new View("watermark_add_form.html");
-    $form->errors = $form->fields = array("file" => "");
+    $form = watermark::get_watermark_form();
+    if ($form->validate()) {
+        $file = $_POST["file"];
+        
+        // Format of the file is config["upload.directory"]/uploadfile-hash-filename.
+        $index = strrpos($file, "-");
+        $watermark_target = VARPATH . substr($file, strrpos($file, "-") + 1);
+        if (rename($file, $watermark_target)) {
+          module::set_var("watermark", "watermark_image_path", $watermark_target);
 
-    if ($_FILES) {
-      $post = Validation::factory(array_merge($_POST, $_FILES))
-        ->add_rules("file", "upload::valid", "upload::type[gif,jpg,png]", "upload::size[1M]");
-
-      if ($post->validate()) {
-        $file = upload::save("file");
-        Kohana::log("debug", $file);
-        $form->success = _("Watermark saved");
-      } else {
-        $form->fields = arr::overwrite($form->fields, $post->as_array());
-        $form->errors = arr::overwrite($form->errors, $post->errors());
-        Kohana::log("debug", print_r($form->errors,1));
-      }
+          $form->success = _("Watermark saved");
+        } else {
+          // @todo set and error message
+        }
     }
 
     print $form;