more thorough cleanup on account/contact removal

diff --git a/include/Contact.php b/include/Contact.php
index 7cac3c0e0ca9a3b555b1569a1bb05d0461ddc418..4ca77d065175c58bc0f02d3b2f7239cc20fadb73 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -14,11 +14,13 @@ function user_remove($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 == local_user()) {
                unset($_SESSION['authenticated']);
@@ -41,6 +43,9 @@ function contact_remove($id) {
        q("DELETE FROM `mail` WHERE `contact-id` = %d ",
                intval($id)
        );
+       q("DELETE FROM `event` WHERE `cid` = %d ",
+               intval($id)
+       );
 }
 
 

diff --git a/mod/photos.php b/mod/photos.php
index 4bb6e3eab47b6a96e2759d886f831aafec9bd6bb..8298d0d3f060e83dc8ea79752e222006da165bea 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -310,6 +310,7 @@ foreach($_FILES AS $key => $val) {
                        $arr['deny_gid']      = $p[0]['deny_gid'];
                        $arr['last-child']    = 1;
                        $arr['visible']       = $visibility;
+                       
                        $arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']' 
                                                . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.jpg' . '[/img]' 
                                                . '[/url]';