From 4e058f32ff6174698709a9afdf67f4f9af60e7db Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Mon, 1 Nov 2010 17:25:03 +0100 Subject: move client/shell stuff to an own page; cleanup upload_form Signed-off-by: Florian Pritz --- data/default.css | 1 - system/application/controllers/file.php | 16 ++++++++++++--- system/application/views/file/client.php | 20 ++++++++++++++++++ system/application/views/file/header.php | 2 -- system/application/views/file/upload_form.php | 29 ++++----------------------- 5 files changed, 37 insertions(+), 31 deletions(-) create mode 100644 system/application/views/file/client.php diff --git a/data/default.css b/data/default.css index 8d29adc0d..70738227b 100644 --- a/data/default.css +++ b/data/default.css @@ -46,6 +46,5 @@ body { .content { padding-left:13px; padding-top:13px; - margin-top:100px; } diff --git a/system/application/controllers/file.php b/system/application/controllers/file.php index 18e322f97..7d0943bdd 100644 --- a/system/application/controllers/file.php +++ b/system/application/controllers/file.php @@ -48,15 +48,25 @@ class File extends Controller { } } + function client() + { + $data['title'] = 'Client'; + $data['client_link'] = base_url().'data/client/fb-'.$this->var->latest_client.'.tar.gz'; + $data['client_link_dir'] = base_url().'data/client/'; + $data['client_link_deb'] = base_url().'data/client/deb/'; + $data['client_link_slackware'] = base_url().'data/client/slackware/'; + + $this->load->view('file/header', $data); + $this->load->view('file/client', $data); + $this->load->view('file/footer', $data); + } + function upload_form() { $data = array(); $data['title'] = 'Upload'; $data['small_upload_size'] = $this->config->item('small_upload_size'); $data['max_upload_size'] = $this->config->item('upload_max_size'); - $data['client_link'] = base_url().'data/client/fb-'.$this->var->latest_client.'.tar.gz'; - $data['client_link_deb'] = base_url().'data/client/deb/'; - $data['client_link_slackware'] = base_url().'data/client/slackware/'; $this->load->view('file/header', $data); $this->load->view('file/upload_form', $data); diff --git a/system/application/views/file/client.php b/system/application/views/file/client.php new file mode 100644 index 000000000..d9470a216 --- /dev/null +++ b/system/application/views/file/client.php @@ -0,0 +1,20 @@ +

Shell:

+
+curl -n -F "content=<-"  < file      (not binary safe)
+cat file | curl -n -F "content=<-"   (not binary safe)
+curl -n -F "file=@/home/user/foo"    (binary safe)
+
+

Client:
+

Development (git): http://git.server-speed.net/users/flo/fb/
+Latest release: .
+GPG sigs, older versions: +

+

If you want to use authentication (needed for deleting) add the following to your ~/.netrc:

+
+machine paste.xinu.at password my_secret_password
+
+

Packages:
+Arch Linux: pacman -S fb-client
+Debian:
+Slackware:

+ diff --git a/system/application/views/file/header.php b/system/application/views/file/header.php index aba7283a7..f6073707a 100644 --- a/system/application/views/file/header.php +++ b/system/application/views/file/header.php @@ -11,7 +11,5 @@
- -
diff --git a/system/application/views/file/upload_form.php b/system/application/views/file/upload_form.php index ef424b496..ec7ab53de 100644 --- a/system/application/views/file/upload_form.php +++ b/system/application/views/file/upload_form.php @@ -1,13 +1,11 @@ -
+

File:

-
-

OR

-
+

OR


@@ -15,33 +13,14 @@

-

+

Uploads/pastes are deleted after 5 days 0): ?> unless they are smaller than . Maximum upload size is

-
-

For shell uploading/pasting use:

-
-curl -n -F "content=<-"  < file      (not binary safe)
-cat file | curl -n -F "content=<-"   (not binary safe)
-curl -n -F "file=@/home/user/foo"    (binary safe)
-
-
-

If you want to use authentication add the following to your ~/.netrc:

-
-machine paste.xinu.at password my_secret_password
-
-
-

If you want to you can use this script to upload files, paste text or delete your uploads:
-

-

Arch Linux users: pacman -S fb-client
-Debian users:
-Slackware users:

- +

For shell uploading/pasting and download information for the client go to ">


If you experience any problems feel free to contact me.


-

This service is provided without warranty of any kind and may not be used to distribute copyrighted content.

-- cgit v1.2.3-24-g4f1b