Comments to public posts no get through

mod/item.php

@@ -39,7 +39,7 @@ require_once 'include/items.php';
 
 function item_post(App $a) {
 
-	if ((! local_user()) && (! remote_user()) && (! x($_REQUEST, 'commenter'))) {
+	if (!local_user() && !remote_user() && !x($_REQUEST, 'commenter')) {
 		return;
 	}
 
@@ -81,8 +81,8 @@ function item_post(App $a) {
 	}
 
 	// Is this a reply to something?
-	$parent = ((x($_REQUEST, 'parent')) ? intval($_REQUEST['parent']) : 0);
+	$parent = (x($_REQUEST, 'parent') ? intval($_REQUEST['parent']) : 0);
-	$parent_uri = ((x($_REQUEST, 'parent_uri')) ? trim($_REQUEST['parent_uri']) : '');
+	$parent_uri = (x($_REQUEST, 'parent_uri') ? trim($_REQUEST['parent_uri']) : '');
 
 	$parent_item = null;
 	$parent_contact = null;
@@ -122,7 +122,7 @@ function item_post(App $a) {
 			}
 		}
 
-		if (! DBM::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			notice( t('Unable to locate original post.') . EOL);
 			if (x($_REQUEST, 'return')) {
 				goaway($return_path);
@@ -201,7 +201,7 @@ function item_post(App $a) {
 
 	// First check that the parent exists and it is a wall item.
 
-	if ((x($_REQUEST, 'commenter')) && ((! $parent) || (! $parent_item['wall']))) {
+	if (x($_REQUEST, 'commenter') && (!$parent || !$parent_item['wall'])) {
 		notice(t('Permission denied.') . EOL) ;
 		if (x($_REQUEST, 'return')) {
 			goaway($return_path);
@@ -209,11 +209,14 @@ function item_post(App $a) {
 		killme();
 	}
 
+	// Allow commenting if it is an answer to a public post
+	$allow_comment = ($profile_uid == 0) && $parent && in_array($parent_item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA]);
+
 	/*
 	 * Now check that it is a page_type of PAGE_BLOG, and that valid personal details
 	 * have been provided, and run any anti-spam plugins
 	 */
-	if ((! can_write_wall($a, $profile_uid)) && (! $allow_moderated)) {
+	if (!(can_write_wall($a, $profile_uid) || $allow_comment) && !$allow_moderated) {
 		notice(t('Permission denied.') . EOL) ;
 		if (x($_REQUEST, 'return')) {
 			goaway($return_path);
@@ -377,11 +380,11 @@ function item_post(App $a) {
 	$self   = false;
 	$contact_id = 0;
 
-	if ((local_user()) && (local_user() == $profile_uid)) {
+	if (local_user() && ((local_user() == $profile_uid) || $allow_comment)) {
 		$self = true;
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
 			intval($_SESSION['uid']));
-	} elseif(remote_user()) {
+	} elseif (remote_user()) {
 		if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
 			foreach ($_SESSION['remote'] as $v) {
 				if ($v['uid'] == $profile_uid) {
@@ -404,10 +407,10 @@ function item_post(App $a) {
 
 	// get contact info for owner
 
-	if ($profile_uid == local_user()) {
+	if ($profile_uid == local_user() || $allow_comment) {
 		$contact_record = $author;
 	} else {
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
 			intval($profile_uid)
 		);
 		if (DBM::is_result($r)) {

src/Worker/Delivery.php

@@ -14,6 +14,7 @@ use Friendica\Model\User;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Email;
+use dba;
 
 require_once 'include/queue_fn.php';
 require_once 'include/html2plain.php';
@@ -85,18 +86,17 @@ class Delivery {
 			$uid = $item_id;
 		} else {
 			// find ancestors
-			$r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1",
+			$target_item = dba::fetch_first("SELECT `item`.*, `contact`.`uid` AS `cuid` FROM `item`
-				intval($item_id)
+							INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			);
+							WHERE `item`.`id` = ? AND `visible` AND NOT `moderated`", $item_id);
 
-			if (!DBM::is_result($r) || !intval($r[0]['parent'])) {
+			if (!DBM::is_result($target_item) || !intval($target_item['parent'])) {
 				return;
 			}
 
-			$target_item = $r[0];
+			$parent_id = intval($target_item['parent']);
-			$parent_id = intval($r[0]['parent']);
+			$uid = $target_item['cuid'];
-			$uid = $r[0]['uid'];
+			$updated = $target_item['edited'];
-			$updated = $r[0]['edited'];
 
 			$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
 				FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC",
@@ -150,7 +150,7 @@ class Delivery {
 
 		$public_message = true;
 
-		if (!($mail || $fsuggest || $relocate)) {
+		if (!$mail && !$fsuggest && !$relocate) {
 			$parent = $items[0];
 
 			// This is IMPORTANT!!!!
@@ -195,10 +195,10 @@ class Delivery {
 				$followup = true;
 			}
 
-			if ((strlen($parent['allow_cid']))
+			if (strlen($parent['allow_cid'])
-				|| (strlen($parent['allow_gid']))
+				|| strlen($parent['allow_gid'])
-				|| (strlen($parent['deny_cid']))
+				|| strlen($parent['deny_cid'])
-				|| (strlen($parent['deny_gid']))
+				|| strlen($parent['deny_gid'])
 				|| $parent["private"]) {
 				$public_message = false; // private recipients, not public
 			}
@@ -283,7 +283,6 @@ class Delivery {
 				// perform local delivery if we are on the same site
 
 				if (link_compare($basepath,System::baseUrl())) {
-
 					$nickname = basename($contact['url']);
 					if ($contact['issued-id']) {
 						$sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
@@ -378,34 +377,35 @@ class Delivery {
 				}
 
 				if ($cmd === 'wall-new' || $cmd === 'comment-new') {
-
 					$it = null;
 					if ($cmd === 'wall-new') {
 						$it = $items[0];
 					} else {
-						$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+						$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
-							intval($item_id),
+							intval($item_id)
-							intval($uid)
 						);
-						if (DBM::is_result($r))
+						if (DBM::is_result($r)) {
 							$it = $r[0];
+						}
 					}
-					if (!$it)
+					if (!$it) {
 						break;
-
+					}
 
 					$local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 						intval($uid)
 					);
-					if (!count($local_user))
+					if (!count($local_user)) {
 						break;
+					}
 
 					$reply_to = '';
 					$r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 						intval($uid)
 					);
-					if ($r1 && $r1[0]['reply_to'])
+					if ($r1 && $r1[0]['reply_to']) {
 						$reply_to = $r1[0]['reply_to'];
+					}
 
 					$subject  = (($it['title']) ? Email::encodeHeader($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
 
@@ -435,8 +435,9 @@ class Delivery {
 						$headers .= "References: <".Email::iri2msgid($it["parent-uri"]).">";
 
 						// If Threading is enabled, write down the correct parent
-						if (($it["thr-parent"] != "") && ($it["thr-parent"] != $it["parent-uri"]))
+						if (($it["thr-parent"] != "") && ($it["thr-parent"] != $it["parent-uri"])) {
 							$headers .= " <".Email::iri2msgid($it["thr-parent"]).">";
+						}
 						$headers .= "\n";
 
 						if (!$it['title']) {
@@ -451,39 +452,42 @@ class Delivery {
 									dbesc($it['parent-uri']),
 									intval($uid));
 
-								if (DBM::is_result($r) && ($r[0]['title'] != ''))
+								if (DBM::is_result($r) && ($r[0]['title'] != '')) {
 									$subject = $r[0]['title'];
+								}
 							}
 						}
-						if (strncasecmp($subject,'RE:',3))
+						if (strncasecmp($subject,'RE:',3)) {
 							$subject = 'Re: '.$subject;
+						}
 					}
 					Email::send($addr, $subject, $headers, $it);
 				}
 				break;
 
 			case NETWORK_DIASPORA:
-				if ($public_message)
+				if ($public_message) {
 					$loc = 'public batch '.$contact['batch'];
-				else
+				} else {
 					$loc = $contact['name'];
+				}
 
 				logger('delivery: diaspora batch deliver: '.$loc);
 
-				if (Config::get('system','dfrn_only') || !Config::get('system','diaspora_enabled'))
+				if (Config::get('system','dfrn_only') || !Config::get('system','diaspora_enabled')) {
 					break;
-
+				}
 				if ($mail) {
 					Diaspora::sendMail($item,$owner,$contact);
 					break;
 				}
 
-				if (!$normal_mode)
+				if (!$normal_mode) {
 					break;
-
+				}
-				if (!$contact['pubkey'] && !$public_message)
+				if (!$contact['pubkey'] && !$public_message) {
 					break;
-
+				}
 				if (($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
 					// top-level retraction
 					logger('diaspora retract: '.$loc);

src/Worker/Notifier.php

@@ -9,6 +9,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
@@ -76,7 +77,7 @@ class Notifier {
 			$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
 					intval($item_id)
 			);
-			if (! count($message)) {
+			if (!count($message)) {
 				return;
 			}
 			$uid = $message[0]['uid'];
@@ -92,7 +93,7 @@ class Notifier {
 			);
 			$uid = $item_id;
 			$item_id = 0;
-			if (! count($items)) {
+			if (!count($items)) {
 				return;
 			}
 		} elseif ($cmd === 'suggest') {
@@ -102,7 +103,7 @@ class Notifier {
 			$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
 				intval($item_id)
 			);
-			if (! count($suggest)) {
+			if (!count($suggest)) {
 				return;
 			}
 			$uid = $suggest[0]['uid'];
@@ -115,9 +116,9 @@ class Notifier {
 				FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
 					WHERE `contact`.`uid` = %d AND `contact`.`self` LIMIT 1",
 					intval($item_id));
-			if (!$r)
+			if (!$r) {
 				return;
-
+			}
 			$user = $r[0];
 
 			$r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id));
@@ -137,30 +138,28 @@ class Notifier {
 						intval($uid), NETWORK_DFRN, NETWORK_DIASPORA);
 		} else {
 			// find ancestors
-			$r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1",
+			$target_item = dba::fetch_first("SELECT `item`.*, `contact`.`uid` AS `cuid` FROM `item`
-				intval($item_id)
+						INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			);
+						WHERE `item`.`id` = ? AND `visible` AND NOT `moderated`", $item_id);
 
-			if ((! DBM::is_result($r)) || (! intval($r[0]['parent']))) {
+			if (!DBM::is_result($target_item) || !intval($target_item['parent'])) {
 				return;
 			}
 
-			$target_item = $r[0];
+			$parent_id = intval($target_item['parent']);
-			$parent_id = intval($r[0]['parent']);
+			$uid = $target_item['cuid'];
-			$uid = $r[0]['uid'];
+			$updated = $target_item['edited'];
-			$updated = $r[0]['edited'];
 
 			$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
-				FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC",
+				FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible AND NOT moderated ORDER BY `id` ASC",
 				intval($parent_id)
 			);
 
-			if (! count($items)) {
+			if (!count($items)) {
 				return;
 			}
 
 			// avoid race condition with deleting entries
-
 			if ($items[0]['deleted']) {
 				foreach ($items as $item) {
 					$item['deleted'] = 1;
@@ -171,24 +170,14 @@ class Notifier {
 				logger('notifier: top level post');
 				$top_level = true;
 			}
-
 		}
 
-		$r = q("SELECT `contact`.*, `user`.`prvkey` AS `uprvkey`,
+		$owner = User::getOwnerDataById($uid);
-			`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
+		if (!$owner) {
-			`user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`
-			FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-			WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
-			intval($uid)
-		);
-
-		if (! DBM::is_result($r)) {
 			return;
 		}
 
-		$owner = $r[0];
+		$walltowall = ($top_level && ($owner['id'] != $items[0]['contact-id']) ? true : false);
-
-		$walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
 
 		// Should the post be transmitted to Diaspora?
 		$diaspora_delivery = true;
@@ -264,7 +253,7 @@ class Notifier {
 			// we will just use it as a fallback test
 			// later we will be able to use it as the primary test of whether or not to relay.
 
-			if (! $target_item['origin']) {
+			if (!$target_item['origin']) {
 				$relay_to_owner = false;
 			}
 			if ($parent['origin']) {
@@ -306,7 +295,6 @@ class Notifier {
 					$push_notify = true;
 
 				if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
-
 					$push_notify = true;
 
 					if ($parent["network"] == NETWORK_OSTATUS) {
@@ -336,15 +324,15 @@ class Notifier {
 
 				// don't send deletions onward for other people's stuff
 
-				if ($target_item['deleted'] && (! intval($target_item['wall']))) {
+				if ($target_item['deleted'] && !intval($target_item['wall'])) {
 					logger('notifier: ignoring delete notification for non-wall item');
 					return;
 				}
 
-				if ((strlen($parent['allow_cid']))
+				if (strlen($parent['allow_cid'])
-					|| (strlen($parent['allow_gid']))
+					|| strlen($parent['allow_gid'])
-					|| (strlen($parent['deny_cid']))
+					|| strlen($parent['deny_cid'])
-					|| (strlen($parent['deny_gid']))) {
+					|| strlen($parent['deny_gid'])) {
 					$public_message = false; // private recipients, not public
 				}
 
@@ -356,7 +344,7 @@ class Notifier {
 				// if our parent is a public forum (forum_mode == 1), uplink to the origional author causing
 				// a delivery fork. private groups (forum_mode == 2) do not uplink
 
-				if ((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
+				if ((intval($parent['forum_mode']) == 1) && !$top_level && ($cmd !== 'uplink')) {
 					Worker::add($a->queue['priority'], 'Notifier', 'uplink', $item_id);
 				}
 
@@ -379,12 +367,12 @@ class Notifier {
 					}
 				}
 
-				if (count($url_recipients))
+				if (count($url_recipients)) {
 					logger('notifier: '.$target_item["guid"].' url_recipients ' . print_r($url_recipients,true));
+				}
 
 				$conversants = array_unique($conversants);
 
-
 				$recipients = array_unique(array_merge($recipients,$allow_people,$allow_groups));
 				$deny = array_unique(array_merge($deny_people,$deny_groups));
 				$recipients = array_diff($recipients,$deny);
@@ -395,7 +383,6 @@ class Notifier {
 			// If the thread parent is OStatus then do some magic to distribute the messages.
 			// We have not only to look at the parent, since it could be a Friendica thread.
 			if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
-
 				$diaspora_delivery = false;
 
 				logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent[0]['author-link']." - Owner: ".$thr_parent[0]['owner-link'], LOGGER_DEBUG);
@@ -457,10 +444,10 @@ class Notifier {
 
 		$mail_disabled = ((function_exists('imap_open') && (!Config::get('system','imap_disabled'))) ? 0 : 1);
 
-		if (! $mail_disabled) {
+		if (!$mail_disabled) {
-			if ((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid']))
+			if (!strlen($target_item['allow_cid']) && !strlen($target_item['allow_gid'])
-				&& (! strlen($target_item['deny_cid'])) && (! strlen($target_item['deny_gid']))
+				&& !strlen($target_item['deny_cid']) && !strlen($target_item['deny_gid'])
-				&& (intval($target_item['pubmail']))) {
+				&& intval($target_item['pubmail'])) {
 				$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
 					intval($uid),
 					dbesc(NETWORK_MAIL)
@@ -558,7 +545,7 @@ class Notifier {
 						continue;
 					}
 
-					if ((! $mail) && (! $fsuggest) && (! $followup)) {
+					if (!$mail && !$fsuggest && !$followup) {
 						logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
 						Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
 								'Delivery', $cmd, $item_id, (int)$rr['id']);