X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fsubthread.php;h=a624cd9a60be2715721da9b89c92ea71e72195bd;hb=2e2930d770e9de39e14c8172fc8875041bcc00fd;hp=c858f2d1fa3a3c847ea132b823605d33b31496ce;hpb=29f7ebe307c22b275466390937b82ccb3820fb1c;p=friendica.git

diff --git a/mod/subthread.php b/mod/subthread.php
index c858f2d1fa..a624cd9a60 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];
 		}
 	}
@@ -63,36 +59,40 @@ function subthread_content(App $a) {
 		WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
 		intval($owner_uid)
 	);
-	if (DBM::is_result($r))
+
+	if (DBM::is_result($r)) {
 		$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",
 			intval($_SESSION['visitor_id']),
 			intval($owner_uid)
 		);
-		if (DBM::is_result($r))
+
+		if (DBM::is_result($r)) {
 			$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 );
@@ -112,20 +112,20 @@ 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;
 	}
 
 	$arr = [];
 
-	$arr['guid'] = get_guid(32);
+	$arr['guid'] = System::createGUID(32);
 	$arr['uri'] = $uri;
 	$arr['uid'] = $owner_uid;
 	$arr['contact-id'] = $contact['id'];
 	$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'];
@@ -164,5 +164,3 @@ EOT;
 	killme();
 
 }
-
-