X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FContact.php;h=4ca77d065175c58bc0f02d3b2f7239cc20fadb73;hb=b43ed54967e133ca250ee7f42a90d699781d904f;hp=a915ae0b444883045097ccfb6d8a8e91e9c64b48;hpb=c7c3db8c54ada33c785a7303de582a3d0c1a14ee;p=friendica.git

diff --git a/include/Contact.php b/include/Contact.php
index a915ae0b44..4ca77d0651 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -6,20 +6,26 @@
 // authorisation to do this.
 
 function user_remove($uid) {
+	if(! $uid)
+		return;
+	$a = get_app();
+	logger('Removing user: ' . $uid);
 	q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `group` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `group_member` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `intro` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `event` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `item` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `mail` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `photo` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `profile` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `profile_check` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `user` WHERE `uid` = %d", intval($uid));
-	if($uid == get_uid()) {
+	if($uid == local_user()) {
 		unset($_SESSION['authenticated']);
 		unset($_SESSION['uid']);
-		killme();
+		goaway($a->get_baseurl());
 	}
 }
 
@@ -34,6 +40,12 @@ function contact_remove($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)
+	);
 }