X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FBookmarklet.php;h=8d64c97e42cb9b1331d2109a33f005d1baa1d0b4;hb=7072a7178896c567caf5003e94a8f8045221bd8f;hp=1c1763e8885786bd13d93a3daefb77ca2ffb4aae;hpb=ab8997f9db910ba70c592bf106a7f5fc41a55b2d;p=friendica.git
diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php
index 1c1763e888..8d64c97e42 100644
--- a/src/Module/Bookmarklet.php
+++ b/src/Module/Bookmarklet.php
@@ -1,9 +1,28 @@
.
+ *
+ */
namespace Friendica\Module;
use Friendica\BaseModule;
-use Friendica\Core\ACL;
+use Friendica\Content\PageInfo;
use Friendica\DI;
use Friendica\Module\Security\Login;
use Friendica\Network\HTTPException;
@@ -15,14 +34,13 @@ use Friendica\Util\Strings;
*/
class Bookmarklet extends BaseModule
{
- public static function content(array $parameters = [])
+ protected function content(array $request = []): string
{
$_GET['mode'] = 'minimal';
- $app = DI::app();
$config = DI::config();
- if (!local_user()) {
+ if (!DI::userSession()->getLocalUserId()) {
$output = '
' . DI::l10n()->t('Login') . '
';
$output .= Login::form(DI::args()->getQueryString(), intval($config->get('config', 'register_policy')) === Register::CLOSED ? false : true);
return $output;
@@ -36,23 +54,13 @@ class Bookmarklet extends BaseModule
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($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(DI::page(), $app->user, true),
- 'bang' => '',
- 'visitor' => 'block',
- 'profile_uid' => local_user(),
'title' => trim($_REQUEST['title'] ?? '', '*'),
'content' => $content
];
- $output = status_editor($app, $x, 0, false);
+ $output = DI::conversation()->statusEditor($x, 0, false);
$output .= "";
} else {
$output = '' . DI::l10n()->t('The post was created') . '
';