3 files changed, 40 insertions, 34 deletions

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()
diff --git a/application/controllers/user.php b/application/controllers/user.php
index 27e027ac7..37c84b1ed 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -7,29 +7,15 @@
  *
  */
 
-class User extends CI_Controller {
-
-	public $data = array();
-	public $var;
+class User 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());
-		}
-
 		$this->load->model("muser");
-		$this->data["title"] = "FileBin";
-
-		$this->load->helper(array('form', 'filebin'));
 
 		$this->var->view_dir = "user/";
-		$this->data['username'] = $this->muser->get_username();
 	}
 
 	function index()
@@ -293,6 +279,8 @@ class User extends CI_Controller {
 	// This simply queries the username
 	function _reset_password_username_form()
 	{
+		$this->data['username'] = $this->muser->get_username();
+
 		$this->load->view('header', $this->data);
 		$this->load->view($this->var->view_dir.'reset_password_username_form', $this->data);
 		$this->load->view('footer', $this->data);
diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
new file mode 100644
index 000000000..278768ad2
--- /dev/null
+++ b/application/core/MY_Controller.php
@@ -0,0 +1,36 @@
+<?php
+/*
+ * Copyright 2009-2013 Florian "Bluewind" Pritz <bluewind@server-speed.net>
+ *
+ * Licensed under AGPLv3
+ * (see COPYING for full license text)
+ *
+ */
+
+class MY_Controller extends CI_Controller {
+	public $data = array();
+	public $var;
+
+	private $json_enabled_functions = array(
+	);
+
+	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->data['title'] = "FileBin";
+	}
+}