Add cache handling to maintenance.php and eclipse keeps changing formatting in newsportal.php.
This commit is contained in:
parent
68f94d4f6e
commit
7390e2a9bc
|
@ -1635,7 +1635,7 @@ function get_newsgroups_by_msgid($msgid, $noarray = false)
|
|||
}
|
||||
}
|
||||
}
|
||||
if (!isset($groups)) {
|
||||
if (! isset($groups)) {
|
||||
$database = $spooldir . '/articles-overview.db3';
|
||||
$table = 'overview';
|
||||
$overview_dbh = overview_db_open($database, $table);
|
||||
|
@ -2932,77 +2932,84 @@ function delete_message_from_overboard($config_name, $group, $messageid)
|
|||
$cachefile = $spooldir . "/" . $config_name . "-overboard.dat";
|
||||
if (is_file($cachefile)) {
|
||||
$cached_overboard = unserialize(file_get_contents($cachefile));
|
||||
if ($target = $cached_overboard['msgids'][$messageid]) {
|
||||
unset($cached_overboard['threads'][$target['date']]);
|
||||
unset($cached_overboard['msgids'][$messageid]);
|
||||
unset($cached_overboard['threadlink'][$messageid]);
|
||||
file_put_contents($cachefile, serialize($cached_overboard));
|
||||
if (isset($cached_overboard['msgids'][$messageid])) {
|
||||
if ($target = $cached_overboard['msgids'][$messageid]) {
|
||||
unset($cached_overboard['threads'][$target['date']]);
|
||||
unset($cached_overboard['msgids'][$messageid]);
|
||||
unset($cached_overboard['threadlink'][$messageid]);
|
||||
file_put_contents($cachefile, serialize($cached_overboard));
|
||||
}
|
||||
}
|
||||
}
|
||||
$cachefile = $spooldir . "/" . $group . "-overboard.dat";
|
||||
if (is_file($cachefile)) {
|
||||
$cached_overboard = unserialize(file_get_contents($cachefile));
|
||||
if ($target = $cached_overboard['msgids'][$messageid]) {
|
||||
unset($cached_overboard['threads'][$target['date']]);
|
||||
unset($cached_overboard['msgids'][$messageid]);
|
||||
unset($cached_overboard['threadlink'][$messageid]);
|
||||
file_put_contents($cachefile, serialize($cached_overboard));
|
||||
if (isset($cached_overboard['msgids'][$messageid])) {
|
||||
if ($target = $cached_overboard['msgids'][$messageid]) {
|
||||
unset($cached_overboard['threads'][$target['date']]);
|
||||
unset($cached_overboard['msgids'][$messageid]);
|
||||
unset($cached_overboard['threadlink'][$messageid]);
|
||||
file_put_contents($cachefile, serialize($cached_overboard));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function cache_add($cache_key, $data, $cache_ttl, $memcacheD = null) {
|
||||
global $enable_cache, $cache_dir, $cache_log;
|
||||
function cache_add($cache_key, $data, $cache_ttl, $memcacheD = null)
|
||||
{
|
||||
global $enable_cache, $cache_dir, $cache_log, $low_spool_disk_space;
|
||||
$cache_key = base64_encode($cache_key);
|
||||
if($enable_cache == 'memcached'){
|
||||
if($memcacheD) {
|
||||
if($nicole = $memcacheD->add($cache_key, $data, $cache_ttl)) {
|
||||
if ($enable_cache == 'memcached') {
|
||||
if ($memcacheD) {
|
||||
if ($nicole = $memcacheD->add($cache_key, $data, $cache_ttl)) {
|
||||
return $nicole;
|
||||
}
|
||||
}
|
||||
}
|
||||
if($enable_cache == 'diskcache'){
|
||||
if ($low_spool_disk_space) {
|
||||
file_put_contents($cache_log, "\n" . format_log_date() . " " . $config_name . " Low Disk Space (less than " . $min_spool_disk_space . "Gb available for cache). Pausing diskcache", FILE_APPEND);
|
||||
return false;
|
||||
}
|
||||
if($nicole = file_put_contents($cache_dir . '/' . $cache_key, $data)) {
|
||||
return $nicole;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if ($enable_cache == 'diskcache') {
|
||||
if ($low_spool_disk_space) {
|
||||
file_put_contents($cache_log, "\n" . format_log_date() . " " . $config_name . " Low Disk Space (less than " . $min_spool_disk_space . "Gb available for cache). Pausing diskcache", FILE_APPEND);
|
||||
return false;
|
||||
}
|
||||
if ($nicole = file_put_contents($cache_dir . '/' . $cache_key, $data)) {
|
||||
return $nicole;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function cache_delete($cache_key, $memcacheD = null) {
|
||||
function cache_delete($cache_key, $memcacheD = null)
|
||||
{
|
||||
global $enable_cache, $cache_dir;
|
||||
$cache_key = base64_encode($cache_key);
|
||||
if($enable_cache == 'memcached'){
|
||||
if($memcacheD) {
|
||||
if($nicole = $memcacheD->delete($cache_key)) {
|
||||
if ($enable_cache == 'memcached') {
|
||||
if ($memcacheD) {
|
||||
if ($nicole = $memcacheD->delete($cache_key)) {
|
||||
return $nicole;
|
||||
}
|
||||
}
|
||||
}
|
||||
if($enable_cache == 'diskcache'){
|
||||
if(file_exists($cache_dir . '/' . $cache_key)) {
|
||||
if ($enable_cache == 'diskcache') {
|
||||
if (file_exists($cache_dir . '/' . $cache_key)) {
|
||||
return unlink($cache_dir . '/' . $cache_key);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function cache_get($cache_key, $memcacheD = null) {
|
||||
function cache_get($cache_key, $memcacheD = null)
|
||||
{
|
||||
global $enable_cache, $cache_dir;
|
||||
$cache_key = base64_encode($cache_key);
|
||||
if($enable_cache == 'memcached'){
|
||||
if($memcacheD) {
|
||||
if($nicole = $memcacheD->get($cache_key)) {
|
||||
if ($enable_cache == 'memcached') {
|
||||
if ($memcacheD) {
|
||||
if ($nicole = $memcacheD->get($cache_key)) {
|
||||
return $nicole;
|
||||
}
|
||||
}
|
||||
}
|
||||
if($enable_cache == 'diskcache'){
|
||||
if(file_exists($cache_dir . '/' . $cache_key)) {
|
||||
if ($enable_cache == 'diskcache') {
|
||||
if (file_exists($cache_dir . '/' . $cache_key)) {
|
||||
return file_get_contents($cache_dir . '/' . $cache_key);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -67,6 +67,9 @@ if ($argv[1][0] == '-') {
|
|||
default:
|
||||
echo "-help: This help page\n";
|
||||
echo "-version: Display version\n";
|
||||
echo "******************* IMPORTANT **************************\n";
|
||||
echo "*** PLEASE DISABLE cron.php WHEN RUNNING THIS SCRIPT ***\n";
|
||||
echo "********************************************************\n";
|
||||
echo "-clean: Remove extraneous group db3 files\n";
|
||||
echo "-import: Import articles from a .db3 file (-import alt.test-articles)\n";
|
||||
echo " You must first add group name to <config_dir>/<section>/groups.txt manually\n";
|
||||
|
@ -172,7 +175,8 @@ function reset_group($group, $remove = 0)
|
|||
$config_location = $spooldir . '/' . $section;
|
||||
$config_files = array_diff(scandir($config_location), array(
|
||||
'..',
|
||||
'.'
|
||||
'.',
|
||||
'outgoing'
|
||||
));
|
||||
|
||||
foreach ($config_files as $config_file) {
|
||||
|
@ -200,18 +204,22 @@ function remove_articles($group)
|
|||
$group = trim($group);
|
||||
|
||||
# Overview
|
||||
$dbh = overview_db_open($spooldir . '/articles-overview.db3');
|
||||
$clear_stmt = $dbh->prepare("DELETE FROM overview WHERE newsgroup=:group");
|
||||
$clear_stmt->bindParam(':group', $group);
|
||||
$clear_stmt->execute();
|
||||
$dbh = null;
|
||||
$overview_dbh = overview_db_open($spooldir . '/articles-overview.db3');
|
||||
|
||||
# History
|
||||
$dbh = history_db_open($spooldir . '/history.db3');
|
||||
$clear_stmt = $dbh->prepare("DELETE FROM history WHERE newsgroup=:group");
|
||||
$clear_stmt->bindParam(':group', $group);
|
||||
$clear_stmt->execute();
|
||||
$dbh = null;
|
||||
$fetch_stmt = $overview_dbh->prepare("SELECT msgid FROM overview WHERE newsgroup=:group");
|
||||
$fetch_stmt->bindParam(':group', $group);
|
||||
$fetch_stmt->execute();
|
||||
$del_array = array();
|
||||
while ($row = $fetch_stmt->fetch()) {
|
||||
if (isset($row['msgid'])) {
|
||||
$del_array[] = $row['msgid'];
|
||||
}
|
||||
}
|
||||
$overview_dbh = null;
|
||||
foreach($del_array as $delme) {
|
||||
delete_message($delme, $group);
|
||||
echo "Deleting " . $delme . " from " . $group . "\n";
|
||||
}
|
||||
|
||||
rename($spooldir . '/' . $group . '-articles.db3', $spooldir . '/' . $group . '-articles.db3-removed');
|
||||
unlink($spooldir . '/' . $group . '-data.db3');
|
||||
|
|
Loading…
Reference in New Issue