X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsubthread.php;h=23ebf4fe4858f40a7f46f2bde0a6251852edb09d;hb=5ea033db33c62562dcd27dd70447a35b3d14326e;hp=0b6f4ecaaaad33d0289752603d9aacf61dc15fd5;hpb=e3584daef9c7801bce8d504152c5ccbd3ab492b4;p=friendica.git
diff --git a/mod/subthread.php b/mod/subthread.php
index 0b6f4ecaaa..23ebf4fe48 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -3,14 +3,15 @@
* @file mod/subthread.php
*/
use Friendica\App;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Item;
-
-require_once 'include/security.php';
-require_once 'include/items.php';
+use Friendica\Util\Security;
+use Friendica\Util\Strings;
+use Friendica\Util\XML;
function subthread_content(App $a) {
@@ -20,19 +21,19 @@ function subthread_content(App $a) {
$activity = ACTIVITY_FOLLOW;
- $item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
+ $item_id = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : 0);
$condition = ["`parent` = ? OR `parent-uri` = ? AND `parent` = `id`", $item_id, $item_id];
$item = Item::selectFirst([], $condition);
- if (empty($item_id) || !DBM::is_result($item)) {
- logger('subthread: no item ' . $item_id);
+ if (empty($item_id) || !DBA::isResult($item)) {
+ Logger::log('subthread: no item ' . $item_id);
return;
}
$owner_uid = $item['uid'];
- if (!can_write_wall($owner_uid)) {
+ if (!Security::canWriteToUserWall($owner_uid)) {
return;
}
@@ -40,15 +41,12 @@ function subthread_content(App $a) {
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)) {
+ $contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'uid' => $item['uid']]);
+ if (!DBA::isResult($contact)) {
return;
}
- if (!$r[0]['self']) {
- $remote_owner = $r[0];
+ if (!$contact['self']) {
+ $remote_owner = $contact;
}
}
@@ -60,12 +58,12 @@ function subthread_content(App $a) {
intval($owner_uid)
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$owner = $r[0];
}
if (!$owner) {
- logger('like: no owner');
+ Logger::log('like: no owner');
return;
}
@@ -79,24 +77,17 @@ function subthread_content(App $a) {
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)) {
- $contact = $r[0];
+ $contact = DBA::selectFirst('contact', [], ['id' => $_SESSION['visitor_id'], 'uid' => $owner_uid]);
+ if (!DBA::isResult($contact)) {
+ return;
}
}
- if (!$contact) {
- return;
- }
$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 );
- $link = xmlify('' . "\n") ;
+ $link = XML::escape('' . "\n");
$body = $item['body'];
$obj = <<< EOT
@@ -118,14 +109,13 @@ EOT;
$arr = [];
- $arr['guid'] = get_guid(32);
+ $arr['guid'] = System::createUUID();
$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'];
@@ -159,8 +149,8 @@ EOT;
$arr['id'] = $post_id;
- Addon::callHooks('post_local_end', $arr);
+ Hook::callAll('post_local_end', $arr);
- killme();
+ exit();
}