merging 6.2.8 changes and initial draft of TinyMCE as rich editor

This commit is contained in:
JT Smith 2004-10-30 15:49:59 +00:00
parent a189f52942
commit 6ddb7c49e6
38 changed files with 328 additions and 145 deletions

View file

@ -18,16 +18,16 @@ use WebGUI::SQL;
#-----------------------------------------
sub process {
my @date = WebGUI::DateTime::localtime();
if ($date[4] == 3) { # only occurs at 3am on the day in question.
if ($date[3] == 3) { # only occurs at 3am on the day in question.
my $sth = WebGUI::SQL->read("select groupId,deleteOffset,dbCacheTimeout from groups");
while (my $data = $sth->hashRef) {
if ($data->{dbCacheTimeout} > 0) {
# there is no need to wait deleteOffset days for expired external group cache data
WebGUI::SQL->write("delete from groupings where groupId=".quote($data->{groupId})." and expireDate < ".WebGUI::DateTime::time());
} else {
# there is no need to wait deleteOffset days for expired external group cache data
WebGUI::SQL->write("delete from groupings where groupId=".quote($data->{groupId})." and expireDate < ".WebGUI::DateTime::time());
} else {
WebGUI::SQL->write("delete from groupings where groupId=".quote($data->{groupId})." and expireDate < "
.(WebGUI::DateTime::time()-(86400*$data->{deleteOffset})));
}
}
}
$sth->finish;
}

View file

@ -169,9 +169,9 @@ sub getIndexerParams {
b.fieldData as publicProfile,
'profile' as namespace,
1 as pageId,
7 as page_groupIdView,
7 as wobject_groupIdView,
7 as wobject_special_groupIdView
2 as page_groupIdView,
2 as wobject_groupIdView,
2 as wobject_special_groupIdView
from userProfileData
LEFT join userProfileData b
on userProfileData.userId=b.userId

View file

@ -19,18 +19,20 @@ use WebGUI::SQL;
#-----------------------------------------
sub process {
my $verbose = shift;
my @date = WebGUI::DateTime::localtime(WebGUI::DateTime::time());
if ($date[4] == 1) { # only occurs at 1am on the day in question.
if ($date[3] == 1) { # only occurs at 1am on the day in question.
my $now = WebGUI::DateTime::time();
my $a = WebGUI::SQL->read("select groupId,expireNotifyOffset,expireNotifyMessage from groups
where expireNotify=1");
while (my $group = $a->hashRef) {
my $start = $now + (86400 * $group->{expireNotifyOffset});
my $start = $now + (86400 * ($group->{expireNotifyOffset}-1));
my $end = $start + 86400;
my $b = WebGUI::SQL->read("select userId from groupings where groupId=".quote($group->{groupId})." and
expireDate>=".$start." and expireDate<=".$end);
while (my ($userId) = $b->array) {
WebGUI::MessageLog::addEntry($userId,"",WebGUI::International::get(867),$group->{expireNotifyMessage});
print "\n\t\tNotified ".$userId." about ".$group->{groupId} if ($verbose);
}
$b->finish;
}