X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FBookmarklet.php;h=959ed71a8debf2c4cc6b20f0e55069a9043a3381;hb=c81a9d1ddd7e5b7fff6a173a159ae78ee7fc7698;hp=f5627e4354eb7c0f8172f06a5b167dd4b7214c11;hpb=e6f61c2cc77f23ad7f2fd34bab3f9b374fc48618;p=friendica.git diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php index f5627e4354..959ed71a8d 100644 --- a/src/Module/Bookmarklet.php +++ b/src/Module/Bookmarklet.php @@ -1,10 +1,28 @@ . + * + */ namespace Friendica\Module; use Friendica\BaseModule; -use Friendica\Core\ACL; -use Friendica\Core\L10n; +use Friendica\Content\PageInfo; use Friendica\DI; use Friendica\Module\Security\Login; use Friendica\Network\HTTPException; @@ -16,47 +34,36 @@ use Friendica\Util\Strings; */ class Bookmarklet extends BaseModule { - public static function content(array $parameters = []) + protected function content(array $request = []): string { $_GET['mode'] = 'minimal'; - $app = DI::app(); $config = DI::config(); - if (!local_user()) { - $output = '

' . L10n::t('Login') . '

'; + if (!DI::userSession()->getLocalUserId()) { + $output = '

' . DI::l10n()->t('Login') . '

'; $output .= Login::form(DI::args()->getQueryString(), intval($config->get('config', 'register_policy')) === Register::CLOSED ? false : true); return $output; } $referer = Strings::normaliseLink($_SERVER['HTTP_REFERER'] ?? ''); - $page = Strings::normaliseLink(DI::baseUrl()->get() . "/bookmarklet"); + $page = Strings::normaliseLink(DI::baseUrl() . "/bookmarklet"); if (!strstr($referer, $page)) { if (empty($_REQUEST["url"])) { - throw new HTTPException\BadRequestException(L10n::t('This page is missing a url parameter.')); + throw new HTTPException\BadRequestException(DI::l10n()->t('This page is missing a url parameter.')); } - $content = add_page_info($_REQUEST["url"]); + $content = "\n" . PageInfo::getFooterFromUrl($_REQUEST['url']); $x = [ - 'is_owner' => true, - 'allow_location' => $app->user['allow_location'], - 'default_location' => $app->user['default-location'], - 'nickname' => $app->user['nickname'], - 'lockstate' => ((is_array($app->user) && ((strlen($app->user['allow_cid'])) || (strlen($app->user['allow_gid'])) || (strlen($app->user['deny_cid'])) || (strlen($app->user['deny_gid'])))) ? 'lock' : 'unlock'), - 'default_perms' => ACL::getDefaultUserPermissions($app->user), - 'acl' => ACL::getFullSelectorHTML($app->page, $app->user, true), - 'bang' => '', - 'visitor' => 'block', - 'profile_uid' => local_user(), 'title' => trim($_REQUEST['title'] ?? '', '*'), 'content' => $content ]; - $output = status_editor($app, $x, 0, false); + $output = DI::conversation()->statusEditor($x, 0, false); $output .= ""; } else { - $output = '

' . L10n::t('The post was created') . '

'; + $output = '

' . DI::l10n()->t('The post was created') . '

'; $output .= ""; }