From 84ce2c6ce0eb1b4f2f32c4ae0d7e08f3571f5018 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Wed, 14 Aug 2013 17:06:07 +0200
Subject: Provide json output for api functions

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/views/file/deleted.php                | 9 +++------
 application/views/file/too_big.php                | 3 ---
 application/views/file/upload_error.php           | 6 ------
 application/views/file_plaintext/too_big.php      | 2 --
 application/views/file_plaintext/upload_error.php | 2 --
 5 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 application/views/file/too_big.php
 delete mode 100644 application/views/file/upload_error.php
 delete mode 100644 application/views/file_plaintext/too_big.php
 delete mode 100644 application/views/file_plaintext/upload_error.php

(limited to 'application/views')

diff --git a/application/views/file/deleted.php b/application/views/file/deleted.php
index ef02398d9..8a5818f2d 100644
--- a/application/views/file/deleted.php
+++ b/application/views/file/deleted.php
@@ -1,12 +1,9 @@
 <div class="center">
 	<?php if (!empty($errors)) {
 		echo "<p>";
-		echo implode("<br />\n", $errors);
-		echo "</p>";
-	} ?>
-	<?php if (!empty($msgs)) {
-		echo "<p>";
-		echo implode("<br />\n", $msgs);
+		foreach ($errors as $error) {
+			echo "${error["id"]}: ${error["reason"]}<br>\n";
+		}
 		echo "</p>";
 	} ?>
 
diff --git a/application/views/file/too_big.php b/application/views/file/too_big.php
deleted file mode 100644
index 5b970a4c8..000000000
--- a/application/views/file/too_big.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="center">
-  <p>Sorry, the file you uploaded is too big.</p>
-</div>
diff --git a/application/views/file/upload_error.php b/application/views/file/upload_error.php
deleted file mode 100644
index 83968eec2..000000000
--- a/application/views/file/upload_error.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="center">
-  <p>
-    An error occurred while uploading.<br />
-		<?php echo $msg; ?>
-  </p>
-</div>
diff --git a/application/views/file_plaintext/too_big.php b/application/views/file_plaintext/too_big.php
deleted file mode 100644
index d27a0295c..000000000
--- a/application/views/file_plaintext/too_big.php
+++ /dev/null
@@ -1,2 +0,0 @@
-Sorry, the file you uploaded is too big.
-
diff --git a/application/views/file_plaintext/upload_error.php b/application/views/file_plaintext/upload_error.php
deleted file mode 100644
index c86c56911..000000000
--- a/application/views/file_plaintext/upload_error.php
+++ /dev/null
@@ -1,2 +0,0 @@
-An error occurred while uploading. <?php echo $msg; ?>
-
-- 
cgit v1.2.3-24-g4f1b