X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FBookmarklet.php;h=fab9dbc6c59e56fcc243d6744bad021b78b99c4f;hb=15caf4b3f7eacda399a56b1ad8eeb9d3257306d9;hp=1b6ff384597169eae700e21e3536bb17b9847d09;hpb=37f9af2f24ef9bb76b8bd95737386bf752b1b689;p=friendica.git

diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php
index 1b6ff38459..fab9dbc6c5 100644
--- a/src/Module/Bookmarklet.php
+++ b/src/Module/Bookmarklet.php
@@ -1,10 +1,31 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Content\PageInfo;
 use Friendica\Core\ACL;
-use Friendica\Core\L10n;
+use Friendica\DI;
+use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Strings;
 
@@ -14,47 +35,47 @@ use Friendica\Util\Strings;
  */
 class Bookmarklet extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$_GET['mode'] = 'minimal';
 
-		$app = self::getApp();
-		$config = $app->getConfig();
+		$app = DI::app();
+		$config = DI::config();
 
 		if (!local_user()) {
-			$output = '<h2>' . L10n::t('Login') . '</h2>';
-			$output .= Login::form($app->query_string, intval($config->get('config', 'register_policy')) === Register::CLOSED ? false : true);
+			$output = '<h2>' . DI::l10n()->t('Login') . '</h2>';
+			$output .= Login::form(DI::args()->getQueryString(), intval($config->get('config', 'register_policy')) === Register::CLOSED ? false : true);
 			return $output;
 		}
 
-		$referer = Strings::normaliseLink(defaults($_SERVER, 'HTTP_REFERER', ''));
-		$page = Strings::normaliseLink($app->getBaseURL() . "/bookmarklet");
+		$referer = Strings::normaliseLink($_SERVER['HTTP_REFERER'] ?? '');
+		$page = Strings::normaliseLink(DI::baseUrl()->get() . "/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($a->user['allow_gid'])) || (strlen($app->user['deny_cid'])) || (strlen($app->user['deny_gid'])))) ? 'lock' : 'unlock'),
+				'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->user, true),
+				'acl'              => ACL::getFullSelectorHTML(DI::page(), $app->user, true),
 				'bang'             => '',
 				'visitor'          => 'block',
 				'profile_uid'      => local_user(),
-				'title'            => trim(defaults($_REQUEST, 'title', ''), '*'),
+				'title'            => trim($_REQUEST['title'] ?? '', '*'),
 				'content'          => $content
 			];
 			$output = status_editor($app, $x, 0, false);
 			$output .= "<script>window.resizeTo(800,550);</script>";
 		} else {
-			$output = '<h2>' . L10n::t('The post was created') . '</h2>';
+			$output = '<h2>' . DI::l10n()->t('The post was created') . '</h2>';
 			$output .= "<script>window.close()</script>";
 		}