Merge pull request #4152 from MrPetovan/task/4137-add-posts-only-feed

Add posts only feed

mod/dfrn_poll.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file mod/dfrn_poll.php
  */
@@ -12,27 +13,27 @@ use Friendica\Protocol\OStatus;
 require_once 'include/items.php';
 require_once 'include/auth.php';
 
-function dfrn_poll_init(App $a) {
+function dfrn_poll_init(App $a)
-	$dfrn_id         = ((x($_GET,'dfrn_id'))         ? $_GET['dfrn_id']              : '');
+{
-	$type            = ((x($_GET,'type'))            ? $_GET['type']                 : 'data');
+	$dfrn_id         = x($_GET,'dfrn_id')         ? $_GET['dfrn_id']              : '';
-	$last_update     = ((x($_GET,'last_update'))     ? $_GET['last_update']          : '');
+	$type            = x($_GET,'type')            ? $_GET['type']                 : 'data';
-	$destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url']      : '');
+	$last_update     = x($_GET,'last_update')     ? $_GET['last_update']          : '';
-	$challenge       = ((x($_GET,'challenge'))       ? $_GET['challenge']            : '');
+	$destination_url = x($_GET,'destination_url') ? $_GET['destination_url']      : '';
-	$sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
+	$challenge       = x($_GET,'challenge')       ? $_GET['challenge']            : '';
-	$dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 2.0);
+	$sec             = x($_GET,'sec')             ? $_GET['sec']                  : '';
-	$perm            = ((x($_GET,'perm'))            ? $_GET['perm']                 : 'r');
+	$dfrn_version    = x($_GET,'dfrn_version')    ? (float) $_GET['dfrn_version'] : 2.0;
-	$quiet			 = ((x($_GET,'quiet'))			 ? true							 : false);
+	$perm            = x($_GET,'perm')            ? $_GET['perm']                 : 'r';
+	$quiet           = x($_GET,'quiet')           ? true                          : false;
 
 	// Possibly it is an OStatus compatible server that requests a user feed
 	if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) {
 		$nickname = $a->argv[1];
 		header("Content-type: application/atom+xml");
-		echo OStatus::feed($a, $nickname, $last_update, 10);
+		echo OStatus::feed($nickname, $last_update, 10);
 		killme();
 	}
 
