Merge branch 'soft_api_key' into dev

fixes #377
This commit is contained in:
Claude 2016-09-03 11:35:38 +02:00
commit 07dc1efaf3
2 changed files with 26 additions and 3 deletions

View File

@ -178,6 +178,19 @@ $config['per_page'] = 15;
**/
$config['apikey'] = '';
/**
* Soft API
*
* When set to true, allow interaction:
* without apikey: badword-check applies
* with apikey: badwords are ignored
*
* this is useful to maintain a restrictive blocklist
* for spammers and bypass it using the apikey.
*
**/
$config['soft_api'] = false;
/**
* Anti spam
*

View File

@ -40,7 +40,7 @@ class Api extends Main
function create()
{
if (config_item('apikey') != $this->input->get('apikey'))
if (config_item('apikey') != $this->input->get('apikey') && config_item('soft_api') == false)
{
die("Invalid API key\n");
}
@ -74,9 +74,19 @@ class Api extends Main
die("You are not allowed to paste\n");
}
if (!$this->_blockwords_check())
if (config_item('soft_api') == true && (config_item('apikey') == $this->input->get('apikey')))
{
die("Your paste contains blocked words\n");
//pass
}
else
{
if (!$this->_blockwords_check())
{
die("Your paste contains blocked words\n");
}
}
//create paste