dbclean is restructured

diff --git a/include/dbclean.php b/include/dbclean.php
index 746c39ed973ba7d579bfa02a6e19e01f642b3d5d..659733a1a8e338846b6273eecef0d715b75da2ae 100644 (file)
--- a/include/dbclean.php
+++ b/include/dbclean.php
@@ -5,23 +5,25 @@
  */
 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');
+       load_config('config');
+       load_config('system');
 
-remove_orphans();
-killme();
+       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();
+}
 ?>