-	$direction = (-1);
+	$direction = -1;
-
 
 	if (strpos($dfrn_id, ':') == 1) {
 		$direction = intval(substr($dfrn_id, 0, 1));
@@ -42,7 +43,7 @@ function dfrn_poll_init(App $a) {
 	$hidewall = false;
 
 	if (($dfrn_id === '') && (!x($_POST, 'dfrn_id'))) {
-		if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+		if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
 			http_status_exit(403);
 		}
 
@@ -51,8 +52,9 @@ function dfrn_poll_init(App $a) {
 			$r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
 				dbesc($a->argv[1])
 			);
-			if (!$r)
+			if (!$r) {
 				http_status_exit(404);
+			}
 
 			$hidewall = ($r[0]['hidewall'] && !local_user());
 
@@ -66,10 +68,9 @@ function dfrn_poll_init(App $a) {
 	}
 
 	if (($type === 'profile') && (!strlen($sec))) {
-
 		$sql_extra = '';
 		switch ($direction) {
-			case (-1):
+			case -1:
 				$sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id), dbesc($dfrn_id));
 				$my_id = $dfrn_id;
 				break;
@@ -94,19 +95,18 @@ function dfrn_poll_init(App $a) {
 		);
 
 		if (DBM::is_result($r)) {
-
 			$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
 
 			logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
 
 			if (strlen($s)) {
-
 				$xml = parse_xml_string($s);
 
-				if((int) $xml->status == 1) {
+				if ((int) $xml->status === 1) {
 					$_SESSION['authenticated'] = 1;
-					if(! x($_SESSION,'remote'))
+					if (!x($_SESSION, 'remote')) {
 						$_SESSION['remote'] = array();
+					}
 
 					$_SESSION['remote'][] = array('cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']);
 
@@ -114,8 +114,10 @@ function dfrn_poll_init(App $a) {
 					$_SESSION['visitor_home'] = $r[0]['url'];
 					$_SESSION['visitor_handle'] = $r[0]['addr'];
 					$_SESSION['visitor_visiting'] = $r[0]['uid'];
-					if(!$quiet)
+					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;
@@ -129,13 +131,10 @@ function dfrn_poll_init(App $a) {
 			goaway((strlen($destination_url)) ? $destination_url : System::baseUrl() . '/profile/' . $profile);
 		}
 		goaway(System::baseUrl());
-
 	}
 
 	if ($type === 'profile-check' && $dfrn_version < 2.2) {
-
 		if ((strlen($challenge)) && (strlen($sec))) {
-
 			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)
@@ -144,9 +143,11 @@ function dfrn_poll_init(App $a) {
 				xml_status(3, 'No ticket');
 				// NOTREACHED
 			}
+
 			$orig_id = $r[0]['dfrn_id'];
-			if(strpos($orig_id, ':'))
+			if (strpos($orig_id, ':')) {
 				$orig_id = substr($orig_id, 2);
+			}
 
 			$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 				intval($r[0]['cid'])
@@ -154,6 +155,7 @@ function dfrn_poll_init(App $a) {
 			if (!DBM::is_result($c)) {
 				xml_status(3, 'No profile');
 			}
+
 			$contact = $c[0];
 
 			$sent_dfrn_id = hex2bin($dfrn_id);
@@ -164,16 +166,16 @@ function dfrn_poll_init(App $a) {
 			if (($contact['duplex']) && strlen($contact['prvkey'])) {
 				openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']);
 				openssl_private_decrypt($challenge, $decoded_challenge, $contact['prvkey']);
-			}
+			} else {
-			else {
 				openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
 				openssl_public_decrypt($challenge, $decoded_challenge, $contact['pubkey']);
 			}
 
 			$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
 
-			if(strpos($final_dfrn_id,':') == 1)
+			if (strpos($final_dfrn_id, ':') == 1) {
 				$final_dfrn_id = substr($final_dfrn_id, 2);
+			}
 
 			if ($final_dfrn_id != $orig_id) {
 				logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
@@ -185,10 +187,8 @@ function dfrn_poll_init(App $a) {
 			echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>";
 			killme();
 			// NOTREACHED
-		}
+		} else {
-		else {
 			// old protocol
-
 			switch ($direction) {
 				case 1:
 					$dfrn_id = '0:' . $dfrn_id;
@@ -200,7 +200,6 @@ function dfrn_poll_init(App $a) {
 					break;
 			}
 
-
 			q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
 			$r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
 				dbesc($dfrn_id));
@@ -212,25 +211,20 @@ function dfrn_poll_init(App $a) {
 			return; // NOTREACHED
 		}
 	}
-
 }
 
-
+function dfrn_poll_post(App $a)
-
+{
-function dfrn_poll_post(App $a) {
+	$dfrn_id      = x($_POST,'dfrn_id')      ? $_POST['dfrn_id']              : '';
-
+	$challenge    = x($_POST,'challenge')    ? $_POST['challenge']            : '';
-	$dfrn_id      = ((x($_POST,'dfrn_id'))      ? $_POST['dfrn_id']              : '');
+	$url          = x($_POST,'url')          ? $_POST['url']                  : '';
-	$challenge    = ((x($_POST,'challenge'))    ? $_POST['challenge']            : '');
+	$sec          = x($_POST,'sec')          ? $_POST['sec']                  : '';
-	$url          = ((x($_POST,'url'))          ? $_POST['url']                  : '');
+	$ptype        = x($_POST,'type')         ? $_POST['type']                 : '';
-	$sec          = ((x($_POST,'sec'))          ? $_POST['sec']                  : '');
+	$dfrn_version = x($_POST,'dfrn_version') ? (float) $_POST['dfrn_version'] : 2.0;
-	$ptype        = ((x($_POST,'type'))         ? $_POST['type']                 : '');
+	$perm         = x($_POST,'perm')         ? $_POST['perm']                 : 'r';
-	$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)) {
-		if((strlen($challenge)) && (strlen($sec))) {
-
 			logger('dfrn_poll: POST: profile-check');
 
 			q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
@@ -241,9 +235,11 @@ function dfrn_poll_post(App $a) {
 				xml_status(3, 'No ticket');
 				// NOTREACHED
 			}
+
 			$orig_id = $r[0]['dfrn_id'];
-			if(strpos($orig_id, ':'))
+			if (strpos($orig_id, ':')) {
 				$orig_id = substr($orig_id, 2);
+			}
 
 			$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 				intval($r[0]['cid'])
@@ -251,6 +247,7 @@ function dfrn_poll_post(App $a) {
 			if (!DBM::is_result($c)) {
 				xml_status(3, 'No profile');
 			}
+
 			$contact = $c[0];
 
 			$sent_dfrn_id = hex2bin($dfrn_id);
@@ -258,19 +255,19 @@ function dfrn_poll_post(App $a) {
 
 			$final_dfrn_id = '';
 
-			if(($contact['duplex']) && strlen($contact['prvkey'])) {
+			if ($contact['duplex'] && strlen($contact['prvkey'])) {
 				openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']);
 				openssl_private_decrypt($challenge, $decoded_challenge, $contact['prvkey']);
-			}
+			} else {
-			else {
 				openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
 				openssl_public_decrypt($challenge, $decoded_challenge, $contact['pubkey']);
 			}
 
 			$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
 
-			if(strpos($final_dfrn_id,':') == 1)
+			if (strpos($final_dfrn_id, ':') == 1) {
 				$final_dfrn_id = substr($final_dfrn_id, 2);
+			}
 
 			if ($final_dfrn_id != $orig_id) {
 				logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
@@ -283,16 +280,14 @@ function dfrn_poll_post(App $a) {
 			killme();
 			// NOTREACHED
 		}
-
 	}
 
-	$direction    = (-1);
+	$direction = -1;
 	if (strpos($dfrn_id, ':') == 1) {
 		$direction = intval(substr($dfrn_id, 0, 1));
 		$dfrn_id = substr($dfrn_id, 2);
 	}
 
-
 	$r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
 		dbesc($dfrn_id),
 		dbesc($challenge)
@@ -313,7 +308,7 @@ function dfrn_poll_post(App $a) {
 
 	$sql_extra = '';
 	switch ($direction) {
-		case (-1):
+		case -1:
 			$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
 			$my_id = $dfrn_id;
 			break;
@@ -330,10 +325,7 @@ function dfrn_poll_post(App $a) {
 			break; // NOTREACHED
 	}
 
-
 	$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
-
-
 	if (!DBM::is_result($r)) {
 		killme();
 	}
@@ -342,7 +334,6 @@ function dfrn_poll_post(App $a) {
 	$owner_uid = $r[0]['uid'];
 	$contact_id = $r[0]['id'];
 
-
 	if ($type === 'reputation' && strlen($url)) {
 		$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($url),
@@ -370,16 +361,15 @@ function dfrn_poll_post(App $a) {
 		";
 		killme();
 		// NOTREACHED
-	}
+	} else {
-	else {
-
 		// 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')
+			if ($perm === 'rw') {
 				$writable = 1;
-			else
+			} else {
 				$writable = 0;
+			}
 
 			if ($writable != $contact['writable']) {
 				q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d",
@@ -393,28 +383,26 @@ function dfrn_poll_post(App $a) {
 		$o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction);
 		echo $o;
 		killme();
-
 	}
 }
 
-function dfrn_poll_content(App $a) {
+function dfrn_poll_content(App $a)
+{
+	$dfrn_id         = x($_GET,'dfrn_id')         ? $_GET['dfrn_id']              : '';
+	$type            = x($_GET,'type')            ? $_GET['type']                 : 'data';
+	$last_update     = x($_GET,'last_update')     ? $_GET['last_update']          : '';
+	$destination_url = x($_GET,'destination_url') ? $_GET['destination_url']      : '';
+	$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;
 
-	$dfrn_id         = ((x($_GET,'dfrn_id'))         ? $_GET['dfrn_id']              : '');
+	$direction = -1;
-	$type            = ((x($_GET,'type'))            ? $_GET['type']                 : 'data');
-	$last_update     = ((x($_GET,'last_update'))     ? $_GET['last_update']          : '');
-	$destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url']      : '');
-	$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) {
 		$direction = intval(substr($dfrn_id, 0, 1));
 		$dfrn_id = substr($dfrn_id, 2);
 	}
 
-
 	if ($dfrn_id != '') {
 		// initial communication from external contact
 		$hash = random_string();
@@ -433,13 +421,16 @@ function dfrn_poll_content(App $a) {
 				dbesc($last_update)
 			);
 		}
+
 		$sql_extra = '';
 		switch ($direction) {
-			case (-1):
+			case -1:
-				if($type === 'profile')
+				if ($type === 'profile') {
 					$sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id), dbesc($dfrn_id));
-				else
+				} else {
 					$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
+				}
+
 				$my_id = $dfrn_id;
 				break;
 			case 0:
@@ -463,35 +454,29 @@ function dfrn_poll_content(App $a) {
 			AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
 			dbesc($nickname)
 		);
-
 		if (DBM::is_result($r)) {
-
 			$challenge = '';
 			$encrypted_id = '';
 			$id_str = $my_id . '.' . mt_rand(1000, 9999);
 
-			if(($r[0]['duplex'] && strlen($r[0]['pubkey'])) || (! strlen($r[0]['prvkey']))) {
+			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']);
-			}
+			} else {
-			else {
 				openssl_private_encrypt($hash, $challenge, $r[0]['prvkey']);
 				openssl_private_encrypt($id_str, $encrypted_id, $r[0]['prvkey']);
 			}
 
 			$challenge = bin2hex($challenge);
 			$encrypted_id = bin2hex($encrypted_id);
-		}
+		} else {
-		else {
 			$status = 1;
 			$challenge = '';
 			$encrypted_id = '';
 		}
 
 		if (($type === 'profile') && (strlen($sec))) {
-
 			// URL reply
-
 			if ($dfrn_version < 2.2) {
 				$s = fetch_url($r[0]['poll']
 					. '?dfrn_id=' . $encrypted_id
@@ -500,8 +485,7 @@ function dfrn_poll_content(App $a) {
 					. '&challenge=' . $challenge
 					. '&sec=' . $sec
 				);
-			}
+			} else {
-			else {
 				$s = post_url($r[0]['poll'], array(
 					'dfrn_id' => $encrypted_id,
 					'type' => 'profile-check',
@@ -533,7 +517,6 @@ function dfrn_poll_content(App $a) {
 			logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA);
 
 			if (strlen($s) && strstr($s, '<?xml')) {
-
 				$xml = parse_xml_string($s);
 
 				logger('dfrn_poll: profile: parsed xml: ' . print_r($xml, true), LOGGER_DATA);
@@ -541,17 +524,20 @@ function dfrn_poll_content(App $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'))
+					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'];
-					if(!$quiet)
+					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;
@@ -565,9 +551,7 @@ function dfrn_poll_content(App $a) {
 			}
 			goaway($dest);
 			// NOTREACHED
-
+		} else {
-		}
-		else {
 			// XML reply
 			header("Content-type: text/xml");
 			echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n"

mod/profile.php

@@ -6,22 +6,22 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
-require_once('include/contact_widgets.php');
+require_once 'include/contact_widgets.php';
-require_once('include/redir.php');
+require_once 'include/redir.php';
 
-function profile_init(App $a) {
+function profile_init(App $a)
-
+{
-	if(! x($a->page,'aside'))
+	if (!x($a->page, 'aside')) {
 		$a->page['aside'] = '';
+	}
 
-	if($a->argc > 1)
+	if ($a->argc > 1) {
 		$which = htmlspecialchars($a->argv[1]);
-	else {
+	} else {
-		$r = q("select nickname from user where blocked = 0 and account_expired = 0 and account_removed = 0 and verified = 1 order by rand() limit 1");
+		$r = q("SELECT `nickname` FROM `user` WHERE `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 ORDER BY RAND() LIMIT 1");
 		if (DBM::is_result($r)) {
 			goaway(System::baseUrl() . '/profile/' . $r[0]['nickname']);
-		}
+		} else {
-		else {
 			logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
 			notice(t('Requested profile is not available.') . EOL);
 			$a->error = 404;
@@ -30,40 +30,44 @@ function profile_init(App $a) {
 	}
 
 	$profile = 0;
-	if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
+	if (local_user() && $a->argc > 2 && $a->argv[2] === 'view') {
 		$which = $a->user['nickname'];
 		$profile = htmlspecialchars($a->argv[1]);
-	}
+	} else {
-	else {
 		auto_redir($a, $which);
 	}
 
 	profile_load($a, $which, $profile);
 
-	$blocked = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+	$blocked = Config::get('system', 'block_public') && !local_user() && !remote_user();
-	$userblock = (($a->profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false);
+	$userblock = $a->profile['hidewall'] && !local_user() && !remote_user();
 
-	if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
+	if (x($a->profile, 'page-flags') && $a->profile['page-flags'] == PAGE_COMMUNITY) {
 		$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
 	}
+
 	if (x($a->profile, 'openidserver')) {
 		$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
 	}
+
 	if (x($a->profile, 'openid')) {
 		$delegate = ((strstr($a->profile['openid'], '://')) ? $a->profile['openid'] : 'https://' . $a->profile['openid']);
 		$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
 	}
 	// site block
-	if ((! $blocked) && (! $userblock)) {
+	if (!$blocked && !$userblock) {
-		$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+		$keywords = x($a->profile, 'pub_keywords') ? $a->profile['pub_keywords'] : '';
 		$keywords = str_replace(array('#', ',', ' ', ',,'), array('', ' ', ',', ','), $keywords);
-		if(strlen($keywords))
+		if (strlen($keywords)) {
 			$a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n";
 		}
+	}
 
-	$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
+	$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . ($a->profile['net-publish'] ? 'true' : 'false') . '" />' . "\r\n";
-	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
+	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/" title="' . t('%s\'s posts', $a->profile['username']) . '"/>' . "\r\n";
-	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
+	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/comments" title="' . t('%s\'s comments', $a->profile['username']) . '"/>' . "\r\n";
+	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/activity" title="' . t('%s\'s timeline', $a->profile['username']) . '"/>' . "\r\n";
+	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : ''));
 	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
 	header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
@@ -71,13 +75,12 @@ function profile_init(App $a) {
 	foreach ($dfrn_pages as $dfrn) {
 		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"" . System::baseUrl() . "/dfrn_{$dfrn}/{$which}\" />\r\n";
 	}
-	$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".System::baseUrl()."/poco/{$which}\" />\r\n";
 
+	$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"" . System::baseUrl() . "/poco/{$which}\" />\r\n";
 }
 
-
+function profile_content(App $a, $update = 0)
-function profile_content(App $a, $update = 0) {
+{
-
 	$category = $datequery = $datequery2 = '';
 
 	if ($a->argc > 2) {
@@ -95,20 +98,20 @@ function profile_content(App $a, $update = 0) {
 	}
 
 	if (!x($category)) {
-		$category = ((x($_GET,'category')) ? $_GET['category'] : '');
+		$category = x($_GET, 'category') ? $_GET['category'] : '';
 	}
 
-	$hashtags = (x($_GET, 'tag') ? $_GET['tag'] : '');
+	$hashtags = x($_GET, 'tag') ? $_GET['tag'] : '';
 
 	if (Config::get('system', 'block_public') && (!local_user()) && (!remote_user())) {
 		return login();
 	}
 
-	require_once("include/bbcode.php");
+	require_once 'include/bbcode.php';
-	require_once('include/security.php');
+	require_once 'include/security.php';
-	require_once('include/conversation.php');
+	require_once 'include/conversation.php';
-	require_once('include/acl_selectors.php');
+	require_once 'include/acl_selectors.php';
-	require_once('include/items.php');
+	require_once 'include/items.php';
 
 	$groups = array();
 
@@ -155,10 +158,10 @@ function profile_content(App $a, $update = 0) {
 		}
 	}
 
-	$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+	$is_owner = local_user() && local_user() == $a->profile['profile_uid'];
 	$last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . remote_user();
 
-	if ($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+	if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
 		notice(t('Access to this profile has been restricted.') . EOL);
 		return;
 	}
@@ -190,33 +193,31 @@ function profile_content(App $a, $update = 0) {
 		$a->page['aside'] .= tagcloud_wall_widget();
 
 		if (can_write_wall($a, $a->profile['profile_uid'])) {
-
 			$x = array(
 				'is_owner' => $is_owner,
 				'allow_location' => ((($is_owner || $commvisitor) && $a->profile['allow_location']) ? true : false),
 				'default_location' => (($is_owner) ? $a->user['default-location'] : ''),
 				'nickname' => $a->profile['nickname'],
-				'lockstate' => (((is_array($a->user) && ((strlen($a->user['allow_cid'])) ||
+				'lockstate' => is_array($a->user)
-						(strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) ||
+					&& (strlen($a->user['allow_cid'])
-						(strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+						|| strlen($a->user['allow_gid'])
-				'acl' => (($is_owner) ? populate_acl($a->user, true) : ''),
+						|| strlen($a->user['deny_cid'])
+						|| strlen($a->user['deny_gid'])
+					) ? 'lock' : 'unlock',
+				'acl' => $is_owner ? populate_acl($a->user, true) : '',
 				'bang' => '',
-				'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
+				'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
 				'profile_uid' => $a->profile['profile_uid'],
-				'acl_data' => ( $is_owner ? construct_acl_data($a, $a->user) : '' ), // For non-Javascript ACL selector
+				'acl_data' => $is_owner ? construct_acl_data($a, $a->user) : '', // For non-Javascript ACL selector
 			);
 
 			$o .= status_editor($a, $x);
 		}
 	}
 
-
+	// Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
-	/**
-	 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
-	 */
 	$sql_extra = item_permissions_sql($a->profile['profile_uid'], $remote_contact, $groups);
 
-
 	if ($update) {
 		$last_updated = (x($_SESSION['last_updated'], $last_updated_key) ? $_SESSION['last_updated'][$last_updated_key] : 0);
 
@@ -247,7 +248,6 @@ function profile_content(App $a, $update = 0) {
 		if (!DBM::is_result($r)) {
 			return '';
 		}
-
 	} else {
 		$sql_post_table = "";
 
@@ -289,10 +289,12 @@ function profile_content(App $a, $update = 0) {
 			$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network');
 			$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
 		}
+
 		//  now that we have the user settings, see if the theme forces
 		//  a maximum item number which is lower then the user choice
-		if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network))
+		if (($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network)) {
 			$itemspage_network = $a->force_max_items;
+		}
 
 		$a->set_pager_itemspage($itemspage_network);
 
@@ -312,7 +314,6 @@ function profile_content(App $a, $update = 0) {
 			ORDER BY `thread`.`created` DESC $pager_sql",
 			intval($a->profile['profile_uid'])
 		);
-
 	}
 
 	$parents_arr = array();
@@ -323,8 +324,10 @@ function profile_content(App $a, $update = 0) {
 	$_SESSION['last_updated'][$last_updated_key] = time();
 
 	if (DBM::is_result($r)) {
-		foreach($r as $rr)
+		foreach ($r as $rr) {
 			$parents_arr[] = $rr['item_id'];
+		}
+
 		$parents_str = implode(', ', $parents_arr);
 
 		$items = q(item_query() . " AND `item`.`uid` = %d
@@ -339,7 +342,7 @@ function profile_content(App $a, $update = 0) {
 		$items = array();
 	}
 
-	if($is_owner && (! $update) && (! Config::get('theme','hide_eventlist'))) {
+	if ($is_owner && !$update && !Config::get('theme', 'hide_eventlist')) {
 		$o .= get_birthdays();
 		$o .= get_events();
 	}

src/Module/Feed.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Protocol\OStatus;
+
+/**
+ * Provides public Atom feeds
+ *
+ * Currently supported:
+ * - /feed/[nickname]/ => posts
+ * - /feed/[nickname]/posts => posts
+ * - /feed/[nickname]/comments => comments
+ * - /feed/[nickname]/replies => comments
+ * - /feed/[nickname]/activity => activity
+ *
+ * The nocache GET parameter is provided mainly for debug purposes, requires auth
+ *
+ * @brief Provides public Atom feeds
+ *
+ * @author Hypolite Petovan <mrpetovan@gmail.com>
+ */
+class Feed extends BaseModule
+{
+	public static function content()
+	{
+		$a = self::getApp();
+
+		$last_update = x($_GET, 'last_update') ? $_GET['last_update'] : '';
+		$nocache     = x($_GET, 'nocache') && local_user();
+
+		if ($a->argc < 2) {
+			http_status_exit(400);
+		}
+
+		$type = null;
+		if ($a->argc > 2) {
+			$type = $a->argv[2];
+		}
+
+		switch ($type) {
+			case 'posts':
+			case 'comments':
+			case 'activity':
+				break;
+			case 'replies':
+				$type = 'comments';
+				break;
+			default:
+				$type = 'posts';
+		}
+
+		$nickname = $a->argv[1];
+		header("Content-type: application/atom+xml");
+		echo OStatus::feed($nickname, $last_update, 10, $type, $nocache);
+		killme();
+	}
+}

src/Protocol/OStatus.php

@@ -1237,10 +1237,11 @@ class OStatus
 	 *
 	 * @param object $doc    XML document
 	 * @param array  $owner  Contact data of the poster
+	 * @param string $filter The related feed filter (activity, posts or comments)
 	 *
 	 * @return object header root element
 	 */
-	private static function addHeader($doc, $owner)
+	private static function addHeader($doc, $owner, $filter)
 	{
 		$a = get_app();
 
@@ -1256,10 +1257,16 @@ class OStatus
 		$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
 		$root->setAttribute("xmlns:mastodon", NAMESPACE_MASTODON);
 
+		switch ($filter) {
+			case 'activity': $title = t('%s\'s timeline', $owner['name']); break;
+			case 'posts'   : $title = t('%s\'s posts'   , $owner['name']); break;
+			case 'comments': $title = t('%s\'s comments', $owner['name']); break;
+		}
+
 		$attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION);
 		XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
 		XML::addElement($doc, $root, "id", System::baseUrl() . "/profile/" . $owner["nick"]);
-		XML::addElement($doc, $root, "title", sprintf("%s timeline", $owner["name"]));
+		XML::addElement($doc, $root, "title", $title);
 		XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"]));
 		XML::addElement($doc, $root, "logo", $owner["photo"]);
 		XML::addElement($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME));
@@ -2067,42 +2074,51 @@ class OStatus
 	}
 
 	/**
+	 * Creates the XML feed for a given nickname
+	 *
+	 * Supported filters:
+	 * - activity (default): all the public posts
+	 * - posts: all the public top-level posts
+	 * - comments: all the public replies
+	 *
+	 * Updates the provided last_update parameter if the result comes from the
+	 * cache or it is empty
+	 *
 	 * @brief Creates the XML feed for a given nickname
 	 *
-	 * @param object  $a           The application class
 	 * @param string  $owner_nick  Nickname of the feed owner
 	 * @param string  $last_update Date of the last update
 	 * @param integer $max_items   Number of maximum items to fetch
+	 * @param string  $filter      Feed items filter (activity, posts or comments)
+	 * @param boolean $nocache     Wether to bypass caching
 	 *
 	 * @return string XML feed
 	 */
-	public static function feed(App $a, $owner_nick, &$last_update, $max_items = 300)
+	public static function feed($owner_nick, &$last_update, $max_items = 300, $filter = 'activity', $nocache = false)
 	{
 		$stamp = microtime(true);
 
-		$cachekey = "ostatus:feed:".$owner_nick.":".$last_update;
+		$cachekey = "ostatus:feed:" . $owner_nick . ":" . $filter . ":" . $last_update;
 
 		$previous_created = $last_update;
 
 		$result = Cache::get($cachekey);
-		if (!is_null($result)) {
+		if (!$nocache && !is_null($result)) {
-			logger('Feed duration: '.number_format(microtime(true) - $stamp, 3).' - '.$owner_nick.' - '.$previous_created.' (cached)', LOGGER_DEBUG);
+			logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)', LOGGER_DEBUG);
 			$last_update = $result['last_update'];
 			return $result['feed'];
 		}
 
-		$r = q(
+		$owner = dba::fetch_first(
 			"SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
 				FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-				WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
+				WHERE `contact`.`self` AND `user`.`nickname` = ? LIMIT 1",
-			dbesc($owner_nick)
+			$owner_nick
 		);
-		if (!DBM::is_result($r)) {
+		if (!DBM::is_result($owner)) {
 			return;
 		}
 
-		$owner = $r[0];
-
 		if (!strlen($last_update)) {
 			$last_update = 'now -30 days';
 		}
@@ -2110,23 +2126,40 @@ class OStatus
 		$check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s');
 		$authorid = Contact::getIdForURL($owner["url"], 0);
 
+		$sql_extra = '';
+		if ($filter === 'posts') {
+			$sql_extra .= ' AND `item`.`id` = `item`.`parent` ';
+		}
+
+		if ($filter === 'comments') {
+			$sql_extra .= sprintf(" AND `item`.`object-type` = '%s' ", dbesc(ACTIVITY_OBJ_COMMENT));
+		}
+
 		$items = q(
 			"SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`)
 				STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent`
-				WHERE `item`.`uid` = %d AND `item`.`contact-id` = %d AND
+				WHERE `item`.`uid` = %d
-					`item`.`author-id` = %d AND `item`.`created` > '%s' AND
+				AND `item`.`contact-id` = %d
-					NOT `item`.`deleted` AND NOT `item`.`private` AND
+				AND `item`.`author-id` = %d
-					`thread`.`network` IN ('%s', '%s')
+				AND `item`.`created` > '%s'
+				AND NOT `item`.`deleted`
+				AND NOT `item`.`private`
+				AND `thread`.`network` IN ('%s', '%s')
+				$sql_extra
 				ORDER BY `item`.`created` DESC LIMIT %d",
-			intval($owner["uid"]), intval($owner["id"]),
+			intval($owner["uid"]),
-			intval($authorid), dbesc($check_date),
+			intval($owner["id"]),
-			dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN), intval($max_items)
+			intval($authorid),
+			dbesc($check_date),
+			dbesc(NETWORK_OSTATUS),
+			dbesc(NETWORK_DFRN),
+			intval($max_items)
 		);
 
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;
 
-		$root = self::addHeader($doc, $owner);
+		$root = self::addHeader($doc, $owner, $filter);
 
 		foreach ($items as $item) {
 			if (Config::get('system', 'ostatus_debug')) {
@@ -2145,7 +2178,7 @@ class OStatus
 		$msg = array('feed' => $feeddata, 'last_update' => $last_update);
 		Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
 
-		logger('Feed duration: '.number_format(microtime(true) - $stamp, 3).' - '.$owner_nick.' - '.$previous_created, LOGGER_DEBUG);
+		logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created, LOGGER_DEBUG);
 
 		return $feeddata;
 	}

src/Worker/PubSubPublish.php

@@ -52,7 +52,7 @@ class PubSubPublish {
 		logger("Generate feed of user ".$rr['nickname']." to ".$rr['callback_url']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
 
 		$last_update = $rr['last_update'];
-		$params = OStatus::feed($a, $rr['nickname'], $last_update);
+		$params = OStatus::feed($rr['nickname'], $last_update);
 
 		if (!$params) {
 			return;