Simplified settings by removing the scramble option. This is now turned on by default. Also fixed backslash escaping in regular expressions.
This commit is contained in:
Janek Bevendorff
parent
5dd7bd6564
commit
0166c86686
|
|
@ -42,11 +42,12 @@
|
|||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_DEFAULT', 'Standard');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_JSON', 'JSON');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_SMARTY', 'Smarty');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_SMARTY_ENC', 'Smarty + Verschlüsselung');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QT_MATH', 'Rechenaufgaben');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QT_CUSTOM', 'Eigene Fragen');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_DESC', 'Fortgeschrittene Konfigurationsoptionen für das verstecke Captcha. Wenn dieses nicht aktiviert ist, kann dieser Abschnitt getrost übersprungen werden.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_ANSWER_RETRIEVAL', 'Methode für Abfrage der Antwort');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_ANSWER_RETRIEVAL_DESC', 'Wähle hier aus, wie die korrekte Antwort abgefragt werden soll. Bei Auswahl von "JSON" kann ein Ajax-Request an index.php/plugin/spamblockbeecaptcha abgesetzt werden, um die richtige Antwort zu erhalten. Die Auswahl "Smarty" wird die Antwort über die Smarty-Variable {$beeCaptchaAnswer} bereitstellen, während "Standard" den Wert in der Seite hartkodiert. ACHTUNG: ist "Smarty" ausgewählt, wird keinerlei zusätzliches CSS oder JavaScript eingebunden. Das Captcha-Feld muss also selbst befüllt und versteckt werden.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_ANSWER_RETRIEVAL_DESC', 'Wähle hier aus, wie die korrekte Antwort abgefragt werden soll. Bei Auswahl von "JSON" kann ein Ajax-Request an index.php/plugin/spamblockbeecaptcha abgesetzt werden, um die richtige Antwort zu erhalten. Die Auswahl "Smarty" wird die Antwort über die Smarty-Variable {$beeCaptchaAnswer} bereitstellen, während "Standard" den Wert in der Seite hartkodiert. ACHTUNG: ist "Smarty" ausgewählt, wird keinerlei zusätzliches CSS oder JavaScript eingebunden. Das Captcha-Feld muss also selbst befüllt und versteckt werden. "Smarty + Verschlüsselung" ist dasselbe wie "Smarty" mit dem Unterschied, dass die {$beeCaptchaAnswer} mit einer simplen XOR-Verschlüsselung verschleiert wurde. Der Entschlüsselungs-Key steht in der Variablen {$beeCaptchaScrambleKey}.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QUESTION_TYPE', 'Art der Frage');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QUESTION_TYPE_DESC', 'Spamschutz Biene kann automatisch simple Rechenaufgaben generieren. Es können aber auch eigene Fragen und Antworten angegeben werden. Wähle aus, was du bevorzugst.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QUESTIONS', 'Eigene Fragen');
|
||||
|
|
@ -57,11 +58,6 @@
|
|||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_DEFAULT_ANSWERS', "Antwort1\nAntwort2");
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_USE_REGEXP', 'Reguläre Ausdrücke benutzen');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_USE_REGEXP_DESC', 'Gibt an, ob Perl-kompatible reguläre Ausdrücke (PCREs) für die Antworten verwendet werden sollen. Diese können dazu benutzt werden, mehrere Varianten einer Antwort zuzulassen. Jeder Antwortzeile sollte dabei dem Muster /pattern/:Antwort entsprechen. ACHTUNG: Aktiviere diese Option nur, wenn du weißt, was du tust. Ein ungültiger regulärer Ausdruck wird Validitäts-Prüfungen fehlschlagen lassen und könnte dein Blog in wenigen Fällen einer sogenannten Denial-of-Service-Attacke aussetzen. Antworten länger als 1000 Zeichen werden abgewiesen, wenn reguläre Ausdrücke eingeschaltet sind.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE', 'JavaScript verschleiern');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_DESC', 'In einigen wenigen Fällen kann eine JavaScript-Verschleierung die Effektivität des versteckten Captchas erhöhen, indem es Spam-Bots davon abhält, die korrekte Antwort durch eine simple String-Pattern-Suche aus dem Code zu extrahieren. Es stehen zwei Verschleierungs-Methoden zur Verfügung: "Verschleiere Antwort" verschleiert bloß die Antwort durch eine simple XOR-Verschlüsselung anstatt sie als Klartext in das HTML-Dokument zu schreiben. "Verschleiere Antwort und Code" verschleiert auch noch den JavaScript-Code, um ihn schwerer verständlich zu machen (dies funktioniert nur mit der Standard-Methode zur Abfrage der Antwort). Bei Verwendung der Methode "Smarty" enthält die Variable {$beeCaptchaScrambleKey} den Entschlüsselungs-Key. Denke daran, dass die verschlüsselte Antwort URL-enkodiert werden muss, bevor du sie ins HTML-Dokument schreiben kannst!');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_OFF', 'Nicht verschleiern');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_SCRAMBLE_JS', 'Verschleiere Antwort');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_SCRAMBLE_JS_AND_CODE', 'Verschleiere Antwort und Code');
|
||||
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CAPTCHA_0', 'Null');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CAPTCHA_1', 'Eins');
|
||||
|
|
|
|||
|
|
@ -42,11 +42,12 @@
|
|||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_DEFAULT', 'Standard');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_JSON', 'JSON');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_SMARTY', 'Smarty');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_SMARTY_ENC', 'Smarty + Verschlüsselung');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QT_MATH', 'Rechenaufgaben');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QT_CUSTOM', 'Eigene Fragen');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_DESC', 'Fortgeschrittene Konfigurationsoptionen für das verstecke Captcha. Wenn dieses nicht aktiviert ist, kann dieser Abschnitt getrost übersprungen werden.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_ANSWER_RETRIEVAL', 'Methode für Abfrage der Antwort');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_ANSWER_RETRIEVAL_DESC', 'Wähle hier aus, wie die korrekte Antwort abgefragt werden soll. Bei Auswahl von "JSON" kann ein Ajax-Request an index.php/plugin/spamblockbeecaptcha abgesetzt werden, um die richtige Antwort zu erhalten. Die Auswahl "Smarty" wird die Antwort über die Smarty-Variable {$beeCaptchaAnswer} bereitstellen, während "Standard" den Wert in der Seite hartkodiert. ACHTUNG: ist "Smarty" ausgewählt, wird keinerlei zusätzliches CSS oder JavaScript eingebunden. Das Captcha-Feld muss also selbst befüllt und versteckt werden.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_ANSWER_RETRIEVAL_DESC', 'Wähle hier aus, wie die korrekte Antwort abgefragt werden soll. Bei Auswahl von "JSON" kann ein Ajax-Request an index.php/plugin/spamblockbeecaptcha abgesetzt werden, um die richtige Antwort zu erhalten. Die Auswahl "Smarty" wird die Antwort über die Smarty-Variable {$beeCaptchaAnswer} bereitstellen, während "Standard" den Wert in der Seite hartkodiert. ACHTUNG: ist "Smarty" ausgewählt, wird keinerlei zusätzliches CSS oder JavaScript eingebunden. Das Captcha-Feld muss also selbst befüllt und versteckt werden. "Smarty + Verschlüsselung" ist dasselbe wie "Smarty" mit dem Unterschied, dass die {$beeCaptchaAnswer} mit einer simplen XOR-Verschlüsselung verschleiert wurde. Der Entschlüsselungs-Key steht in der Variablen {$beeCaptchaScrambleKey}.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QUESTION_TYPE', 'Art der Frage');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QUESTION_TYPE_DESC', 'Spamschutz Biene kann automatisch simple Rechenaufgaben generieren. Es können aber auch eigene Fragen und Antworten angegeben werden. Wähle aus, was du bevorzugst.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QUESTIONS', 'Eigene Fragen');
|
||||
|
|
@ -57,11 +58,6 @@
|
|||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_DEFAULT_ANSWERS', "Antwort1\nAntwort2");
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_USE_REGEXP', 'Reguläre Ausdrücke benutzen');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_USE_REGEXP_DESC', 'Gibt an, ob Perl-kompatible reguläre Ausdrücke (PCREs) für die Antworten verwendet werden sollen. Diese können dazu benutzt werden, mehrere Varianten einer Antwort zuzulassen. Jeder Antwortzeile sollte dabei dem Muster /pattern/:Antwort entsprechen. ACHTUNG: Aktiviere diese Option nur, wenn du weißt, was du tust. Ein ungültiger regulärer Ausdruck wird Validitäts-Prüfungen fehlschlagen lassen und könnte dein Blog in wenigen Fällen einer sogenannten Denial-of-Service-Attacke aussetzen. Antworten länger als 1000 Zeichen werden abgewiesen, wenn reguläre Ausdrücke eingeschaltet sind.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE', 'JavaScript verschleiern');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_DESC', 'In einigen wenigen Fällen kann eine JavaScript-Verschleierung die Effektivität des versteckten Captchas erhöhen, indem es Spam-Bots davon abhält, die korrekte Antwort durch eine simple String-Pattern-Suche aus dem Code zu extrahieren. Es stehen zwei Verschleierungs-Methoden zur Verfügung: "Verschleiere Antwort" verschleiert bloß die Antwort durch eine simple XOR-Verschlüsselung anstatt sie als Klartext in das HTML-Dokument zu schreiben. "Verschleiere Antwort und Code" verschleiert auch noch den JavaScript-Code, um ihn schwerer verständlich zu machen (dies funktioniert nur mit der Standard-Methode zur Abfrage der Antwort). Bei Verwendung der Methode "Smarty" enthält die Variable {$beeCaptchaScrambleKey} den Entschlüsselungs-Key. Denke daran, dass die verschlüsselte Antwort URL-enkodiert werden muss, bevor du sie ins HTML-Dokument schreiben kannst!');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_OFF', 'Nicht verschleiern');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_SCRAMBLE_JS', 'Verschleiere Antwort');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_SCRAMBLE_JS_AND_CODE', 'Verschleiere Antwort und Code');
|
||||
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CAPTCHA_0', 'Null');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CAPTCHA_1', 'Eins');
|
||||
|
|
|
|||
|
|
@ -44,11 +44,12 @@
|
|||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_DEFAULT', 'Default');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_JSON', 'JSON');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_SMARTY', 'Smarty');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_SMARTY_ENC', 'Smarty + Encryption');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QT_MATH', 'Math problems');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QT_CUSTOM', 'Custom questions');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_DESC', 'Advanced configuration options for the hidden Captcha. If the captcha is disabled, you can safely ignore this section.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_ANSWER_RETRIEVAL', 'Answer retrieval method');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_ANSWER_RETRIEVAL_DESC', 'Select how you want to retrieve to correct answer to the Captcha. If you select "JSON", you can send an Ajax request to index.php/plugin/spamblockbeecaptcha to get the answer. "Smarty" will provide the answer through the Smarty variable {$beeCaptchaAnswer}, whereas "Default" will hard code it into the page. NOTE: If "Smarty" is selected, no additional CSS or JavaScript will be included. You have to fill and hide the Captcha field yourself.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_ANSWER_RETRIEVAL_DESC', 'Select how you want to retrieve to correct answer to the Captcha. If you select "JSON", you can send an Ajax request to index.php/plugin/spamblockbeecaptcha to get the answer. "Smarty" will provide the answer through the Smarty variable {$beeCaptchaAnswer}, whereas "Default" will hard code it into the page. NOTE: If "Smarty" is selected, no additional CSS or JavaScript will be included. You have to fill and hide the Captcha field yourself. "Smarty + Encryption" is the same as "Smarty" with the difference that the answer in {$beeCaptchaAnswer} is scrambled with a simple XOR cipher. The variable {$beeCaptchaScrambleKey} contains the decryption key.');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QUESTION_TYPE', 'Type of question');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QUESTION_TYPE_DESC', 'Spamblock Bee can automatically generate simple math problems for you or you can create your own questions and answers. Select which one you prefer');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QUESTIONS', 'Custom questions');
|
||||
|
|
@ -59,11 +60,6 @@
|
|||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_DEFAULT_ANSWERS', "Answer1\nAnswer2");
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_USE_REGEXP', 'Use regular expressions');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_USE_REGEXP_DESC', "Whether to interpret the answers given above as Perl compatible regular expressions (PCREs). This can be used to allow several variants of an answer. Each answer line should follow the rule /pattern/:answer. NOTE: Only enable this if you know what you\'re doing. Filling in bad regular expressions causes validity checks to fail and in some rare cases might expose yourself to a so called Denial of Service attack! Answers longer than 1000 characters will be rejected when regular expression matching is on.");
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE', 'Obfuscate JavaScript');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_DESC', 'In some rare cases JavaScript obfuscation can make the hidden Captcha more effective by preventing spam bots from performing simple string pattern searches in order to extract the correct answer from the code. There are two methods of obfuscation: "Scramble Answer" will only scramble the answer with a simple XOR cipher instead of writing it in plain text to the HTML document. "Scramble Answer and Code" will also obfuscate the code to make it harder to understand (this only works with the "Default" answer retrieval method). If you are using the method "Smarty", the variable {$beeCaptchaScrambleKey} will contain the decryption key. Remember to URL encode the scrambled answer before writing it to the HTML document!');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_OFF', 'Don\'t obfuscate');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_SCRAMBLE_JS', 'Scramble Answer');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_SCRAMBLE_JS_AND_CODE', 'Scramble Answer and Code');
|
||||
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CAPTCHA_0', 'zero');
|
||||
@define('PLUGIN_EVENT_SPAMBLOCK_BEE_CAPTCHA_1', 'one');
|
||||
|
|
|
|||
|
|
@ -74,18 +74,6 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
*/
|
||||
var $useRegularExpressions = false;
|
||||
|
||||
/**
|
||||
* Whether to scramble the Captcha answer
|
||||
* @var boolean
|
||||
*/
|
||||
var $captchaScrambleAnswer = false;
|
||||
|
||||
/**
|
||||
* Whether to obfuscate the JS code for the hidden Captcha
|
||||
* @var boolean
|
||||
*/
|
||||
var $captchaObfuscateCode = false;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor. Initialize class variables from configuration
|
||||
|
|
@ -97,14 +85,6 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
$this->useHoneyPot = $this->get_config('do_honeypot', true);
|
||||
$this->hiddenCaptchaHandle = $this->get_config('do_hiddencaptcha', PLUGIN_EVENT_SPAMBLOCK_SWTCH_MODERATE);
|
||||
$this->useRegularExpressions = $this->get_config('use_regexp', false);
|
||||
|
||||
$obfuscate = $this->get_config('obfuscate_answer', 'off');
|
||||
if ($obfuscate == 'scramble_answer') {
|
||||
$this->captchaScrambleAnswer = true;
|
||||
} else if ($obfuscate == 'scramble_answer_and_js') {
|
||||
$this->captchaScrambleAnswer = true;
|
||||
$this->captchaObfuscateCode = true;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -144,7 +124,7 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
$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', 'obfuscate_answer'
|
||||
'questions', 'answers', 'use_regexp'
|
||||
));
|
||||
|
||||
$propbag->add('configuration', $configuration );
|
||||
|
|
@ -154,7 +134,7 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
),
|
||||
PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_SECTION_ADVANCED => array(
|
||||
'advanced_cc_desc', 'answer_retrieval_method', 'question_type',
|
||||
'questions', 'answers', 'use_regexp', 'obfuscate_answer'
|
||||
'questions', 'answers', 'use_regexp'
|
||||
)
|
||||
)
|
||||
);
|
||||
|
|
@ -187,22 +167,17 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
);
|
||||
|
||||
$retrievalMethod = array(
|
||||
'default' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_DEFAULT,
|
||||
'json' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_JSON,
|
||||
'smarty' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_SMARTY
|
||||
'default' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_DEFAULT,
|
||||
'json' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_JSON,
|
||||
'smarty' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_SMARTY,
|
||||
'smarty_enc' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_RM_SMARTY_ENC
|
||||
);
|
||||
|
||||
$questionType = array(
|
||||
'math' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QT_MATH,
|
||||
'math' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QT_MATH,
|
||||
'custom' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_QT_CUSTOM
|
||||
);
|
||||
|
||||
$obfuscateAnswer = array(
|
||||
'off' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_OFF,
|
||||
'scramble_answer' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_SCRAMBLE_JS,
|
||||
'scramble_answer_and_js' => PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_SCRAMBLE_JS_AND_CODE
|
||||
);
|
||||
|
||||
switch($name) {
|
||||
case 'header_desc':
|
||||
$propbag->add('type', 'content');
|
||||
|
|
@ -319,14 +294,6 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
$propbag->add('default', false);
|
||||
break;
|
||||
|
||||
case 'obfuscate_answer':
|
||||
$propbag->add('type', 'select');
|
||||
$propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE);
|
||||
$propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_BEE_CONFIG_ADV_OBFUSCATE_DESC);
|
||||
$propbag->add('select_values', $obfuscateAnswer);
|
||||
$propbag->add('default', 'off');
|
||||
break;
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
|
@ -432,7 +399,6 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
if ($this->captchaQuestionType == 'custom' && $this->useRegularExpressions) {
|
||||
// Sanitize regular expression and remove answer part
|
||||
$pattern = preg_replace('/^\s*\/(.*)\/\s*[imsxeADSUXJu]*\s*$/s', '$1', $correctAnswer['pattern']);
|
||||
$pattern = addcslashes($pattern, '\\');
|
||||
|
||||
// Try to match pattern with given answer
|
||||
$match = @preg_match('/' . $pattern . '/si', $answer);
|
||||
|
|
@ -592,7 +558,7 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
|
||||
if (!isset($answer['answer'])) {
|
||||
$answer = array('answer' => 'ERROR');
|
||||
} else if ($this->captchaScrambleAnswer) {
|
||||
} else {
|
||||
$answer['answer'] = rawurlencode($this->xorScramble($answer['answer'], $scrambleKey));
|
||||
$answer['scrambleKey'] = $scrambleKey;
|
||||
}
|
||||
|
|
@ -629,9 +595,9 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
echo '<input class="" type="text" id="bee_captcha" name="serendipity[beecaptcha]" value="" placeholder=""/>' . "\n";
|
||||
echo "</div>\n";
|
||||
|
||||
if ($this->answerRetrievalMethod == 'smarty') {
|
||||
if ($this->answerRetrievalMethod == 'smarty' || $this->answerRetrievalMethod == 'smarty_enc') {
|
||||
$answer = $this->getCaptchaAnswer();
|
||||
if ($this->captchaScrambleAnswer) {
|
||||
if ($this->answerRetrievalMethod == 'smarty_enc') {
|
||||
$scrambleKey = rand();
|
||||
$answer['answer'] = $this->xorScramble($answer['answer'], $scrambleKey);
|
||||
$serendipity['smarty']->assign('beeCaptchaScrambleKey', $scrambleKey);
|
||||
|
|
@ -647,7 +613,7 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
* print the needed JavaScript for filling out and hiding the Captcha to the buffer.
|
||||
*/
|
||||
function printJsExtras() {
|
||||
if ($this->answerRetrievalMethod == 'smarty') {
|
||||
if ($this->answerRetrievalMethod == 'smarty' || $this->answerRetrievalMethod == 'smarty_enc') {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -662,18 +628,16 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
|
||||
if ($this->answerRetrievalMethod == 'json') {
|
||||
$jsProperties['url'] = $serendipity['baseURL'] . 'index.php/plugin/spamblockbeecaptcha';
|
||||
echo '<script>var spamBeeData = ' . json_encode($jsProperties) . ';</script>' . "\n";
|
||||
} else {
|
||||
$scrambleKey = rand();
|
||||
|
||||
if ($this->captchaScrambleAnswer) {
|
||||
$answer = rawurlencode($this->xorScramble($answer, $scrambleKey));
|
||||
$jsProperties['scrambleKey'] = $scrambleKey;
|
||||
}
|
||||
|
||||
$jsProperties['answer'] = is_numeric($answer) ? $answer : trim($answer);
|
||||
$scrambleKey = rand();
|
||||
$answer = rawurlencode($this->xorScramble($answer, $scrambleKey));
|
||||
$jsProperties['scrambleKey'] = $scrambleKey;
|
||||
$jsProperties['answer'] = is_numeric($answer) ? $answer : trim($answer);
|
||||
}
|
||||
unset($jsProperties['pattern']);
|
||||
|
||||
if ($this->answerRetrievalMethod == 'default' && $this->captchaObfuscateCode) {
|
||||
if ($this->answerRetrievalMethod == 'default') {
|
||||
// Do some weird obfuscation stuff to the JS code
|
||||
$spamBeeVar = $this->generateUniqueVarName(array());
|
||||
|
||||
|
|
@ -706,10 +670,9 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
}
|
||||
|
||||
echo 'return ' . $spamBeeVar . '; }();';
|
||||
echo '</script>';
|
||||
} else {
|
||||
echo '<script>var spamBeeData = ' . json_encode($jsProperties) . ';</script>' . "\n";
|
||||
echo "</script>\n";
|
||||
}
|
||||
|
||||
echo '<script src="' . $path . 'serendipity_event_spamblock_bee.js"></script>';
|
||||
}
|
||||
}
|
||||
|
|
@ -754,7 +717,7 @@ class serendipity_event_spamblock_bee extends serendipity_event
|
|||
* @param array $addData
|
||||
*/
|
||||
function printCss(&$eventData, &$addData) {
|
||||
if ($this->answerRetrievalMethod == 'smarty') {
|
||||
if ($this->answerRetrievalMethod == 'smarty' || $this->answerRetrievalMethod == 'smarty_enc') {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue