X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=d6a07186aca299e007e7a14ba9d436b42fa1affd;hb=41fe07e12821a25e3ad8279abc5344b8bbe011ab;hp=fe5cd49063ee0dee05dcdfe3f868077b1e960b2b;hpb=5189a56ef832e1c5c6976f87d77d218bf4a6c221;p=friendica.git

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
old mode 100755
new mode 100644
index fe5cd49063..d6a07186ac
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -17,6 +17,7 @@ function dfrn_poll_init(&$a) {
 	$sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
 	$dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 2.0);
 	$perm            = ((x($_GET,'perm'))            ? $_GET['perm']                 : 'r');
+	$quiet			 = ((x($_GET,'quiet'))			 ? true							 : false);
 
 	$direction = (-1);
 
@@ -26,21 +27,26 @@ function dfrn_poll_init(&$a) {
 		$dfrn_id   = substr($dfrn_id,2);
 	}
 
-	if(($dfrn_id === '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
+	if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) {
 		if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-			killme();
+			http_status_exit(403);
 		}
 
-		$r = q("SELECT `hidewall` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
-			dbesc($a->argv[1])
-		);
-		if(count($r) && $r[0]['hidewall'])
-			killme();
- 
-		logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] );
+		$user = '';
+		if($a->argc > 1) {
+			$r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
+				dbesc($a->argv[1])
+			);
+			if(! $r)
+				http_status_exit(404);
+			if(($r[0]['hidewall']) && (! local_user()))
+				http_status_exit(403);
+			$user = $r[0]['nickname'];
+		}
+
+		logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
 		header("Content-type: application/atom+xml");
-		$o = get_feed_for($a, '', $a->argv[1],$last_update);
-		echo $o;
+		echo get_feed_for($a, '', $user,$last_update);
 		killme();
 	}
 
@@ -65,13 +71,13 @@ function dfrn_poll_init(&$a) {
 				break; // NOTREACHED
 		}
 
-		$r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname` 
+		$r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname`
 			FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
-			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
 			dbesc($a->argv[1])
 		);
-		
+
 		if(count($r)) {
 
 			$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
@@ -84,18 +90,24 @@ function dfrn_poll_init(&$a) {
 
 				if((int) $xml->status == 1) {
 					$_SESSION['authenticated'] = 1;
+					if(! x($_SESSION,'remote'))
+						$_SESSION['remote'] = array();
+
+					$_SESSION['remote'][] = array('cid' => $r[0]['id'],'uid' => $r[0]['uid'],'url' => $r[0]['url']);
+
 					$_SESSION['visitor_id'] = $r[0]['id'];
 					$_SESSION['visitor_home'] = $r[0]['url'];
 					$_SESSION['visitor_handle'] = $r[0]['addr'];
 					$_SESSION['visitor_visiting'] = $r[0]['uid'];
-					info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
+					if(!$quiet)
+						info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL);
 					// Visitors get 1 day session.
 					$session_id = session_id();
 					$expire = time() + 86400;
-					q("UPDATE `session` SET `expire` = '%s' WHERE `sid` = '%s' LIMIT 1",
+					q("UPDATE `session` SET `expire` = '%s' WHERE `sid` = '%s'",
 						dbesc($expire),
 						dbesc($session_id)
-					); 
+					);
 				}
 			}
 			$profile = $r[0]['nickname'];
@@ -199,13 +211,13 @@ function dfrn_poll_post(&$a) {
 	$ptype        = ((x($_POST,'type'))         ? $_POST['type']                 : '');
 	$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
 	$perm         = ((x($_POST,'perm'))         ? $_POST['perm']                 : 'r');
-          
+
 	if($ptype === 'profile-check') {
 
 		if((strlen($challenge)) && (strlen($sec))) {
 
 			logger('dfrn_poll: POST: profile-check');
- 
+
 			q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
 			$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
 				dbesc($sec)
@@ -277,7 +289,7 @@ function dfrn_poll_post(&$a) {
 	$type = $r[0]['type'];
 	$last_update = $r[0]['last_update'];
 
-	$r = q("DELETE FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
+	$r = q("DELETE FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s'",
 		dbesc($dfrn_id),
 		dbesc($challenge)
 	);
@@ -311,7 +323,7 @@ function dfrn_poll_post(&$a) {
 
 	$contact = $r[0];
 	$owner_uid = $r[0]['uid'];
-	$contact_id = $r[0]['id']; 
+	$contact_id = $r[0]['id'];
 
 
 	if($type === 'reputation' && strlen($url)) {
@@ -344,7 +356,7 @@ function dfrn_poll_post(&$a) {
 	}
 	else {
 
-		// Update the writable flag if it changed		
+		// Update the writable flag if it changed
 		logger('dfrn_poll: post request feed: ' . print_r($_POST,true),LOGGER_DATA);
 		if($dfrn_version >= 2.21) {
 			if($perm === 'rw')
@@ -353,13 +365,13 @@ function dfrn_poll_post(&$a) {
 				$writable = 0;
 
 			if($writable !=  $contact['writable']) {
-				q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
+				q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d",
 					intval($writable),
 					intval($contact_id)
 				);
 			}
 		}
-				
+
 		header("Content-type: application/atom+xml");
 		$o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update, $direction);
 		echo $o;
@@ -377,6 +389,7 @@ function dfrn_poll_content(&$a) {
 	$sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
 	$dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 2.0);
 	$perm            = ((x($_GET,'perm'))            ? $_GET['perm']                 : 'r');
+	$quiet		 = ((x($_GET,'quiet'))           ? true	                         : false);
 
 	$direction = (-1);
 	if(strpos($dfrn_id,':') == 1) {
@@ -425,11 +438,13 @@ function dfrn_poll_content(&$a) {
 				break; // NOTREACHED
 		}
 
-		$r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname` 
+		$nickname = $a->argv[1];
+
+		$r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname`
 			FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
-			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
-			dbesc($a->argv[1])
+			dbesc($nickname)
 		);
 
 		if(count($r)) {
@@ -438,7 +453,7 @@ function dfrn_poll_content(&$a) {
 			$encrypted_id = '';
 			$id_str = $my_id . '.' . mt_rand(1000,9999);
 
-			if($r[0]['duplex'] && strlen($r[0]['pubkey'])) {
+			if(($r[0]['duplex'] && strlen($r[0]['pubkey'])) || (! strlen($r[0]['prvkey']))) {
 				openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']);
 				openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']);
 			}
@@ -461,8 +476,8 @@ function dfrn_poll_content(&$a) {
 			// URL reply
 
 			if($dfrn_version < 2.2) {
-				$s = fetch_url($r[0]['poll'] 
-					. '?dfrn_id=' . $encrypted_id 
+				$s = fetch_url($r[0]['poll']
+					. '?dfrn_id=' . $encrypted_id
 					. '&type=profile-check'
 					. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
 					. '&challenge=' . $challenge
@@ -478,12 +493,12 @@ function dfrn_poll_content(&$a) {
 					'sec' => $sec
 				));
 			}
-			
-			$profile = $r[0]['nickname'];
+
+			$profile = ((count($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
 
 			switch($destination_url) {
 				case 'profile':
-					$dest = $a->get_baseurl() . '/profile/' . $profile . '?tab=profile';
+					$dest = $a->get_baseurl() . '/profile/' . $profile . '?f=&tab=profile';
 					break;
 				case 'photos':
 					$dest = $a->get_baseurl() . '/photos/' . $profile;
@@ -491,9 +506,9 @@ function dfrn_poll_content(&$a) {
 				case 'status':
 				case '':
 					$dest = $a->get_baseurl() . '/profile/' . $profile;
-					break;		
+					break;
 				default:
-					$dest = $destination_url;
+					$dest = $destination_url . '?f=&redir=1';
 					break;
 			}
 
@@ -507,23 +522,27 @@ function dfrn_poll_content(&$a) {
 
 				logger('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash);
 				logger('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec);
- 
-				
+
+
 				if(((int) $xml->status == 0) && ($xml->challenge == $hash)  && ($xml->sec == $sec)) {
 					$_SESSION['authenticated'] = 1;
+					if(! x($_SESSION,'remote'))
+						$_SESSION['remote'] = array();
+					$_SESSION['remote'][] = array('cid' => $r[0]['id'],'uid' => $r[0]['uid'],'url' => $r[0]['url']);
 					$_SESSION['visitor_id'] = $r[0]['id'];
 					$_SESSION['visitor_home'] = $r[0]['url'];
 					$_SESSION['visitor_visiting'] = $r[0]['uid'];
-					info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
+					if(!$quiet)
+						info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL);
 					// Visitors get 1 day session.
 					$session_id = session_id();
 					$expire = time() + 86400;
-					q("UPDATE `session` SET `expire` = '%s' WHERE `sid` = '%s' LIMIT 1",
+					q("UPDATE `session` SET `expire` = '%s' WHERE `sid` = '%s'",
 						dbesc($expire),
 						dbesc($session_id)
-					); 
+					);
 				}
-			
+
 				goaway($dest);
 			}
 			goaway($dest);
@@ -545,5 +564,3 @@ function dfrn_poll_content(&$a) {
 		}
 	}
 }
-
-