X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fremove_contact.php;h=92f712255771bb05537801b2451b3533448ca89b;hb=8cb4a8d0c420dc7c7fe9b96a43b78016c105a8fc;hp=153b98805a226b775b69bd787cd411777fb0c2d8;hpb=a38a5019d05e95add3375c52f8f509b99e92cd72;p=friendica.git

diff --git a/include/remove_contact.php b/include/remove_contact.php
index 153b98805a..92f7122557 100644
--- a/include/remove_contact.php
+++ b/include/remove_contact.php
@@ -3,24 +3,10 @@
  * @file include/remove_contact.php
  * @brief Removes orphaned data from deleted contacts
  */
-require_once("boot.php");
 
-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);
-	}
-
-	load_config('config');
-	load_config('system');
+use Friendica\Core\Config;
 
+function remove_contact_run($argv, $argc) {
 	if ($argc != 2) {
 		return;
 	}
@@ -28,25 +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;
 	}
 
-die("Blubb ".$id);
-	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));
 }
-?>