Move $pager and $page_offset out of App

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 20c0aaf747e25edfa7dfdc0bf955aca1c9039240..dcccf5d75c096202935953dc86903a88ed962e08 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -16,6 +16,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
@@ -32,6 +33,8 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
+use Friendica\Util\Security;
+use function Friendica\Core\function_exists;
 
 require_once 'include/enotify.php';
 require_once 'include/text.php';
@@ -42,8 +45,6 @@ function item_post(App $a) {
                return 0;
        }
 
-       require_once 'include/security.php';
-
        $uid = local_user();
 
        if (!empty($_REQUEST['dropitems'])) {
@@ -116,7 +117,7 @@ function item_post(App $a) {
                if (!DBA::isResult($parent_item)) {
                        notice(L10n::t('Unable to locate original post.') . EOL);
                        if (!empty($_REQUEST['return'])) {
-                               goaway($return_path);
+                               $a->internalRedirect($return_path);
                        }
                        killme();
                }
@@ -159,14 +160,14 @@ function item_post(App $a) {
        }
 
        // Allow commenting if it is an answer to a public post
-       $allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
+       $allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
 
        // Now check that valid personal details have been provided
-       if (!can_write_wall($profile_uid) && !$allow_comment) {
+       if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) {
                notice(L10n::t('Permission denied.') . EOL) ;
 
                if (!empty($_REQUEST['return'])) {
-                       goaway($return_path);
+                       $a->internalRedirect($return_path);
                }
 
                killme();
@@ -284,7 +285,7 @@ function item_post(App $a) {
                        }
                        info(L10n::t('Empty post discarded.') . EOL);
                        if (!empty($_REQUEST['return'])) {
-                               goaway($return_path);
+                               $a->internalRedirect($return_path);
                        }
                        killme();
                }
@@ -343,20 +344,11 @@ function item_post(App $a) {
 
        $tags = get_tags($body);
 
-       // Add a tag if the parent contact is from OStatus (This will notify them during delivery)
-       if ($parent) {
-               if ($thr_parent_contact['network'] == Protocol::OSTATUS) {
-                       $contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]';
-                       if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) {
-                               $tags[] = $contact;
-                       }
-               }
-
-               if ($parent_contact['network'] == Protocol::OSTATUS) {
-                       $contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
-                       if (!stripos(implode($tags), '[url=' . $parent_contact['url'] . ']')) {
-                               $tags[] = $contact;
-                       }
+       // Add a tag if the parent contact is from ActivityPub or OStatus (This will notify them)
+       if ($parent && in_array($thr_parent_contact['network'], [Protocol::OSTATUS, Protocol::ACTIVITYPUB])) {
+               $contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]';
+               if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) {
+                       $tags[] = $contact;
                }
        }
 
@@ -677,10 +669,10 @@ function item_post(App $a) {
                $datarray["item_id"] = -1;
                $datarray["author-network"] = Protocol::DFRN;
 
-               $o = conversation($a,[array_merge($contact_record,$datarray)],'search', false, true);
+               $o = conversation($a, [array_merge($contact_record, $datarray)], new Pager($a->query_string), 'search', false, true);
                logger('preview: ' . $o);
                echo json_encode(['preview' => $o]);
-               killme();
+               exit();
        }
 
        Addon::callHooks('post_local',$datarray);
@@ -688,7 +680,7 @@ function item_post(App $a) {
        if (!empty($datarray['cancel'])) {
                logger('mod_item: post cancelled by addon.');
                if ($return_path) {
-                       goaway($return_path);
+                       $a->internalRedirect($return_path);
                }
 
                $json = ['cancel' => 1];
@@ -724,7 +716,7 @@ function item_post(App $a) {
 
                if (!empty($_REQUEST['return']) && strlen($return_path)) {
                        logger('return: ' . $return_path);
-                       goaway($return_path);
+                       $a->internalRedirect($return_path);
                }
                killme();
        } else {
@@ -739,14 +731,14 @@ function item_post(App $a) {
 
        if (!$post_id) {
                logger("Item wasn't stored.");
-               goaway($return_path);
+               $a->internalRedirect($return_path);
        }
 
        $datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
 
        if (!DBA::isResult($datarray)) {
                logger("Item with id ".$post_id." couldn't be fetched.");
-               goaway($return_path);
+               $a->internalRedirect($return_path);
        }
 
        // update filetags in pconfig
@@ -854,13 +846,14 @@ function item_post(App $a) {
 function item_post_return($baseurl, $api_source, $return_path)
 {
        // figure out how to return, depending on from whence we came
+    $a = get_app();
 
        if ($api_source) {
                return;
        }
 
        if ($return_path) {
-               goaway($return_path);
+               $a->internalRedirect($return_path);
        }
 
        $json = ['success' => 1];
@@ -880,18 +873,16 @@ function item_content(App $a)
                return;
        }
 
-       require_once 'include/security.php';
-
        $o = '';
 
        if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
-               if (is_ajax()) {
+               if ($a->isAjax()) {
                        $o = Item::deleteForUser(['id' => $a->argv[2]], local_user());
                } else {
                        $o = drop_item($a->argv[2]);
                }
 
-               if (is_ajax()) {
+               if ($a->isAjax()) {
                        // ajax return: [<item id>, 0 (no perm) | <owner id>]
                        echo json_encode([intval($a->argv[2]), intval($o)]);
                        killme();
@@ -1024,12 +1015,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 
                        $profile = $contact["url"];
                        $alias   = $contact["alias"];
-                       $newname = $contact["nick"];
-
-                       if (($newname == "") || (($contact["network"] != Protocol::OSTATUS) && ($contact["network"] != Protocol::TWITTER)
-                               && ($contact["network"] != Protocol::STATUSNET))) {
-                               $newname = $contact["name"];
-                       }
+                       $newname = defaults($contact, "name", $contact["nick"]);
                }
 
                //if there is an url for this persons profile