X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fremove_contact.php;h=92f712255771bb05537801b2451b3533448ca89b;hb=cb3077b7a9023a65b6dc13df065bfbbe7f7633fb;hp=aa206211160ad1d14a13e38574cbe94c371adc29;hpb=4d30f2b292ec0b77de13cae3c622df84f84aa54f;p=friendica.git

diff --git a/include/remove_contact.php b/include/remove_contact.php
index aa20621116..92f7122557 100644
--- a/include/remove_contact.php
+++ b/include/remove_contact.php
@@ -4,26 +4,9 @@
  * @brief Removes orphaned data from deleted contacts
  */
 
-use \Friendica\Core\Config;
-
-require_once("boot.php");
+use Friendica\Core\Config;
 
 function remove_contact_run($argv, $argc) {
-	global $a, $db;
-
-	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);
-	}
-
-	Config::load();
-
 	if ($argc != 2) {
 		return;
 	}
@@ -31,24 +14,11 @@ function remove_contact_run($argv, $argc) {
 	$id = intval($argv[1]);
 
 	// Only delete if the contact doesn't exist (anymore)
-	$r = q("SELECT `id` FROM `contact` WHERE `id` = %d", intval($id));
+	$r = dba::select('contact', array('id'), array('id' => $id), array('limit' => 1));
 	if (dbm::is_result($r)) {
 		return;
 	}
 
-	q("DELETE FROM `item` WHERE `contact-id` = %d", intval($id));
-
-	q("DELETE FROM `photo` WHERE `contact-id` = %d", intval($id));
-
-	q("DELETE FROM `mail` WHERE `contact-id` = %d", intval($id));
-
-	q("DELETE FROM `event` WHERE `cid` = %d", intval($id));
-
-	q("DELETE FROM `queue` WHERE `cid` = %d", intval($id));
-}
-
-if (array_search(__file__, get_included_files()) === 0) {
-	remove_contact_run($_SERVER["argv"], $_SERVER["argc"]);
-	killme();
+	// Now we delete all the depending table entries
+	dba::delete('contact', array('id' => $id));
 }
-?>