diff options
author | Michael Vogel <icarus@dabo.de> | 2012-04-13 00:10:41 +0200 |
---|---|---|
committer | Michael Vogel <icarus@dabo.de> | 2012-04-13 00:10:41 +0200 |
commit | 572678fef95816deaa1ecafe5cbcfb8cc65963c9 (patch) | |
tree | e59df4f38865c14111d5460e85192759380786a8 /include/Contact.php | |
parent | 138caa4380c442200964c8cf071438a0be89da70 (diff) | |
parent | e3af552bbfff2632bbcf2ce94c3e08ad4a5142d2 (diff) | |
download | volse-hubzilla-572678fef95816deaa1ecafe5cbcfb8cc65963c9.tar.gz volse-hubzilla-572678fef95816deaa1ecafe5cbcfb8cc65963c9.tar.bz2 volse-hubzilla-572678fef95816deaa1ecafe5cbcfb8cc65963c9.zip |
Merge commit 'upstream/master'
Conflicts:
include/dba.php
Diffstat (limited to 'include/Contact.php')
-rw-r--r-- | include/Contact.php | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/include/Contact.php b/include/Contact.php index 532ea2f95..8d893cf70 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -23,16 +23,24 @@ function user_remove($uid) { ); q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid)); + q("DELETE FROM `gcign` 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 `item_id` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `mail` WHERE `uid` = %d", intval($uid)); + q("DELETE FROM `mailacct` WHERE `uid` = %d", intval($uid)); + q("DELETE FROM `manage` WHERE `uid` = %d", intval($uid)); + q("DELETE FROM `notify` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `photo` WHERE `uid` = %d", intval($uid)); + q("DELETE FROM `attach` 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 `search` WHERE `uid` = %d", intval($uid)); + q("DELETE FROM `spam` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `user` WHERE `uid` = %d", intval($uid)); if($uid == local_user()) { unset($_SESSION['authenticated']); @@ -165,4 +173,15 @@ function random_profile() { if(count($r)) return dirname($r[0]['url']); return ''; -}
\ No newline at end of file +} + + +function contacts_not_grouped($uid) { + $r = q("select * from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) ", + intval($uid), + intval($uid) + ); + + return $r; +} + |