$r[0]['nickname']
);
- q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid));
+ // don't delete yet, will be done later when contacts have deleted my stuff
+ // 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 `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));
+ // don't delete yet, will be done later when contacts have deleted my stuff
+ // q("DELETE FROM `user` WHERE `uid` = %d", intval($uid));
+ q("UPDATE `user` SET `account_removed` = 1, `account_expires_on` = UTC_TIMESTAMP() WHERE `uid` = %d", intval($uid));
+ proc_run('php', "include/notifier.php", "removeme", $uid);
if($uid == local_user()) {
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
if(! function_exists('mark_for_death')) {
function mark_for_death($contact) {
+
+ if($contact['archive'])
+ return;
+
if($contact['term-date'] == '0000-00-00 00:00:00') {
q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1",
dbesc(datetime_convert()),
);
}
else {
+
+ // TODO: We really should send a notification to the owner after 2-3 weeks
+ // so they won't be surprised when the contact vanishes and can take
+ // remedial action if this was a serious mistake or glitch
+
$expiry = $contact['term-date'] . ' + 32 days ';
if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) {
// relationship is really truly dead.
+ // archive them rather than delete
+ // though if the owner tries to unarchive them we'll start the whole process over again
- contact_remove($contact['id']);
+ q("update contact set `archive` = 1 where id = %d limit 1",
+ intval($contact['id'])
+ );
+ q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact['id']), intval($contact['uid']));
+
+ //contact_remove($contact['id']);
}
}
$status_link="";
$photos_link="";
$posts_link="";
+ $contact_drop_link = "";
+ $poke_link="";
$sparkle = false;
if($contact['network'] === NETWORK_DFRN) {
$status_link = $profile_link . "?url=status";
$photos_link = $profile_link . "?url=photos";
$profile_link = $profile_link . "?url=profile";
+ $contact_drop_link = $a->get_baseurl() . '/contacts/' . $contact['id'] . '/drop';
$pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
}
+ $poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
$contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
- $posts_link = $a->get_baseurl() . '/network/?cid=' . $contact['id'];
+ $posts_link = $a->get_baseurl() . '/network/0?nets=all&cid=' . $contact['id'];
$menu = Array(
- t("View Status") => $status_link,
- t("View Profile") => $profile_link,
- t("View Photos") => $photos_link,
- t("Network Posts") => $posts_link,
- t("Edit Contact") => $contact_url,
- t("Send PM") => $pm_url,
+ 'poke' => array(t("Poke"), $poke_link),
+ 'status' => array(t("View Status"), $status_link),
+ 'profile' => array(t("View Profile"), $profile_link),
+ 'photos' => array(t("View Photos"), $photos_link),
+ 'network' => array(t("Network Posts"), $posts_link),
+ 'edit' => array(t("Edit Contact"), $contact_url),
+ 'drop' => array(t("Drop Contact"), $contact_drop_link),
+ 'pm' => array(t("Send PM"), $pm_url),
);
- $args = array('contact' => $contact, 'menu' => $menu);
+ $args = array('contact' => $contact, 'menu' => &$menu);
call_hooks('contact_photo_menu', $args);
- $o = "";
+/* $o = "";
foreach($menu as $k=>$v){
if ($v!="") {
if(($k !== t("Network Posts")) && ($k !== t("Send PM")) && ($k !== t('Edit Contact')))
$o .= "<li><a href=\"$v\">$k</a></li>\n";
}
}
- return $o;
+ return $o;*/
+ foreach($menu as $k=>$v){
+ if ($v[1]!="") {
+ if(($v[0] !== t("Network Posts")) && ($v[0] !== t("Send PM")) && ($v[0] !== t('Edit Contact')))
+ $menu[$k][2] = 1;
+ else
+ $menu[$k][2] = 0;
+ }
+ }
+ return $menu;
}}