add a linebreak and fix some whitespaces

This commit is contained in:
Ian 2015-09-03 11:43:49 +02:00
parent bec25c8f5f
commit d6166ffaa7
5 changed files with 218 additions and 207 deletions

View file

@ -1,3 +1,9 @@
Version 1.2.9
* add a linebreak
Version 1.2.8
* Size honepot form field in case it is actually shown
Version 1.2.7
* Made it work more nice with the contactform plugin

View file

@ -1,6 +1,5 @@
<?php
if (IN_serendipity !== true) {
die ("Don't hack!");
}
@ -114,16 +113,17 @@ class serendipity_event_spamblock_bee extends serendipity_event
'frontend_saveComment' => true,
'frontend_footer' => true,
'css' => true,
'external_plugin' => true,
'external_plugin' => true
));
$propbag->add('groups', array('ANTISPAM'));
$configuration = array('header_desc','do_honeypot', 'do_hiddencaptcha' );
if (!class_exists('serendipity_event_spamblock')) { // Only do that, if spamblock is not installed.
$configuration =array_merge($configuration, array('entrytitle', 'samebody', 'required_fields'));
// Only do that, if spamblock is not installed
if (!class_exists('serendipity_event_spamblock')) {
$configuration = array_merge($configuration, array('entrytitle', 'samebody', 'required_fields'));
}
$configuration =array_merge($configuration, array('spamlogtype', 'spamlogfile', 'plugin_path'));
$configuration =array_merge($configuration, array(
$configuration = array_merge($configuration, array('spamlogtype', 'spamlogfile', 'plugin_path'));
$configuration = array_merge($configuration, array(
'advanced_cc_desc', 'answer_retrieval_method', 'question_type',
'questions', 'answers', 'use_regexp'
));
@ -335,9 +335,11 @@ class serendipity_event_spamblock_bee extends serendipity_event
}
return true;
break;
case 'frontend_comment':
$this->printCommentEditExtras($eventData, $addData);
break;
case 'frontend_footer':
// Comment header code only if in single article mode or contactform
// If contact form is installed, display on any page not being the article list
@ -349,9 +351,11 @@ class serendipity_event_spamblock_bee extends serendipity_event
$this->printJsExtras();
}
break;
case 'css':
$this->printCss($eventData, $addData);
break;
default:
return false;
break;
@ -682,7 +686,7 @@ class serendipity_event_spamblock_bee extends serendipity_event
echo "</script>\n";
}
echo '<script src="' . $path . 'serendipity_event_spamblock_bee.js"></script>';
echo '<script src="' . $path . 'serendipity_event_spamblock_bee.js"></script>' . "\n";
}
}

View file

@ -1,4 +1,5 @@
<?php
// Probe for a language include with constants. Still include defines later on, if some constants were missing
$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
if (file_exists($probelang)) {
@ -11,7 +12,6 @@ class serendipity_plugin_spamblock_bee extends serendipity_plugin {
var $title = PLUGIN_SPAMBLOCK_BEE_TITLE;
var $cache_file = null;
function introspect(&$propbag) {
$this->title = $this->get_config('title', $this->title);
@ -65,7 +65,7 @@ Bayes:%Bayes%'
$propbag->add('type', 'string');
$propbag->add('name', PLUGIN_SPAMBLOCK_BEE_CACHEMINS);
$propbag->add('description', PLUGIN_SPAMBLOCK_BEE_CACHEMINS_DESC);
$propbag->add('default','10'); // 10min
$propbag->add('default', '10'); // 10min
break;
case 'loggedin_only':
$propbag->add('type', 'boolean');
@ -159,6 +159,7 @@ Bayes:%Bayes%'
}
return array();
}
function cacheStats($stats) {
$stats = serialize($stats);
$cacheFile = $this->getCacheFilename();

View file

@ -1,2 +1,2 @@
<?php
@define('PLUGIN_SPAMBLOCK_BEE_VERSION', '1.2.8');
@define('PLUGIN_SPAMBLOCK_BEE_VERSION', '1.2.9');