From e1e658c6547a2b00a2b5b32bf3cd34ab8a5f2a52 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 17 Jan 2013 18:54:35 +0100
Subject: Support multiple uploads in the same request

This change *should* be backwards compatible.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/views/file/show_url.php              | 10 ++++++----
 application/views/file/upload_form.php           |  5 +++--
 application/views/file_plaintext/show_url.php    |  3 ++-
 application/views/file_plaintext/upload_form.php |  1 +
 4 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'application/views')

diff --git a/application/views/file/show_url.php b/application/views/file/show_url.php
index 3c08ed952..a3d965717 100644
--- a/application/views/file/show_url.php
+++ b/application/views/file/show_url.php
@@ -1,6 +1,8 @@
 <div class="center">
-  <p>
-    You can get your file here:<br />
-    <a href="<?php echo $url; ?>"><?php echo $url; ?></a><br />
-  </p>
+	<p>You can get your file(s) here:</p>
+	<p>
+	<?php foreach ($urls as $key => $url) { ?>
+		<a href="<?php echo $url; ?>"><?php echo $url; ?></a><br />
+	<?php } ?>
+	</p>
 </div>
diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php
index a6f4eedc7..aaf36931a 100644
--- a/application/views/file/upload_form.php
+++ b/application/views/file/upload_form.php
@@ -13,7 +13,7 @@
 		<div class="span6">
 			<?php echo form_open_multipart('file/do_upload'); ?>
 				<h2>File upload</h2>
-				<input id="file" type="file" name="file"><br>
+				<input class="file-upload" type="file" name="file[]" multiple="multiple"><br>
 				<button type="submit" id="upload_button" class="btn btn-primary">Upload it!</button>
 			</form>
 			<div class="alert alert-block alert-info">
@@ -22,7 +22,8 @@
 					Uploads/pastes are deleted after <?php echo $upload_max_age; ?> days
 					<?php if($small_upload_size > 0) {
 						echo "unless they are smaller than ".format_bytes($small_upload_size);
-					} ?>. Maximum upload size is <?php echo format_bytes($max_upload_size); ?>
+					} ?>. Maximum upload size is <?php echo format_bytes($max_upload_size); ?>.
+					You can upload a maximum of <?php echo ini_get("max_file_uploads"); ?> files at once.
 				</p>
 			</div>
 		</div>
diff --git a/application/views/file_plaintext/show_url.php b/application/views/file_plaintext/show_url.php
index bb94d7422..64050ddcd 100644
--- a/application/views/file_plaintext/show_url.php
+++ b/application/views/file_plaintext/show_url.php
@@ -1,2 +1,3 @@
-<?php echo $url; ?>
+<?php
+echo implode(" ", $urls)."\n";
 
diff --git a/application/views/file_plaintext/upload_form.php b/application/views/file_plaintext/upload_form.php
index 7fe3aa801..a74e5d434 100644
--- a/application/views/file_plaintext/upload_form.php
+++ b/application/views/file_plaintext/upload_form.php
@@ -1,5 +1,6 @@
 Uploads/pastes are deleted after <?php echo $upload_max_age; ?> days<?php if($small_upload_size > 0): ?> unless they are smaller than <?php echo format_bytes($small_upload_size); ?><?php endif; ?>.
 Maximum upload size is <?php echo format_bytes($max_upload_size); ?>.
+You can upload a maximum of <?php echo ini_get("max_file_uploads"); ?> files at once.
 
 How to link your uploads:
  - "/<ID>/" automatically highlight the uploads
-- 
cgit v1.2.3-24-g4f1b