clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7071 from nupplaphil/task/mod_bookmarklet 

Move mod/bookmarklet to src/Module/BookMarklet
This commit is contained in:
Hypolite Petovan 2019-05-02 20:03:26 -04:00 committed by GitHub
parent 8010ccdc21 a9f701b9d6
commit cd41efe29d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
mod/bookmarklet.php
View File

@ -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;
}

1
src/App/Router.php
View File

@ -88,6 +88,7 @@ class Router
$this->routeCollector->addRoute(['GET'], '/apps', Module\Apps::class); $this->routeCollector->addRoute(['GET'], '/apps', Module\Apps::class);
$this->routeCollector->addRoute(['GET'], '/attach/{item:\d+}', Module\Attach::class); $this->routeCollector->addRoute(['GET'], '/attach/{item:\d+}', Module\Attach::class);
$this->routeCollector->addRoute(['GET'], '/babel', Module\Babel::class); $this->routeCollector->addRoute(['GET'], '/babel', Module\Babel::class);
$this->routeCollector->addRoute(['GET'], '/bookmarklet', Module\BookMarklet::class);
$this->routeCollector->addGroup('/contact', function (RouteCollector $collector) { $this->routeCollector->addGroup('/contact', function (RouteCollector $collector) {
$collector->addRoute(['GET'], '[/]', Module\Contact::class); $collector->addRoute(['GET'], '[/]', Module\Contact::class);
$collector->addRoute(['GET'], '/{id:\d+}[/posts|conversations]', Module\Contact::class); $collector->addRoute(['GET'], '/{id:\d+}[/posts|conversations]', Module\Contact::class);

63
src/Module/BookMarklet.php Normal file
View File

@ -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;
}
}