summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xssn.at>2010-02-27 21:18:15 +0100
committerFlorian Pritz <bluewind@xssn.at>2010-02-27 21:22:52 +0100
commit7bb325ba0df707d6de6501a00527ebac457f3e0f (patch)
tree5be03f5278d232a7f2037a1afc3ecaffd69e9b71
parent1d5ab0d38219163e07cc0923d30349e3bc82b9d7 (diff)
move html template to own file
Signed-off-by: Florian Pritz <bluewind@xssn.at>
-rw-r--r--system/application/controllers/file.php19
-rw-r--r--system/application/views/file/html_footer.php6
-rw-r--r--system/application/views/file/html_header.php13
3 files changed, 24 insertions, 14 deletions
diff --git a/system/application/controllers/file.php b/system/application/controllers/file.php
index ac8f15452..ba231d47f 100644
--- a/system/application/controllers/file.php
+++ b/system/application/controllers/file.php
@@ -167,24 +167,15 @@ class File extends Controller {
&& $this->file_mod->mime2extension($type)
&& filesize($file) <= $this->config->item('upload_max_text_size')
) {
+ $data['title'] = $filedata['filename'];
+ $data['raw_link'] = site_url($this->config->item('paste_download_url').$id);
header("Content-Type: text/html\n");
- // TODO: move to own file
- echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
- .'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"'
- .' <head><title>'.$filedata['filename'].'</title>'
- .' <link rel="stylesheet" type="text/css" href="'.base_url().'data/paste.css" />'
- .' </head>'
- .'<body>'
- .' <div class="top_bar">'
- .' <a class="raw_link no" href="'.site_url($this->config->item('paste_download_url').$id).'">Raw</a>'
- .' </div'
- .' <table class="content">'
- .' <tr><td class="numbers"><pre>';
+ echo $this->load->view('file/html_header', $data, true);
// TODO: implement in PHP
echo shell_exec('/usr/bin/seq 1 $(/usr/bin/wc -l '.escapeshellarg($file).' | /bin/cut -d\ -f1) | sed -r \'s/^(.*)$/<a href="#n\1" class="no" name="n\1" id="n\1">\1<\/a>/g\'');
- echo ' </pre></td><td class="code"><pre>'."\n";
+ echo '</pre></td><td class="code"><pre>'."\n";
echo shell_exec(FCPATH.'scripts/syntax-highlighting.sh '.$filedata['filename'].'.'.$mode.' < '.escapeshellarg($file));
- echo '</pre></td></tr></table></body></html>';
+ echo $this->load->view('file/html_footer', $data, true);
} else {
header("Content-Type: ".$type."\n");
header("Content-disposition: inline; filename=\"".$filedata['filename']."\"\n");
diff --git a/system/application/views/file/html_footer.php b/system/application/views/file/html_footer.php
new file mode 100644
index 000000000..9e449440f
--- /dev/null
+++ b/system/application/views/file/html_footer.php
@@ -0,0 +1,6 @@
+</pre>
+ </td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/system/application/views/file/html_header.php b/system/application/views/file/html_header.php
new file mode 100644
index 000000000..069ea6f1d
--- /dev/null
+++ b/system/application/views/file/html_header.php
@@ -0,0 +1,13 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title><?php echo $title; ?></title>
+ <link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>data/paste.css" />
+ </head>
+ <body>
+ <div class="top_bar">
+ <a class="raw_link no" href="<?php echo $raw_link; ?>">Raw</a>
+ </div>
+ <table class="content">
+ <tr>
+ <td class="numbers"><pre>