X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=92557264023ba0d1d3737a8720e556f9a594cb2e;hb=48ffa880f099b19052f18e399bf6af50780a24b0;hp=7ac9a50c315ca2c4fee0ef0203ba49b68132f2c9;hpb=c16f314ec348205f4741e0171335168720e652d2;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index 7ac9a50c31..9255726402 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -10,76 +10,81 @@ function follow_post(&$a) {
 		// NOTREACHED
 	}
 
-	$url = notags(trim($_POST['url']));
-
-	if($url) {
-		$links = lrdd($url);
-		if(count($links)) {
-			foreach($links as $link) {
-				if($link['@attributes']['rel'] === NAMESPACE_DFRN)
-					$dfrn = $link['@attributes']['href'];
-				if($link['@attributes']['rel'] === 'salmon')
-					$notify = $link['@attributes']['href'];
-				if($link['@attributes']['rel'] === NAMESPACE_FEED)
-					$poll = $link['@attributes']['href'];
-				if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
-					$hcard = $link['@attributes']['href'];
-				if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
-					$profile = $link['@attributes']['href'];
-
-			}
-		}
-	}	
-
-	// If we find a DFRN site, send our subscriber to the other person's
-	// dfrn_request page and all the other details will get sorted.
-
-	if(strlen($dfrn)) {
-		$ret = scrape_dfrn($dfrn);
-		if(is_array($ret) && x($ret,'dfrn-request')) {
-			if(strlen($a->path))
-				$myaddr = urlencode($a->get_baseurl() . '/profile/' . $a->user['nickname']);
-			else
-				$myaddr = urlencode($a->user['nickname'] . '@' . $a->get_hostname());
+	$url = $orig_url = notags(trim($_POST['url']));
+
+	// remove ajax junk, e.g. Twitter
+
+	$url = str_replace('/#!/','/',$url);
+
+	if(! allowed_url($url)) {
+		notice( t('Disallowed profile URL.') . EOL);
+		goaway($_SESSION['return_url']);
+		// NOTREACHED
+	}
+
+	$ret = probe_url($url);
+
+	if($ret['network'] === NETWORK_DFRN) {
+		if(strlen($a->path))
+			$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
+		else
+			$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
  
-			goaway($ret['dfrn-request'] . "&address=$myaddr");
+		goaway($ret['request'] . "&addr=$myaddr");
 		
-			// NOTREACHED
-		}
+		// NOTREACHED
 	}
-
-	if($hcard) {
-		$vcard = scrape_vcard($hcard);
+	else {
+		if(get_config('system','dfrn_only')) {
+			notice( t('This site is not configured to allow communications with other networks.') . EOL);
+			notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
+			goaway($_SESSION['return_url']);
+		}
 	}
 
-	if(! $profile)
-		$profile = $url;
-
 	// do we have enough information?
-
-	if(! x($vcard,'fn'))
-		if(x($vcard,'nick'))
-			$vcard['fn'] = $vcard['nick'];
-
-	if(! ((x($vcard['fn'])) && ($poll) && ($notify) && ($profile))) {
+	
+	if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
 		notice( t('The profile address specified does not provide adequate information.') . EOL);
+		if(! x($ret,'poll'))
+			notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
+		if(! x($ret,'name'))
+			notice( t('An author or name was not found.') . EOL);
+		if(! x($ret,'url'))
+			notice( t('No browser URL could be matched to this address.') . EOL);
+		if(strpos($url,'@') !== false)
+			notice('Unable to match @-style Identity Address with a known protocol or email contact');
 		goaway($_SESSION['return_url']);
-	} 
+	}
 
-	if(! x($vcard,'photo'))
-		$vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ; 
+	if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) {
+		notice( t('Communication options with this network have been restricted.') . EOL);
+		$ret['notify'] = '';
+	}
 
+	if(! $ret['notify']) {
+		notice( t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL);
+	}
+
+	$writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
+	if($ret['network'] === NETWORK_MAIL) {
+		$writeable = 1;
+		
+	}
 	// check if we already have a contact
+	// the poll url is more reliable than the profile url, as we may have
+	// indirect links or webfinger links
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1",
 		intval(local_user()),
-		dbesc($poll)
+		dbesc($ret['poll'])
 	);			
