X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=38f4a58fba4bfb3b1e157c78fa9b5e0fb66baea1;hb=59675c4f0bbb12029e3b7a141ca484fb180a2fef;hp=4cc10e628cd50ec95f56884f2c4b6e58f856e50e;hpb=0185c912460eef341b83d1724ded693fff151b81;p=friendica.git diff --git a/include/items.php b/include/items.php index 4cc10e628c..38f4a58fba 100644 --- a/include/items.php +++ b/include/items.php @@ -1,29 +1,38 @@ . + * */ -use Friendica\BaseObject; -use Friendica\Content\Feature; -use Friendica\Core\Config; use Friendica\Core\Hook; -use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Session; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Item; use Friendica\Protocol\DFRN; use Friendica\Protocol\Feed; 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 __DIR__ . '/../mod/share.php'; @@ -42,7 +51,7 @@ function add_page_info_data(array $data, $no_photos = false) $data["type"] = "link"; } - $data["title"] = defaults($data, "title", ""); + $data["title"] = $data["title"] ?? ''; if ((($data["type"] != "link") && ($data["type"] != "video") && ($data["type"] != "photo")) || ($data["title"] == $data["url"])) { return ""; @@ -79,7 +88,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 { @@ -94,9 +103,8 @@ function add_page_info_data(array $data, $no_photos = false) $hashtags = "\n"; foreach ($data["keywords"] as $keyword) { /// @TODO make a positive list of allowed characters - $hashtag = str_replace([" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"], - ["", "", "", "", "", "", "", "", "", "", "", ""], $keyword); - $hashtags .= "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url] "; + $hashtag = str_replace([' ', '+', '/', '.', '#', '@', "'", '"', '’', '`', '(', ')', '„', '“'], '', $keyword); + $hashtags .= "#[url=" . DI::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url] "; } } @@ -133,25 +141,22 @@ function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklis return $data; } -function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blacklist = "") +function get_page_keywords($url, $photo = "", $keywords = false, $keyword_blacklist = "") { $data = query_page_info($url, $photo, $keywords, $keyword_blacklist); + if (empty($data["keywords"]) || !is_array($data["keywords"])) { + return []; + } - $tags = ""; - if (isset($data["keywords"]) && count($data["keywords"])) { - foreach ($data["keywords"] as $keyword) { - $hashtag = str_replace([" ", "+", "/", ".", "#", "'"], - ["", "", "", "", "", ""], $keyword); - - if ($tags != "") { - $tags .= ", "; - } + $taglist = []; + foreach ($data['keywords'] as $keyword) { + $hashtag = str_replace([" ", "+", "/", ".", "#", "'"], + ["", "", "", "", "", ""], $keyword); - $tags .= "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]"; - } + $taglist[] = $hashtag; } - return $tags; + return $taglist; } function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") @@ -263,7 +268,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; } @@ -302,7 +307,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()); @@ -344,7 +349,7 @@ function drop_items(array $items) function drop_item($id, $return = '') { - $a = BaseObject::getApp(); + $a = DI::app(); // locate item to be deleted @@ -352,8 +357,8 @@ function drop_item($id, $return = '') $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]); if (!DBA::isResult($item)) { - notice(L10n::t('Item not found.') . EOL); - $a->internalRedirect('network'); + notice(DI::l10n()->t('Item not found.') . EOL); + DI::baseUrl()->redirect('network'); } if ($item['deleted']) { @@ -372,7 +377,7 @@ function drop_item($id, $return = '') if (!empty($_REQUEST['confirm'])) { //
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) { @@ -384,17 +389,17 @@ 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 if (!empty($_REQUEST['canceled'])) { - $a->internalRedirect('display/' . $item['guid']); + DI::baseUrl()->redirect('display/' . $item['guid']); } $is_comment = ($item['gravity'] == GRAVITY_COMMENT) ? true : false; @@ -416,28 +421,28 @@ function drop_item($id, $return = '') if ($is_comment) { // Return to parent guid if (!empty($parentitem)) { - $a->internalRedirect('display/' . $parentitem['guid']); + DI::baseUrl()->redirect('display/' . $parentitem['guid']); //NOTREACHED } // In case something goes wrong else { - $a->internalRedirect('network'); + DI::baseUrl()->redirect('network'); //NOTREACHED } } else { // if unknown location or deleting top level post called from display if (empty($return_url) || strpos($return_url, 'display') !== false) { - $a->internalRedirect('network'); + DI::baseUrl()->redirect('network'); //NOTREACHED } else { - $a->internalRedirect($return_url); + DI::baseUrl()->redirect($return_url); //NOTREACHED } } } else { - notice(L10n::t('Permission denied.') . EOL); - $a->internalRedirect('display/' . $item['guid']); + notice(DI::l10n()->t('Permission denied.') . EOL); + DI::baseUrl()->redirect('display/' . $item['guid']); //NOTREACHED } }