X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=41b5e0ef54f16587dae6e2935ad40916b801e519;hb=9de0d354506fdb20929e68d10cf3680181d4382c;hp=85e896dcf5775239d6dc47d750ff14ddda1dbe92;hpb=f04d40a37eb36e903433478d671a9dcd5bb6aacb;p=friendica.git diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 85e896dcf5..41b5e0ef54 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -20,16 +20,16 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\L10n; -use Friendica\Core\PConfig; +use Friendica\Core\Protocol; use Friendica\Core\System; -use Friendica\Core\Worker; -use Friendica\Database\DBM; +use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Group; use Friendica\Model\User; use Friendica\Network\Probe; use Friendica\Protocol\Diaspora; use Friendica\Util\Crypto; +use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; use Friendica\Util\XML; @@ -67,8 +67,8 @@ function dfrn_confirm_post(App $a, $handsfree = null) return; } - $user = dba::selectFirst('user', [], ['uid' => $uid]); - if (!DBM::is_result($user)) { + $user = DBA::selectFirst('user', [], ['uid' => $uid]); + if (!DBA::isResult($user)) { notice(L10n::t('Profile not found.') . EOL); return; } @@ -81,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)); } /* @@ -120,11 +118,11 @@ function dfrn_confirm_post(App $a, $handsfree = null) AND `uid` = %d AND `duplex` = 0 LIMIT 1", - dbesc($dfrn_id), + DBA::escape($dfrn_id), intval($cid), intval($uid) ); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { logger('Contact not found in DB.'); notice(L10n::t('Contact not found.') . EOL); notice(L10n::t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL); @@ -139,13 +137,13 @@ function dfrn_confirm_post(App $a, $handsfree = null) $dfrn_confirm = $contact['confirm']; $aes_allow = $contact['aes_allow']; - $network = ((strlen($contact['issued-id'])) ? NETWORK_DFRN : NETWORK_OSTATUS); + $network = ((strlen($contact['issued-id'])) ? Protocol::DFRN : Protocol::OSTATUS); if ($contact['network']) { $network = $contact['network']; } - if ($network === NETWORK_DFRN) { + if ($network === Protocol::DFRN) { /* * Generate a key pair for all further communications with this person. * We have a keypair for every contact, and a site key for unknown people. @@ -160,7 +158,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) // Save the private key. Send them the public key. q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d", - dbesc($private_key), + DBA::escape($private_key), intval($contact_id), intval($uid) ); @@ -204,11 +202,11 @@ function dfrn_confirm_post(App $a, $handsfree = null) $params['duplex'] = 1; } - if ($user['page-flags'] == PAGE_COMMUNITY) { + if ($user['page-flags'] == Contact::PAGE_COMMUNITY) { $params['page'] = 1; } - if ($user['page-flags'] == PAGE_PRVGROUP) { + if ($user['page-flags'] == Contact::PAGE_PRVGROUP) { $params['page'] = 2; } @@ -249,6 +247,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (stristr($res, " $intro_id]); + if (DBA::isResult($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) { @@ -305,13 +306,14 @@ function dfrn_confirm_post(App $a, $handsfree = null) logger('dfrn_confirm: confirm - imported photos'); - if ($network === NETWORK_DFRN) { - $new_relation = CONTACT_IS_FOLLOWER; - if (($relation == CONTACT_IS_SHARING) || ($duplex)) { - $new_relation = CONTACT_IS_FRIEND; + if ($network === Protocol::DFRN) { + $new_relation = Contact::FOLLOWER; + + if (($relation == Contact::SHARING) || ($duplex)) { + $new_relation = Contact::FRIEND; } - if (($relation == CONTACT_IS_SHARING) && ($duplex)) { + if (($relation == Contact::SHARING) && ($duplex)) { $duplex = 0; } @@ -325,16 +327,16 @@ function dfrn_confirm_post(App $a, $handsfree = null) `network` = '%s' WHERE `id` = %d ", intval($new_relation), - dbesc(datetime_convert()), - dbesc(datetime_convert()), + DBA::escape(DateTimeFormat::utcNow()), + DBA::escape(DateTimeFormat::utcNow()), intval($duplex), intval($hidden), - dbesc(NETWORK_DFRN), + DBA::escape(Protocol::DFRN), intval($contact_id) ); } else { - // $network !== NETWORK_DFRN - $network = defaults($contact, 'network', NETWORK_OSTATUS); + // $network !== Protocol::DFRN + $network = defaults($contact, 'network', Protocol::OSTATUS); $arr = Probe::uri($contact['url']); @@ -346,22 +348,19 @@ function dfrn_confirm_post(App $a, $handsfree = null) $new_relation = $contact['rel']; $writable = $contact['writable']; - if ($network === NETWORK_DIASPORA) { + if ($network === Protocol::DIASPORA) { if ($duplex) { - $new_relation = CONTACT_IS_FRIEND; + $new_relation = Contact::FRIEND; } else { - $new_relation = CONTACT_IS_FOLLOWER; + $new_relation = Contact::FOLLOWER; } - if ($new_relation != CONTACT_IS_FOLLOWER) { + if ($new_relation != Contact::FOLLOWER) { $writable = 1; } } - 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', @@ -376,12 +375,12 @@ function dfrn_confirm_post(App $a, $handsfree = null) `rel` = %d WHERE `id` = %d ", - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc($addr), - dbesc($notify), - dbesc($poll), - dbesc($network), + DBA::escape(DateTimeFormat::utcNow()), + DBA::escape(DateTimeFormat::utcNow()), + DBA::escape($addr), + DBA::escape($notify), + DBA::escape($poll), + DBA::escape($network), intval($writable), intval($hidden), intval($new_relation), @@ -389,62 +388,17 @@ function dfrn_confirm_post(App $a, $handsfree = null) ); } - /// @TODO is DBM::is_result() working here? - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { notice(L10n::t('Unable to set contact photo.') . EOL); } // reload contact info - $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)) { + $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]); + if ((isset($new_relation) && $new_relation == Contact::FRIEND)) { + if (DBA::isResult($contact) && ($contact['network'] === Protocol::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'] = '' . ACTIVITY_OBJ_PERSON . '' . $contact['name'] . '' - . '' . $contact['url'] . '/' . $contact['name'] . ''; - $arr['object'] .= '' . xmlify('' . "\n"); - $arr['object'] .= xmlify('' . "\n"); - $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_store($arr); - if ($i) { - Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i); - } - } - } } Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact['id']); @@ -491,10 +445,10 @@ function dfrn_confirm_post(App $a, $handsfree = null) } // Find our user's account - $user = dba::selectFirst('user', [], ['nickname' => $node]); - if (!DBM::is_result($user)) { + $user = DBA::selectFirst('user', [], ['nickname' => $node]); + if (!DBA::isResult($user)) { $message = L10n::t('No user record found for \'%s\' ', $node); - Network::xmlExit(3, $message); // failure + System::xmlExit(3, $message); // failure // NOTREACHED } @@ -504,7 +458,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (!strstr($my_prvkey, 'PRIVATE KEY')) { $message = L10n::t('Our site encryption key is apparently messed up.'); - Network::xmlExit(3, $message); + System::xmlExit(3, $message); } // verify everything @@ -515,23 +469,23 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (!strlen($decrypted_source_url)) { $message = L10n::t('Empty site URL was provided or URL could not be decrypted by us.'); - Network::xmlExit(3, $message); + System::xmlExit(3, $message); // NOTREACHED } - $contact = dba::selectFirst('contact', [], ['url' => $decrypted_source_url, 'uid' => $local_uid]); - if (!DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', [], ['url' => $decrypted_source_url, 'uid' => $local_uid]); + if (!DBA::isResult($contact)) { if (strstr($decrypted_source_url, 'http:')) { $newurl = str_replace('http:', 'https:', $decrypted_source_url); } else { $newurl = str_replace('https:', 'http:', $decrypted_source_url); } - $contact = dba::selectFirst('contact', [], ['url' => $newurl, 'uid' => $local_uid]); - if (!DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', [], ['url' => $newurl, 'uid' => $local_uid]); + if (!DBA::isResult($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.'); - Network::xmlExit(3, $message); + System::xmlExit(3, $message); return; // NOTREACHED } } @@ -545,7 +499,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (!$foreign_pubkey) { $message = L10n::t('Site public key not available in contact record for URL %s.', $decrypted_source_url); - Network::xmlExit(3, $message); + System::xmlExit(3, $message); } $decrypted_dfrn_id = ""; @@ -559,20 +513,20 @@ 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.'); - Network::xmlExit(1, $message); // Birthday paradox - duplicate dfrn-id + System::xmlExit(1, $message); // Birthday paradox - duplicate dfrn-id // NOTREACHED } $r = q("UPDATE `contact` SET `dfrn-id` = '%s', `pubkey` = '%s' WHERE `id` = %d", - dbesc($decrypted_dfrn_id), - dbesc($dfrn_pubkey), + DBA::escape($decrypted_dfrn_id), + DBA::escape($dfrn_pubkey), intval($dfrn_record) ); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { $message = L10n::t('Unable to set your contact credentials on our system.'); - Network::xmlExit(3, $message); + System::xmlExit(3, $message); } // It's possible that the other person also requested friendship. @@ -585,8 +539,8 @@ 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]); - if (DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', ['photo'], ['id' => $dfrn_record]); + if (DBA::isResult($contact)) { $photo = $contact['photo']; } else { $photo = System::baseUrl() . '/images/person-175.jpg'; @@ -596,12 +550,13 @@ function dfrn_confirm_post(App $a, $handsfree = null) logger('dfrn_confirm: request - photos imported'); - $new_relation = CONTACT_IS_SHARING; - if (($relation == CONTACT_IS_FOLLOWER) || ($duplex)) { - $new_relation = CONTACT_IS_FRIEND; + $new_relation = Contact::SHARING; + + if (($relation == Contact::FOLLOWER) || ($duplex)) { + $new_relation = Contact::FRIEND; } - if (($relation == CONTACT_IS_FOLLOWER) && ($duplex)) { + if (($relation == Contact::FOLLOWER) && ($duplex)) { $duplex = 0; } @@ -617,17 +572,17 @@ function dfrn_confirm_post(App $a, $handsfree = null) `network` = '%s' WHERE `id` = %d ", intval($new_relation), - dbesc(datetime_convert()), - dbesc(datetime_convert()), + DBA::escape(DateTimeFormat::utcNow()), + DBA::escape(DateTimeFormat::utcNow()), intval($duplex), intval($forum), intval($prv), - dbesc(NETWORK_DFRN), + DBA::escape(Protocol::DFRN), intval($dfrn_record) ); - if (!DBM::is_result($r)) { // indicates schema is messed up or total db failure + if (!DBA::isResult($r)) { // indicates schema is messed up or total db failure $message = L10n::t('Unable to update your contact profile details on our system'); - Network::xmlExit(3, $message); + System::xmlExit(3, $message); } // Otherwise everything seems to have worked and we are almost done. Yay! @@ -643,11 +598,11 @@ function dfrn_confirm_post(App $a, $handsfree = null) LIMIT 1", intval($dfrn_record) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $combined = $r[0]; if ($combined['notify-flags'] & NOTIFY_CONFIRM) { - $mutual = ($new_relation == CONTACT_IS_FRIEND); + $mutual = ($new_relation == Contact::FRIEND); notification([ 'type' => NOTIFY_CONFIRM, 'notify_flags' => $combined['notify-flags'], @@ -665,50 +620,7 @@ 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'] = '' . ACTIVITY_OBJ_GROUP . '' . $combined['name'] . '' - . '' . $combined['url'] . '/' . $combined['name'] . ''; - $arr['object'] .= '' . xmlify('' . "\n"); - $arr['object'] .= xmlify('' . "\n"); - $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_store($arr); - if ($i) { - Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i); - } - } - } - } - Network::xmlExit(0); // Success + System::xmlExit(0); // Success return; // NOTREACHED ////////////////////// End of this scenario /////////////////////////////////////////////// }