X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fitems.php;h=4c7551e5c49f0a565a4b7b75dfde9339472b1d2a;hb=ad68aaae3fe2f8fe2d7a1368bef1f6d2192ba42b;hp=b4793b888f3fb6a531852560a54650a749524c15;hpb=5a929c587f69ba98a0f5d6f28cf3d209edc9bca0;p=friendica.git diff --git a/include/items.php b/include/items.php index b4793b888f..4c7551e5c4 100644 --- a/include/items.php +++ b/include/items.php @@ -1,36 +1,44 @@ . + * */ -use Friendica\BaseObject; -use Friendica\Content\Feature; -use Friendica\Core\Addon; -use Friendica\Core\Config; -use Friendica\Core\L10n; +use Friendica\Core\Hook; 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 'include/text.php'; -require_once 'mod/share.php'; -require_once 'include/enotify.php'; +require_once __DIR__ . '/../mod/share.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 ''; @@ -43,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 ""; @@ -80,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 { @@ -95,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] "; } } @@ -148,7 +155,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]"; } } @@ -206,8 +213,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; } @@ -246,26 +252,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); return; } @@ -297,8 +303,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 @@ -306,7 +310,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()); @@ -331,7 +335,7 @@ function drop_items(array $items) { $uid = 0; - if (!local_user() && !remote_user()) { + if (!Session::isAuthenticated()) { return; } @@ -348,7 +352,7 @@ function drop_items(array $items) function drop_item($id, $return = '') { - $a = BaseObject::getApp(); + $a = DI::app(); // locate item to be deleted @@ -356,8 +360,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']) { @@ -367,14 +371,8 @@ function drop_item($id, $return = '') $contact_id = 0; // check if logged in user is either the author or owner of this item - - if (!empty($_SESSION['remote'])) { - foreach ($_SESSION['remote'] as $visitor) { - if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) { - $contact_id = $visitor['cid']; - break; - } - } + if (Session::getRemoteContactID($item['uid']) == $item['contact-id']) { + $contact_id = $item['contact-id']; } if ((local_user() == $item['uid']) || $contact_id) { @@ -382,7 +380,7 @@ function drop_item($id, $return = '') if (!empty($_REQUEST['confirm'])) { //