Merge pull request #7071 from nupplaphil/task/mod_bookmarklet

Move mod/bookmarklet to src/Module/BookMarklet

diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
deleted file mode 100644 (file)
index f15d12d..0000000
--- a/mod/bookmarklet.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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;
-
-function bookmarklet_init()
-{
-       $_GET["mode"] = "minimal";
-}
-
-function bookmarklet_content(App $a)
-{
-       if (!local_user()) {
-               $o = '<h2>' . L10n::t('Login') . '</h2>';
-               $o .= Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED ? false : true);
-               return $o;
-       }
-
-       $referer = Strings::normaliseLink(defaults($_SERVER, 'HTTP_REFERER', ''));
-       $page = Strings::normaliseLink(System::baseUrl() . "/bookmarklet");
-
-       if (!strstr($referer, $page)) {
-               if (empty($_REQUEST["url"])) {
-                       throw new \Friendica\Network\HTTPException\BadRequestException(L10n::t('This page is missing a url parameter.'));
-               }
-
-               $content = add_page_info($_REQUEST["url"]);
-
-               $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' => ACL::getDefaultUserPermissions($a->user),
-                       'acl' => ACL::getFullSelectorHTML($a->user, true),
-                       'bang' => '',
-                       'visitor' => 'block',
-                       'profile_uid' => local_user(),
-                       'title' => trim(defaults($_REQUEST, 'title', ''), "*"),
-                       'content' => $content
-               ];
-               $o = status_editor($a, $x, 0, false);
-               $o .= "<script>window.resizeTo(800,550);</script>";
-       } else {
-               $o = '<h2>' . L10n::t('The post was created') . '</h2>';
-               $o .= "<script>window.close()</script>";
-       }
-
-       return $o;
-}

diff --git a/src/App/Router.php b/src/App/Router.php
index f4d5d6dfe39a9150323bf05c723cb4895a22bbf4..83cdf425542c5c3a2df8fa59f46498879eef5f31 100644 (file)
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -88,6 +88,7 @@ class Router
                $this->routeCollector->addRoute(['GET'],         '/apps',                Module\Apps::class);
                $this->routeCollector->addRoute(['GET'],         '/attach/{item:\d+}',   Module\Attach::class);
                $this->routeCollector->addRoute(['GET'],         '/babel',               Module\Babel::class);
+               $this->routeCollector->addRoute(['GET'],         '/bookmarklet',         Module\BookMarklet::class);
                $this->routeCollector->addGroup('/contact', function (RouteCollector $collector) {
                        $collector->addRoute(['GET'], '[/]',                                 Module\Contact::class);
                        $collector->addRoute(['GET'], '/{id:\d+}[/posts|conversations]',     Module\Contact::class);

diff --git a/src/Module/BookMarklet.php b/src/Module/BookMarklet.php
new file mode 100644 (file)
index 0000000..51feb25
--- /dev/null
+++ b/src/Module/BookMarklet.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\ACL;
+use Friendica\Core\L10n;
+use Friendica\Network\HTTPException;
+use Friendica\Util\Strings;
+
+/**
+ * Creates a bookmarklet
+ * Shows either a editor browser or adds the given bookmarklet to the current user
+ */
+class BookMarklet extends BaseModule
+{
+       public static function content()
+       {
+               $_GET['mode'] = 'minimal';
+
+               $app = self::getApp();
+               $config = $app->getConfig();
+
+               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);
+                       return $output;
+               }
+
+               $referer = Strings::normaliseLink(defaults($_SERVER, 'HTTP_REFERER', ''));
+               $page = Strings::normaliseLink($app->getBaseURL() . "/bookmarklet");
+
+               if (!strstr($referer, $page)) {
+                       if (empty($_REQUEST["url"])) {
+                               throw new HTTPException\BadRequestException(L10n::t('This page is missing a url parameter.'));
+                       }
+
+                       $content = add_page_info($_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'),
+                               'default_perms'    => ACL::getDefaultUserPermissions($app->user),
+                               'acl'              => ACL::getFullSelectorHTML($app->user, true),
+                               'bang'             => '',
+                               'visitor'          => 'block',
+                               'profile_uid'      => local_user(),
+                               'title'            => trim(defaults($_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 .= "<script>window.close()</script>";
+               }
+
+               return $output;
+       }
+}