Issue 6603: Events are now fetchable via AP

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index 961a20b240e01548879faad46ffeb5630e16202c..88eec1dc48794de8faa89f91ac80aeaaedf91ac0 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -5,8 +5,8 @@
 
 use Friendica\BaseObject;
 use Friendica\Content\Feature;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
@@ -21,15 +21,13 @@ use Friendica\Protocol\OStatus;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
+use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
-require_once 'include/text.php';
 require_once 'mod/share.php';
-require_once 'include/enotify.php';
-
 function add_page_info_data(array $data, $no_photos = false)
 {
-       Addon::callHooks('page_info_data', $data);
+       Hook::callAll('page_info_data', $data);
 
        if (empty($data['type'])) {
                return '';
@@ -96,7 +94,7 @@ function add_page_info_data(array $data, $no_photos = false)
                        /// @TODO make a positive list of allowed characters
                        $hashtag = str_replace([" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"],
                                                ["", "", "", "", "", "", "", "", "", "", "", ""], $keyword);
-                       $hashtags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url] ";
+                       $hashtags .= "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url] ";
                }
        }
 
@@ -147,7 +145,7 @@ function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blackl
                                $tags .= ", ";
                        }
 
-                       $tags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]";
+                       $tags .= "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]";
                }
        }
 
@@ -205,8 +203,7 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false)
                        $body = $removedlink;
                }
 
-               $url = str_replace(['/', '.'], ['\/', '\.'], $matches[1]);
-               $removedlink = preg_replace("/\[url\=" . $url . "\](.*?)\[\/url\]/ism", '', $body);
+               $removedlink = preg_replace("/\[url\=" . preg_quote($matches[1], '/') . "\](.*?)\[\/url\]/ism", '', $body);
                if (($removedlink == "") || strstr($body, $removedlink)) {
                        $body = $removedlink;
                }
@@ -245,26 +242,26 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false)
  * model where comments can have sub-threads. That would require some massive sorting
  * to get all the feed items into a mostly linear ordering, and might still require
  * recursion.
+ *
+ * @param       $xml
+ * @param array $importer
+ * @param array $contact
+ * @param       $hub
+ * @throws ImagickException
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
-function consume_feed($xml, array $importer, array $contact, &$hub, $datedir = 0, $pass = 0)
+function consume_feed($xml, array $importer, array $contact, &$hub)
 {
        if ($contact['network'] === Protocol::OSTATUS) {
-               if ($pass < 2) {
-                       // Test - remove before flight
-                       //$tempfile = tempnam(get_temppath(), "ostatus2");
-                       //file_put_contents($tempfile, $xml);
-                       Logger::log("Consume OStatus messages ", Logger::DEBUG);
-                       OStatus::import($xml, $importer, $contact, $hub);
-               }
+               Logger::log("Consume OStatus messages ", Logger::DEBUG);
+               OStatus::import($xml, $importer, $contact, $hub);
 
                return;
        }
 
        if ($contact['network'] === Protocol::FEED) {
-               if ($pass < 2) {
-                       Logger::log("Consume feeds", Logger::DEBUG);
-                       Feed::import($xml, $importer, $contact, $hub);
-               }
+               Logger::log("Consume feeds", Logger::DEBUG);
+               Feed::import($xml, $importer, $contact, $hub);
 
                return;
        }
@@ -296,8 +293,6 @@ function subscribe_to_hub($url, array $importer, array $contact, $hubmode = 'sub
                return;
        }
 
-       $a = BaseObject::getApp();
-
        $user = DBA::selectFirst('user', ['nickname'], ['uid' => $importer['uid']]);
 
        // No user, no nickname, we quit
@@ -308,7 +303,7 @@ function subscribe_to_hub($url, array $importer, array $contact, $hubmode = 'sub
        $push_url = System::baseUrl() . '/pubsub/' . $user['nickname'] . '/' . $contact['id'];
 
        // Use a single verify token, even if multiple hubs
-       $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string());
+       $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : Strings::getRandomHex());
 
        $params= 'hub.mode=' . $hubmode . '&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($contact['poll']) . '&hub.verify=async&hub.verify_token=' . $verify_token;
 
@@ -351,7 +346,7 @@ function drop_item($id, $return = '')
 
        // locate item to be deleted
 
-       $fields = ['id', 'uid', 'guid', 'contact-id', 'deleted'];
+       $fields = ['id', 'uid', 'guid', 'contact-id', 'deleted', 'gravity', 'parent'];
        $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
 
        if (!DBA::isResult($item)) {
@@ -406,17 +401,43 @@ function drop_item($id, $return = '')
                        $a->internalRedirect('display/' . $item['guid']);
                }
 
+               $is_comment = ($item['gravity'] == GRAVITY_COMMENT) ? true : false;
+               $parentitem = null;
+               if (!empty($item['parent'])){
+                       $fields = ['guid'];
+                       $parentitem = Item::selectFirstForUser(local_user(), $fields, ['id' => $item['parent']]);
+               }
+
                // delete the item
                Item::deleteForUser(['id' => $item['id']], local_user());
 
                $return_url = hex2bin($return);
-               if (empty($return_url) || strpos($return_url, 'display') !== false) {
-                       $a->internalRedirect('network');
-                       //NOTREACHED
+
+               // removes update_* from return_url to ignore Ajax refresh
+               $return_url = str_replace("update_", "", $return_url);
+
+               // Check if delete a comment
+               if ($is_comment) {
+                       // Return to parent guid
+                       if (!empty($parentitem)) {
+                               $a->internalRedirect('display/' . $parentitem['guid']);
+                               //NOTREACHED
+                       }
+                       // In case something goes wrong
+                       else {
+                               $a->internalRedirect('network');
+                               //NOTREACHED
+                       }
                }
                else {
-                       $a->internalRedirect($return_url);
-                       //NOTREACHED
+                       // if unknown location or deleting top level post called from display
+                       if (empty($return_url) || strpos($return_url, 'display') !== false) {
+                               $a->internalRedirect('network');
+                               //NOTREACHED
+                       } else {
+                               $a->internalRedirect($return_url);
+                               //NOTREACHED
+                       }
                }
        } else {
                notice(L10n::t('Permission denied.') . EOL);
@@ -451,7 +472,7 @@ function list_post_dates($uid, $wall)
                $dend = substr($dnow, 0, 8) . Temporal::getDaysInMonth(intval($dnow), intval(substr($dnow, 5)));
                $start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
                $end_month = DateTimeFormat::utc($dend, 'Y-m-d');
-               $str = day_translate(DateTimeFormat::utc($dnow, 'F'));
+               $str = L10n::getDay(DateTimeFormat::utc($dnow, 'F'));
 
                if (empty($ret[$dyear])) {
                        $ret[$dyear] = [];