oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migrating datetime api for session

Browse source
This commit is contained in:
JT Smith 2006-01-10 17:06:41 +00:00
parent c4354c1ff1
commit 9520b4ce48
52 changed files with 435 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/WebGUI/Asset/Wobject/Collaboration.pm
View file

@ -52,7 +52,7 @@ sub appendPostListTemplateVars {
}
}
my $inDateRange;
if ($post->get("startDate") < WebGUI::DateTime::time() && $post->get("endDate") > WebGUI::DateTime::time()) {
if ($post->get("startDate") < $self->session->datetime->time() && $post->get("endDate") > $self->session->datetime->time()) {
$inDateRange = 1;
} else {
$inDateRange = 0;
@ -71,8 +71,8 @@ sub appendPostListTemplateVars {
"lastReply.user.isVisitor"=>$lastPost->get("ownerUserId") eq "1",
"lastReply.username"=>$lastPost->get("username"),
"lastReply.userProfile.url"=>$lastPost->WebGUI::Asset::Post::getPosterProfileUrl(),
"lastReply.dateSubmitted.human"=>epochToHuman($lastPost->get("dateSubmitted"),"%z"),
"lastReply.timeSubmitted.human"=>epochToHuman($lastPost->get("dateSubmitted"),"%Z")
"lastReply.dateSubmitted.human"=$self->session->datetime->epochToHuman($lastPost->get("dateSubmitted"),"%z"),
"lastReply.timeSubmitted.human"=$self->session->datetime->epochToHuman($lastPost->get("dateSubmitted"),"%Z")
);
}
}
@ -91,10 +91,10 @@ sub appendPostListTemplateVars {
"status"=>$post->getStatus,
"thumbnail"=>$post->getThumbnailUrl,
"image.url"=>$post->getImageUrl,
"dateSubmitted.human"=>epochToHuman($post->get("dateSubmitted"),"%z"),
"dateUpdated.human"=>epochToHuman($post->get("dateUpdated"),"%z"),
"timeSubmitted.human"=>epochToHuman($post->get("dateSubmitted"),"%Z"),
"timeUpdated.human"=>epochToHuman($post->get("dateUpdated"),"%Z"),
"dateSubmitted.human"=$self->session->datetime->epochToHuman($post->get("dateSubmitted"),"%z"),
"dateUpdated.human"=$self->session->datetime->epochToHuman($post->get("dateUpdated"),"%z"),
"timeSubmitted.human"=$self->session->datetime->epochToHuman($post->get("dateSubmitted"),"%Z"),
"timeUpdated.human"=$self->session->datetime->epochToHuman($post->get("dateUpdated"),"%Z"),
"userProfile.url"=>$post->getPosterProfileUrl,
"user.isVisitor"=>$post->get("ownerUserId") eq "1",
"edit.url"=>$post->getEditUrl,
@ -1110,7 +1110,7 @@ sub www_unsubscribe {
my @_months = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
sub _get_rfc822_date {
my ($time) = @_;
my ($year, $mon, $mday, $hour, $min, $sec) = WebGUI::DateTime::localtime($time);
my ($year, $mon, $mday, $hour, $min, $sec) = $self->session->datetime->loca$self->session->datetime->time($time);
my $month = $_months[$mon - 1];
return sprintf("%02d %s %04d %02d:%02d:%02d GMT",
$mday, $month, $year, $hour, $min, $sec);

20
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -324,7 +324,7 @@ sub getListTemplateVars {
"record.username"=>$record->{username},
"record.userId"=>$record->{userId},
"record.submissionDate.epoch"=>$record->{submissionDate},
"record.submissionDate.human"=>WebGUI::DateTime::epochToHuman($record->{submissionDate}),
"record.submissionDate.human"=>$self->session->datetime->epochToHuman($record->{submissionDate}),
"record.entryId"=>$record->{DataForm_entryId},
"record.data_loop"=>\@dataLoop
});
@ -397,7 +397,7 @@ sub getRecordTemplateVars {
$var->{ipAddress} = $entry->{ipAddress};
$var->{username} = $entry->{username};
$var->{userId} = $entry->{userId};
$var->{date} = WebGUI::DateTime::epochToHuman($entry->{submissionDate});
$var->{date} = $self->session->datetime->epochToHuman($entry->{submissionDate});
$var->{epoch} = $entry->{submissionDate};
$var->{"edit.URL"} = $self->getFormUrl('entryId='.$var->{entryId});
$where .= " and b.DataForm_entryId=".$self->session->db->quote($var->{entryId});
@ -416,7 +416,7 @@ sub getRecordTemplateVars {
my $formValue = $session{form}{$data{name}};
if ((not exists $data{value}) && $self->session->form->process("func") ne "editSave" && $self->session->form->process("func") ne "editFieldSave" && defined $formValue) {
$data{value} = $formValue;
$data{value} = WebGUI::DateTime::setToEpoch($data{value}) if ($data{type} eq "date");
$data{value} = $self->session->datetime->setToEpoch($data{value}) if ($data{type} eq "date");
}
if (not exists $data{value}) {
my $defaultValue = $data{defaultValue};
@ -425,8 +425,8 @@ sub getRecordTemplateVars {
}
my $hidden = (($data{status} eq "hidden" && !$self->session->var->get("adminOn")) || ($data{isMailField} && !$self->get("mailData")));
my $value = $data{value};
$value = WebGUI::DateTime::epochToHuman($value,"%z") if ($data{type} eq "date");
$value = WebGUI::DateTime::epochToHuman($value,"%z %Z") if ($data{type} eq "dateTime");
$value = $self->session->datetime->epochToHuman($value,"%z") if ($data{type} eq "date");
$value = $self->session->datetime->epochToHuman($value,"%z %Z") if ($data{type} eq "dateTime");
push(@fields, {
"tab.field.form" => _createField(\%data),
"tab.field.name" => $data{name},
@ -460,7 +460,7 @@ sub getRecordTemplateVars {
my $formValue = $session{form}{$data{name}};
if ((not exists $data{value}) && $self->session->form->process("func") ne "editSave" && $self->session->form->process("func") ne "editFieldSave" && defined $formValue) {
$data{value} = $formValue;
$data{value} = WebGUI::DateTime::setToEpoch($data{value}) if ($data{type} eq "date");
$data{value} = $self->session->datetime->setToEpoch($data{value}) if ($data{type} eq "date");
}
if (not exists $data{value}) {
my $defaultValue = $data{defaultValue};
@ -469,8 +469,8 @@ sub getRecordTemplateVars {
}
my $hidden = (($data{status} eq "hidden" && !$self->session->var->get("adminOn")) || ($data{isMailField} && !$self->get("mailData")));
my $value = $data{value};
$value = WebGUI::DateTime::epochToHuman($value,"%z") if ($data{type} eq "date");
$value = WebGUI::DateTime::epochToHuman($value) if ($data{type} eq "dateTime");
$value = $self->session->datetime->epochToHuman($value,"%z") if ($data{type} eq "date");
$value = $self->session->datetime->epochToHuman($value) if ($data{type} eq "dateTime");
my %fieldProperties = (
"form" => _createField(\%data),
"name" => $data{name},
@ -972,7 +972,7 @@ sub www_exportTab {
ipAddress => $entryData->{ipAddress},
username => $entryData->{username},
userId => $entryData->{userId},
submissionDate => WebGUI::DateTime::epochToHuman($entryData->{submissionDate}),
submissionDate => $self->session->datetime->epochToHuman($entryData->{submissionDate}),
};
my $values = $self->session->db->read("select value,DataForm_fieldId from DataForm_entryData where
DataForm_entryId=".$self->session->db->quote($entryData->{DataForm_entryId}));
@ -1046,7 +1046,7 @@ sub www_process {
userId=>$self->session->user->profileField("userId"),
username=>$self->session->user->profileField("username"),
ipAddress=>$self->session->env->get("REMOTE_ADDR"),
submissionDate=>time()
submissionDate=$self->session->datetime->time()
},0);
my ($var, %row, @errors, $updating, $hadErrors);
$var->{entryId} = $entryId;

80
lib/WebGUI/Asset/Wobject/EventsCalendar.pm
View file

@ -98,7 +98,7 @@ The number of seconds since January 1, 1970.
sub epochToArray {
my $timeZone = $self->session->user->profileField("timeZone") || "America/Chicago";
use DateTime;
return map {$_ += 0} split / /, DateTime->from_epoch( epoch =>shift, time_zone=>$timeZone)->strftime("%Y %m %d %H %M %S");
return map {$_ += 0} split / /, DateTime->from_epoch( epoch =>shift, time_zone=>$timeZone)->str$self->session->datetime->time("%Y %m %d %H %M %S");
}
@ -222,42 +222,42 @@ sub view {
#define range of allowed months from the wobject settings.
if ($startMonth eq "first") {
#Don't really do anything - leading months will not be pushed if there are no events.
$minDate = WebGUI::DateTime::time();
$minDate = $self->session->datetime->time();
} elsif ($startMonth eq "january") {
$minDate = WebGUI::DateTime::humanToEpoch(WebGUI::DateTime::epochToHuman("","%y")."-01-01 00:00:00");
$minDate = $self->session->datetime->humanToEpoch($self->session->datetime->epochToHuman("","%y")."-01-01 00:00:00");
} else {
$minDate = WebGUI::DateTime::time();
$minDate = $self->session->datetime->time();
}
my $startsNow = 0;
unless ($self->get("startMonth") eq "now") {
($minDate,$junk) = WebGUI::DateTime::monthStartEnd($minDate);
($minDate,$junk) = $self->session->datetime->monthStartEnd($minDate);
} else { $startsNow = 1;}
tie %previous, 'Tie::CPHash';
#This merely limits the months to publish. Month's processing is skipped if
#the month is after the maxDate.
my $endMonth = $self->getValue("endMonth");
if ($endMonth eq "last") {
$maxDate = WebGUI::DateTime::addToDate($minDate,99,0,0);
$maxDate = $self->session->datetime->addToDate($minDate,99,0,0);
} elsif ($endMonth eq "after12") {
$maxDate = WebGUI::DateTime::addToDate($minDate,1,0,0);
$maxDate = $self->session->datetime->addToDate($minDate,1,0,0);
} elsif ($endMonth eq "after9") {
$maxDate = WebGUI::DateTime::addToDate($minDate,0,9,0);
$maxDate = $self->session->datetime->addToDate($minDate,0,9,0);
} elsif ($endMonth eq "after6") {
$maxDate = WebGUI::DateTime::addToDate($minDate,0,6,0);
$maxDate = $self->session->datetime->addToDate($minDate,0,6,0);
} elsif ($endMonth eq "after3") {
$maxDate = WebGUI::DateTime::addToDate($minDate,0,3,0);
$maxDate = $self->session->datetime->addToDate($minDate,0,3,0);
} elsif ($endMonth eq "current") {
$maxDate = WebGUI::DateTime::addToDate($minDate,0,1,0);
$maxDate = $self->session->datetime->addToDate($minDate,0,1,0);
}
#$self->session->errorHandler->warn("calMonthStart:".$calMonthStart." calMonthEnd:".$calMonthEnd);
my @now = epochToArray(WebGUI::DateTime::time());
my @now = epochToArray($self->session->datetime->time());
my $calHasEvent = 0;
#monthcount minus i is the number of months remaining to be processed.
for (my $i=$calMonthStart;$i<=$calMonthEnd;$i++) {
#for each month, do the following....
my $monthHasEvent = 0;
my $thisMonth = WebGUI::DateTime::addToDate($minDate,0,($i-1),0);
my ($monthStart, $monthEnd) = WebGUI::DateTime::monthStartEnd($thisMonth);
my $thisMonth = $self->session->datetime->addToDate($minDate,0,($i-1),0);
my ($monthStart, $monthEnd) = $self->session->datetime->monthStartEnd($thisMonth);
my @thisMonthDate = epochToArray($thisMonth);
#Check month to see if it is in the allowed month range. End loop if it's not.
if ($thisMonth > $maxDate) {
@ -282,31 +282,31 @@ sub view {
next if (($eventEndDate < $minDate) && $startsNow);
#Hide this event unless we are allowed to see it. Funny that each event has 4 date/time pairs.
next unless $event->canView;
my $eventLength = WebGUI::DateTime::getDaysInInterval($eventStartDate,$eventEndDate);
my $eventLength = $self->session->datetime->getDaysInInterval($eventStartDate,$eventEndDate);
my ($startYear, $startMonth, $startDay, $startDate, $startTime, $startAmPm, $startDayOfWeek) = split " ",
WebGUI::DateTime::epochToHuman($eventStartDate, "%y %c %D %z %Z %w");
$self->session->datetime->epochToHuman($eventStartDate, "%y %c %D %z %Z %w");
my ($endYear, $endMonth, $endDay, $endDate, $endTime, $endAmPm, $endDayOfWeek) = split " ",
WebGUI::DateTime::epochToHuman($eventEndDate, "%y %c %D %z %Z %w");
$self->session->datetime->epochToHuman($eventEndDate, "%y %c %D %z %Z %w");
my $eventCycleStart = 0;
# Fast-Forward Event Cycle to this month (for events spanning multiple months)
$eventCycleStart = (WebGUI::DateTime::getDaysInInterval($eventStartDate,$monthStart) - 1) if ($eventStartDate < $monthStart);
$eventCycleStart = ($self->session->datetime->getDaysInInterval($eventStartDate,$monthStart) - 1) if ($eventStartDate < $monthStart);
# also, skip leading days of this event if $startsNow is true. Doesn't work in Events List. Oh well.
# $eventCycleStart = (WebGUI::DateTime::getDaysInInterval($eventStartDate,time)) if (($eventStartDate < time) && ($startsNow));
# $eventCycleStart = ($self->session->datetime->getDaysInInterval($eventStartDate,time)) if (($eventStartDate < time) && ($startsNow));
# by default, stop processing this event at the end of its length.
my $eventCycleStop = ($eventLength);
#cycle through each day in the event, pushing the event's day listing into the proper day.
for (my $i=$eventCycleStart; $i<=$eventCycleStop; $i++) {
#create an array for the specific day in the event.
my @date = epochToArray(WebGUI::DateTime::addToDate($eventStartDate,0,0,$i));
my @date = epochToArray($self->session->datetime->addToDate($eventStartDate,0,0,$i));
# if the event goes past the end of this month, halt the loop.
# No need to continue processing days that aren't in this month.
if ($monthEnd < (WebGUI::DateTime::addToDate($eventStartDate,0,0,$i) - 1)) {
if ($monthEnd < ($self->session->datetime->addToDate($eventStartDate,0,0,$i) - 1)) {
$i = ($eventCycleStop + 2);
next;
}
#this conditional used to only test if we are in the proper month...
#Now also test to see if we're at the maxDate yet and after the minDate.
if (($date[1] == $thisMonthDate[1]) && (WebGUI::DateTime::addToDate($eventStartDate,0,0,$i) <= ($maxDate + 2678400))){
if (($date[1] == $thisMonthDate[1]) && ($self->session->datetime->addToDate($eventStartDate,0,0,$i) <= ($maxDate + 2678400))){
push(@{$events{$date[2]}}, {
description=>$event->get("description"),
name=>$event->get("title"),
@ -350,8 +350,8 @@ sub view {
# next unless $monthHasEvent;
# }
my $dayOfWeekCounter = 1;
my $firstDayInFirstWeek = WebGUI::DateTime::getFirstDayInMonthPosition($thisMonth);
my $daysInMonth = WebGUI::DateTime::getDaysInMonth($thisMonth);
my $firstDayInFirstWeek = $self->session->datetime->getFirstDayInMonthPosition($thisMonth);
my $daysInMonth = $self->session->datetime->getDaysInMonth($thisMonth);
my @prepad;
while (($dayOfWeekCounter <= $firstDayInFirstWeek) and $firstDayInFirstWeek != 7) {
push(@prepad,{
@ -393,7 +393,7 @@ sub view {
'day_loop'=>\@dayloop,
'prepad_loop'=>\@prepad,
'postpad_loop'=>\@postpad,
'month'=>WebGUI::DateTime::getMonthName($date[1]),
'month'=>$self->session->datetime->getMonthName($date[1]),
'year'=>$date[0]
});
}
@ -401,22 +401,22 @@ sub view {
$var{month_loop} = \@$monthloop;
$var{"addevent.url"} = $self->getUrl().'?func=add;class=WebGUI::Asset::Event';
$var{"addevent.label"} = WebGUI::International::get(20,"Asset_EventsCalendar");
$var{'sunday.label'} = WebGUI::DateTime::getDayName(7);
$var{'monday.label'} = WebGUI::DateTime::getDayName(1);
$var{'tuesday.label'} = WebGUI::DateTime::getDayName(2);
$var{'wednesday.label'} = WebGUI::DateTime::getDayName(3);
$var{'thursday.label'} = WebGUI::DateTime::getDayName(4);
$var{'friday.label'} = WebGUI::DateTime::getDayName(5);
$var{'saturday.label'} = WebGUI::DateTime::getDayName(6);
$var{'sunday.label.short'} = substr(WebGUI::DateTime::getDayName(7),0,1);
$var{'monday.label.short'} = substr(WebGUI::DateTime::getDayName(1),0,1);
$var{'tuesday.label.short'} = substr(WebGUI::DateTime::getDayName(2),0,1);
$var{'wednesday.label.short'} = substr(WebGUI::DateTime::getDayName(3),0,1);
$var{'thursday.label.short'} = substr(WebGUI::DateTime::getDayName(4),0,1);
$var{'friday.label.short'} = substr(WebGUI::DateTime::getDayName(5),0,1);
$var{'saturday.label.short'} = substr(WebGUI::DateTime::getDayName(6),0,1);
$var{'sunday.label'} = $self->session->datetime->getDayName(7);
$var{'monday.label'} = $self->session->datetime->getDayName(1);
$var{'tuesday.label'} = $self->session->datetime->getDayName(2);
$var{'wednesday.label'} = $self->session->datetime->getDayName(3);
$var{'thursday.label'} = $self->session->datetime->getDayName(4);
$var{'friday.label'} = $self->session->datetime->getDayName(5);
$var{'saturday.label'} = $self->session->datetime->getDayName(6);
$var{'sunday.label.short'} = substr($self->session->datetime->getDayName(7),0,1);
$var{'monday.label.short'} = substr($self->session->datetime->getDayName(1),0,1);
$var{'tuesday.label.short'} = substr($self->session->datetime->getDayName(2),0,1);
$var{'wednesday.label.short'} = substr($self->session->datetime->getDayName(3),0,1);
$var{'thursday.label.short'} = substr($self->session->datetime->getDayName(4),0,1);
$var{'friday.label.short'} = substr($self->session->datetime->getDayName(5),0,1);
$var{'saturday.label.short'} = substr($self->session->datetime->getDayName(6),0,1);
# Create pagination variables.
$var{'pagination.pageCount.isMultiple'} = 1 if (($calMonthStart > 1) || ($maxDate > WebGUI::DateTime::addToDate($minDate,0,($monthRangeLength-1),0)));
$var{'pagination.pageCount.isMultiple'} = 1 if (($calMonthStart > 1) || ($maxDate > $self->session->datetime->addToDate($minDate,0,($monthRangeLength-1),0)));
my $prevCalMonthStart = $calMonthStart - $monthRangeLength;
my $nextCalMonthStart = $calMonthStart + $monthRangeLength;
my $prevCalMonthEnd = $calMonthEnd - $monthRangeLength;

12
lib/WebGUI/Asset/Wobject/InOutBoard.pm
View file

@ -256,7 +256,7 @@ order by department, lastName, firstName";
}
$row{'status'} = ($data->{status}||WebGUI::International::get(15, "Asset_InOutBoard"));
$row{'dateStamp'} = WebGUI::DateTime::epochToHuman($data->{dateStamp});
$row{'dateStamp'} = $self->session->datetime->epochToHuman($data->{dateStamp});
$row{'message'} = ($data->{message}||"&nbsp;");
push (@rows, \%row);
@ -357,9 +357,9 @@ sub www_setStatus {
$self->session->scratch->delete("userId");
$self->session->db->write("delete from InOutBoard_status where userId=".$self->session->db->quote($sessionUserId)." and assetId=".$self->session->db->quote($self->getId));
$self->session->db->write("insert into InOutBoard_status (assetId,userId,status,dateStamp,message) values (".$self->session->db->quote($self->getId).",".$self->session->db->quote($sessionUserId).","
.$self->session->db->quote($self->session->form->process("status")).",".WebGUI::DateTime::time().",".$self->session->db->quote($self->session->form->process("message")).")");
.$self->session->db->quote($self->session->form->process("status")).",".$self->session->datetime->time().",".$self->session->db->quote($self->session->form->process("message")).")");
$self->session->db->write("insert into InOutBoard_statusLog (assetId,userId,createdBy,status,dateStamp,message) values (".$self->session->db->quote($self->getId).",".$self->session->db->quote($sessionUserId).",".$self->session->db->quote($self->session->user->profileField("userId")).","
.$self->session->db->quote($self->session->form->process("status")).",".WebGUI::DateTime::time().",".$self->session->db->quote($self->session->form->process("message")).")");
.$self->session->db->quote($self->session->form->process("status")).",".$self->session->datetime->time().",".$self->session->db->quote($self->session->form->process("message")).")");
}
else {
#$self->session->errorHandler->warn("Set scratch, redisplay\n");
@ -389,7 +389,7 @@ sub www_viewReport {
-name=>"doit",
-value=>"1"
);
my $startDate = WebGUI::DateTime::addToDate(WebGUI::DateTime::time(),0,0,-15);
my $startDate = $self->session->datetime->addToDate($self->session->datetime->time(),0,0,-15);
$startDate = $self->session->form->date("startDate") if ($self->session->form->process("doit"));
$f->date(
-name=>"startDate",
@ -431,7 +431,7 @@ sub www_viewReport {
my $url = $self->getUrl("func=viewReport&selectDepartment=$self->session->form->process("selectDepartment")&reportPagination=$self->session->form->process("reportPagination")&startDate=$self->session->form->process("startDate")&endDate=$self->session->form->process("endDate")&doit=1");
if ($self->session->form->process("doit")) {
$var{showReport} = 1;
$endDate = WebGUI::DateTime::addToTime($endDate,24,0,0);
$endDate = $self->session->datetime->addToTime($endDate,24,0,0);
my $lastDepartment = "_none_";
my $p = WebGUI::Paginator->new($url, $pageReportAfter);
@ -476,7 +476,7 @@ order by department, lastName, firstName, InOutBoard_statusLog.dateStamp";
$row{'username'} = _defineUsername($data);
$row{'status'} = ($data->{status}||WebGUI::International::get(15, "Asset_InOutBoard"));
$row{'dateStamp'} = WebGUI::DateTime::epochToHuman($data->{dateStamp});
$row{'dateStamp'} = $self->session->datetime->epochToHuman($data->{dateStamp});
$row{'message'} = ($data->{message}||"&nbsp;");
if (! exists $changedBy{ $data->{createdBy} }) {
my %whoChanged = _fetchNames($data->{createdBy});

2
lib/WebGUI/Asset/Wobject/IndexedSearch/Search.pm
View file

@ -425,7 +425,7 @@ sub indexDocument {
$self->session->db->quote($document->{bodyShortcut})." ,".
$self->session->db->quote($document->{contentType})." ,".
$self->session->db->quote($document->{ownerId} || 3).",
".WebGUI::DateTime::time()." )"
".$self->session->datetime->time()." )"
);
$self->{_docId}++;
}

20
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -152,7 +152,7 @@ sub hasRated {
my $ratingTimeout = WebGUI::Grouping::isInGroup($self->get("privilegedGroup")) ? $self->get("ratingTimeoutPrivileged") : $self->get("ratingTimeout");
my ($hasRated) = $self->session->db->quickArray("select count(*) from Matrix_rating where
((userId=".$self->session->db->quote($self->session->user->profileField("userId"))." and userId<>'1') or (userId='1' and ipAddress=".$self->session->db->quote($self->session->env->get("HTTP_X_FORWARDED_FOR")).")) and
listingId=".$self->session->db->quote($listingId)." and timeStamp>".(WebGUI::DateTime::time()-$ratingTimeout));
listingId=".$self->session->db->quote($listingId)." and timeStamp>".($self->session->datetime->time()-$ratingTimeout));
return $hasRated;
}
@ -185,7 +185,7 @@ sub setRatings {
foreach my $category ($self->getCategories) {
if ($ratings->{$category}) {
$self->session->db->write("insert into Matrix_rating (userId, category, rating, timeStamp, listingId,ipAddress, assetId) values (
".$self->session->db->quote($self->session->user->profileField("userId")).", ".$self->session->db->quote($category).", ".$self->session->db->quote($ratings->{$category}).", ".WebGUI::DateTime::time()
".$self->session->db->quote($self->session->user->profileField("userId")).", ".$self->session->db->quote($category).", ".$self->session->db->quote($ratings->{$category}).", ".$self->session->datetime->time()
.", ".$self->session->db->quote($listingId).", ".$self->session->db->quote($self->session->env->get("HTTP_X_FORWARDED_FOR")).",".$self->session->db->quote($self->getId).")");
}
my $sql = "from Matrix_rating where listingId=".$self->session->db->quote($listingId)." and category=".$self->session->db->quote($category);
@ -251,7 +251,7 @@ sub www_compare {
url=>$self->formatURL("viewDetail",$cms)
});
push(@datecol, {
lastUpdated=>WebGUI::DateTime::epochToHuman($data->{lastUpdated},"%z")
lastUpdated=>$self->session->datetime->epochToHuman($data->{lastUpdated},"%z")
});
}
$var{product_loop} = \@prodcol;
@ -573,7 +573,7 @@ sub www_editListingSave {
return WebGUI::International('no edit rights','Asset_Matrix') unless (($self->session->form->process("listingId") eq "new" && WebGUI::Grouping::isInGroup($self->get("groupToAdd"))) || $self->session->user->profileField("userId") eq $listing->{maintainerId} || $self->canEdit);
my %data = (
listingId => $self->session->form->process("listingId"),
lastUpdated => WebGUI::DateTime::time(),
lastUpdated => $self->session->datetime->time(),
productName => $self->session->form->process("productName"),
productUrl => $self->session->form->process("productUrl"),
manufacturerName => $self->session->form->process("manufacturerName"),
@ -591,8 +591,8 @@ sub www_editListingSave {
url=>$self->session->form->process("productName"),
groupIdView=>7,
groupIdEdit=>3,
startDate=>time(),
endDate=>time()+60*60*24*365*15,
startDate=$self->session->datetime->time(),
endDate=$self->session->datetime->time()+60*60*24*365*15,
displayLastReply => 0,
allowReplies => 1,
threadsPerPage => 30,
@ -928,17 +928,17 @@ sub view {
push(@lastUpdated, {
url => $self->formatURL("viewDetail",$listingId),
name=>$productName,
lastUpdated=>WebGUI::DateTime::epochToHuman($lastUpdated,"%z")
lastUpdated=>$self->session->datetime->epochToHuman($lastUpdated,"%z")
});
}
$var{'last_updated_loop'} = \@lastUpdated;
$var{'best.updated.url'} = $self->formatURL("viewDetail",$data->{listingId});
$var{'best.updated.date'} = WebGUI::DateTime::epochToHuman($data->{lastUpdated},"%z");;
$var{'best.updated.date'} = $self->session->datetime->epochToHuman($data->{lastUpdated},"%z");;
$var{'best.updated.name'} = $data->{productName};
# site stats
($var{'user.count'}) = $self->session->db->quickArray("select count(*) from users");
($var{'current.user.count'}) = $self->session->db->quickArray("select count(*)+0 from userSession where lastPageView>".(WebGUI::DateTime::time()-600));
($var{'current.user.count'}) = $self->session->db->quickArray("select count(*)+0 from userSession where lastPageView>".($self->session->datetime->time()-600));
($var{'listing.count'}) = $self->session->db->quickArray("select count(*) from Matrix_listing where status = 'approved' and assetId=".$self->session->db->quote($self->getId));
my $sth = $self->session->db->read("select listingId,productName from Matrix_listing where status='pending'");
while (my ($id,$name) = $sth->array) {
@ -977,7 +977,7 @@ sub www_viewDetail {
$var{'delete.url'} = $self->getUrl("func=deleteListing&listingId=".$listingId."&mlog=".$self->session->form->process("mlog"));
$var{'isPending'} = ($listing->{status} eq "pending");
$var{'lastUpdated.epoch'} = $listing->{lastupdated};
$var{'lastUpdated.date'} = WebGUI::DateTime::epochToHuman($listing->{lastUpdated},"%z");
$var{'lastUpdated.date'} = $self->session->datetime->epochToHuman($listing->{lastUpdated},"%z");
$var{description} = $listing->{description};
$var{productName} = $listing->{productName};
$var{productUrl} = $listing->{productUrl};

4
lib/WebGUI/Asset/Wobject/MessageBoard.pm
View file

@ -69,8 +69,8 @@ sub view {
if (defined $lastPost) {
%lastPostVars = (
'forum.lastPost.url' => $lastPost->getUrl,
'forum.lastPost.date' => WebGUI::DateTime::epochToHuman($lastPost->get("dateSubmitted"),"%z"),
'forum.lastPost.time' => WebGUI::DateTime::epochToHuman($lastPost->get("dateSubmitted"),"%Z"),
'forum.lastPost.date' => $self->session->datetime->epochToHuman($lastPost->get("dateSubmitted"),"%z"),
'forum.lastPost.time' => $self->session->datetime->epochToHuman($lastPost->get("dateSubmitted"),"%Z"),
'forum.lastPost.epoch' => $lastPost->get("dateSubmitted"),
'forum.lastPost.subject' => $lastPost->get("title"),
'forum.lastPost.user.id' => $lastPost->get("ownerUserId"),

12
lib/WebGUI/Asset/Wobject/StockData.pm
View file

@ -179,7 +179,7 @@ sub _convertToEpoch {
}
$hour = $self->_appendZero($hour);
$minute = $self->_appendZero($minute);
return WebGUI::DateTime::humanToEpoch("$year-$month-$day $hour:$minute:00");
return $self->session->datetime->humanToEpoch("$year-$month-$day $hour:$minute:00");
}
#-------------------------------------------------------------------
@ -409,9 +409,9 @@ sub view {
#Create last update date formats
unless ($var->{'lastUpdate.default'}) {
my $luEpoch = $self->_convertToEpoch($hash->{'stocks.date'},$hash->{'stocks.time'});
$var->{'lastUpdate.intl'} = WebGUI::DateTime::epochToHuman($luEpoch,"%y-%m-%d %j:%n");
$var->{'lastUpdate.us'} = WebGUI::DateTime::epochToHuman($luEpoch,"%m/%d/%y %h:%n %p");
$var->{'lastUpdate.default'} = WebGUI::DateTime::epochToHuman($luEpoch,"%C %d %H:%n %P");
$var->{'lastUpdate.intl'} = $self->session->datetime->epochToHuman($luEpoch,"%y-%m-%d %j:%n");
$var->{'lastUpdate.us'} = $self->session->datetime->epochToHuman($luEpoch,"%m/%d/%y %h:%n %p");
$var->{'lastUpdate.default'} = $self->session->datetime->epochToHuman($luEpoch,"%C %d %H:%n %P");
}
push (@stocks, $hash);
@ -441,8 +441,8 @@ sub www_displayStock {
#Configure last update dates
my $luEpoch = $self->_convertToEpoch($var->{'stocks.date'},$var->{'stocks.time'});
$var->{'lastUpdate.intl'} = WebGUI::DateTime::epochToHuman($luEpoch,"%y-%m-%d");
$var->{'lastUpdate.us'} = WebGUI::DateTime::epochToHuman($luEpoch,"%m/%d/%y");
$var->{'lastUpdate.intl'} = $self->session->datetime->epochToHuman($luEpoch,"%y-%m-%d");
$var->{'lastUpdate.us'} = $self->session->datetime->epochToHuman($luEpoch,"%m/%d/%y");
$self->session->setting->get("showDebug") = 0;
return $self->processTemplate($var, $self->get("displayTemplateId"));

14
lib/WebGUI/Asset/Wobject/Survey.pm
View file

@ -197,7 +197,7 @@ sub generateResponseId {
userId=>$userId,
ipAddress=>$ipAddress,
username=>$self->session->user->profileField("username"),
startDate=>WebGUI::DateTime::time(),
startDate=>$self->session->datetime->time(),
'Survey_id'=>$self->get("Survey_id")
});
$self->session->scratch->set($varname,$responseId);
@ -1177,14 +1177,14 @@ sub www_respond {
my $response = $session{form}{"textResponse_".$id} || $answer->{answer};
$self->session->db->write("insert into Survey_questionResponse (Survey_answerId,Survey_questionId,Survey_responseId,Survey_id,comment,response,dateOfResponse) values (
".$self->session->db->quote($answer->{Survey_answerId}).", ".$self->session->db->quote($answer->{Survey_questionId}).", ".$self->session->db->quote($session{scratch}{$varname}).", ".$self->session->db->quote($answer->{Survey_id}).",
".$self->session->db->quote($session{form}{"comment_".$id}).", ".$self->session->db->quote($response).", ".WebGUI::DateTime::time().")");
".$self->session->db->quote($session{form}{"comment_".$id}).", ".$self->session->db->quote($response).", ".$self->session->datetime->time().")");
}
}
my $responseCount = $self->getQuestionResponseCount($session{scratch}{$varname});
if ($terminate || $responseCount >= $self->getValue("questionsPerResponse") || $responseCount >= $self->getQuestionCount) {
$self->session->db->setRow("Survey_response","Survey_responseId",{
isComplete=>1,
endDate=>WebGUI::DateTime::time(),
endDate=>$self->session->datetime->time(),
Survey_responseId=>$session{scratch}{$varname}
});
}
@ -1254,12 +1254,12 @@ sub www_viewIndividualSurvey {
my $response = $self->session->db->getRow("Survey_response","Survey_responseId",$self->session->form->process("responseId"));
$var->{'start.date.label'} = WebGUI::International::get(76,'Asset_Survey');
$var->{'start.date.epoch'} = $response->{startDate};
$var->{'start.date.human'} = epochToHuman($response->{startDate},"%z");
$var->{'start.time.human'} = epochToHuman($response->{startDate},"%Z");
$var->{'start.date.human'} =$self->session->datetime->epochToHuman($response->{startDate},"%z");
$var->{'start.time.human'} =$self->session->datetime->epochToHuman($response->{startDate},"%Z");
$var->{'end.date.label'} = WebGUI::International::get(77,'Asset_Survey');
$var->{'end.date.epoch'} = $response->{endDate};
$var->{'end.date.human'} = epochToHuman($response->{endDate},"%z");
$var->{'end.time.human'} = epochToHuman($response->{endDate},"%Z");
$var->{'end.date.human'} =$self->session->datetime->epochToHuman($response->{endDate},"%z");
$var->{'end.time.human'} =$self->session->datetime->epochToHuman($response->{endDate},"%Z");
$var->{'duration.label'} = WebGUI::International::get(78,'Asset_Survey');
$var->{'duration.minutes'} = int(($response->{end} - $response->{start})/60);
$var->{'duration.minutes.label'} = WebGUI::International::get(79,'Asset_Survey');

2
lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
View file

@ -324,7 +324,7 @@ sub _assign_rss_dates {
if (my $date = $cache->get()) {
$item->{date} = $date;
} else {
$item->{date} = time();
$item->{date} =$self->session->datetime->time();
$cache->set($item->{date}, '1 year');
}
}