Merge pull request #9509 from MrPetovan/task/5616-clear-notifications-display

[friendica.git] / src / Module / Bookmarklet.php

diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php
index c7f4cdae4a4e0e91e64e27fac1082cfcdc8660bc..e5b3ee4adecf9ff63b53f4309b62cd8f7cf25f69 100644 (file)
--- a/src/Module/Bookmarklet.php
+++ b/src/Module/Bookmarklet.php
@@ -1,10 +1,29 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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;
@@ -24,8 +43,8 @@ class Bookmarklet extends BaseModule
                $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;
                }
 
@@ -34,10 +53,10 @@ class Bookmarklet extends BaseModule
 
                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,
@@ -46,7 +65,7 @@ class Bookmarklet extends BaseModule
                                '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),
+                               'acl'              => ACL::getFullSelectorHTML(DI::page(), $app->user, true),
                                'bang'             => '',
                                'visitor'          => 'block',
                                'profile_uid'      => local_user(),
@@ -56,7 +75,7 @@ class Bookmarklet extends BaseModule
                        $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>";
                }