Remove secondary controller for CLI usage output

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

3 files changed, 17 insertions, 13 deletions

diff --git a/application/controllers/Main.php b/application/controllers/Main.php
index 19cb63d4f..2422d96bf 100644
--- a/application/controllers/Main.php
+++ b/application/controllers/Main.php
@@ -20,8 +20,8 @@ class Main extends MY_Controller {
 	function index()
 	{
 		if ($this->input->is_cli_request()) {
-			$this->load->library("../controllers/tools");
-			return $this->tools->index();
+			output_cli_usage();
+			exit;
 		}
 
 		// Try to guess what the user would like to do.
diff --git a/application/controllers/Tools.php b/application/controllers/Tools.php
index 9e0ddfb5f..bb481db80 100644
--- a/application/controllers/Tools.php
+++ b/application/controllers/Tools.php
@@ -19,17 +19,7 @@ class Tools extends MY_Controller {
 
 	function index()
 	{
-		echo "php index.php <controller> <function> [arguments]\n";
-		echo "\n";
-		echo "Functions:\n";
-		echo "  file cron               Cronjob\n";
-		echo "  file nuke_id <ID>       Nukes all IDs sharing the same hash\n";
-		echo "  user cron               Cronjob\n";
-		echo "  tools update_database   Update/Initialise the database\n";
-		echo "\n";
-		echo "Functions that shouldn't have to be run:\n";
-		echo "  file clean_stale_files     Remove files without database entries\n";
-		echo "  file update_file_metadata  Update filesize and mimetype in database\n";
+		output_cli_usage();
 		exit;
 	}
 
diff --git a/application/helpers/filebin_helper.php b/application/helpers/filebin_helper.php
index c1a6f4f96..ffecec98d 100644
--- a/application/helpers/filebin_helper.php
+++ b/application/helpers/filebin_helper.php
@@ -392,4 +392,18 @@ function ensure_json_keys_contain_objects($data, $keys) {
 	return $data;
 }
 
+function output_cli_usage() {
+	echo "php index.php <controller> <function> [arguments]\n";
+	echo "\n";
+	echo "Functions:\n";
+	echo "  file cron               Cronjob\n";
+	echo "  file nuke_id <ID>       Nukes all IDs sharing the same hash\n";
+	echo "  user cron               Cronjob\n";
+	echo "  tools update_database   Update/Initialise the database\n";
+	echo "\n";
+	echo "Functions that shouldn't have to be run:\n";
+	echo "  file clean_stale_files     Remove files without database entries\n";
+	echo "  file update_file_metadata  Update filesize and mimetype in database\n";
+}
+
 # vim: set noet: