fixing more bugs
This commit is contained in:
parent
b4498138fb
commit
c1a19e9c6b
8 changed files with 25 additions and 8 deletions
|
|
@ -13,6 +13,7 @@ package Hourly::DeleteExpiredClipboard;
|
|||
|
||||
use strict;
|
||||
use WebGUI::DateTime;
|
||||
use WebGUI::Page;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::SQL;
|
||||
|
||||
|
|
@ -20,12 +21,13 @@ use WebGUI::SQL;
|
|||
sub process {
|
||||
if ($session{config}{DeleteExpiredClipboard_offset} ne "") {
|
||||
my $expireDate = (time()-(86400*$session{config}{DeleteExpiredClipboard_offset}));
|
||||
|
||||
WebGUI::ErrorHandler::audit("moving expired clipboard items to trash");
|
||||
|
||||
WebGUI::SQL->write("update page set parentId=3, bufferPrevId=2, bufferDate=" .WebGUI::DateTime::time()
|
||||
." where parentId=2 and bufferDate < ". $expireDate );
|
||||
|
||||
my $sth = WebGUI::SQL->read("select pageId from page where parentId=2 and bufferDate <".$expireDate);
|
||||
while (my ($pageId) = $sth->array) {
|
||||
my $page = WebGUI::Page->new($pageId);
|
||||
$page->delete;
|
||||
}
|
||||
$sth->finish;
|
||||
WebGUI::SQL->write("update wobject set pageId=3, bufferPrevId=2, bufferDate=" .WebGUI::DateTime::time()
|
||||
." where pageId=2 and bufferDate < ". $expireDate );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ package Hourly::DeleteExpiredTrash;
|
|||
|
||||
use strict;
|
||||
use WebGUI::DateTime;
|
||||
use WebGUI::Page;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::SQL;
|
||||
|
||||
|
|
@ -44,7 +45,8 @@ sub process {
|
|||
WebGUI::ErrorHandler::audit("purging expired page ". $pageId ." from trash");
|
||||
WebGUI::Operation::Trash::_recursePageTree($pageId);
|
||||
WebGUI::Operation::Trash::_purgeWobjects($pageId);
|
||||
WebGUI::SQL->write("delete from page where pageId=".quote($pageId));
|
||||
my $page = WebGUI::Page->new($pageId);
|
||||
$page->purge;
|
||||
}
|
||||
$a->finish;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ package Hourly::TrashExpiredContent;
|
|||
|
||||
use strict;
|
||||
use WebGUI::DateTime;
|
||||
use WebGUI::Page;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::SQL;
|
||||
|
||||
|
|
@ -20,7 +21,12 @@ sub process {
|
|||
my $offset = $session{config}{TrashExpiredContent_offset};
|
||||
if ($offset ne "") {
|
||||
my $epoch = time()-(86400*$offset);
|
||||
WebGUI::SQL->write("update page set parentId=3, endDate=endDate+31536000 where endDate<".$epoch);
|
||||
my $sth = WebGUI::SQL->read("select pageId from page where endDate<".$epoch);
|
||||
while (my ($pageId) = $sth->array) {
|
||||
my $page = WebGUI::Page->new($pageId);
|
||||
$page->delete;
|
||||
}
|
||||
$sth->finish;
|
||||
WebGUI::SQL->write("update wobject set pageId=3, endDate=endDate+31536000 where endDate<".$epoch);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue