X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=317eb9e2e7bceb3b8c606271e1582e910df7bdd6;hb=c17adaf3333b356d0c7b19226b29cd733a43017b;hp=857f6c82df22c15ed69bb96a6e80ee46b395b458;hpb=9b55e52184dd22c6a2414b98ab37852299024fee;p=friendica.git
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 857f6c82df..317eb9e2e7 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -20,13 +20,11 @@
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
use Friendica\Core\System;
-use Friendica\Core\Worker;
+use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Group;
-use Friendica\Model\Item;
use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Protocol\Diaspora;
@@ -69,7 +67,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
return;
}
- $user = dba::selectFirst('user', [], ['uid' => $uid]);
+ $user = DBA::selectFirst('user', [], ['uid' => $uid]);
if (!DBM::is_result($user)) {
notice(L10n::t('Profile not found.') . EOL);
return;
@@ -83,14 +81,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));
}
/*
@@ -284,13 +280,13 @@ function dfrn_confirm_post(App $a, $handsfree = null)
}
if (($status == 0) && $intro_id) {
- $intro = dba::selectFirst('intro', ['note'], ['id' => $intro_id]);
+ $intro = DBA::selectFirst('intro', ['note'], ['id' => $intro_id]);
if (DBM::is_result($intro)) {
- dba::update('contact', ['reason' => $intro['note']], ['id' => $contact_id]);
+ DBA::update('contact', ['reason' => $intro['note']], ['id' => $contact_id]);
}
// Success. Delete the notification.
- dba::delete('intro', ['id' => $intro_id]);
+ DBA::delete('intro', ['id' => $intro_id]);
}
if ($status != 0) {
@@ -362,7 +358,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
}
}
- dba::delete('intro', ['id' => $intro_id]);
+ DBA::delete('intro', ['id' => $intro_id]);
$r = q("UPDATE `contact` SET `name-date` = '%s',
`uri-date` = '%s',
@@ -395,56 +391,12 @@ function dfrn_confirm_post(App $a, $handsfree = null)
}
// reload contact info
- $contact = dba::selectFirst('contact', [], ['id' => $contact_id]);
+ $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
if (DBM::is_result($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
$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']);
@@ -491,7 +443,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
}
// Find our user's account
- $user = dba::selectFirst('user', [], ['nickname' => $node]);
+ $user = DBA::selectFirst('user', [], ['nickname' => $node]);
if (!DBM::is_result($user)) {
$message = L10n::t('No user record found for \'%s\' ', $node);
System::xmlExit(3, $message); // failure
@@ -519,7 +471,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
// NOTREACHED
}
- $contact = dba::selectFirst('contact', [], ['url' => $decrypted_source_url, 'uid' => $local_uid]);
+ $contact = DBA::selectFirst('contact', [], ['url' => $decrypted_source_url, 'uid' => $local_uid]);
if (!DBM::is_result($contact)) {
if (strstr($decrypted_source_url, 'http:')) {
$newurl = str_replace('http:', 'https:', $decrypted_source_url);
@@ -527,7 +479,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
$newurl = str_replace('https:', 'http:', $decrypted_source_url);
}
- $contact = dba::selectFirst('contact', [], ['url' => $newurl, 'uid' => $local_uid]);
+ $contact = DBA::selectFirst('contact', [], ['url' => $newurl, 'uid' => $local_uid]);
if (!DBM::is_result($contact)) {
// this is either a bogus confirmation (?) or we deleted the original introduction.
$message = L10n::t('Contact record was not found for you on our site.');
@@ -559,7 +511,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
$dfrn_pubkey = $public_key;
}
- if (dba::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) {
+ if (DBA::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) {
$message = L10n::t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
System::xmlExit(1, $message); // Birthday paradox - duplicate dfrn-id
// NOTREACHED
@@ -585,7 +537,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
}
// We're good but now we have to scrape the profile photo and send notifications.
- $contact = dba::selectFirst('contact', ['photo'], ['id' => $dfrn_record]);
+ $contact = DBA::selectFirst('contact', ['photo'], ['id' => $dfrn_record]);
if (DBM::is_result($contact)) {
$photo = $contact['photo'];
} else {
@@ -665,49 +617,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 ///////////////////////////////////////////////