X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsubthread.php;h=f689eca9d87e61cde8aad0663008984dfc5e26a8;hb=7072e213444a8a23da83b16cfeba37c807a54674;hp=0b6f4ecaaaad33d0289752603d9aacf61dc15fd5;hpb=78114c13d5ce27b36682a960859056d4ebf9d9be;p=friendica.git
diff --git a/mod/subthread.php b/mod/subthread.php
index 0b6f4ecaaa..f689eca9d8 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -2,37 +2,41 @@
/**
* @file mod/subthread.php
*/
+
use Friendica\App;
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\Session;
use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Item;
-
-require_once 'include/security.php';
-require_once 'include/items.php';
+use Friendica\Protocol\Activity;
+use Friendica\Util\Security;
+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) || !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 +44,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 +61,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 +80,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") ;
+ $post_type = (($item['resource-id']) ? DI::l10n()->t('photo') : DI::l10n()->t('status'));
+ $objtype = (($item['resource-id']) ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE );
+ $link = XML::escape('' . "\n");
$body = $item['body'];
$obj = <<< EOT
@@ -110,7 +104,7 @@ function subthread_content(App $a) {
$body
EOT;
- $bodyverb = L10n::t('%1$s is following %2$s\'s %3$s');
+ $bodyverb = DI::l10n()->t('%1$s is following %2$s\'s %3$s');
if (!isset($bodyverb)) {
return;
@@ -118,14 +112,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'];
@@ -138,7 +131,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;
@@ -159,8 +152,8 @@ EOT;
$arr['id'] = $post_id;
- Addon::callHooks('post_local_end', $arr);
+ Hook::callAll('post_local_end', $arr);
- killme();
+ exit();
}