diff options
| author | Florian Pritz <bluewind@xinu.at> | 2013-06-09 00:01:13 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2013-06-09 00:01:13 +0200 |
| commit | 51ebe79aa0fc50df691f442a73e3ac34a08179a0 (patch) | |
| tree | 8615bfe4869764507ca0106465df1ca0003fcfd3 /application | |
| parent | ee6706a4ab8207fc2c007fc2069505b24873e780 (diff) | |
implement repasting (fills textarea with ID's content)
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application')
| -rw-r--r-- | application/controllers/file.php | 10 | ||||
| -rw-r--r-- | application/views/file/html_header.php | 2 | ||||
| -rw-r--r-- | application/views/file/upload_form.php | 6 |
3 files changed, 17 insertions, 1 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php index cb95edf0c..1c216aa15 100644 --- a/application/controllers/file.php +++ b/application/controllers/file.php @@ -353,6 +353,16 @@ class File extends CI_Controller { $this->data['username'] = $this->muser->get_username(); + $repaste_id = $this->input->get("repaste"); + + if ($repaste_id) { + $filedata = $this->mfile->get_filedata($repaste_id); + + if ($filedata !== false && $this->mfile->can_highlight($filedata["mimetype"])) { + $this->data["textarea_content"] = file_get_contents($this->mfile->file($filedata["hash"])); + } + } + $this->load->view('header', $this->data); $this->load->view($this->var->view_dir.'/upload_form', $this->data); if (is_cli_client()) { diff --git a/application/views/file/html_header.php b/application/views/file/html_header.php index b861e0a39..7964488d6 100644 --- a/application/views/file/html_header.php +++ b/application/views/file/html_header.php @@ -72,6 +72,8 @@ include(FCPATH."application/views/header.php"); ?> </div> </div> </li> + <li class="divider-vertical"></li> + <li><a href="<?php echo site_url('file/index?repaste='.$id); ?>" role="button">Repaste</a></li> </ul> <div class="btn-group pull-right" style="margin-top: 7px; margin-right:-10px;"> <a id="linewrap" class="btn btn-small" rel="tooltip" title="Toggle wrapping of long lines">Linewrap</a> diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php index be449ee6e..a83ca3c87 100644 --- a/application/views/file/upload_form.php +++ b/application/views/file/upload_form.php @@ -4,7 +4,11 @@ <div class="span12 text-upload-form"> <?php echo form_open_multipart('file/do_paste'); ?> <h2>Text paste</h2> - <textarea name="content" class="text-upload span12"></textarea><br> + <textarea name="content" class="text-upload span12"><?php + if (isset($textarea_content)) { + echo $textarea_content; + } + ?></textarea><br> <button type="submit" class="btn btn-primary">Paste it!</button> </form> </div> |