Merge remote branch 'upstream/master'

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
old mode 100644 (file)
new mode 100755 (executable)
index 6eda0b6..d9949b1
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -10,6 +10,18 @@ function user_remove($uid) {
                return;
        $a = get_app();
        logger('Removing user: ' . $uid);
+
+       $r = q("select * from user where uid = %d limit 1", intval($uid));
+
+       call_hooks('remove_user',$r[0]);
+
+       // save username (actually the nickname as it is guaranteed 
+       // unique), so it cannot be re-registered in the future.
+
+       q("insert into userd ( username ) values ( '%s' )",
+               $r[0]['nickname']
+       );
+
        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));
@@ -46,6 +58,10 @@ function contact_remove($id) {
        q("DELETE FROM `event` WHERE `cid` = %d ",
                intval($id)
        );
+       q("DELETE FROM `queue` WHERE `cid` = %d ",
+               intval($id)
+       );
+
 }
 
 
@@ -114,8 +130,8 @@ function contact_photo_menu($contact) {
                $pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
        }
 
-       $contact_url = $a->get_baseurl() . '/contacts/' . $cid;
-       $posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
+       $contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
+       $posts_link = $a->get_baseurl() . '/network/?cid=' . $contact['id'];
 
        $menu = Array(
                t("View status") => $status_link,
@@ -133,7 +149,12 @@ function contact_photo_menu($contact) {
        
        $o = "";
        foreach($menu as $k=>$v){
-               if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
+               if ($v!="") {
+                       if(($k !== t("View recent")) && ($k !== t("Send PM")))
+                               $o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n";
+                       else
+                               $o .= "<li><a href=\"$v\">$k</a></li>\n";
+               }
        }
        return $o;
 }}