Merge branch 'working'

8 files changed, 8 insertions, 24 deletions

diff --git a/application/views/file/client.php b/application/views/file/client.php
index 5e141f141..29e254a80 100644
--- a/application/views/file/client.php
+++ b/application/views/file/client.php
@@ -42,7 +42,7 @@ machine <?php echo $domain; ?> login my_username password my_secret_password
 <h1>Shell</h1>
 
 <pre>
-curl -n -F "file=@/home/user/foo" <?php echo site_url(); ?>   (binary safe)
-cat file | curl -n -F "file=@-;filename=stdin" <?php echo site_url(); ?>   (binary safe)
+curl -n -F "file=@/home/user/foo" <?php echo site_url("file/do_upload"); ?>   (binary safe)
+cat file | curl -n -F "file=@-;filename=stdin" <?php echo site_url("file/do_upload"); ?>   (binary safe)
 </pre>
 
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/upload_form.php b/application/views/file/upload_form.php
index 841ac3746..21a2cc4e6 100644
--- a/application/views/file/upload_form.php
+++ b/application/views/file/upload_form.php
@@ -46,7 +46,7 @@
 
 <?php } else { ?>
 	<?php echo form_open('user/login'); ?>
-		<input type="text" name="username" placeholder="Username" />
+		<input type="text" name="username" placeholder="Username" autofocus />
 		<input type="password" name="password" placeholder="Password" />
 		<input type="submit" class="btn btn-primary" value="Login" name="process" style="margin-bottom: 9px" />
 		<?php if(auth_driver_function_implemented("can_reset_password")) { ?>
diff --git a/application/views/file_plaintext/client.php b/application/views/file_plaintext/client.php
index b37fd81bd..0ab556df2 100644
--- a/application/views/file_plaintext/client.php
+++ b/application/views/file_plaintext/client.php
@@ -1,6 +1,6 @@
 Shell (binary safe):
-  curl -n -F "file=@/home/user/foo" <?php echo site_url()."\n"; ?>
-  cat file | curl -n -F "file=@-;filename=stdin" <?php echo site_url()."\n"; ?>
+  curl -n -F "file=@/home/user/foo" <?php echo site_url("file/do_upload")."\n"; ?>
+  cat file | curl -n -F "file=@-;filename=stdin" <?php echo site_url("file/do_upload")."\n"; ?>
 
 Client:
 Development (git): http://git.server-speed.net/users/flo/fb
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; ?>
-