X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=317eb9e2e7bceb3b8c606271e1582e910df7bdd6;hb=d1d2ee6b2f2a46f1c6495bfe9936146a2bfad403;hp=8baacf0931e5a54da053e1377039bbb93c0a5359;hpb=4000e81f1b3d423248e2919c36ea8f9f794c6b26;p=friendica.git

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 8baacf0931..317eb9e2e7 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file mod/dfrn_confirm.php
  * @brief Module: dfrn_confirm
@@ -20,9 +19,9 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
@@ -30,6 +29,9 @@ 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;
 
 require_once 'include/enotify.php';
 require_once 'include/items.php';
@@ -61,13 +63,13 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 	if (!x($_POST, 'source_url')) {
 		$uid = defaults($handsfree, 'uid', local_user());
 		if (!$uid) {
-			notice(t('Permission denied.') . EOL);
+			notice(L10n::t('Permission denied.') . EOL);
 			return;
 		}
 
-		$user = dba::selectFirst('user', [], ['uid' => $uid]);
+		$user = DBA::selectFirst('user', [], ['uid' => $uid]);
 		if (!DBM::is_result($user)) {
-			notice(t('Profile not found.') . EOL);
+			notice(L10n::t('Profile not found.') . EOL);
 			return;
 		}
 
@@ -79,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));
 		}
 
 		/*
@@ -124,8 +124,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 		);
 		if (!DBM::is_result($r)) {
 			logger('Contact not found in DB.');
-			notice(t('Contact not found.') . EOL);
-			notice(t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL);
+			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);
 			return;
 		}
 
@@ -220,7 +220,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			 *
 			 */
 
-			$res = post_url($dfrn_confirm, $params, null, $redirects, 120);
+			$res = Network::post($dfrn_confirm, $params, null, $redirects, 120);
 
 			logger(' Confirm: received data: ' . $res, LOGGER_DATA);
 
@@ -235,28 +235,28 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 				// We shouldn't proceed, because the xml parser might choke,
 				// and $status is going to be zero, which indicates success.
 				// We can hardly call this a success.
-				notice(t('Response from remote site was not understood.') . EOL);
+				notice(L10n::t('Response from remote site was not understood.') . EOL);
 				return;
 			}
 
 			if (strlen($leading_junk) && Config::get('system', 'debugging')) {
 				// This might be more common. Mixed error text and some XML.
 				// If we're configured for debugging, show the text. Proceed in either case.
-				notice(t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL);
+				notice(L10n::t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL);
 			}
 
 			if (stristr($res, "<status") === false) {
 				// wrong xml! stop here!
-				notice(t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res) . EOL);
+				notice(L10n::t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res) . EOL);
 				return;
 			}
 
-			$xml = parse_xml_string($res);
+			$xml = XML::parseString($res);
 			$status = (int) $xml->status;
 			$message = unxmlify($xml->message);   // human readable text of what may have gone wrong.
 			switch ($status) {
 				case 0:
-					info(t("Confirmation completed successfully.") . EOL);
+					info(L10n::t("Confirmation completed successfully.") . EOL);
 					break;
 				case 1:
 					// birthday paradox - generate new dfrn-id and fall through.
@@ -268,23 +268,25 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 					);
 
 				case 2:
-					notice(t("Temporary failure. Please wait and try again.") . EOL);
+					notice(L10n::t("Temporary failure. Please wait and try again.") . EOL);
 					break;
 				case 3:
-					notice(t("Introduction failed or was revoked.") . EOL);
+					notice(L10n::t("Introduction failed or was revoked.") . EOL);
 					break;
 			}
 
 			if (strlen($message)) {
-				notice(t('Remote site reported: ') . $message . EOL);
+				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) {
@@ -323,8 +325,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 				`network` = '%s' WHERE `id` = %d
 			",
 				intval($new_relation),
-				dbesc(datetime_convert()),
-				dbesc(datetime_convert()),
+				dbesc(DateTimeFormat::utcNow()),
+				dbesc(DateTimeFormat::utcNow()),
 				intval($duplex),
 				intval($hidden),
 				dbesc(NETWORK_DFRN),
@@ -356,10 +358,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',
@@ -374,8 +373,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 				`rel` = %d
 				WHERE `id` = %d
 			",
-				dbesc(datetime_convert()),
-				dbesc(datetime_convert()),
+				dbesc(DateTimeFormat::utcNow()),
+				dbesc(DateTimeFormat::utcNow()),
 				dbesc($addr),
 				dbesc($notify),
 				dbesc($poll),
@@ -387,64 +386,17 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			);
 		}
 
-		/// @TODO is DBM::is_result() working here?
 		if (!DBM::is_result($r)) {
-			notice(t('Unable to set contact photo.') . EOL);
+			notice(L10n::t('Unable to set contact photo.') . EOL);
 		}
 
 		// 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'] = t('%1$s is now friends with %2$s', $A, $B) . "\n\n\n" . $BPhoto;
