Move user tombstone activity data to ActivityPub\Transmitter

[friendica.git] / mod / like.php

diff --git a/mod/like.php b/mod/like.php
index 9371c30743c45a94ba131fc463d3e3d70046f8ce..7fc7b2b42c7ea2f0ca41b05e7d284923871f918b 100644 (file)
--- a/mod/like.php
+++ b/mod/like.php
@@ -1,12 +1,8 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\System;
 use Friendica\Model\Item;
-
-require_once 'include/security.php';
-require_once 'include/bbcode.php';
-require_once 'include/items.php';
+use Friendica\Util\Strings;
 
 function like_content(App $a) {
        if (!local_user() && !remote_user()) {
@@ -14,13 +10,13 @@ function like_content(App $a) {
        }
 
 
-       $verb = notags(trim($_GET['verb']));
+       $verb = Strings::escapeTags(trim($_GET['verb']));
 
        if (!$verb) {
                $verb = 'like';
        }
 
-       $item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
+       $item_id = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : 0);
 
        $r = Item::performLike($item_id, $verb);
        if (!$r) {
@@ -28,17 +24,17 @@ function like_content(App $a) {
        }
 
        // See if we've been passed a return path to redirect to
-       $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
+       $return_path = defaults($_REQUEST, 'return', '');
 
-       like_content_return(System::baseUrl(), $return_path);
-       killme(); // NOTREACHED
+       like_content_return($a, $return_path);
+       exit();
 }
 
 
 // Decide how to return. If we were called with a 'return' argument,
 // then redirect back to the calling page. If not, just quietly end
 
-function like_content_return($baseurl, $return_path) {
+function like_content_return(App $a, $return_path) {
        if ($return_path) {
                $rand = '_=' . time();
                if (strpos($return_path, '?')) {
@@ -47,8 +43,6 @@ function like_content_return($baseurl, $return_path) {
                        $rand = "?$rand";
                }
 
-               goaway($baseurl . "/" . $return_path . $rand);
+               $a->internalRedirect($return_path . $rand);
        }
-
-       killme();
 }