X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fbookmarklet.php;h=1c4d191c4f8d1fa21b89e4d6194cb915be585dc9;hb=6c341962648b73c935c2de26996b07332b776a1f;hp=a26757740a3daf6625e4edce488951fef8e8c789;hpb=2fa6cc000013089d59d9cc221b544ed1a7a4cd37;p=friendica.git diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php index a26757740a..1c4d191c4f 100644 --- a/mod/bookmarklet.php +++ b/mod/bookmarklet.php @@ -9,9 +9,7 @@ use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\System; use Friendica\Module\Login; - -require_once 'include/conversation.php'; -require_once 'include/items.php'; +use Friendica\Util\Strings; function bookmarklet_init() { @@ -22,14 +20,18 @@ function bookmarklet_content(App $a) { if (!local_user()) { $o = '

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

'; - $o .= Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? false : true); + $o .= Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED ? false : true); return $o; } - $referer = normalise_link($_SERVER["HTTP_REFERER"]); - $page = normalise_link(System::baseUrl() . "/bookmarklet"); + $referer = Strings::normaliseLink(defaults($_SERVER, 'HTTP_REFERER', '')); + $page = Strings::normaliseLink(System::baseUrl() . "/bookmarklet"); if (!strstr($referer, $page)) { + if (empty($_REQUEST["url"])) { + System::httpExit(400, ["title" => L10n::t('Bad Request')]); + } + $content = add_page_info($_REQUEST["url"]); $x = [ @@ -43,7 +45,7 @@ function bookmarklet_content(App $a) 'bang' => '', 'visitor' => 'block', 'profile_uid' => local_user(), - 'title' => trim($_REQUEST["title"], "*"), + 'title' => trim(defaults($_REQUEST, 'title', ''), "*"), 'content' => $content ]; $o = status_editor($a, $x, 0, false);