From 1040dbad987e280c61134c83194832224ff870b5 Mon Sep 17 00:00:00 2001
From: Florian Pritz
Date: Sun, 8 Apr 2012 23:38:05 +0200
Subject: Revert "Disable paste box"
Signed-off-by: Florian Pritz
---
application/controllers/file.php | 3 +-
application/views/file/upload_form.php | 42 +++++++++++-----------
data/js/upload_form.js | 64 ++++++++++++++++++++++++++++++++++
3 files changed, 86 insertions(+), 23 deletions(-)
create mode 100644 data/js/upload_form.js
diff --git a/application/controllers/file.php b/application/controllers/file.php
index 466037833..2e8664984 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -217,7 +217,8 @@ class File extends CI_Controller {
$this->muser->require_access();
if ($this->uri->segment(3)) {
- exit;
+ $this->var->cli_client = true;
+ $this->var->view_dir = "file_plaintext";
}
$extension = $this->input->post('extension');
diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php
index e1e4313a5..04f7fd9f4 100644
--- a/application/views/file/upload_form.php
+++ b/application/views/file/upload_form.php
@@ -8,35 +8,33 @@
+
-Uploads are deleted after days 0): ?>
+
Uploads/pastes are deleted after days 0): ?>
unless they are smaller than
. Maximum upload size is
-Features
-For shell uploading and download information for the client go to ">
+Features
+For shell uploading/pasting and download information for the client go to ">
You can use the to find old uploads.
-How to link your uploads:
+How to link your pastes:
- - /<ID>/ automatically highlight the uploads
+ - /<ID>/ automatically highlight the paste
- /<ID> set the detected MIME type and let the browser do the rest
- /<ID>/plain force the MIME type to be text/plain
- /<ID>/<file extension> override auto detection and use the supplied file extension or language name for highlighting
diff --git a/data/js/upload_form.js b/data/js/upload_form.js
new file mode 100644
index 000000000..598d86465
--- /dev/null
+++ b/data/js/upload_form.js
@@ -0,0 +1,64 @@
+// check file size before uploading if browser support html5
+if (window.File && window.FileList) {
+ function checkFileUpload(evt) {
+ var f = evt.target.files[0];
+ if (f.size > max_upload_size) {
+ document.getElementById('upload_button').value = "File too big";
+ document.getElementById('upload_button').disabled = true;
+ } else {
+ document.getElementById('upload_button').value = "Upload";
+ document.getElementById('upload_button').disabled = false;
+ }
+ }
+
+ document.getElementById('file').addEventListener('change', checkFileUpload, false);
+}
+
+function encode64(inp){
+ var key="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+ var chr1,chr2,chr3,enc3,enc4,i=0,out="";
+ while(i127) chr1=88;
+ chr2=inp.charCodeAt(i++);if(chr2>127) chr2=88;
+ chr3=inp.charCodeAt(i++);if(chr3>127) chr3=88;
+ if(isNaN(chr3)) {enc4=64;chr3=0;} else enc4=chr3&63
+ if(isNaN(chr2)) {enc3=64;chr2=0;} else enc3=((chr2<<2)|(chr3>>6))&63
+ out+=key.charAt((chr1>>2)&63)+key.charAt(((chr1<<4)|(chr2>>4))&63)+key.charAt(enc3)+key.charAt(enc4);
+ }
+ return encodeURIComponent(out);
+}
+
+function gen_boundary() {
+ var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+ var string_length = 40;
+ var randomstring = '';
+ for (var i=0; i