From d87e4e2881d4cfa17dfd0445fae1fa881d5707c0 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Thu, 22 Aug 2013 18:08:48 +0200 Subject: Deduplicate initialisation code in controllers Signed-off-by: Florian Pritz --- application/controllers/file.php | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'application/controllers/file.php') diff --git a/application/controllers/file.php b/application/controllers/file.php index e8bb5896f..25e283e4b 100644 --- a/application/controllers/file.php +++ b/application/controllers/file.php @@ -7,27 +7,12 @@ * */ -class File extends CI_Controller { - - public $data = array(); - public $var; +class File extends MY_Controller { function __construct() { parent::__construct(); - $this->var = new StdClass(); - - $this->load->library('migration'); - if ( ! $this->migration->current()) { - show_error($this->migration->error_string()); - } - - $old_path = getenv("PATH"); - putenv("PATH=$old_path:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"); - - mb_internal_encoding('UTF-8'); - $this->load->helper(array('form', 'filebin')); $this->load->model('mfile'); $this->load->model('muser'); @@ -36,9 +21,6 @@ class File extends CI_Controller { } else { $this->var->view_dir = "file"; } - - $this->data['username'] = $this->muser->get_username(); - $this->data['title'] = "FileBin"; } function index() -- cgit v1.2.3-24-g4f1b