From 1dd61073aa449e6f2bc13e44775ed2edf03914fb Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Fri, 19 Aug 2011 21:20:15 +0200 Subject: 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 --- application/controllers/file.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'application/controllers/file.php') 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); } -- cgit v1.2.3-24-g4f1b