dbclean 0.2.10: PHP 8 compatibility changes
The database functions can now throw an exception we need to catch and the language constant loading throws a warning when seeing constants twice
This commit is contained in:
parent
3777967be3
commit
aa683eba97
|
@ -1,3 +1,6 @@
|
||||||
|
0.2.10:
|
||||||
|
PHP 8 compatibility fixes
|
||||||
|
|
||||||
0.2.9:
|
0.2.9:
|
||||||
Add other sqlite layers
|
Add other sqlite layers
|
||||||
0.2.8:
|
0.2.8:
|
||||||
|
|
|
@ -4,14 +4,7 @@ if (IN_serendipity !== true) {
|
||||||
die ("Don't hack!");
|
die ("Don't hack!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@serendipity_plugin_api::load_language(dirname(__FILE__));
|
||||||
// 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)) {
|
|
||||||
include $probelang;
|
|
||||||
}
|
|
||||||
|
|
||||||
include dirname(__FILE__) . '/lang_en.inc.php';
|
|
||||||
|
|
||||||
class serendipity_event_dbclean extends serendipity_event {
|
class serendipity_event_dbclean extends serendipity_event {
|
||||||
var $title = PLUGIN_EVENT_DBCLEAN_NAME;
|
var $title = PLUGIN_EVENT_DBCLEAN_NAME;
|
||||||
|
@ -24,7 +17,7 @@ class serendipity_event_dbclean extends serendipity_event {
|
||||||
$propbag->add('description', PLUGIN_EVENT_DBCLEAN_DESC);
|
$propbag->add('description', PLUGIN_EVENT_DBCLEAN_DESC);
|
||||||
$propbag->add('stackable', false);
|
$propbag->add('stackable', false);
|
||||||
$propbag->add('author', 'Malte Paskuda, Matthias Mees');
|
$propbag->add('author', 'Malte Paskuda, Matthias Mees');
|
||||||
$propbag->add('version', '0.2.9');
|
$propbag->add('version', '0.2.10');
|
||||||
$propbag->add('requirements', array(
|
$propbag->add('requirements', array(
|
||||||
'serendipity' => '0.8'
|
'serendipity' => '0.8'
|
||||||
));
|
));
|
||||||
|
@ -185,27 +178,29 @@ class serendipity_event_dbclean extends serendipity_event {
|
||||||
function cleanDB($table, $days) {
|
function cleanDB($table, $days) {
|
||||||
global $serendipity;
|
global $serendipity;
|
||||||
set_time_limit(0);
|
set_time_limit(0);
|
||||||
if($table=='visitors') {
|
try {
|
||||||
$sql = "DELETE
|
if($table=='visitors') {
|
||||||
FROM {$serendipity['dbPrefix']}visitors
|
$sql = "DELETE
|
||||||
WHERE unix_timestamp(concat(day,' ',time)) <" . (time() - ($days*24*60*60));
|
FROM {$serendipity['dbPrefix']}visitors
|
||||||
serendipity_db_query($sql);
|
WHERE unix_timestamp(concat(day,' ',time)) <" . (time() - ($days*24*60*60));
|
||||||
} else if ($table =='referrers') {
|
serendipity_db_query($sql);
|
||||||
$sql = "DELETE
|
} else if ($table =='referrers') {
|
||||||
FROM {$serendipity['dbPrefix']}$table
|
$sql = "DELETE
|
||||||
WHERE day <" . (time() - ($days*24*60*60));
|
FROM {$serendipity['dbPrefix']}$table
|
||||||
serendipity_db_query($sql);
|
WHERE day <" . (time() - ($days*24*60*60));
|
||||||
} else if ($table =='exits') {
|
serendipity_db_query($sql);
|
||||||
$sql = "DELETE
|
} else if ($table =='exits') {
|
||||||
FROM {$serendipity['dbPrefix']}$table
|
$sql = "DELETE
|
||||||
WHERE day < '" . date( 'Y-m-d', (time() - ($days*24*60*60))) ."'";
|
FROM {$serendipity['dbPrefix']}$table
|
||||||
serendipity_db_query($sql);
|
WHERE day < '" . date( 'Y-m-d', (time() - ($days*24*60*60))) ."'";
|
||||||
} else {
|
serendipity_db_query($sql);
|
||||||
$sql = "DELETE
|
} else {
|
||||||
FROM {$serendipity['dbPrefix']}$table
|
$sql = "DELETE
|
||||||
WHERE timestamp < " . (time() - ($days*24*60*60));
|
FROM {$serendipity['dbPrefix']}$table
|
||||||
serendipity_db_query($sql);
|
WHERE timestamp < " . (time() - ($days*24*60*60));
|
||||||
}
|
serendipity_db_query($sql);
|
||||||
|
}
|
||||||
|
} catch (Exception $e) { }
|
||||||
|
|
||||||
switch($serendipity['dbType']) {
|
switch($serendipity['dbType']) {
|
||||||
case 'sqlite':
|
case 'sqlite':
|
||||||
|
@ -226,7 +221,9 @@ class serendipity_event_dbclean extends serendipity_event {
|
||||||
case 'mysqli':
|
case 'mysqli':
|
||||||
$sql = "OPTIMIZE TABLE
|
$sql = "OPTIMIZE TABLE
|
||||||
{$serendipity['dbPrefix']}$table";
|
{$serendipity['dbPrefix']}$table";
|
||||||
serendipity_db_query($sql);
|
try {
|
||||||
|
serendipity_db_query($sql);
|
||||||
|
} catch (Exception $e) { }
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -318,7 +315,10 @@ class serendipity_event_dbclean extends serendipity_event {
|
||||||
WHERE timestamp < $timespan";
|
WHERE timestamp < $timespan";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$count = serendipity_db_query($sql);
|
$count = 0;
|
||||||
|
try {
|
||||||
|
$count = serendipity_db_query($sql);
|
||||||
|
} catch (Exception $e) { }
|
||||||
if(is_array($count)) {
|
if(is_array($count)) {
|
||||||
if (is_array($count[0])) {
|
if (is_array($count[0])) {
|
||||||
return $count[0][0];
|
return $count[0][0];
|
||||||
|
|
Loading…
Reference in a new issue