-	if($r) {
+
+	if(count($r)) {
 		// update contact
-		if($r[0]['rel'] == REL_VIP) {
-			q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval(REL_BUD),
+		if($r[0]['rel'] == CONTACT_IS_FOLLOWER) {
+			q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
+				intval(CONTACT_IS_FRIEND),
 				intval($r[0]['id']),
 				intval(local_user())
 			);
@@ -87,25 +92,31 @@ function follow_post(&$a) {
 	}
 	else {
 		// create contact record 
-		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, 
-			`blocked`, `readonly`, `pending` )
-			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 0 ) ",
+		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`,
+			`writable`, `blocked`, `readonly`, `pending` )
+			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
 			intval(local_user()),
 			dbesc(datetime_convert()),
-			dbesc($profile),
-			dbesc($notify),
-			dbesc($poll),
-			dbesc($vcard['fn']),
-			dbesc($vcard['nick']),
-			dbesc($vcard['photo']),
-			dbesc('stat'),
-			intval(REL_FAN)
+			dbesc($ret['url']),
+			dbesc($ret['addr']),
+			dbesc($ret['alias']),
+			dbesc($ret['notify']),
+			dbesc($ret['poll']),
+			dbesc($ret['name']),
+			dbesc($ret['nick']),
+			dbesc($ret['photo']),
+			dbesc($ret['network']),
+			intval(($ret['network'] === NETWORK_MAIL) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING),
+			intval($ret['priority']),
+			intval($writeable)
 		);
 	}
+
 	$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
-		dbesc($profile),
+		dbesc($ret['url']),
 		intval(local_user())
 	);
+
 	if(! count($r)) {
 		notice( t('Unable to retrieve contact information.') . EOL);
 		goaway($_SESSION['return_url']);
@@ -117,49 +128,19 @@ function follow_post(&$a) {
 
 	require_once("Photo.php");
 
-	$photo_failure = false;
-
-	$filename = basename($vcard['photo']);
-	$img_str = fetch_url($vcard['photo'],true);
-	$img = new Photo($img_str);
-	if($img->is_valid()) {
-
-		$img->scaleImageSquare(175);
-					
-		$hash = photo_new_resource();
-
-		$r = $img->store(local_user(), $contact_id, $hash, $filename, t('Contact Photos'), 4 );
-
-		if($r === false)
-			$photo_failure = true;
-
-		$img->scaleImage(80);
-
-		$r = $img->store(local_user(), $contact_id, $hash, $filename, t('Contact Photos'), 5 );
-
-		if($r === false)
-			$photo_failure = true;
-
-		$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg';
-		$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg';
-	}
-	else
-		$photo_failure = true;
-
-	if($photo_failure) {
-		$photo = $a->get_baseurl() . '/images/default-profile.jpg';
-		$thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg';
-	}
+	$photos = import_profile_photo($ret['photo'],local_user(),$contact_id);
 
 	$r = q("UPDATE `contact` SET `photo` = '%s', 
-			`thumb` = '%s', 
+			`thumb` = '%s',
+			`micro` = '%s', 
 			`name-date` = '%s', 
 			`uri-date` = '%s', 
 			`avatar-date` = '%s'
 			WHERE `id` = %d LIMIT 1
 		",
-			dbesc($photo),
-			dbesc($thumb),
+			dbesc($photos[0]),
+			dbesc($photos[1]),
+			dbesc($photos[2]),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
@@ -169,10 +150,11 @@ function follow_post(&$a) {
 
 	// pull feed and consume it, which should subscribe to the hub.
 
+	proc_run('php',"include/poller.php","$contact_id");
 
 	// create a follow slap
 
-	$tpl = load_view_file('view/follow_slap.tpl');
+	$tpl = get_markup_template('follow_slap.tpl');
 	$slap = replace_macros($tpl, array(
 		'$name' => $a->user['username'],
 		'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
@@ -184,7 +166,8 @@ function follow_post(&$a) {
 		'$type' => 'text',
 		'$content' => t('following'),
 		'$nick' => $a->user['nickname'],
-		'$verb' => ACTIVITY_FOLLOW
+		'$verb' => ACTIVITY_FOLLOW,
+		'$ostat_follow' => ''
 	));
 
 	$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
@@ -192,8 +175,11 @@ function follow_post(&$a) {
 			intval(local_user())
 	);
 
-	require_once('include/salmon.php');
-	slapper($r[0],$contact,$slap);
+
+	if((count($r)) && (x($contact,'notify')) && (strlen($contact['notify']))) {
+		require_once('include/salmon.php');
+		slapper($r[0],$contact['notify'],$slap);
+	}
 
 	goaway($_SESSION['return_url']);
 	// NOTREACHED