X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FContact.php;h=a6429bbf49eced95df08533580c48bfd3087327f;hb=a162ea725139bee852e2dee6f5963a6d34106fee;hp=d9949b1ef8db45cb3167fb61e84b9d3383d39a64;hpb=43d5876e8b35d53a0bef5248c5d63e5bc209dbbf;p=friendica.git
diff --git a/include/Contact.php b/include/Contact.php
index d9949b1ef8..a6429bbf49 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -22,18 +22,30 @@ function user_remove($uid) {
$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 `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 `user` WHERE `uid` = %d", intval($uid));
+ q("DELETE FROM `search` WHERE `uid` = %d", intval($uid));
+ q("DELETE FROM `spam` 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']);
@@ -43,7 +55,22 @@ function user_remove($uid) {
function contact_remove($id) {
- q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
+
+ $r = q("select uid from contact where id = %d limit 1",
+ intval($id)
+ );
+ if((! count($r)) || (! intval($r[0]['uid'])))
+ return;
+
+ $archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
+ if($archive) {
+ q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d",
+ intval($id)
+ );
+ return;
+ }
+
+ q("DELETE FROM `contact` WHERE `id` = %d",
intval($id)
);
q("DELETE FROM `item` WHERE `contact-id` = %d ",
@@ -65,6 +92,49 @@ function contact_remove($id) {
}
+// sends an unfriend message. Does not remove the contact
+
+function terminate_friendship($user,$self,$contact) {
+
+
+ $a = get_app();
+
+ require_once('include/datetime.php');
+
+ if($contact['network'] === NETWORK_OSTATUS) {
+
+ $slap = replace_macros(get_markup_template('follow_slap.tpl'), array(
+ '$name' => $user['username'],
+ '$profile_page' => $a->get_baseurl() . '/profile/' . $user['nickname'],
+ '$photo' => $self['photo'],
+ '$thumb' => $self['thumb'],
+ '$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
+ '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . random_string(),
+ '$title' => '',
+ '$type' => 'text',
+ '$content' => t('stopped following'),
+ '$nick' => $user['nickname'],
+ '$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW,
+ '$ostat_follow' => '' // 'http://ostatus.org/schema/1.0/unfollow' . "\r\n"
+ ));
+
+ if((x($contact,'notify')) && (strlen($contact['notify']))) {
+ require_once('include/salmon.php');
+ slapper($user,$contact['notify'],$slap);
+ }
+ }
+ elseif($contact['network'] === NETWORK_DIASPORA) {
+ require_once('include/diaspora.php');
+ diaspora_unshare($user,$contact);
+ }
+ elseif($contact['network'] === NETWORK_DFRN) {
+ require_once('include/items.php');
+ dfrn_deliver($user,$contact,'placeholder', 1);
+ }
+
+}
+
+
// Contact has refused to recognise us as a friend. We will start a countdown.
// If they still don't recognise us in 32 days, the relationship is over,
// and we won't waste any more time trying to communicate with them.
@@ -73,19 +143,35 @@ function contact_remove($id) {
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",
+ q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()),
intval($contact['id'])
);
}
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",
+ 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']);
}
}
@@ -95,7 +181,7 @@ function mark_for_death($contact) {
if(! function_exists('unmark_for_death')) {
function unmark_for_death($contact) {
// It's a miracle. Our dead contact has inexplicably come back to life.
- q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1",
+ q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
dbesc('0000-00-00 00:00:00'),
intval($contact['id'])
);
@@ -111,6 +197,8 @@ function contact_photo_menu($contact) {
$status_link="";
$photos_link="";
$posts_link="";
+ $contact_drop_link = "";
+ $poke_link="";
$sparkle = false;
if($contact['network'] === NETWORK_DFRN) {
@@ -130,31 +218,78 @@ function contact_photo_menu($contact) {
$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'];
+ $contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1';
+
$menu = Array(
- t("View status") => $status_link,
- t("View profile") => $profile_link,
- t("View photos") => $photos_link,
- t("View recent") => $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("View recent")) && ($k !== t("Send PM")))
+ if(($k !== t("Network Posts")) && ($k !== t("Send PM")) && ($k !== t('Edit Contact')))
$o .= "$k\n";
else
$o .= "$k\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;
}}
+
+
+function random_profile() {
+ $r = q("select url from gcontact where url like '%%://%%/profile/%%' order by rand() limit 1");
+ if(count($r))
+ return dirname($r[0]['url']);
+ return '';
+}
+
+
+function contacts_not_grouped($uid,$start = 0,$count = 0) {
+
+ if(! $count) {
+ $r = q("select count(*) as total 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;
+
+
+ }
+
+ $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) and blocked = 0 and pending = 0 limit %d, %d",
+ intval($uid),
+ intval($uid),
+ intval($start),
+ intval($count)
+ );
+
+ return $r;
+}
+