X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fbookmarklet.php;h=be3e1fd33670e1a5638b3f42a55a6fe9fd9ea2c8;hb=c4038e7af15442d8bca8c7d7818ffbb9b02a0521;hp=785a2fbea1014d0e8bce535617f259616dd3cc64;hpb=94f6f12ba3a5c1d506255803e709cb640147ebf4;p=friendica.git

diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index 785a2fbea1..be3e1fd336 100644
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -1,47 +1,57 @@
 <?php
+/**
+ * @file mod/bookmarklet.php
+ */
 
 use Friendica\App;
+use Friendica\Core\ACL;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
+use Friendica\Module\Login;
+use Friendica\Util\Strings;
 
-require_once('include/conversation.php');
-require_once('include/items.php');
-
-function bookmarklet_init(App $a) {
+function bookmarklet_init()
+{
 	$_GET["mode"] = "minimal";
 }
 
-function bookmarklet_content(App $a) {
+function bookmarklet_content(App $a)
+{
 	if (!local_user()) {
-		$o = '<h2>'.t('Login').'</h2>';
-		$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
+		$o = '<h2>' . L10n::t('Login') . '</h2>';
+		$o .= Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === 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 = array(
+		$x = [
 			'is_owner' => true,
 			'allow_location' => $a->user['allow_location'],
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
 			'lockstate' => ((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))) ? 'lock' : 'unlock'),
-			'default_perms' => get_acl_permissions($a->user),
-			'acl' => populate_acl($a->user,true),
+			'default_perms' => ACL::getDefaultUserPermissions($a->user),
+			'acl' => ACL::getFullSelectorHTML($a->user, true),
 			'bang' => '',
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
-			'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
-			'title' => trim($_REQUEST["title"], "*"),
+			'title' => trim(defaults($_REQUEST, 'title', ''), "*"),
 			'content' => $content
-		);
-		$o = status_editor($a,$x, 0, false);
+		];
+		$o = status_editor($a, $x, 0, false);
 		$o .= "<script>window.resizeTo(800,550);</script>";
 	} else {
-		$o = '<h2>'.t('The post was created').'</h2>';
+		$o = '<h2>' . L10n::t('The post was created') . '</h2>';
 		$o .= "<script>window.close()</script>";
 	}