qbi/additional_plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

byes: Fix markall-buttons, database-backend w/o db

Browse source 
Fixes s9y/Serendipity#292
This commit is contained in:
onli 2015-02-15 18:48:43 +01:00
parent 60a29b2930
commit 62fb7bfb6b
3 changed files with 51 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
serendipity_event_spamblock_bayes/ChangeLog
View file

@ -1,3 +1,7 @@
0.4.18:
* Fix mark all buttons in 2.0 backend
* Show database backend also when the database was deleted
0.4.14:
* Proper $s9ybackend referencing

5
serendipity_event_spamblock_bayes/bayes_commentlist.js
View file

@ -283,6 +283,11 @@ function getChecked() {
var form = document.getElementById('formMultiDelete');
var checkboxes = getElementByClass('input_checkbox', form, 'input');
var length = checkboxes.length;
if (length == 0) {
// the classes changed in 2.0 backend, so we use another selector there
checkboxes = form.querySelectorAll('.multidelete');
length = checkboxes.length;
}
var ids = new Array()
for (var i=0; i < length; i++) {
if (checkboxes[i].checked) {

73
serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php
View file

@ -42,7 +42,7 @@ class serendipity_event_spamblock_bayes extends serendipity_event {
$this->title = PLUGIN_EVENT_SPAMBLOCK_BAYES_NAME;
$propbag->add ( 'description', PLUGIN_EVENT_SPAMBLOCK_BAYES_DESC);
$propbag->add ( 'name', $this->title);
$propbag->add ( 'version', '0.4.17' );
$propbag->add ( 'version', '0.4.18' );
$propbag->add ( 'event_hooks', array ('frontend_saveComment' => true,
'backend_spamblock_comments_shown' => true,
'external_plugin' => true,
@ -571,34 +571,36 @@ class serendipity_event_spamblock_bayes extends serendipity_event {
{$serendipity['dbPrefix']}spamblock_bayes;";
$results = serendipity_db_query($sql);
foreach ($results as $result) {
$token = $result['token'];
$ham = $result['ham'];
$spam = $result['spam'];
$type = $result['type'];
$sql = "SELECT
token
FROM
{$serendipity['dbPrefix']}spamblock_bayes_temp
WHERE
token = '$token' AND type = '$type';";
$tester = serendipity_db_query($sql);
if (empty($tester['0'])) {
$sql2 = "INSERT INTO
{$serendipity['dbPrefix']}spamblock_bayes_temp
(token, ham, spam, type)
VALUES
('$token', $ham, $spam, '$type');";
} else {
$sql2 = "UPDATE
{$serendipity['dbPrefix']}spamblock_bayes_temp
if (is_array($results)) {
foreach ($results as $result) {
$token = $result['token'];
$ham = $result['ham'];
$spam = $result['spam'];
$type = $result['type'];
$sql = "SELECT
token
FROM
{$serendipity['dbPrefix']}spamblock_bayes_temp
WHERE
token = '$token' AND type = '$type'
SET
ham = ham + $ham,
spam = spam + $spam;";
token = '$token' AND type = '$type';";
$tester = serendipity_db_query($sql);
if (empty($tester['0'])) {
$sql2 = "INSERT INTO
{$serendipity['dbPrefix']}spamblock_bayes_temp
(token, ham, spam, type)
VALUES
('$token', $ham, $spam, '$type');";
} else {
$sql2 = "UPDATE
{$serendipity['dbPrefix']}spamblock_bayes_temp
WHERE
token = '$token' AND type = '$type'
SET
ham = ham + $ham,
spam = spam + $spam;";
}
serendipity_db_query($sql2);
}
serendipity_db_query($sql2);
}
}
@ -1465,10 +1467,19 @@ class serendipity_event_spamblock_bayes extends serendipity_event {
token, ham, spam, type
FROM
{$serendipity['dbPrefix']}spamblock_bayes ORDER BY spam" . serendipity_db_limit_sql(sprintf("%d,%d", $commentpage*20, 20));
$bayesTable = serendipity_db_query($sql, false, "assoc");
$sql ="SELECT COUNT(token) FROM {$serendipity['dbPrefix']}spamblock_bayes";
$amount = serendipity_db_query($sql, true, "num");
$amount = $amount[0];
try {
$bayesTable = serendipity_db_query($sql, false, "assoc");
} catch (Exception $e) {
$bayesTable = array();
}
try {
$sql ="SELECT COUNT(token) FROM {$serendipity['dbPrefix']}spamblock_bayes";
$amount = serendipity_db_query($sql, true, "num");
$amount = $amount[0];
} catch (Exception $e) {
$amount = 0;
}
$data['pages'] = ceil($amount / 20);
$data['bayesTable'] = $bayesTable;