X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=0bcf137857ab5a2ca6f3e8614e4327dfd4e7451a;hb=0ee153e1bdebc344746bfea682c2d044b9c5c350;hp=d5264aa056e7954b02ccdf97842aeca414084a88;hpb=876acd68a0c6f7384c5aa0c78553dd70cd32bd99;p=friendica.git
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index d5264aa056..0bcf137857 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -83,14 +83,12 @@ function dfrn_confirm_post(App $a, $handsfree = null)
$duplex = $handsfree['duplex'];
$cid = 0;
$hidden = intval(defaults($handsfree, 'hidden' , 0));
- $activity = intval(defaults($handsfree, 'activity', 0));
} else {
$dfrn_id = notags(trim(defaults($_POST, 'dfrn_id' , '')));
$intro_id = intval(defaults($_POST, 'intro_id' , 0));
$duplex = intval(defaults($_POST, 'duplex' , 0));
$cid = intval(defaults($_POST, 'contact_id', 0));
$hidden = intval(defaults($_POST, 'hidden' , 0));
- $activity = intval(defaults($_POST, 'activity' , 0));
}
/*
@@ -283,12 +281,14 @@ function dfrn_confirm_post(App $a, $handsfree = null)
notice(L10n::t('Remote site reported: ') . $message . EOL);
}
- if (($status == 0) && ($intro_id)) {
+ if (($status == 0) && $intro_id) {
+ $intro = dba::selectFirst('intro', ['note'], ['id' => $intro_id]);
+ if (DBM::is_result($intro)) {
+ dba::update('contact', ['reason' => $intro['note']], ['id' => $contact_id]);
+ }
+
// Success. Delete the notification.
- q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d",
- intval($intro_id),
- intval($uid)
- );
+ dba::delete('intro', ['id' => $intro_id]);
}
if ($status != 0) {
@@ -360,10 +360,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
}
}
- q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d",
- intval($intro_id),
- intval($uid)
- );
+ dba::delete('intro', ['id' => $intro_id]);
$r = q("UPDATE `contact` SET `name-date` = '%s',
`uri-date` = '%s',
@@ -391,7 +388,6 @@ function dfrn_confirm_post(App $a, $handsfree = null)
);
}
- /// @TODO is DBM::is_result() working here?
if (!DBM::is_result($r)) {
notice(L10n::t('Unable to set contact photo.') . EOL);
}
@@ -403,50 +399,6 @@ function dfrn_confirm_post(App $a, $handsfree = null)
$ret = Diaspora::sendShare($user, $contact);
logger('share returns: ' . $ret);
}
-
- // Send a new friend post if we are allowed to...
- $profile = dba::selectFirst('profile', ['hide-friends'], ['is-default' => true, 'uid' => $uid]);
- if (x($profile, 'hide-friends') === 0 && $activity && !$hidden) {
- $self = dba::selectFirst('contact', [], ['self' => true, 'uid' => $uid]);
- if (DBM::is_result($self)) {
- $arr = [];
- $arr['guid'] = get_guid(32);
- $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid);
- $arr['uid'] = $uid;
- $arr['contact-id'] = $self['id'];
- $arr['wall'] = 1;
- $arr['type'] = 'wall';
- $arr['gravity'] = 0;
- $arr['origin'] = 1;
- $arr['author-name'] = $arr['owner-name'] = $self['name'];
- $arr['author-link'] = $arr['owner-link'] = $self['url'];
- $arr['author-avatar'] = $arr['owner-avatar'] = $self['thumb'];
-
- $A = '[url=' . $self['url'] . ']' . $self['name'] . '[/url]';
- $B = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
- $BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]';
-
- $arr['verb'] = ACTIVITY_FRIEND;
- $arr['object-type'] = ACTIVITY_OBJ_PERSON;
- $arr['body'] = L10n::t('%1$s is now friends with %2$s', $A, $B) . "\n\n\n" . $BPhoto;
-
- $arr['object'] = '' . "\n";
-
- $arr['allow_cid'] = $user['allow_cid'];
- $arr['allow_gid'] = $user['allow_gid'];
- $arr['deny_cid'] = $user['deny_cid'];
- $arr['deny_gid'] = $user['deny_gid'];
-
- $i = Item::insert($arr);
- if ($i) {
- Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
- }
- }
- }
}
Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact['id']);
@@ -667,49 +619,6 @@ function dfrn_confirm_post(App $a, $handsfree = null)
}
}
- // Send a new friend post if we are allowed to...
- if ($page && intval(PConfig::get($local_uid, 'system', 'post_joingroup'))) {
- $profile = dba::selectFirst('profile', ['hide-friends'], ['is-default' => true, 'uid' => $local_uid]);
- if (x($profile, 'hide-friends') === 0) {
- $self = dba::selectFirst('contact', [], ['self' => true, 'uid' => $local_uid]);
- if (DBM::is_result($self)) {
- $arr = [];
- $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $local_uid);
- $arr['uid'] = $local_uid;
- $arr['contact-id'] = $self['id'];
- $arr['wall'] = 1;
- $arr['type'] = 'wall';
- $arr['gravity'] = 0;
- $arr['origin'] = 1;
- $arr['author-name'] = $arr['owner-name'] = $self['name'];
- $arr['author-link'] = $arr['owner-link'] = $self['url'];
- $arr['author-avatar'] = $arr['owner-avatar'] = $self['thumb'];
-
- $A = '[url=' . $self['url'] . ']' . $self['name'] . '[/url]';
- $B = '[url=' . $combined['url'] . ']' . $combined['name'] . '[/url]';
- $BPhoto = '[url=' . $combined['url'] . ']' . '[img]' . $combined['thumb'] . '[/img][/url]';
-
- $arr['verb'] = ACTIVITY_JOIN;
- $arr['object-type'] = ACTIVITY_OBJ_GROUP;
- $arr['body'] = L10n::t('%1$s has joined %2$s', $A, $B) . "\n\n\n" . $BPhoto;
- $arr['object'] = '' . "\n";
-
- $arr['allow_cid'] = $user['allow_cid'];
- $arr['allow_gid'] = $user['allow_gid'];
- $arr['deny_cid'] = $user['deny_cid'];
- $arr['deny_gid'] = $user['deny_gid'];
-
- $i = Item::insert($arr);
- if ($i) {
- Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
- }
- }
- }
- }
System::xmlExit(0); // Success
return; // NOTREACHED
////////////////////// End of this scenario ///////////////////////////////////////////////