X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fsubthread.php;h=9fa1a410d37130eff5ad646e84f840c0c1011ba5;hb=b2d685482928363ce86c3c0519c8ff39d0af43ca;hp=1153f2147d7c5efcb11f2f71b141fda086640253;hpb=47c2565917bb0f190ef9374d261e538c424b210c;p=friendica.git

diff --git a/mod/subthread.php b/mod/subthread.php
index 1153f2147d..9fa1a410d3 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\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) || !DBA::isResult($item)) {
-		logger('subthread: no item ' . $item_id);
+		Logger::log('subthread: no item ' . $item_id);
 		return;
 	}
 
 	$owner_uid = $item['uid'];
 
-	if (!can_write_wall($owner_uid)) {
+	if (!Security::canWriteToUserWall($owner_uid)) {
 		return;
 	}
 
@@ -62,7 +63,7 @@ function subthread_content(App $a) {
 	}
 
 	if (!$owner) {
-		logger('like: no owner');
+		Logger::log('like: no owner');
 		return;
 	}
 
@@ -86,7 +87,7 @@ function subthread_content(App $a) {
 
 	$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
-	$link = xmlify('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
+	$link = XML::escape('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/display/' . $item['guid'] . '" />' . "\n");
 	$body = $item['body'];
 
 	$obj = <<< EOT
@@ -108,7 +109,7 @@ EOT;
 
 	$arr = [];
 
-	$arr['guid'] = System::createGUID(32);
+	$arr['guid'] = System::createUUID();
 	$arr['uri'] = $uri;
 	$arr['uid'] = $owner_uid;
 	$arr['contact-id'] = $contact['id'];
@@ -127,7 +128,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=' . System::baseUrl() . '/display/' . $item['guid'] . ']' . $post_type . '[/url]';
 	$arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink );
 
 	$arr['verb'] = $activity;
@@ -148,8 +149,8 @@ EOT;
 
 	$arr['id'] = $post_id;
 
-	Addon::callHooks('post_local_end', $arr);
+	Hook::callAll('post_local_end', $arr);
 
-	killme();
+	exit();
 
 }