X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsubthread.php;h=02d5cdcce53efb82bda3ee7556ddd826b6197499;hb=af88c2daa34e39cb6430abf64d0648665bfeb9cd;hp=0082021df575c8376fa27c56b4885d6ab735ddf7;hpb=9c9ebfc7c97016881d9ad2bb3c3b54a5640d2f08;p=friendica.git
diff --git a/mod/subthread.php b/mod/subthread.php
index 0082021df5..02d5cdcce5 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -2,31 +2,36 @@
/**
* @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\Session;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Item;
+use Friendica\Protocol\Activity;
use Friendica\Util\Security;
-
-require_once 'include/items.php';
+use Friendica\Util\Strings;
+use Friendica\Util\XML;
function subthread_content(App $a) {
- if (!local_user() && !remote_user()) {
+ if (!Session::isAuthenticated()) {
return;
}
- $activity = ACTIVITY_FOLLOW;
+ $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) || !DBA::isResult($item)) {
- logger('subthread: no item ' . $item_id);
+ Logger::log('subthread: no item ' . $item_id);
return;
}
@@ -62,7 +67,7 @@ function subthread_content(App $a) {
}
if (!$owner) {
- logger('like: no owner');
+ Logger::log('like: no owner');
return;
}
@@ -85,8 +90,8 @@ function subthread_content(App $a) {
$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") ;
+ $objtype = (($item['resource-id']) ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE );
+ $link = XML::escape('' . "\n");
$body = $item['body'];
$obj = <<< EOT
@@ -127,7 +132,7 @@ EOT;
$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
- $plink = '[url=' . System::baseUrl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
+ $plink = '[url=' . DI::baseUrl() . '/display/' . $item['guid'] . ']' . $post_type . '[/url]';
$arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink );
$arr['verb'] = $activity;
@@ -148,8 +153,8 @@ EOT;
$arr['id'] = $post_id;
- Addon::callHooks('post_local_end', $arr);
+ Hook::callAll('post_local_end', $arr);
- killme();
+ exit();
}