X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fbookmarklet.php;h=2e0d449711eb569cf6c832a06f9b394197f66608;hb=3b23f89ca257f972aa9c7beffdd308b1fd1b37e6;hp=9bc8c3353555a929c350a1bf739913ff32b390ff;hpb=42c2e09382d3b2846a0cb709d88cda97e717424f;p=friendica.git

diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index 9bc8c33535..2e0d449711 100644
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -1,21 +1,27 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Module\Login;
+
 require_once('include/conversation.php');
 require_once('include/items.php');
 
-function bookmarklet_init(App &$a) {
+function bookmarklet_init(App $a)
+{
 	$_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>' . t('Login') . '</h2>';
+		$o .= Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? false : true);
 		return $o;
 	}
 
 	$referer = normalise_link($_SERVER["HTTP_REFERER"]);
-	$page = normalise_link(App::get_baseurl()."/bookmarklet");
+	$page = normalise_link(System::baseUrl() . "/bookmarklet");
 
 	if (!strstr($referer, $page)) {
 		$content = add_page_info($_REQUEST["url"]);
@@ -27,18 +33,17 @@ function bookmarklet_content(App &$a) {
 			'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),
+			'acl' => populate_acl($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"], "*"),
 			'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>' . t('The post was created') . '</h2>';
 		$o .= "<script>window.close()</script>";
 	}