summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2021-04-11 14:56:35 +0200
committerFlorian Pritz <bluewind@xinu.at>2021-04-11 15:00:21 +0200
commitb9af5af789c7200bc14a383a31110f6e222f6eca (patch)
treef485a4e6f05871fedbcc3c7a396b97735d8f69f6
parent54b3b5930d30860c6bede5e2d2421f973cb39058 (diff)
Copy filename when repasting file
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--NEWS1
-rw-r--r--application/controllers/Main.php1
-rw-r--r--application/views/file/upload_form.php2
3 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 3ffce0f1d..e507b4dd9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
This file lists major, incompatible or otherwise important changes, you should look at it after every update.
NEXT
+ - Copy filename when repasting file
- Add link to new android client
3.6.0 2021-02-21
diff --git a/application/controllers/Main.php b/application/controllers/Main.php
index 9db63b39f..df3e8ad78 100644
--- a/application/controllers/Main.php
+++ b/application/controllers/Main.php
@@ -468,6 +468,7 @@ class Main extends MY_Controller {
if ($filedata !== false) {
$pygments = new \libraries\Pygments($this->mfile->file($filedata["data_id"]), $filedata["mimetype"], $filedata["filename"]);
if ($pygments->can_highlight()) {
+ $this->data["textarea_filename"] = $filedata["filename"];
$this->data["textarea_content"] = file_get_contents($this->mfile->file($filedata["data_id"]));
}
}
diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php
index 8f6807373..e2350c09d 100644
--- a/application/views/file/upload_form.php
+++ b/application/views/file/upload_form.php
@@ -14,7 +14,7 @@
<div class="tab-pane active" id="text-upload-tab-1">
<div class="panel panel-default">
<div class="panel-heading">
- <input type="text" name="filename[1]" class="form-control" placeholder="Filename/title (default: stdin)">
+ <input type="text" name="filename[1]" class="form-control" placeholder="Filename/title (default: stdin)" value="<?php if (isset($textarea_filename)) { echo htmlspecialchars($textarea_filename); } ?>">
</div>
<textarea name="content[1]" class="form-control text-upload" placeholder="Paste content"><?php
if (isset($textarea_content)) {