X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=4dacb5d81707c9528ae6d9729be42a80dbb2b956;hb=8f6ae2b66044a36996ac92a8db1a540db9c71fe3;hp=4e2a70e048f8978e94df92aa6d367ed370d2a539;hpb=4cff911939b263993eb41682ca558c975e2db01f;p=friendica.git

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 4e2a70e048..4dacb5d817 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -123,9 +123,12 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		$dfrn_confirm = $contact['confirm'];
 		$aes_allow    = $contact['aes_allow'];
 
-		$network = ((strlen($contact['issued-id'])) ? 'dfrn' : 'stat');
+		$network = ((strlen($contact['issued-id'])) ? NETWORK_DFRN : NETWORK_OSTATUS);
 
-		if($network === 'dfrn') {
+		if($contact['network'])
+			$network = $contact['network'];
+
+		if($network === NETWORK_DFRN) {
 
 			/**
 			 *
@@ -298,19 +301,19 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		 *
 		 */
 
-		require_once("Photo.php");
+		require_once('include/Photo.php');
 
 		$photos = import_profile_photo($contact['photo'],$uid,$contact_id);
 		
 		logger('dfrn_confirm: confirm - imported photos');
 
-		if($network === 'dfrn') {
+		if($network === NETWORK_DFRN) {
 
-			$new_relation = REL_VIP;
-			if(($relation == REL_FAN) || ($duplex))
-				$new_relation = REL_BUD;
+			$new_relation = CONTACT_IS_FOLLOWER;
+			if(($relation == CONTACT_IS_SHARING) || ($duplex))
+				$new_relation = CONTACT_IS_FRIEND;
 
-			if(($relation == REL_FAN) && ($duplex))
+			if(($relation == CONTACT_IS_SHARING) && ($duplex))
 				$duplex = 0;
 
 			$r = q("UPDATE `contact` SET `photo` = '%s', 
@@ -337,21 +340,35 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			);
 		}
 		else {  
-			// $network !== 'dfrn'
-
-			$notify = '';
-			$poll   = '';
-
-			$arr = lrdd($contact['url']);
-			if(count($arr)) {
-				foreach($arr as $link) {
-					if($link['@attributes']['rel'] === 'salmon')
-						$notify = $link['@attributes']['href'];
-					if($link['@attributes']['rel'] === NAMESPACE_FEED)
-						$poll = $link['@attributes']['href'];
+
+			// $network !== NETWORK_DFRN
+
+			$network = (($contact['network']) ? $contact['network'] : NETWORK_OSTATUS);
+			$notify = (($contact['notify']) ? $contact['notify'] : '');
+			$poll   = (($contact['poll']) ? $contact['poll'] : '');
+
+			if((! $contact['notify']) || (! $contact['poll'])) {
+				$arr = lrdd($contact['url']);
+				if(count($arr)) {
+					foreach($arr as $link) {
+						if($link['@attributes']['rel'] === 'salmon')
+							$notify = $link['@attributes']['href'];
+						if($link['@attributes']['rel'] === NAMESPACE_FEED)
+							$poll = $link['@attributes']['href'];
+					}
 				}
 			}
 
+			$new_relation = $contact['rel'];
+			$writable = $contact['writable'];
+
+			if($network === NETWORK_DIASPORA) {
+				if($duplex)
+					$new_relation = CONTACT_IS_FRIEND;
+				if($new_relation != CONTACT_IS_FOLLOWER)
+					$writable = 1;
+			}
+
 			$r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($intro_id),
 				intval($uid)
@@ -368,7 +385,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				`poll` = '%s',
 				`blocked` = 0, 
 				`pending` = 0,
-				`network` = 'stat'
+				`network` = '%s',
+				`writable` = %d,
+				`rel` = %d
 				WHERE `id` = %d LIMIT 1
 			",
 				dbesc($photos[0]),
@@ -379,6 +398,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				dbesc(datetime_convert()),
 				dbesc($notify),
 				dbesc($poll),
+				dbesc($network),
+				intval($writable),
+				intval($new_relation),
 				intval($contact_id)
 			);			
 		}
@@ -401,7 +423,13 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		$r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
 			intval($uid)
 		);
-		if((count($r)) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) &&  isset($new_relation) && ($new_relation == REL_BUD)) {
+		if((count($r)) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) &&  isset($new_relation) && ($new_relation == CONTACT_IS_FRIEND)) {
+
+			if($r[0]['network'] === NETWORK_DIASPORA) {
+				require_once('include/diaspora.php');
+				$ret = diaspora_share($user[0],$r[0]);
+				logger('mod_follow: diaspora_share returns: ' . $ret);
+			}
 
 			require_once('include/items.php');
 
@@ -507,7 +535,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		$local_uid = $r[0]['uid'];
 
 
-		if(! strstr($my_prvkey,'BEGIN RSA PRIVATE KEY')) {
+		if(! strstr($my_prvkey,'PRIVATE KEY')) {
 			$message = t('Our site encryption key is apparently messed up.');
 			xml_status(3,$message);
 		}
@@ -528,12 +556,22 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			dbesc($decrypted_source_url),
 			intval($local_uid)
 		);
-
 		if(! count($ret)) {
-			// 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);
-			return; // NOTREACHED 
+			if(strstr($decrypted_source_url,'http:'))
+				$newurl = str_replace('http:','https:',$decrypted_source_url);
+			else
+				$newurl = str_replace('https:','http:',$decrypted_source_url);
+
+			$ret = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($newurl),
+				intval($local_uid)
+			);
+			if(! count($r)) {
+				// 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);
+				return; // NOTREACHED 
+			}
 		}
 
 		$relation = $ret[0]['rel'];
@@ -592,11 +630,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 		logger('dfrn_confirm: request - photos imported');
 
-		$new_relation = REL_FAN;
-		if(($relation == REL_VIP) || ($duplex))
-			$new_relation = REL_BUD;
+		$new_relation = CONTACT_IS_SHARING;
+		if(($relation == CONTACT_IS_FOLLOWER) || ($duplex))
+			$new_relation = CONTACT_IS_FRIEND;
 
-		if(($relation == REL_VIP) && ($duplex))
+		if(($relation == CONTACT_IS_FOLLOWER) && ($duplex))
 			$duplex = 0;
 
 		$r = q("UPDATE `contact` SET 
@@ -610,7 +648,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			`blocked` = 0, 
 			`pending` = 0,
 			`duplex` = %d, 
-			`network` = 'dfrn' WHERE `id` = %d LIMIT 1
+			`network` = '%s' WHERE `id` = %d LIMIT 1
 		",
 			dbesc($photos[0]),
 			dbesc($photos[1]),
@@ -620,6 +658,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			intval($duplex),
+			dbesc(NETWORK_DFRN),
 			intval($dfrn_record)
 		);
 		if($r === false) {    // indicates schema is messed up or total db failure
@@ -632,13 +671,14 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 		logger('dfrn_confirm: request: info updated');
 
-		$r = q("SELECT * FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
+		$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
 			WHERE `contact`.`id` = %d LIMIT 1",
 			intval($dfrn_record)
 		);
 		if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
 
-			$tpl = (($new_relation == REL_BUD) 
+			push_lang($r[0]['language']);
+			$tpl = (($new_relation == CONTACT_IS_FRIEND) 
 				? get_intltext_template('friend_complete_eml.tpl')
 				: get_intltext_template('intro_complete_eml.tpl'));
 		
@@ -661,6 +701,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			if(!$res) {
 				// pointless throwing an error here and confusing the person at the other end of the wire.
 			}
+			pop_lang();
 		}
 		xml_status(0); // Success
 		return; // NOTREACHED
@@ -670,7 +711,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 	// somebody arrived here by mistake or they are fishing. Send them to the homepage.
 
-	goaway($a->get_baseurl());
+	goaway(z_root());
 	// NOTREACHED
 
 }