From 5e9bbbe490e40da103e0a7960312ab1c814dafa3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 20 Nov 2009 19:41:45 -0800
Subject: Convert the Simple Uploader form over to Forge, and use the event
 model to let the Tags module modify it.  This brings it inline with our other
 module-extensible form based interactions.

---
 modules/gallery/views/form_uploadify.html.php      | 123 ++++++++++++++++
 .../gallery/views/form_uploadify_buttons.html.php  |   8 ++
 modules/gallery/views/simple_uploader.html.php     | 160 ---------------------
 3 files changed, 131 insertions(+), 160 deletions(-)
 create mode 100644 modules/gallery/views/form_uploadify.html.php
 create mode 100644 modules/gallery/views/form_uploadify_buttons.html.php
 delete mode 100644 modules/gallery/views/simple_uploader.html.php

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
new file mode 100644
index 00000000..7448db84
--- /dev/null
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -0,0 +1,123 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<style>
+#g-add-photos-canvas object {
+  left: -50px;
+  position: relative;
+  z-index: 100;
+}
+#g-add-photos-button {
+  left: 55px;
+  position: relative;
+  top: -15px;
+  z-index: -1;
+}
+</style>
+<script type="text/javascript" src="<?= url::file("lib/swfobject.js") ?>"></script>
+<script type="text/javascript" src="<?= url::file("lib/uploadify/jquery.uploadify.min.js") ?>"></script>
+<script type="text/javascript">
+  $("#g-add-photos-canvas").ready(function () {
+    $("#g-uploadify").uploadify({
+      uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>",
+      script: "<?= url::site("simple_uploader/add_photo/{$album->id}") ?>",
+      scriptData: <?= json_encode($script_data) ?>,
+      fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
+      fileDesc: <?= t("Photos and movies")->for_js() ?>,
+      cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
+      buttonText: <?= t("Select Photos ...")->for_js() ?>,
+      simUploadLimit: 10,
+      wmode: "transparent",
+      hideButton: true, /* should be true */
+      auto: true,
+      multi: true,
+      onAllComplete: function(filesUploaded, errors, allbytesLoaded, speed) {
+        $("#g-upload-cancel-all")
+          .addClass("ui-state-disabled")
+          .attr("disabled", "disabled");
+        return true;
+      },
+      onClearQueue: function(event) {
+        $("#g-upload-cancel-all")
+          .addClass("ui-state-disabled")
+          .attr("disabled", "disabled");
+        return true;
+      },
+      onComplete: function(event, queueID, fileObj, response, data) {
+        var re = /^error: (.*)$/i;
+        var msg = re.exec(response);
+        if (msg) {
+          $("#g-add-photos-status ul").append(
+            "<li class=\"g-error\">" + fileObj.name + " - " + msg[1] + "</li>");
+        } else {
+          $("#g-add-photos-status ul").append(
+            "<li class=\"g-success\">" + fileObj.name + " - <?= t("Completed") ?></li>");
+        }
+        return true;
+      },
+      onError: function(event, queueID, fileObj, errorObj) {
+        var msg = " - ";
+        if (errorObj.type == "HTTP") {
+          if (errorObj.info == "500") {
+            msg += <?= t("Unable to process this file")->for_js() ?>;
+            // Server error - check server logs
+          } else if (errorObj.info == "404") {
+            msg += <?= t("The upload script was not found.")->for_js() ?>;
+            // Server script not found
+          } else {
+            // Server Error: status: errorObj.info
+            msg += (<?= t("Server error: __INFO__")->for_js() ?>.replace("__INFO__", errorObj.info));
+          }
+        } else if (errorObj.type == "File Size") {
+          var sizelimit = $("#g-uploadify").uploadifySettings(sizeLimit);
+          msg += fileObj.name+' '+errorObj.type+' Limit: '+Math.round(d.sizeLimit/1024)+'KB';
+        } else {
+          msg += (<?= t("Server error: __INFO__ (__TYPE__)")->for_js() ?>
+            .replace("__INFO__", errorObj.info)
+            .replace("__TYPE__", errorObj.type));
+        }
+        $("#g-add-photos-status ul").append(
+          "<li class=\"g-error\">" + fileObj.name + msg + "</li>");
+        $("#g-uploadify" + queueID).remove();
+        //return false;
+      },
+      onSelect: function(event) {
+        if ($("#g-upload-cancel-all").hasClass("ui-state-disabled")) {
+          $("#g-upload-cancel-all")
+            .removeClass("ui-state-disabled")
+            .attr("disabled", null);
+        }
+        return true;
+      }
+    });
+  });
+</script>
+
+<? if (ini_get("suhosin.session.encrypt")): ?>
+<ul id="g-action-status" class="g-message-block">
+  <li class="g-error">
+    <?= t("Error: your server is configured to use the <a href=\"%encrypt_url\"><code>suhosin.session.encrypt</code></a> setting from <a href=\"%suhosin_url\">Suhosin</a>.  You must disable this setting to upload photos.",
+        array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt",
+    "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?>
+  </li>
+</ul>
+<? endif ?>
+
+<div>
+  <p>
+    <?= t("Photos will be uploaded to album: ") ?>
+  </p>
+  <ul class="g-breadcrumbs">
+    <? foreach ($album->parents() as $i => $parent): ?>
+    <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::clean($parent->title) ?> </li>
+    <? endforeach ?>
+    <li class="g-active"> <?= html::purify($album->title) ?> </li>
+  </ul>
+</div>
+
+<div id="g-add-photos-canvas" style="text-align: center;">
+  <a id="g-add-photos-button" class="ui-corner-all" style="padding-bottom: 1em;" href="#"><?= t("Select Photos...") ?></a>
+  <span id="g-uploadify"></span>
+</div>
+<div id="g-add-photos-status" style="text-align: center;">
+  <ul>
+  </ul>
+</div>
diff --git a/modules/gallery/views/form_uploadify_buttons.html.php b/modules/gallery/views/form_uploadify_buttons.html.php
new file mode 100644
index 00000000..d88bb6aa
--- /dev/null
+++ b/modules/gallery/views/form_uploadify_buttons.html.php
@@ -0,0 +1,8 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<!-- Proxy the done request back to our form, since its been ajaxified -->
+<button id="g-upload-done" class="ui-state-default ui-corner-all" onclick="$('#g-add-photos-form').submit();return false;">
+  <?= t("Done") ?>
+</button>
+<button id="g-upload-cancel-all" class="ui-state-default ui-corner-all ui-state-disabled" onclick="$('#g-uploadify').uploadifyClearQueue();return false;" disabled="disabled">
+  <?= t("Cancel All") ?>
+</button>
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
deleted file mode 100644
index d23b89e0..00000000
--- a/modules/gallery/views/simple_uploader.html.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<style>
-#g-add-photos-canvas object {
-  left: -50px;
-  position: relative;
-  z-index: 100;
-}
-#g-add-photos-button {
-  left: 55px;
-  position: relative;
-  top: -15px;
-  z-index: -1;
-}
-</style>
-<script type="text/javascript" src="<?= url::file("lib/swfobject.js") ?>"></script>
-<script type="text/javascript" src="<?= url::file("lib/uploadify/jquery.uploadify.min.js") ?>"></script>
-<script type="text/javascript">
-  $("#g-add-photos-canvas").ready(function () {
-    $("#g-uploadify").uploadify({
-      uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>",
-      script: "<?= url::site("simple_uploader/add_photo/{$item->id}") ?>",
-      scriptData: <?= json_encode(array(
-        "g3sid" => Session::instance()->id(),
-        "tags" => "",
-        "user_agent" => Input::instance()->server("HTTP_USER_AGENT"),
-        "csrf" => $csrf)) ?>,
-      fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
-      fileDesc: <?= t("Photos and movies")->for_js() ?>,
-      cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
-      buttonText: <?= t("Select Photos ...")->for_js() ?>,
-      simUploadLimit: 10,
-      wmode: "transparent",
-      hideButton: true, /* should be true */
-      auto: true,
-      multi: true,
-      onAllComplete: function(filesUploaded, errors, allbytesLoaded, speed) {
-        $("#g-upload-cancel-all")
-          .addClass("ui-state-disabled")
-          .attr("disabled", "disabled");
-        return true;
-      },
-      onClearQueue: function(event) {
-        $("#g-upload-cancel-all")
-          .addClass("ui-state-disabled")
-          .attr("disabled", "disabled");
-        return true;
-      },
-      onComplete: function(event, queueID, fileObj, response, data) {
-        var re = /^error: (.*)$/i;
-        var msg = re.exec(response);
-        if (msg) {
-          $("#g-add-photos-status ul").append(
-            "<li class=\"g-error\">" + fileObj.name + " - " + msg[1] + "</li>");
-        } else {
-          $("#g-add-photos-status ul").append(
-            "<li class=\"g-success\">" + fileObj.name + " - <?= t("Completed") ?></li>");
-        }
-        return true;
-      },
-      onError: function(event, queueID, fileObj, errorObj) {
-        var msg = " - ";
-        if (errorObj.type == "HTTP") {
-          if (errorObj.info == "500") {
-            msg += <?= t("Unable to process this file")->for_js() ?>;
-            // Server error - check server logs
-          } else if (errorObj.info == "404") {
-            msg += <?= t("The upload script was not found.")->for_js() ?>;
-            // Server script not found
-          } else {
-            // Server Error: status: errorObj.info
-            msg += (<?= t("Server error: __INFO__")->for_js() ?>.replace("__INFO__", errorObj.info));
-          }
-        } else if (errorObj.type == "File Size") {
-          var sizelimit = $("#g-uploadify").uploadifySettings(sizeLimit);
-          msg += fileObj.name+' '+errorObj.type+' Limit: '+Math.round(d.sizeLimit/1024)+'KB';
-        } else {
-          msg += (<?= t("Server error: __INFO__ (__TYPE__)")->for_js() ?>
-            .replace("__INFO__", errorObj.info)
-            .replace("__TYPE__", errorObj.type));
-        }
-        $("#g-add-photos-status ul").append(
-          "<li class=\"g-error\">" + fileObj.name + msg + "</li>");
-        $("#g-uploadify" + queueID).remove();
-        //return false;
-      },
-      onSelect: function(event) {
-        if ($("#g-upload-cancel-all").hasClass("ui-state-disabled")) {
-          $("#g-upload-cancel-all")
-            .removeClass("ui-state-disabled")
-            .attr("disabled", null);
-        }
-        return true;
-      }
-    });
-  <? if (module::active("tag")): ?>
-    $('#g-add-photos-tags').autocomplete(
-      '<?= url::site("tags/autocomplete") ?>',
-      {max: 30, multiple: true, multipleSeparator: ',', cacheLength: 1}
-    );
-    $('#g-add-photos-tags').blur(function (event) {
-      $("#g-uploadify").uploadifySettings("scriptData", {"tags": $(this).val()});
-    });
-  <? endif ?>
-  });
-</script>
-
-<form id="g-add-photos-form" action="<?= url::site("simple_uploader/finish?csrf=$csrf") ?>">
-  <fieldset>
-    <legend>
-      <?= t("Add photos to %album_title", array("album_title" => html::purify($item->title))) ?>
-    </legend>
-  </fieldset>
-  <div id="g-add-photos">
-    <? if (ini_get("suhosin.session.encrypt")): ?>
-    <ul id="g-action-status" class="g-message-block">
-      <li class="g-error">
-        <?= t("Error: your server is configured to use the <a href=\"%encrypt_url\"><code>suhosin.session.encrypt</code></a> setting from <a href=\"%suhosin_url\">Suhosin</a>.  You must disable this setting to upload photos.",
-          array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt",
-                "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?>
-      </li>
-    </ul>
-    <? endif ?>
-
-    <div>
-      <p>
-        <?= t("Photos will be uploaded to album: ") ?>
-      </p>
-      <ul class="g-breadcrumbs">
-        <? foreach ($item->parents() as $i => $parent): ?>
-        <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::clean($parent->title) ?> </li>
-        <? endforeach ?>
-        <li class="g-active"> <?= html::purify($item->title) ?> </li>
-      </ul>
-    </div>
-
-    <div id="g-add-photos-canvas" style="text-align: center;">
-      <a id="g-add-photos-button" class="ui-corner-all" style="padding-bottom: 1em;" href="#"><?= t("Select Photos...") ?></a>
-      <span id="g-uploadify"></span>
-    </div>
-    <div id="g-add-photos-status" style="text-align: center;">
-      <ul>
-      </ul>
-    </div>
-
-    <? if (module::active("tag")): ?>
-    <div style="clear: both;">
-      <label for="g-add-photos-tags"><?= t("Add tags to all uploaded files") ?></label>
-      <input type="text" id="g-add-photos-tags" name="tags" value="" />
-    </div>
-    <? endif ?>
-
-    <!-- Proxy the done request back to our form, since its been ajaxified -->
-    <button id="g-upload-done" class="ui-state-default ui-corner-all" onclick="$('#g-add-photos-form').submit();return false;">
-      <?= t("Done") ?>
-    </button>
-    <button id="g-upload-cancel-all" class="ui-state-default ui-corner-all ui-state-disabled" onclick="$('#g-uploadify').uploadifyClearQueue();return false;" disabled="disabled">
-      <?= t("Cancel All") ?>
-    </button>
-  </div>
-</form>
-- 
cgit v1.2.3