Just some more fixed notice

[friendica.git] / mod / subthread.php

diff --git a/mod/subthread.php b/mod/subthread.php
index 562e189be1b7232f32e1bb4350d22439c8f75cc3..3cd089d63e7df0bb8cc8c032223f834852330c59 100644 (file)
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -10,12 +10,11 @@ use Friendica\Database\DBM;
 use Friendica\Model\Item;
 
 require_once 'include/security.php';
-require_once 'include/bbcode.php';
 require_once 'include/items.php';
 
 function subthread_content(App $a) {
 
-       if(! local_user() && ! remote_user()) {
+       if (!local_user() && !remote_user()) {
                return;
        }
 
@@ -23,75 +22,77 @@ 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];
                }
        }
 
+       $owner = null;
        // this represents the post owner on this system.
 
        $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
                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 );
@@ -111,20 +112,19 @@ 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'];
@@ -163,5 +163,3 @@ EOT;
        killme();
 
 }
-
-