X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fsubthread.php;h=e05aa5fec83588de0155dfabbe406cc91042f539;hb=19209f6826fc513b5e1bc3460c212a4b80c02049;hp=df44df6efa893331ba525d29de6ee2573a80ea95;hpb=ce75177d4e40882ecffe35fcc7b101d8716801e0;p=friendica.git

diff --git a/mod/subthread.php b/mod/subthread.php
index df44df6efa..e05aa5fec8 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -14,7 +14,7 @@ require_once 'include/items.php';
 
 function subthread_content(App $a) {
 
-	if(! local_user() && ! remote_user()) {
+	if (!local_user() && !remote_user()) {
 		return;
 	}
 
@@ -22,36 +22,32 @@ function subthread_content(App $a) {
 
 	$item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
 
-	$r = q("SELECT * FROM `item` WHERE `parent` = '%s' OR `parent-uri` = '%s' and parent = id LIMIT 1",
-		dbesc($item_id),
-		dbesc($item_id)
-	);
+	$condition = ["`parent` = ? OR `parent-uri` = ? AND `parent` = `id`", $item_id, $item_id];
+	$item = Item::selectFirst([], $condition);
 
-	if(! $item_id || (! DBM::is_result($r))) {
+	if (empty($item_id) || !DBM::is_result($item)) {
 		logger('subthread: no item ' . $item_id);
 		return;
 	}
 
-	$item = $r[0];
-
 	$owner_uid = $item['uid'];
 
-	if(! can_write_wall($owner_uid)) {
+	if (!can_write_wall($owner_uid)) {
 		return;
 	}
 
 	$remote_owner = null;
 
-	if(! $item['wall']) {
+	if (!$item['wall']) {
 		// The top level post may have been written by somebody on another system
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($item['contact-id']),
 			intval($item['uid'])
 		);
-		if (! DBM::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return;
 		}
-		if (! $r[0]['self']) {
+		if (!$r[0]['self']) {
 			$remote_owner = $r[0];
 		}
 	}
@@ -68,19 +64,19 @@ function subthread_content(App $a) {
 		$owner = $r[0];
 	}
 
-	if (! $owner) {
+	if (!$owner) {
 		logger('like: no owner');
 		return;
 	}
 
-	if (! $remote_owner) {
+	if (!$remote_owner) {
 		$remote_owner = $owner;
 	}
 
 	$contact = null;
 	// This represents the person posting
 
-	if ((local_user()) && (local_user() == $owner_uid)) {
+	if (local_user() && (local_user() == $owner_uid)) {
 		$contact = $owner;
 	} else {
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -92,11 +88,11 @@ function subthread_content(App $a) {
 			$contact = $r[0];
 		}
 	}
-	if (! $contact) {
+	if (!$contact) {
 		return;
 	}
 
-	$uri = item_new_uri($a->get_hostname(),$owner_uid);
+	$uri = Item::newURI($owner_uid);
 
 	$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
@@ -116,7 +112,7 @@ function subthread_content(App $a) {
 EOT;
 	$bodyverb = L10n::t('%1$s is following %2$s\'s %3$s');
 
-	if (! isset($bodyverb)) {
+	if (!isset($bodyverb)) {
 		return;
 	}
 
@@ -129,7 +125,7 @@ EOT;
 	$arr['type'] = 'activity';
 	$arr['wall'] = $item['wall'];
 	$arr['origin'] = 1;
-	$arr['gravity'] = GRAVITY_LIKE;
+	$arr['gravity'] = GRAVITY_ACTIVITY;
 	$arr['parent'] = $item['id'];
 	$arr['parent-uri'] = $item['uri'];
 	$arr['thr-parent'] = $item['uri'];
@@ -168,5 +164,3 @@ EOT;
 	killme();
 
 }
-
-