friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

Admin config setting added for blockbot, added option to block gabsocial #871

Merged
annando merged 4 commits from block-config into develop 2019-07-28 17:24:09 +02:00
Conversation 1 Commits 4 Files changed 2 +25 -2
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7c8c09836e - Show all commits

27
blockbot/blockbot.php
View file

@ -2,8 +2,9 @@
/** /**
* Name: blockbot * Name: blockbot
* Description: Blocking bots based on detecting bots/crawlers/spiders via the user agent and http_from header. * Description: Blocking bots based on detecting bots/crawlers/spiders via the user agent and http_from header.
* Version: 0.1 * Version: 0.2
* Author: Philipp Holzer <admin@philipp.info> * Author: Philipp Holzer <admin@philipp.info>
* Author: Michael Vogel <https://pirati.ca/profile/heluecht>
* *
*/ */
@ -13,6 +14,8 @@ use Friendica\Core\Hook;
use Friendica\Core\System; use Friendica\Core\System;
use Jaybizzle\CrawlerDetect\CrawlerDetect; use Jaybizzle\CrawlerDetect\CrawlerDetect;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\L10n;
require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'; require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
@ -25,6 +28,22 @@ function blockbot_uninstall() {
Hook::unregister('init_1', __FILE__, 'blockbot_init_1'); Hook::unregister('init_1', __FILE__, 'blockbot_init_1');
} }
function blockbot_addon_admin(&$a, &$o) {
$t = Renderer::getMarkupTemplate("admin.tpl", "addon/blockbot/");
$o = Renderer::replaceMacros($t, [
'$submit' => L10n::t('Save Settings'),
'$training' => ['training', L10n::t('Training mode'), Config::get('blockbot', 'training'), "Activates the training mode. This is only meant for developing purposes. Don't activate this on a production machine."],
'$block_gab' => ['block_gab', L10n::t('Block GabSocial'), Config::get('blockbot', 'block_gab'), 'Block the software GabSocial. This will block every access for that software. You can block dedicated gab instances in the blocklist settings in the admin section.'],
]);
}
function blockbot_addon_admin_post(&$a) {
Config::set('blockbot', 'training', $_POST['training'] ?? false);
Config::set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
info(L10n::t('Settings updated.'). EOL);
}
function blockbot_init_1(App $a) { function blockbot_init_1(App $a) {
if (empty($_SERVER['HTTP_USER_AGENT'])) { if (empty($_SERVER['HTTP_USER_AGENT'])) {
return; return;
@ -49,7 +68,11 @@ function blockbot_init_1(App $a) {
'ArchiveTeam ArchiveBot/', 'yacybot', 'https://developers.google.com/+/web/snippet/', 'ArchiveTeam ArchiveBot/', 'yacybot', 'https://developers.google.com/+/web/snippet/',
'Scrapy/', 'github-camo', 'MJ12bot/', 'DotBot/', 'Pinterestbot/', 'Jooblebot/', 'Scrapy/', 'github-camo', 'MJ12bot/', 'DotBot/', 'Pinterestbot/', 'Jooblebot/',
'Cliqzbot/', 'YaK/', 'Mediatoolkitbot', 'Snacktory', 'FunWebProducts', 'oBot/', 'Cliqzbot/', 'YaK/', 'Mediatoolkitbot', 'Snacktory', 'FunWebProducts', 'oBot/',
'7Siters/']; '7Siters/', 'KOCMOHABT', 'Google-SearchByImage'];
if (Config::get('blockbot', 'block_gab')) {
$agents[] = 'GabSocial/';
}
foreach ($agents as $agent) { foreach ($agents as $agent) {
if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) { if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {