From 4397fbcba26037acc2c1323e73e5a54200da7c17 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Fri, 13 Apr 2012 19:25:45 +0200
Subject: Add do_paste() and remove ajax from upload_form

If the session has timed out, javascript will get the login page and try
to redirect to "base_url/$htmlcode" which will obviously fail. Instead
of fixing the js code, reintroduce do_paste and use it.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/views/file/upload_form.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'application/views/file')

diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php
index ce1d00498..3ab70eb62 100644
--- a/application/views/file/upload_form.php
+++ b/application/views/file/upload_form.php
@@ -6,18 +6,15 @@
       <input type="submit" value="Upload" id="upload_button" name="process" />
     </p>
   </form>
+  <p><b>OR</b></p>
+  <?php echo form_open_multipart('file/do_paste'); ?>
+    <p>
+      <textarea id="textarea" name="content" cols="80" rows="20"></textarea><br />
+      <input  type="submit" value="Paste" name="process" />
+    </p>
+  </form>
   <script type="text/javascript">
     /* <![CDATA[ */
-document.write('\
-  <p><b>OR</b></p>\
-  <form action="javascript: do_paste()">\
-    <p>\
-      <textarea id="textarea" name="content" cols="80" rows="20"></textarea><br />\
-      <input  type="submit" value="Paste" name="process" />\
-    </p>\
-    </form>\
-');
-  var upload_url = "<?php echo site_url("file/do_upload/dumb"); ?>";
   var max_upload_size = "<?php echo $max_upload_size; ?>";
     /* ]]> */
   </script>
-- 
cgit v1.2.3-24-g4f1b