move inclusion of file_plaintext/client view to controller

This allows me to remove redundant variable definition from
upload_form() since the same code is in client().

Signed-off-by: Florian Pritz <bluewind@xinu.at>

2 files changed, 3 insertions, 4 deletions

diff --git a/application/controllers/file.php b/application/controllers/file.php
index bfb45e69a..1cff27fa9 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -75,12 +75,13 @@ class File extends CI_Controller {
 		$data['small_upload_size'] = $this->config->item('small_upload_size');
 		$data['max_upload_size'] = $this->config->item('upload_max_size');
 		$data['upload_max_age'] = $this->config->item('upload_max_age')/60/60/24;
-		$data['client_link'] = base_url().'data/client/fb-'.$this->var->latest_client.'.tar.gz';
-		$data['client_link_dir'] = base_url().'data/client/';
 		$data['contact_me_url'] = $this->config->item('contact_me_url');
 
 		$this->load->view($this->var->view_dir.'/header', $data);
 		$this->load->view($this->var->view_dir.'/upload_form', $data);
+		if ($this->var->cli_client) {
+			$this->load->view($this->var->view_dir.'/client', $data);
+		}
 		$this->load->view($this->var->view_dir.'/footer', $data);
 	}
 
diff --git a/application/views/file_plaintext/upload_form.php b/application/views/file_plaintext/upload_form.php
index 9dabcc95d..18ff958ce 100644
--- a/application/views/file_plaintext/upload_form.php
+++ b/application/views/file_plaintext/upload_form.php
@@ -1,4 +1,2 @@
 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); ?>.
-
-<?php include "client.php"; ?>