From 31409e2ca12684328a0f0d9961f81eed559b78ae Mon Sep 17 00:00:00 2001
From: Michael Vogel <ike@pirati.ca>
Date: Sat, 22 Oct 2016 04:57:52 +0000
Subject: [PATCH] dbclean is restructured

---
 include/dbclean.php | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/include/dbclean.php b/include/dbclean.php
index 746c39ed97..659733a1a8 100644
--- a/include/dbclean.php
+++ b/include/dbclean.php
@@ -5,24 +5,26 @@
  */
 require_once("boot.php");
 
-global $a, $db;
+function dbclean_run(&$argv, &$argc) {
+	global $a, $db;
 
-if(is_null($a))
-	$a = new App;
+	if(is_null($a))
+		$a = new App;
 
-if(is_null($db)) {
-	@include(".htconfig.php");
-	require_once("include/dba.php");
-	$db = new dba($db_host, $db_user, $db_pass, $db_data);
-	unset($db_host, $db_user, $db_pass, $db_data);
+	if(is_null($db)) {
+		@include(".htconfig.php");
+		require_once("include/dba.php");
+		$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		unset($db_host, $db_user, $db_pass, $db_data);
+	}
+
+	load_config('config');
+	load_config('system');
+
+	remove_orphans();
+	killme();
 }
 
-load_config('config');
-load_config('system');
-
-remove_orphans();
-killme();
-
 /**
  * @brief Remove orphaned database entries
  */
@@ -68,4 +70,9 @@ function remove_orphans() {
 
 	logger("Done deleting orphaned data from tables");
 }
+
+if (array_search(__file__,get_included_files())===0){
+  dbclean_run($_SERVER["argv"],$_SERVER["argc"]);
+  killme();
+}
 ?>