*/
use Friendica\App;
-use Friendica\Core\Addon;
+use Friendica\BaseModule;
+use Friendica\Content\Text\Markdown;
+use Friendica\Core\Cache;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
-use Friendica\Core\System;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
+use Friendica\Model\Item;
+use Friendica\Model\Term;
+use Friendica\Module\Login;
use Friendica\Network\HTTPException;
+use Friendica\Util\DateTimeFormat;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Symfony\Component\ExpressionLanguage;
-require_once 'boot.php';
-require_once 'include/conversation.php';
-require_once 'include/dba.php';
-require_once 'include/security.php';
-
require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
-function advancedcontentfilter_install()
+function advancedcontentfilter_install(App $a)
{
- Addon::registerHook('dbstructure_definition' , __FILE__, 'advancedcontentfilter_dbstructure_definition');
- Addon::registerHook('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
- Addon::registerHook('addon_settings' , __FILE__, 'advancedcontentfilter_addon_settings');
+ Hook::register('dbstructure_definition' , __FILE__, 'advancedcontentfilter_dbstructure_definition');
+ Hook::register('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
+ Hook::register('addon_settings' , __FILE__, 'advancedcontentfilter_addon_settings');
- DBStructure::update(false, true);
+ DBStructure::update($a->getBasePath(), false, true);
- logger("installed advancedcontentfilter");
+ Logger::log("installed advancedcontentfilter");
}
function advancedcontentfilter_uninstall()
{
- Addon::unregisterHook('dbstructure_definition' , __FILE__, 'advancedcontentfilter_dbstructure_definition');
- Addon::unregisterHook('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
- Addon::unregisterHook('addon_settings' , __FILE__, 'advancedcontentfilter_addon_settings');
+ Hook::unregister('dbstructure_definition' , __FILE__, 'advancedcontentfilter_dbstructure_definition');
+ Hook::unregister('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
+ Hook::unregister('addon_settings' , __FILE__, 'advancedcontentfilter_addon_settings');
}
/*
"expression" => ["type" => "mediumtext" , "not null" => "1", "comment" => "Expression text"],
"serialized" => ["type" => "mediumtext" , "not null" => "1", "comment" => "Serialized parsed expression"],
"active" => ["type" => "boolean" , "not null" => "1", "default" => "1", "comment" => "Whether the rule is active or not"],
- "created" => ["type" => "datetime" , "not null" => "1", "default" => NULL_DATE, "comment" => "Creation date"],
+ "created" => ["type" => "datetime" , "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation date"],
],
"indexes" => [
"PRIMARY" => ["id"],
$vars[str_replace('-', '_', $key)] = $value;
}
- $rules = Friendica\Core\Cache::get('rules_' . local_user());
+ $rules = Cache::get('rules_' . local_user());
if (!isset($rules)) {
- $rules = dba::inArray(dba::select(
+ $rules = DBA::toArray(DBA::select(
'advancedcontentfilter_rules',
['name', 'expression', 'serialized'],
['uid' => local_user(), 'active' => true]
$rule['serialized']
);
- $found = (bool) $expressionLanguage->evaluate($serializedParsedExpression, $vars);
+ // The error suppression operator is used because of potentially broken user-supplied regular expressions
+ $found = (bool) @$expressionLanguage->evaluate($serializedParsedExpression, $vars);
} catch (Exception $e) {
$found = false;
}
function advancedcontentfilter_init(App $a)
{
- if ($a->argv[1] == 'api') {
+ if ($a->argc > 1 && $a->argv[1] == 'api') {
$slim = new \Slim\App();
require __DIR__ . '/src/middlewares.php';
function advancedcontentfilter_content(App $a)
{
if (!local_user()) {
- return \Friendica\Module\Login::form('/' . implode('/', $a->argv));
+ return Login::form('/' . implode('/', $a->argv));
}
- if ($a->argc > 0 && $a->argv[1] == 'help') {
+ if ($a->argc > 1 && $a->argv[1] == 'help') {
$lang = $a->user['language'];
$default_dir = 'addon/advancedcontentfilter/doc/';
$content = file_get_contents($help_path);
- $html = \Friendica\Content\Text\Markdown::convert($content, false);
+ $html = Markdown::convert($content, false);
$html = str_replace('code>', 'key>', $html);
return $html;
} else {
- $t = get_markup_template('settings.tpl', 'addon/advancedcontentfilter/');
- return replace_macros($t, [
- '$backtosettings' => L10n::t('Back to Addon Settings'),
- '$title' => L10n::t('Advanced Content Filter'),
- '$add_a_rule' => L10n::t('Add a Rule'),
- '$help' => L10n::t('Help'),
- '$advanced_content_filter_intro' => L10n::t('Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href="advancedcontentfilter/help">help page</a>.'),
- '$your_rules' => L10n::t('Your rules'),
- '$no_rules' => L10n::t('You have no rules yet! Start adding one by clicking on the button above next to the title.'),
- '$disabled' => L10n::t('Disabled'),
- '$enabled' => L10n::t('Enabled'),
- '$disable_this_rule' => L10n::t('Disable this rule'),
- '$enable_this_rule' => L10n::t('Enable this rule'),
- '$edit_this_rule' => L10n::t('Edit this rule'),
- '$edit_the_rule' => L10n::t('Edit the rule'),
- '$save_this_rule' => L10n::t('Save this rule'),
- '$delete_this_rule' => L10n::t('Delete this rule'),
- '$rule' => L10n::t('Rule'),
- '$close' => L10n::t('Close'),
- '$addtitle' => L10n::t('Add new rule'),
- '$rule_name' => L10n::t('Rule Name'),
- '$rule_expression' => L10n::t('Rule Expression'),
- '$examples' => L10n::t('<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'),
- '$cancel' => L10n::t('Cancel'),
+ $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/advancedcontentfilter/');
+ return Renderer::replaceMacros($t, [
+ '$messages' => [
+ 'backtosettings' => L10n::t('Back to Addon Settings'),
+ 'title' => L10n::t('Advanced Content Filter'),
+ 'add_a_rule' => L10n::t('Add a Rule'),
+ 'help' => L10n::t('Help'),
+ 'intro' => L10n::t('Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'),
+ 'your_rules' => L10n::t('Your rules'),
+ 'no_rules' => L10n::t('You have no rules yet! Start adding one by clicking on the button above next to the title.'),
+ 'disabled' => L10n::t('Disabled'),
+ 'enabled' => L10n::t('Enabled'),
+ 'disable_this_rule' => L10n::t('Disable this rule'),
+ 'enable_this_rule' => L10n::t('Enable this rule'),
+ 'edit_this_rule' => L10n::t('Edit this rule'),
+ 'edit_the_rule' => L10n::t('Edit the rule'),
+ 'save_this_rule' => L10n::t('Save this rule'),
+ 'delete_this_rule' => L10n::t('Delete this rule'),
+ 'rule' => L10n::t('Rule'),
+ 'close' => L10n::t('Close'),
+ 'addtitle' => L10n::t('Add new rule'),
+ 'rule_name' => L10n::t('Rule Name'),
+ 'rule_expression' => L10n::t('Rule Expression'),
+ 'cancel' => L10n::t('Cancel'),
+ ],
+ '$current_theme' => $a->getCurrentTheme(),
'$rules' => advancedcontentfilter_get_rules(),
- '$baseurl' => System::baseUrl(true),
- '$form_security_token' => get_form_security_token()
+ '$form_security_token' => BaseModule::getFormSecurityToken()
]);
}
}
throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
}
- $rules = dba::inArray(dba::select('advancedcontentfilter_rules', [], ['uid' => local_user()]));
+ $rules = DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => local_user()]));
return json_encode($rules);
}
throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
}
- $rule = dba::selectFirst('advancedcontentfilter_rules', [], ['id' => $args['id'], 'uid' => local_user()]);
+ $rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => $args['id'], 'uid' => local_user()]);
return json_encode($rule);
}
throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
}
- if (!check_form_security_token()) {
+ if (!BaseModule::checkFormSecurityToken()) {
throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
}
}
$fields['uid'] = local_user();
- $fields['created'] = \Friendica\Util\DateTimeFormat::utcNow();
+ $fields['created'] = DateTimeFormat::utcNow();
- if (!dba::insert('advancedcontentfilter_rules', $fields)) {
- throw new HTTPException\ServiceUnavaiableException(dba::errorMessage());
+ if (!DBA::insert('advancedcontentfilter_rules', $fields)) {
+ throw new HTTPException\ServiceUnavaiableException(DBA::errorMessage());
}
- $rule = dba::selectFirst('advancedcontentfilter_rules', [], ['id' => dba::lastInsertId()]);
+ $rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => DBA::lastInsertId()]);
return json_encode(['message' => L10n::t('Rule successfully added'), 'rule' => $rule]);
}
throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
}
- if (!check_form_security_token()) {
+ if (!BaseModule::checkFormSecurityToken()) {
throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
}
- if (!dba::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
+ if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
throw new HTTPException\NotFoundException(L10n::t('Rule doesn\'t exist or doesn\'t belong to you.'));
}
throw new HTTPException\BadRequestException($e->getMessage(), 0, $e);
}
- if (!dba::update('advancedcontentfilter_rules', $fields, ['id' => $args['id']])) {
- throw new HTTPException\ServiceUnavaiableException(dba::errorMessage());
+ if (!DBA::update('advancedcontentfilter_rules', $fields, ['id' => $args['id']])) {
+ throw new HTTPException\ServiceUnavaiableException(DBA::errorMessage());
}
return json_encode(['message' => L10n::t('Rule successfully updated')]);
throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
}
- if (!check_form_security_token()) {
+ if (!BaseModule::checkFormSecurityToken()) {
throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
}
- if (!dba::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
+ if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
throw new HTTPException\NotFoundException(L10n::t('Rule doesn\'t exist or doesn\'t belong to you.'));
}
- if (!dba::delete('advancedcontentfilter_rules', ['id' => $args['id']])) {
- throw new HTTPException\ServiceUnavaiableException(dba::errorMessage());
+ if (!DBA::delete('advancedcontentfilter_rules', ['id' => $args['id']])) {
+ throw new HTTPException\ServiceUnavaiableException(DBA::errorMessage());
}
return json_encode(['message' => L10n::t('Rule successfully deleted')]);
throw new HTTPException\BadRequestException(L10n::t('Missing argument: guid.'));
}
- $item = dba::fetch_first(item_query() . " AND `item`.`guid` = ? AND (`item`.`uid` = ? OR `item`.`uid` = 0) ORDER BY `item`.`uid` DESC", $args['guid'], local_user());
+ $condition = ["`guid` = ? AND (`uid` = ? OR `uid` = 0)", $args['guid'], local_user()];
+ $params = ['order' => ['uid' => true]];
+ $item = Item::selectFirstForUser(local_user(), [], $condition, $params);
- if (!\Friendica\Database\DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
throw new HTTPException\NotFoundException(L10n::t('Unknown post with guid: %s', $args['guid']));
}
- $tags = \Friendica\Model\Term::populateTagsFromItem($item);
+ $tags = Term::populateTagsFromItem($item);
$item['tags'] = $tags['tags'];
$item['hashtags'] = $tags['hashtags'];
}
return json_encode(['variables' => str_replace('\\\'', '\'', var_export($return, true))]);
-}
\ No newline at end of file
+}
projects / friendica-addons.git / blobdiff