Move mod/fsuggest to src/Module/SuggestFriends

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index e72b97c1d24a1c6dc05d6b2c0973e8b02b78358f..2230c93c77209a3d87460895c4b61be9bacca760 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -3,13 +3,10 @@
  * @file include/items.php
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -75,7 +72,7 @@ function add_page_info_data(array $data, $no_photos = false)
                $preview = str_replace(["[", "]"], ["[", "]"], htmlentities($data["images"][0]["src"], ENT_QUOTES, 'UTF-8', false));
                // if the preview picture is larger than 500 pixels then show it in a larger mode
                // But only, if the picture isn't higher than large (To prevent huge posts)
-               if (!Config::get('system', 'always_show_preview') && ($data["images"][0]["width"] >= 500)
+               if (!DI::config()->get('system', 'always_show_preview') && ($data["images"][0]["width"] >= 500)
                        && ($data["images"][0]["width"] >= $data["images"][0]["height"])) {
                        $text .= " image='".$preview."'";
                } else {
@@ -92,7 +89,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=" . $hashtag . "]" . $hashtag . "[/url] ";
+                       $hashtags .= "#[url=" . DI::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url] ";
                }
        }
 
@@ -143,7 +140,7 @@ function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blackl
                                $tags .= ", ";
                        }
 
-                       $tags .= "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]";
+                       $tags .= "#[url=" . DI::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]";
                }
        }
 
@@ -259,7 +256,7 @@ function consume_feed($xml, array $importer, array $contact, &$hub)
 
        if ($contact['network'] === Protocol::FEED) {
                Logger::log("Consume feeds", Logger::DEBUG);
-               Feed::import($xml, $importer, $contact, $hub);
+               Feed::import($xml, $importer, $contact);
 
                return;
        }
@@ -298,7 +295,7 @@ function subscribe_to_hub($url, array $importer, array $contact, $hubmode = 'sub
                return;
        }
 
-       $push_url = System::baseUrl() . '/pubsub/' . $user['nickname'] . '/' . $contact['id'];
+       $push_url = DI::baseUrl() . '/pubsub/' . $user['nickname'] . '/' . $contact['id'];
 
        // Use a single verify token, even if multiple hubs
        $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : Strings::getRandomHex());
@@ -348,7 +345,7 @@ function drop_item($id, $return = '')
        $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
 
        if (!DBA::isResult($item)) {
-               notice(L10n::t('Item not found.') . EOL);
+               notice(DI::l10n()->t('Item not found.') . EOL);
                DI::baseUrl()->redirect('network');
        }
 
@@ -368,7 +365,7 @@ function drop_item($id, $return = '')
                if (!empty($_REQUEST['confirm'])) {
                        // <form> can't take arguments in its "action" parameter
                        // so add any arguments as hidden inputs
-                       $query = explode_querystring($a->query_string);
+                       $query = explode_querystring(DI::args()->getQueryString());
                        $inputs = [];
 
                        foreach ($query['args'] as $arg) {
@@ -380,12 +377,12 @@ function drop_item($id, $return = '')
 
                        return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'get',
-                               '$message' => L10n::t('Do you really want to delete this item?'),
+                               '$message' => DI::l10n()->t('Do you really want to delete this item?'),
                                '$extra_inputs' => $inputs,
-                               '$confirm' => L10n::t('Yes'),
+                               '$confirm' => DI::l10n()->t('Yes'),
                                '$confirm_url' => $query['base'],
                                '$confirm_name' => 'confirmed',
-                               '$cancel' => L10n::t('Cancel'),
+                               '$cancel' => DI::l10n()->t('Cancel'),
                        ]);
                }
                // Now check how the user responded to the confirmation query
@@ -432,7 +429,7 @@ function drop_item($id, $return = '')
                        }
                }
        } else {
-               notice(L10n::t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.') . EOL);
                DI::baseUrl()->redirect('display/' . $item['guid']);
                //NOTREACHED
        }