-
-					$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $contact['name'] . '</title>'
-						. '<id>' . $contact['url'] . '/' . $contact['name'] . '</id>';
-					$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $contact['url'] . '" />' . "\n");
-					$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $contact['thumb'] . '" />' . "\n");
-					$arr['object'] .= '</link></object>' . "\n";
-
-					$arr['last-child'] = 1;
-
-					$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 +443,10 @@ 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 = t('No user record found for \'%s\' ', $node);
-			xml_status(3, $message); // failure
+			$message = L10n::t('No user record found for \'%s\' ', $node);
+			System::xmlExit(3, $message); // failure
 			// NOTREACHED
 		}
 
@@ -503,8 +455,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
 
 		if (!strstr($my_prvkey, 'PRIVATE KEY')) {
-			$message = t('Our site encryption key is apparently messed up.');
-			xml_status(3, $message);
+			$message = L10n::t('Our site encryption key is apparently messed up.');
+			System::xmlExit(3, $message);
 		}
 
 		// verify everything
@@ -514,12 +466,12 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
 
 		if (!strlen($decrypted_source_url)) {
-			$message = t('Empty site URL was provided or URL could not be decrypted by us.');
-			xml_status(3, $message);
+			$message = L10n::t('Empty site URL was provided or URL could not be decrypted by us.');
+			System::xmlExit(3, $message);
 			// 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,11 +479,11 @@ 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 = t('Contact record was not found for you on our site.');
-				xml_status(3, $message);
+				$message = L10n::t('Contact record was not found for you on our site.');
+				System::xmlExit(3, $message);
 				return; // NOTREACHED
 			}
 		}
@@ -544,8 +496,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 		$dfrn_record = $contact['id'];
 
 		if (!$foreign_pubkey) {
-			$message = t('Site public key not available in contact record for URL %s.', $decrypted_source_url);
-			xml_status(3, $message);
+			$message = L10n::t('Site public key not available in contact record for URL %s.', $decrypted_source_url);
+			System::xmlExit(3, $message);
 		}
 
 		$decrypted_dfrn_id = "";
@@ -559,9 +511,9 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			$dfrn_pubkey = $public_key;
 		}
 
-		if (dba::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) {
-			$message = t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
-			xml_status(1, $message); // Birthday paradox - duplicate 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
 		}
 
@@ -571,8 +523,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			intval($dfrn_record)
 		);
 		if (!DBM::is_result($r)) {
-			$message = t('Unable to set your contact credentials on our system.');
-			xml_status(3, $message);
+			$message = L10n::t('Unable to set your contact credentials on our system.');
+			System::xmlExit(3, $message);
 		}
 
 		// It's possible that the other person also requested friendship.
@@ -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 {
@@ -617,8 +569,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			`network` = '%s' WHERE `id` = %d
 		",
 			intval($new_relation),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
+			dbesc(DateTimeFormat::utcNow()),
+			dbesc(DateTimeFormat::utcNow()),
 			intval($duplex),
 			intval($forum),
 			intval($prv),
@@ -626,8 +578,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			intval($dfrn_record)
 		);
 		if (!DBM::is_result($r)) {	// indicates schema is messed up or total db failure
-			$message = t('Unable to update your contact profile details on our system');
-			xml_status(3, $message);
+			$message = L10n::t('Unable to update your contact profile details on our system');
+			System::xmlExit(3, $message);
 		}
 
 		// Otherwise everything seems to have worked and we are almost done. Yay!
@@ -656,7 +608,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 					'to_email'     => $combined['email'],
 					'uid'          => $combined['uid'],
 					'link'         => System::baseUrl() . '/contacts/' . $dfrn_record,
-					'source_name'  => ((strlen(stripslashes($combined['name']))) ? stripslashes($combined['name']) : t('[Name Withheld]')),
+					'source_name'  => ((strlen(stripslashes($combined['name']))) ? stripslashes($combined['name']) : L10n::t('[Name Withheld]')),
 					'source_link'  => $combined['url'],
 					'source_photo' => $combined['photo'],
 					'verb'         => ($mutual?ACTIVITY_FRIEND:ACTIVITY_FOLLOW),
@@ -665,52 +617,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'] = t('%1$s has joined %2$s', $A, $B) . "\n\n\n" . $BPhoto;
-					$arr['object'] = '<object><type>' . ACTIVITY_OBJ_GROUP . '</type><title>' . $combined['name'] . '</title>'
-						. '<id>' . $combined['url'] . '/' . $combined['name'] . '</id>';
-					$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $combined['url'] . '" />' . "\n");
-					$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $combined['thumb'] . '" />' . "\n");
-					$arr['object'] .= '</link></object>' . "\n";
-
-					$arr['last-child'] = 1;
-
-					$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);
-					}
-				}
-			}
-		}
-		xml_status(0); // Success
+		System::xmlExit(0); // Success
 		return; // NOTREACHED
 		////////////////////// End of this scenario ///////////////////////////////////////////////
 	}