diff options
| -rw-r--r-- | application/controllers/file/file_default.php | 6 | ||||
| -rw-r--r-- | application/views/file_plaintext/deleted.php | 8 | ||||
| -rw-r--r-- | application/views/file_plaintext/file_info.php | 16 | ||||
| -rw-r--r-- | application/views/file_plaintext/html_footer.php | 1 | ||||
| -rw-r--r-- | application/views/file_plaintext/html_header.php | 1 | ||||
| -rw-r--r-- | application/views/file_plaintext/html_paste_footer.php | 1 | ||||
| -rw-r--r-- | application/views/file_plaintext/html_paste_header.php | 1 | ||||
| -rw-r--r-- | application/views/file_plaintext/multipaste_info.php | 10 | ||||
| -rw-r--r-- | application/views/file_plaintext/non_existent.php | 1 | ||||
| -rw-r--r-- | application/views/file_plaintext/show_url.php | 4 | ||||
| -rw-r--r-- | application/views/file_plaintext/upload_form.php | 19 | ||||
| -rw-r--r-- | application/views/file_plaintext/upload_history.php | 23 |
12 files changed, 1 insertions, 90 deletions
diff --git a/application/controllers/file/file_default.php b/application/controllers/file/file_default.php index 3b5eb0ee4..82e933021 100644 --- a/application/controllers/file/file_default.php +++ b/application/controllers/file/file_default.php @@ -16,11 +16,7 @@ class File_default extends MY_Controller { $this->load->model('mfile'); $this->load->model('mmultipaste'); - if (is_cli_client()) { - $this->var->view_dir = "file_plaintext"; - } else { - $this->var->view_dir = "file"; - } + $this->var->view_dir = "file"; } function index() diff --git a/application/views/file_plaintext/deleted.php b/application/views/file_plaintext/deleted.php deleted file mode 100644 index 347766092..000000000 --- a/application/views/file_plaintext/deleted.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php if (!empty($errors)) { - echo implode("\n", $errors); -} ?> -<?php if (!empty($msgs)) { - echo implode("\n", $msgs); -} ?> - -<?php echo $deleted_count; ?> of <?php echo $total_count; ?> deleted. diff --git a/application/views/file_plaintext/file_info.php b/application/views/file_plaintext/file_info.php deleted file mode 100644 index 125f1d118..000000000 --- a/application/views/file_plaintext/file_info.php +++ /dev/null @@ -1,16 +0,0 @@ -<?php if($filedata): ?> -ID: <?php echo $id; ?> - -Filename: <?php echo $filedata["filename"]; ?> - -Date of upload: <?php echo date("r", $filedata["date"]); ?> - -Date of removal: <?php echo $timeout; ?> - -Size: <?php echo format_bytes($filedata["filesize"]); ?> - -Mimetype: <?php echo $filedata["mimetype"]; ?> - -Hash (MD5): <?php echo $filedata["hash"]; ?> - -<?php endif; ?> diff --git a/application/views/file_plaintext/html_footer.php b/application/views/file_plaintext/html_footer.php deleted file mode 100644 index 3b60874dd..000000000 --- a/application/views/file_plaintext/html_footer.php +++ /dev/null @@ -1 +0,0 @@ -<?php include FCPATH."application/views/file/html_footer.php"; ?> diff --git a/application/views/file_plaintext/html_header.php b/application/views/file_plaintext/html_header.php deleted file mode 100644 index 0280b72a7..000000000 --- a/application/views/file_plaintext/html_header.php +++ /dev/null @@ -1 +0,0 @@ -<?php include FCPATH."application/views/file/html_header.php"; ?> diff --git a/application/views/file_plaintext/html_paste_footer.php b/application/views/file_plaintext/html_paste_footer.php deleted file mode 100644 index c283fd434..000000000 --- a/application/views/file_plaintext/html_paste_footer.php +++ /dev/null @@ -1 +0,0 @@ -<?php include FCPATH."application/views/file/html_paste_footer.php"; ?> diff --git a/application/views/file_plaintext/html_paste_header.php b/application/views/file_plaintext/html_paste_header.php deleted file mode 100644 index 2760d4a2a..000000000 --- a/application/views/file_plaintext/html_paste_header.php +++ /dev/null @@ -1 +0,0 @@ -<?php include FCPATH."application/views/file/html_paste_header.php"; ?> diff --git a/application/views/file_plaintext/multipaste_info.php b/application/views/file_plaintext/multipaste_info.php deleted file mode 100644 index 5a438789c..000000000 --- a/application/views/file_plaintext/multipaste_info.php +++ /dev/null @@ -1,10 +0,0 @@ -ID: <?=$id; ?> - -Number of files: <?=$file_count; ?> - -Date of upload: <?=date("r", $upload_date); ?> - -Date of removal: <?=$timeout_string; ?> - -Total size (including duplicates): <?=format_bytes($size); ?> - diff --git a/application/views/file_plaintext/non_existent.php b/application/views/file_plaintext/non_existent.php deleted file mode 100644 index 7da92e954..000000000 --- a/application/views/file_plaintext/non_existent.php +++ /dev/null @@ -1 +0,0 @@ -I'm sorry, but the requested file doesn't exist. diff --git a/application/views/file_plaintext/show_url.php b/application/views/file_plaintext/show_url.php deleted file mode 100644 index 3288ba08e..000000000 --- a/application/views/file_plaintext/show_url.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$urls = array_map(function($a) {return $a."?cli_deprecated";}, $urls); -echo implode(" ", $urls)."\n"; - diff --git a/application/views/file_plaintext/upload_form.php b/application/views/file_plaintext/upload_form.php deleted file mode 100644 index a74e5d434..000000000 --- a/application/views/file_plaintext/upload_form.php +++ /dev/null @@ -1,19 +0,0 @@ -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 - - "/<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 - - "/<ID>/qr" display a qr code containing a link to /<ID>/ - - "/<ID>/rmd" convert markdown to HTML - - "/<ID>/ascii" convert text with ANSI (shell) escape codes to HTML - - "/<ID>/info" display some information about the ID - -If your upload is not detected as text, only "/<ID>/qr", "/<ID>/plain" -and "/<ID>/info" will work as above and all others will simply return -the file with the detected MIME type. - diff --git a/application/views/file_plaintext/upload_history.php b/application/views/file_plaintext/upload_history.php deleted file mode 100644 index 53801494f..000000000 --- a/application/views/file_plaintext/upload_history.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php -$dateformat = "r"; -$lengths["date"] = max($lengths["date"], strlen(date($dateformat, time()))); -echo - mb_str_pad($fields["id"], $lengths["id"])." | " - .mb_str_pad($fields["filename"], $lengths["filename"])." | " - .mb_str_pad($fields["mimetype"], $lengths["mimetype"])." | " - .mb_str_pad($fields["date"], $lengths["date"])." | " - .mb_str_pad($fields["hash"], $lengths["hash"])." | " - .mb_str_pad($fields["filesize"], $lengths["filesize"])."\n"; - -foreach($items as $key => $item) { - echo - mb_str_pad($item["id"], $lengths["id"])." | " - .mb_str_pad($item["filename"], $lengths["filename"])." | " - .mb_str_pad($item["mimetype"], $lengths["mimetype"])." | " - .date($dateformat, $item["date"])." | " - .mb_str_pad($item["hash"], $lengths["hash"])." | " - .$item["filesize"]."\n"; -} -?> - -Total sum of your distinct uploads: <?php echo $total_size; ?>. |