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

8
lib/WebGUI/Asset.pm
View file

@ -127,8 +127,8 @@ sub canView {
return 0 unless ($self->get("state") eq "published");
if ($userId eq $self->get("ownerUserId")) {
return 1;
} elsif ( $self->get("startDate") < time() &&
$self->get("endDate") > time() &&
} elsif ( $self->get("startDate") <$self->session->datetime->time() &&
$self->get("endDate") >$self->session->datetime->time() &&
WebGUI::Grouping::isInGroup($self->get("groupIdView"),$userId)) {
return 1;
}
@ -1268,7 +1268,7 @@ sub publish {
my $self = shift;
my $assetIds = $self->session->db->buildArrayRef("select assetId from asset where lineage like ".$self->session->db->quote($self->get("lineage").'%'));
my $idList = $self->session->db->quoteAndJoin($assetIds);
$self->session->db->write("update asset set state='published', stateChangedBy=".$self->session->db->quote($self->session->user->profileField("userId")).", stateChanged=".time()." where assetId in (".$idList.")");
$self->session->db->write("update asset set state='published', stateChangedBy=".$self->session->db->quote($self->session->user->profileField("userId")).", stateChanged="$self->session->datetime->time()." where assetId in (".$idList.")");
my $cache = WebGUI::Cache->new;
foreach my $id (@{$assetIds}) {
# we do the purge directly cuz it's a lot faster than instantiating all these assets
@ -1587,7 +1587,7 @@ sub www_manageAssets {
.$child->getRank
.",'<a href=\"".$child->getUrl("func=manageAssets")."\">".$title
."<\\/a>','<img src=\"".$child->getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName
."','".WebGUI::DateTime::epochToHuman($child->get("revisionDate"))
."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
."','".formatBytes($child->get("assetSize"))."'".$lockLink.");\n";
$output .= "assetManager.AddLineSortData('','','','".$title."','".$child->getName
."','".$child->get("revisionDate")."','".$child->get("assetSize")."');

34
lib/WebGUI/Asset/Event.pm
View file

@ -45,11 +45,11 @@ sub definition {
},
eventStartDate => {
fieldType=>"dateTime",
defaultValue=>time()
defaultValue=$self->session->datetime->time()
},
eventEndDate => {
fieldType=>"dateTime",
defaultValue=>time()
defaultValue=$self->session->datetime->time()
},
EventsCalendar_recurringId => {
fieldType=>"hidden",
@ -145,7 +145,7 @@ sub processPropertiesFromFormPost {
if ($self->session->form->process("assetId") eq "new") {
$self->update({eventEndDate=>$self->get("eventStartDate")}) unless ($self->get("eventEndDate") >= $self->get("eventStartDate"));
if ($self->session->form->process("recursEvery") && $self->session->form->process("recursEvery") ne "never") {
my $until = WebGUI::DateTime::setToEpoch($self->session->form->process("until"));
my $until = $self->session->datetime->setToEpoch($self->session->form->process("until"));
$until = $self->get("eventEndDate") unless ($until >= $self->get("eventEndDate"));
my $interval = ($self->session->form->process("interval") < 1) ? 1 : $self->session->form->process("interval");
my $recurringEventId = WebGUI::Id::generate();
@ -156,17 +156,17 @@ sub processPropertiesFromFormPost {
while ($start < $until) {
$i++;
if ($self->session->form->process("recursEvery") eq "day") {
$start = WebGUI::DateTime::addToDate($self->get("eventStartDate"),0,0,($i*$interval));
$end = WebGUI::DateTime::addToDate($self->get("eventEndDate"),0,0,($i*$interval));
$start = $self->session->datetime->addToDate($self->get("eventStartDate"),0,0,($i*$interval));
$end = $self->session->datetime->addToDate($self->get("eventEndDate"),0,0,($i*$interval));
} elsif ($self->session->form->process("recursEvery") eq "week") {
$start = WebGUI::DateTime::addToDate($self->get("eventStartDate"),0,0,(7*$i*$interval));
$end = WebGUI::DateTime::addToDate($self->get("eventEndDate"),0,0,(7*$i*$interval));
$start = $self->session->datetime->addToDate($self->get("eventStartDate"),0,0,(7*$i*$interval));
$end = $self->session->datetime->addToDate($self->get("eventEndDate"),0,0,(7*$i*$interval));
} elsif ($self->session->form->process("recursEvery") eq "month") {
$start = WebGUI::DateTime::addToDate($self->get("eventStartDate"),0,($i*$interval),0);
$end = WebGUI::DateTime::addToDate($self->get("eventEndDate"),0,($i*$interval),0);
$start = $self->session->datetime->addToDate($self->get("eventStartDate"),0,($i*$interval),0);
$end = $self->session->datetime->addToDate($self->get("eventEndDate"),0,($i*$interval),0);
} elsif ($self->session->form->process("recursEvery") eq "year") {
$start = WebGUI::DateTime::addToDate($self->get("eventStartDate"),($i*$interval),0,0);
$end = WebGUI::DateTime::addToDate($self->get("eventEndDate"),($i*$interval),0,0);
$start = $self->session->datetime->addToDate($self->get("eventStartDate"),($i*$interval),0,0);
$end = $self->session->datetime->addToDate($self->get("eventEndDate"),($i*$interval),0,0);
}
my $newEvent = $self->getParent->duplicate($self);
$newEvent->update({
@ -206,19 +206,19 @@ sub view {
$event = $self;
$var{title} = $event->getValue("title");
$var{"start.label"} = WebGUI::International::get(14,"Asset_Event");
$var{"start.date"} = epochToHuman($self->getValue("eventStartDate"),"%z");
$var{"start.time"} = epochToHuman($self->getValue("eventStartDate"),"%Z");
$var{"start.date"} =$self->session->datetime->epochToHuman($self->getValue("eventStartDate"),"%z");
$var{"start.time"} =$self->session->datetime->epochToHuman($self->getValue("eventStartDate"),"%Z");
$var{"end.label"} = WebGUI::International::get(15,"Asset_Event");
$var{"end.date"} = epochToHuman($self->getValue("eventEndDate"),"%z");
$var{"end.time"} = epochToHuman($self->getValue("eventEndDate"),"%Z");
$var{"end.date"} =$self->session->datetime->epochToHuman($self->getValue("eventEndDate"),"%z");
$var{"end.time"} =$self->session->datetime->epochToHuman($self->getValue("eventEndDate"),"%Z");
$var{canEdit} = $self->canEdit;
$var{"edit.url"} = $self->session->url->page('func=edit');
$var{"edit.label"} = WebGUI::International::get(575,"Asset_Event");
$var{"delete.url"} = $self->session->url->page('func=deleteEvent;rid='.$self->getValue("EventsCalendar_recurringId"));
$var{"delete.label"} = WebGUI::International::get(576,"Asset_Event");
my @others;
my ($start, $garbage) = WebGUI::DateTime::dayStartEnd($self->get("eventStartDate"));
my ($garbage, $end) = WebGUI::DateTime::dayStartEnd($self->get("eventEndDate"));
my ($start, $garbage) = $self->session->datetime->dayStartEnd($self->get("eventStartDate"));
my ($garbage, $end) = $self->session->datetime->dayStartEnd($self->get("eventEndDate"));
my $sth = $self->session->db->read("select assetId from EventsCalendar_event where ((eventStartDate >= $start and eventStartDate <= $end) or (eventEndDate >= $start and eventEndDate <= $end)) and assetId<>".$self->session->db->quote($self->getId));
while (my ($assetId) = $sth->array) {
my $asset = WebGUI::Asset::Event->new($assetId);

2
lib/WebGUI/Asset/File/Image.pm
View file

@ -132,7 +132,7 @@ sub getEditForm {
$tabform->getTab("properties")->readOnly(
-label=>WebGUI::International::get('thumbnail', 'Asset_Image'),
-hoverHelp=>WebGUI::International::get('Thumbnail description', 'Asset_Image'),
-value=>'<a href="'.$self->getFileUrl.'"><img src="'.$self->getThumbnailUrl.'?noCache='.time().'" alt="thumbnail" /></a>'
-value=>'<a href="'.$self->getFileUrl.'"><img src="'.$self->getThumbnailUrl.'?noCache='$self->session->datetime->time().'" alt="thumbnail" /></a>'
);
my ($x, $y) = $self->getStorageLocation->getSizeInPixels($self->get("filename"));
$tabform->getTab("properties")->readOnly(

20
lib/WebGUI/Asset/Post.pm
View file

@ -68,7 +68,7 @@ sub canEdit {
my $self = shift;
return (($self->session->form->process("func") eq "add" || ($self->session->form->process("assetId") eq "new" && $self->session->form->process("func") eq "editSave" && $self->session->form->process("class") eq "WebGUI::Asset::Post")) && $self->getThread->getParent->canPost) || # account for new posts
($self->isPoster && $self->getThread->getParent->get("editTimeout") > (WebGUI::DateTime::time() - $self->get("dateUpdated"))) ||
($self->isPoster && $self->getThread->getParent->get("editTimeout") > ($self->session->datetime->time() - $self->get("dateUpdated"))) ||
$self->getThread->getParent->canModerate;
}
@ -129,11 +129,11 @@ sub definition {
dateSubmitted => {
noFormPost=>1,
fieldType=>"hidden",
defaultValue=>time()
defaultValue=$self->session->datetime->time()
},
dateUpdated => {
fieldType=>"hidden",
defaultValue=>time()
defaultValue=$self->session->datetime->time()
},
username => {
fieldType=>"hidden",
@ -417,8 +417,8 @@ sub getTemplateVars {
$var{"user.isPoster"} = $self->isPoster;
$var{"avatar.url"} = $self->getAvatarUrl;
$var{"userProfile.url"} = $self->getUrl("op=viewProfile;uid=".$self->get("ownerUserId"));
$var{"dateSubmitted.human"} = epochToHuman($self->get("dateSubmitted"));
$var{"dateUpdated.human"} = epochToHuman($self->get("dateUpdated"));
$var{"dateSubmitted.human"} =$self->session->datetime->epochToHuman($self->get("dateSubmitted"));
$var{"dateUpdated.human"} =$self->session->datetime->epochToHuman($self->get("dateUpdated"));
$var{'title.short'} = $self->chopTitle;
$var{content} = $self->formatContent if ($self->getThread);
$var{'user.canEdit'} = $self->canEdit if ($self->getThread);
@ -600,7 +600,7 @@ sub markRead {
my $self = shift;
unless ($self->isMarkedRead) {
$self->session->db->write("insert into Post_read (userId, postId, threadId, readDate) values (".$self->session->db->quote($self->session->user->profileField("userId")).",
".$self->session->db->quote($self->getId).", ".$self->session->db->quote($self->get("threadId")).", ".WebGUI::DateTime::time().")");
".$self->session->db->quote($self->getId).", ".$self->session->db->quote($self->get("threadId")).", ".$self->session->datetime->time().")");
}
}
@ -670,7 +670,7 @@ sub processPropertiesFromFormPost {
$data{endDate} = $self->getThread->getParent->get("endDate") unless ($self->session->form->process("endDate"));
($data{synopsis}, $data{content}) = $self->getSynopsisAndContentFromFormPost;
if ($self->getThread->getParent->get("addEditStampToPosts")) {
$data{content} .= "\n\n --- (".WebGUI::International::get('Edited_on','Asset_Post')." ".WebGUI::DateTime::epochToHuman(undef,"%z %Z [GMT%O]").WebGUI::International::get('By','Asset_Post').$self->session->user->profileField("alias").") --- \n";
$data{content} .= "\n\n --- (".WebGUI::International::get('Edited_on','Asset_Post')." ".$self->session->datetime->epochToHuman(undef,"%z %Z [GMT%O]").WebGUI::International::get('By','Asset_Post').$self->session->user->profileField("alias").") --- \n";
if ($self->getValue("contentType") eq "mixed" || $self->getValue("contentType") eq "html") {
$data{content} = '<p>'.$data{content}.'</p>';
}
@ -747,7 +747,7 @@ sub rate {
unless ($self->hasRated) {
$self->session->db->write("insert into Post_rating (assetId,userId,ipAddress,dateOfRating,rating) values ("
.$self->session->db->quote($self->getId).", ".$self->session->db->quote($self->session->user->profileField("userId")).", ".$self->session->db->quote($self->session->env->get("REMOTE_ADDR")).",
".WebGUI::DateTime::time().", ".$self->session->db->quote($rating).")");
".$self->session->datetime->time().", ".$self->session->db->quote($rating).")");
my ($count) = $self->session->db->quickArray("select count(*) from Post_rating where assetId=".$self->session->db->quote($self->getId));
$count = $count || 1;
my ($sum) = $self->session->db->quickArray("select sum(rating) from Post_rating where assetId=".$self->session->db->quote($self->getId));
@ -1095,13 +1095,13 @@ sub www_edit {
value=>$self->getValue("contentType") || "mixed"
});
my $startDate = $self->get("startDate");
$startDate = WebGUI::DateTime::setToEpoch($self->session->form->process("startDate")) if ($self->session->form->process("startDate"));
$startDate = $self->session->datetime->setToEpoch($self->session->form->process("startDate")) if ($self->session->form->process("startDate"));
$var{'startDate.form'} = WebGUI::Form::dateTime({
name => 'startDate',
value => $startDate
});
my $endDate = $self->get("endDate");
$endDate = WebGUI::DateTime::setToEpoch($self->session->form->process("endDate")) if ($self->session->form->process("endDate"));
$endDate = $self->session->datetime->setToEpoch($self->session->form->process("endDate")) if ($self->session->form->process("endDate"));
$var{'endDate.form'} = WebGUI::Form::dateTime({
name => 'endDate',
value => $endDate

2
lib/WebGUI/Asset/Post/Thread.pm
View file

@ -448,7 +448,7 @@ sub rate {
unless ($self->hasRated) {
$self->session->db->write("insert into Post_rating (assetId,userId,ipAddress,dateOfRating,rating) values ("
.$self->session->db->quote($self->getId).", ".$self->session->db->quote($self->session->user->profileField("userId")).", ".$self->session->db->quote($self->session->env->get("REMOTE_ADDR")).",
".WebGUI::DateTime::time().", ".$self->session->db->quote($rating).")");
".$self->session->datetime->time().", ".$self->session->db->quote($rating).")");
my ($count) = $self->session->db->quickArray("select count(*) from Post left join asset on Post.assetId=asset.assetId where Post.threadId=".$self->session->db->quote($self->getId)." and Post.rating>0");
$count = $count || 1;
my ($sum) = $self->session->db->quickArray("select sum(Post.rating) from Post left join asset on Post.assetId=asset.assetId where Post.threadId=".$self->session->db->quote($self->getId)." and Post.rating>0");

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');
}
}

4
lib/WebGUI/AssetClipboard.pm
View file

@ -51,7 +51,7 @@ sub cut {
return undef if ($self->getId eq $self->session->setting->get("defaultPage") || $self->getId eq $self->session->setting->get("notFoundPage"));
$self->session->db->beginTransaction;
$self->session->db->write("update asset set state='clipboard-limbo' where lineage like ".$self->session->db->quote($self->get("lineage").'%')." and state='published'");
$self->session->db->write("update asset set state='clipboard', stateChangedBy=".$self->session->db->quote($self->session->user->profileField("userId")).", stateChanged=".time()." where assetId=".$self->session->db->quote($self->getId));
$self->session->db->write("update asset set state='clipboard', stateChangedBy=".$self->session->db->quote($self->session->user->profileField("userId")).", stateChanged="$self->session->datetime->time()." where assetId=".$self->session->db->quote($self->getId));
$self->session->db->commit;
$self->updateHistory("cut");
$self->{_properties}{state} = "clipboard";
@ -344,7 +344,7 @@ $self->session->style->setLink($self->session->config->get("extrasURL").'/assetM
})
."','<a href=\"".$child->getUrl("func=manageAssets")."\">".$title
."</a>','<img src=\"".$child->getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName
."','".WebGUI::DateTime::epochToHuman($child->get("revisionDate"))
."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
."','".formatBytes($child->get("assetSize"))."');\n";
$output .= "assetManager.AddLineSortData('','".$title."','".$child->getName
."','".$child->get("revisionDate")."','".$child->get("assetSize")."');\n";

4
lib/WebGUI/AssetExportHtml.pm
View file

@ -216,7 +216,7 @@ sub www_exportGenerate {
$|++; # Unbuffered data output
$session{page}{empty} = 1; # Write directly to the browser
print WebGUI::HTTP::getHeader();
my $startTime = time();
my $startTime =$self->session->datetime->time();
my $error = $self->checkExportPath();
if ($error) {
print $error;
@ -267,7 +267,7 @@ sub www_exportGenerate {
}
print WebGUI::International::get('done','Asset');
}
printf WebGUI::International::get('export information','Asset'), scalar(@{$assets}), (time()-$startTime);
printf WebGUI::International::get('export information','Asset'), scalar(@{$assets}), $self->session->datetime->time()-$startTime);
print '<a target="_parent" href="'.$self->getUrl.'">'.WebGUI::International::get(493,"Asset").'</a>';
return;
}

4
lib/WebGUI/AssetLineage.pm
View file

@ -57,7 +57,7 @@ sub addChild {
my $lineage = $self->get("lineage").$self->getNextChildRank;
$self->{_hasChildren} = 1;
$self->session->db->beginTransaction;
my $now = time();
my $now =$self->session->datetime->time();
$self->session->db->write("insert into asset (assetId, parentId, lineage, creationDate, createdBy, className, state) values (".$self->session->db->quote($id).",".$self->session->db->quote($self->getId).", ".$self->session->db->quote($lineage).", ".$now.", ".$self->session->db->quote($self->session->user->profileField("userId")).", ".$self->session->db->quote($properties->{className}).", 'published')");
my $temp = WebGUI::Asset->newByPropertyHashRef({
assetId=>$id,
@ -90,7 +90,7 @@ sub cascadeLineage {
my $self = shift;
my $newLineage = shift;
my $oldLineage = shift || $self->get("lineage");
my $now = time();
my $now =$self->session->datetime->time();
my $prepared = $self->session->db->prepare("update asset set lineage=? where assetId=?");
my $descendants = $self->session->db->read("select assetId,lineage from asset where lineage like ".$self->session->db->quote($oldLineage.'%'));
my $cache = WebGUI::Cache->new;

4
lib/WebGUI/AssetTrash.pm
View file

@ -124,7 +124,7 @@ sub trash {
return undef if ($self->getId eq $self->session->setting->get("defaultPage") || $self->getId eq $self->session->setting->get("notFoundPage"));
$self->session->db->beginTransaction;
$self->session->db->write("update asset set state='trash-limbo' where lineage like ".$self->session->db->quote($self->get("lineage").'%'));
$self->session->db->write("update asset set state='trash', stateChangedBy=".$self->session->db->quote($self->session->user->profileField("userId")).", stateChanged=".time()." where assetId=".$self->session->db->quote($self->getId));
$self->session->db->write("update asset set state='trash', stateChangedBy=".$self->session->db->quote($self->session->user->profileField("userId")).", stateChanged="$self->session->datetime->time()." where assetId=".$self->session->db->quote($self->getId));
$self->session->db->commit;
$self->{_properties}{state} = "trash";
$self->updateHistory("trashed");
@ -217,7 +217,7 @@ sub www_manageTrash {
})
."','<a href=\"".$child->getUrl("func=manageAssets")."\">".$title
."</a>','<img src=\"".$child->getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName
."','".WebGUI::DateTime::epochToHuman($child->get("revisionDate"))
."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
."','".formatBytes($child->get("assetSize"))."');\n";
$output .= "assetManager.AddLineSortData('','".$title."','".$child->getName
."','".$child->get("revisionDate")."','".$child->get("assetSize")."');\n";

20
lib/WebGUI/AssetVersioning.pm
View file

@ -48,14 +48,14 @@ A hash reference containing a list of properties to associate with the child.
=head3 revisionDate
An epoch date representing the date/time stamp that this revision was created. Defaults to time().
An epoch date representing the date/time stamp that this revision was created. Defaults to$self->session->datetime->time().
=cut
sub addRevision {
my $self = shift;
my $properties = shift;
my $now = shift || time();
my $now = shift ||$self->session->datetime->time();
my $versionTag = $self->session->scratch->get("versionTag") || 'pbversion0000000000002';
my $status = $self->session->setting->get("autoCommit") ? 'approved' : 'pending';
$self->session->db->write("insert into assetData (assetId, revisionDate, revisedBy, tagId, status, url, startDate, endDate,
@ -88,11 +88,11 @@ The name of the version tag. If not specified, one will be generated using the c
sub addVersionTag {
my $class = shift;
my $name = shift || "Autotag created ".WebGUI::DateTime::epochToHuman()." by ".$self->session->user->profileField("username");
my $name = shift || "Autotag created ".$self->session->datetime->epochToHuman()." by ".$self->session->user->profileField("username");
my $tagId = $self->session->db->setRow("assetVersionTag","tagId",{
tagId=>"new",
name=>$name,
creationDate=>time(),
creationDate=$self->session->datetime->time(),
createdBy=>$self->session->user->profileField("userId")
});
$self->session->scratch->set("versionTag",$tagId);
@ -150,7 +150,7 @@ sub commitVersionTag {
WebGUI::Asset->new($id,$class,$version)->commit;
}
$sth->finish;
$self->session->db->write("update assetVersionTag set isCommitted=1, commitDate=".time().", committedBy=".$self->session->db->quote($self->session->user->profileField("userId"))." where tagId=".$self->session->db->quote($tagId));
$self->session->db->write("update assetVersionTag set isCommitted=1, commitDate="$self->session->datetime->time().", committedBy=".$self->session->db->quote($self->session->user->profileField("userId"))." where tagId=".$self->session->db->quote($tagId));
$self->session->db->write("delete from userSessionScratch where name='versionTag' and value=".$self->session->db->quote($tagId));
}
@ -329,7 +329,7 @@ sub updateHistory {
my $self = shift;
my $action = shift;
my $userId = shift || $self->session->user->profileField("userId") || '3';
my $dateStamp = time();
my $dateStamp =$self->session->datetime->time();
$self->session->db->write("insert into assetHistory (assetId, userId, actionTaken, dateStamp) values (".$self->session->db->quote($self->getId).", ".$self->session->db->quote($userId).", ".$self->session->db->quote($action).", ".$dateStamp.")");
}
@ -426,7 +426,7 @@ sub www_manageCommittedVersions {
my $u = WebGUI::User->new($by);
$output .= '<tr>
<td><a href="'.$self->getUrl("func=manageRevisionsInTag;tagId=".$id).'">'.$name.'</a></td>
<td>'.WebGUI::DateTime::epochToHuman($date).'</td>
<td>'.$self->session->datetime->epochToHuman($date).'</td>
<td>'.$u->username.'</td>
<td><a href="'.$self->getUrl("proceed=manageCommittedVersions;func=rollbackVersionTag;tagId=".$id).'" onclick="return confirm(\''.$rollbackPrompt.'\');">'.$rollback.'</a></td></tr>';
}
@ -456,7 +456,7 @@ sub www_manageRevisions {
where assetData.assetId=".$self->session->db->quote($self->getId));
while (my ($date,$by,$tag,$tagId) = $sth->array) {
$output .= '<tr><td>'.WebGUI::Icon::deleteIcon("func=purgeRevision;revisionDate=".$date,$self->get("url"),$i18n->get("purge revision prompt")).'</td>
<td><a href="'.$self->getUrl("func=viewRevision;revisionDate=".$date).'">'.WebGUI::DateTime::epochToHuman($date).'</a></td>
<td><a href="'.$self->getUrl("func=viewRevision;revisionDate=".$date).'">'.$self->session->datetime->epochToHuman($date).'</a></td>
<td>'.$by.'</td>
<td><a href="'.$self->getUrl("func=manageRevisionsInTag;tagId=".$tagId).'">'.$tag.'</a></td>
</tr>';
@ -498,7 +498,7 @@ sub www_manageVersions {
$output .= '<tr>
<td>'.WebGUI::Icon::deleteIcon("func=rollbackVersionTag;tagId=".$id,$self->get("url"),$rollbackPrompt).'</td>
<td><a href="'.$self->getUrl("func=manageRevisionsInTag;tagId=".$id).'">'.$name.'</a></td>
<td>'.WebGUI::DateTime::epochToHuman($date).'</td>
<td>'.$self->session->datetime->epochToHuman($date).'</td>
<td>'.$u->username.'</td>
<td>
<a href="'.$self->getUrl("func=setVersionTag;tagId=".$id).'">'.$setTag.'</a> |
@ -532,7 +532,7 @@ sub www_manageRevisionsInTag {
$output .= '<tr><td>'.WebGUI::Icon::deleteIcon("func=purgeRevision;proceed=manageRevisionsInTag;tagId=".$self->session->form->process("tagId").";revisionDate=".$date,$asset->get("url"),$i18n->get("purge revision prompt")).'</td>
<td>'.$asset->getTitle.'</td>
<td><img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" />'.$asset->getName.'</td>
<td><a href="'.$asset->getUrl("func=viewRevision;revisionDate=".$date).'">'.WebGUI::DateTime::epochToHuman($date).'</a></td>
<td><a href="'.$asset->getUrl("func=viewRevision;revisionDate=".$date).'">'.$self->session->datetime->epochToHuman($date).'</a></td>
<td>'.$by.'</td></tr>';
}
$output .= '</table>'.$p->getBarSimple;

4
lib/WebGUI/Auth.pm
View file

@ -59,7 +59,7 @@ sub _isDuplicateUsername {
return 0 if($self->userId ne "1" && $self->session->user->username eq $username);
my ($otherUser) = $self->session->db->quickArray("select count(*) from users where username=".$self->session->db->quote($username));
return 0 if !$otherUser;
$self->error('<li>'.WebGUI::International::get(77).' "'.$username.'too", "'.$username.'2", '.'"'.$username.'_'.WebGUI::DateTime::epochToHuman(time(),"%y").'"'.'</li>');
$self->error('<li>'.WebGUI::International::get(77).' "'.$username.'too", "'.$username.'2", '.'"'.$username.'_'.$self->session->datetime->epochToHuman$self->session->datetime->time(),"%y").'"'.'</li>');
return 1;
}
@ -94,7 +94,7 @@ sub _isValidUsername {
#-------------------------------------------------------------------
sub _logLogin {
my $self = shift;
$self->session->db->write("insert into userLoginLog values (".$self->session->db->$self->session->db->quote($_[0]).",".$self->session->db->quote($_[1]).",".time().","
$self->session->db->write("insert into userLoginLog values (".$self->session->db->$self->session->db->quote($_[0]).",".$self->session->db->quote($_[1]).","$self->session->datetime->time().","
.$self->session->db->$self->session->db->quote($self->session->env->get("REMOTE_ADDR")).",".$self->session->db->$self->session->db->quote($self->session->env->get("HTTP_USER_AGENT")).")");
}

14
lib/WebGUI/Auth/WebGUI.pm
View file

@ -130,9 +130,9 @@ sub addUserFormSave {
$properties->{changeUsername} = $self->session->form->get('authWebGUI.changeUsername');
$properties->{changePassword} = $self->session->form->get('authWebGUI.changePassword');
$properties->{passwordTimeout} = $self->session->form->interval('authWebGUI.passwordTimeout');
$properties->{passwordLastUpdated} = time();
$properties->{passwordLastUpdated} =$self->session->datetime->time();
if($self->session->setting->get("webguiExpirePasswordOnCreation")){
$properties->{passwordLastUpdated} = time() - $properties->{passwordTimeout};
$properties->{passwordLastUpdated} =$self->session->datetime->time() - $properties->{passwordTimeout};
}
$self->SUPER::addUserFormSave($properties);
}
@ -220,7 +220,7 @@ sub createAccountSave {
$properties->{changeUsername} = $self->session->setting->get("webguiChangeUsername");
$properties->{changePassword} = $self->session->setting->get("webguiChangePassword");
$properties->{identifier} = Digest::MD5::md5_base64($password);
$properties->{passwordLastUpdated} = time();
$properties->{passwordLastUpdated} =$self->session->datetime->time();
$properties->{passwordTimeout} = $self->session->setting->get("webguiPasswordTimeout");
$properties->{status} = 'Deactivated' if ($self->session->setting->get("webguiValidateEmail"));
$self->SUPER::createAccountSave($username,$properties,$password,$profile);
@ -328,7 +328,7 @@ sub editUserFormSave {
unless (!$self->session->form->get('authWebGUI.identifier') || $self->session->form->get('authWebGUI.identifier') eq "password") {
$properties->{identifier} = Digest::MD5::md5_base64($self->session->form->get('authWebGUI.identifier'));
if($userData->{identifier} ne $properties->{identifier}){
$properties->{passwordLastUpdated} = time();
$properties->{passwordLastUpdated} =$self->session->datetime->time();
}
}
$properties->{passwordTimeout} = $self->session->form->interval('authWebGUI.passwordTimeout');
@ -477,7 +477,7 @@ sub login {
my $userData = $self->getParams;
if($self->getSetting("passwordTimeout") && $userData->{passwordTimeout}){
my $expireTime = $userData->{passwordLastUpdated} + $userData->{passwordTimeout};
if(time() >= $expireTime){
if$self->session->datetime->time() >= $expireTime){
$self->session->form->process("uid") = $self->userId;
$self->logout;
return $self->resetExpiredPassword;
@ -595,7 +595,7 @@ sub resetExpiredPasswordSave {
return $self->resetExpiredPassword("<h1>".WebGUI::International::get(70)."</h1>".$error) if($error ne "");
$properties->{identifier} = Digest::MD5::md5_base64($self->session->form->process("identifier"));
$properties->{passwordLastUpdated} = time();
$properties->{passwordLastUpdated} =$self->session->datetime->time();
$self->saveParams($u->userId,$self->authMethod,$properties);
_logSecurityMessage();
@ -673,7 +673,7 @@ sub updateAccount {
$properties->{identifier} = Digest::MD5::md5_base64($password);
_logSecurityMessage();
if($userData->{identifier} ne $properties->{identifier}){
$properties->{passwordLastUpdated} = time();
$properties->{passwordLastUpdated} =$self->session->datetime->time();
}
}
}

6
lib/WebGUI/Cache/FileCache.pm
View file

@ -111,7 +111,7 @@ sub get {
if (-e $folder."/expires" && -e $folder."/cache" && open(FILE,"<".$folder."/expires")) {
my $expires = <FILE>;
close(FILE);
return undef if ($expires < time());
return undef if ($expires <$self->session->datetime->time());
my $value;
eval {$value = retrieve($folder."/cache")};
if (ref $value eq "SCALAR") {
@ -177,7 +177,7 @@ sub getNamespaceSize {
if (open(FILE,"<".$dir."/expires")) {
my $expires = <FILE>;
close(FILE);
if ($expires < time()+$expiresModifier) {
if ($expires <$self->session->datetime->time()+$expiresModifier) {
rmtree($dir);
} else {
$self->session->stow->set("cacheSize", $self->session->stow->get("cacheSize") + -s $dir.'cache');
@ -256,7 +256,7 @@ sub set {
}
nstore($value, $path."/cache");
open(FILE,">".$path."/expires");
print FILE time()+$ttl;
print FILE$self->session->datetime->time()+$ttl;
close(FILE);
umask($oldumask);
}

10
lib/WebGUI/Commerce/Payment/ITransact.pm
View file

@ -484,8 +484,8 @@ sub confirmRecurringTransaction {
my $itemProperties = $transaction->getItems->[0];
my $item = WebGUI::Commerce::Item->new($itemProperties->{itemId}, $itemProperties->{itemType});
my $startEpoch = WebGUI::DateTime::setToEpoch(sprintf("%4d-%02d-%02d %02d:%02d:%02d", unpack('a4a2a2a2a2a2', $form->{start_date})));
my $currentEpoch = WebGUI::DateTime::setToEpoch(sprintf("%4d-%02d-%02d %02d:%02d:%02d", unpack('a4a2a2a2a2a2', $form->{when})));
my $startEpoch = $self->session->datetime->setToEpoch(sprintf("%4d-%02d-%02d %02d:%02d:%02d", unpack('a4a2a2a2a2a2', $form->{start_date})));
my $currentEpoch = $self->session->datetime->setToEpoch(sprintf("%4d-%02d-%02d %02d:%02d:%02d", unpack('a4a2a2a2a2a2', $form->{when})));
$self->session->db->write("delete from ITransact_recurringStatus where gatewayId=".$self->session->db->quote($form->{orig_xid}));
$self->session->db->write("insert into ITransact_recurringStatus ".
@ -605,11 +605,11 @@ sub recurringTransaction {
if ($recurring) {
# initial amount = (daysInMonth - dayInMonth) / daysInMonth * amount
$initialAmount = (WebGUI::DateTime::getDaysInMonth(time) - (WebGUI::DateTime::localtime)[2])*$recurring->{amount}/WebGUI::DateTime::getDaysInMonth(time);
$initialAmount = ($self->session->datetime->getDaysInMonth(time) - ($self->session->datetime->localtime)[2])*$recurring->{amount}/$self->session->datetime->getDaysInMonth(time);
$initialAmount = $recurring->{amount} if ($initialAmount < 1);
$self->{_recurring} = 1;
$self->{_transactionParams} = {
START => $recurring->{start} || WebGUI::DateTime::epochToHuman(WebGUI::DateTime::addToDate(time, 0, 0, 1), '%m%d%y'),
START => $recurring->{start} || $self->session->datetime->epochToHuman($self->session->datetime->addToDate(time, 0, 0, 1), '%m%d%y'),
AMT => sprintf('%.2f', $recurring->{amount}),
INITIALAMT => sprintf('%.2f', $initialAmount),
TERM => $recurring->{term} || 9999,
@ -814,7 +814,7 @@ sub validateFormData {
push (@error, $i18n->get('invalid card number')) unless ($self->session->form->process("cardNumber") =~ /^\d+$/);
push (@error, $i18n->get('invalid cvv2')) if ($self->session->form->process("cvv2") !~ /^\d+$/ && $self->get('useCVV2'));
($currentYear, $currentMonth) = WebGUI::DateTime::localtime;
($currentYear, $currentMonth) = $self->session->datetime->localtime;
# Check if expDate and expYear have sane values
unless (($self->session->form->process("expMonth") =~ /^(0[1-9]|1[0-2])$/) && ($self->session->form->process("expYear") =~ /^\d\d\d\d$/)) {

10
lib/WebGUI/Form/Date.pm
View file

@ -81,7 +81,7 @@ sub definition {
defaultValue=>WebGUI::International::get("479","WebGUI")
},
defaultValue=>{
defaultValue=>time()
defaultValue=$self->session->datetime->time()
},
maxlength=>{
defaultValue=> 10
@ -109,7 +109,7 @@ Return the date in a human readable format for the Profile system.
sub displayValue {
my ($self) = @_;
return WebGUI::DateTime::epochToHuman($self->get("value"),"%z");
return $self->session->datetime->epochToHuman($self->get("value"),"%z");
}
#-------------------------------------------------------------------
@ -122,7 +122,7 @@ Returns a validated form post result. If the result does not pass validation, it
sub getValueFromPost {
my $self = shift;
return WebGUI::DateTime::setToEpoch($self->session->request->param($self->get("name")));
return $self->session->datetime->setToEpoch($self->session->request->param($self->get("name")));
}
#-------------------------------------------------------------------
@ -139,7 +139,7 @@ sub toHtml {
$self->get("value") = '';
}
else {
$self->get("value") = WebGUI::DateTime::epochToSet($self->get("value"));
$self->get("value") = $self->session->datetime->epochToSet($self->get("value"));
}
my $language = WebGUI::International::getLanguage($self->session->user->profileField("language"),"languageAbbreviation");
unless ($language) {
@ -173,7 +173,7 @@ sub toHtmlAsHidden {
my $self = shift;
return WebGUI::Form::Hidden->new(
name=>$self->get("name"),
value=>WebGUI::DateTime::epochToSet($self->get("value"))
value=>$self->session->datetime->epochToSet($self->get("value"))
)->toHtmlAsHidden;
}

8
lib/WebGUI/Form/DateTime.pm
View file

@ -76,7 +76,7 @@ sub definition {
defaultValue=>WebGUI::International::get("972","WebGUI")
},
defaultValue=>{
defaultValue=>time()
defaultValue=$self->session->datetime->time()
},
maxlength=>{
defaultValue=> 19
@ -101,7 +101,7 @@ Returns a validated form post result. If the result does not pass validation, it
sub getValueFromPost {
my $self = shift;
return WebGUI::DateTime::setToEpoch($self->session->request->param($self->get("name")));
return $self->session->datetime->setToEpoch($self->session->request->param($self->get("name")));
}
#-------------------------------------------------------------------
@ -114,7 +114,7 @@ Renders a date picker control.
sub toHtml {
my $self = shift;
my $value = WebGUI::DateTime::epochToSet($self->get("value"),1);
my $value = $self->session->datetime->epochToSet($self->get("value"),1);
my $language = WebGUI::International::getLanguage($self->session->user->profileField("language"),"languageAbbreviation");
unless ($language) {
$language = WebGUI::International::getLanguage("English","languageAbbreviation");
@ -155,7 +155,7 @@ sub toHtmlAsHidden {
my $self = shift;
return WebGUI::Form::Hidden->new(
name=>$self->get("name"),
value=>WebGUI::DateTime::epochToSet($self->get("value"),1)
value=>$self->session->datetime->epochToSet($self->get("value"),1)
)->toHtmlAsHidden;
}

6
lib/WebGUI/Form/Interval.pm
View file

@ -90,7 +90,7 @@ Returns either the interval that was posted (in seconds) or if nothing comes bac
sub getValueFromPost {
my $self = shift;
return WebGUI::DateTime::intervalToSeconds($self->session->request->param($self->get("name")."_interval"),$self->session->request->param($self->get("name")."_units")) || 0;
return $self->session->datetime->intervalToSeconds($self->session->request->param($self->get("name")."_interval"),$self->session->request->param($self->get("name")."_units")) || 0;
}
#-------------------------------------------------------------------
@ -112,7 +112,7 @@ sub toHtml {
'weeks'=>WebGUI::International::get(701),
'months'=>WebGUI::International::get(702),
'years'=>WebGUI::International::get(703));
my ($interval, $units) = WebGUI::DateTime::secondsToInterval($self->get("value"));
my ($interval, $units) = $self->session->datetime->secondsToInterval($self->get("value"));
# not sure why, but these things need to be defined like this or
# they fail under some circumstnaces
my $cmd = "WebGUI::Form::Integer";
@ -143,7 +143,7 @@ Returns the field as hidden controls rather than displayable controls.
sub toHtmlAsHidden {
my $self = shift;
my ($interval, $units) = WebGUI::DateTime::secondsToInterval($self->get("value"));
my ($interval, $units) = $self->session->datetime->secondsToInterval($self->get("value"));
return WebGUI::Form::Hidden->new(
name=>$self->get("name").'_interval',
value=>$interval

4
lib/WebGUI/Form/TimeField.pm
View file

@ -95,7 +95,7 @@ Returns the number of seconds since 00:00:00 on a 24 hour clock. Note, this will
sub getValueFromPost {
my $self = shift;
return WebGUI::DateTime::timeToSeconds($self->session->request->param($self->get("name")))-($self->session->user->profileField("timeOffset")*3600);
return $self->session->datetime->timeToSeconds($self->session->request->param($self->get("name")))-($self->session->user->profileField("timeOffset")*3600);
}
#-------------------------------------------------------------------
@ -108,7 +108,7 @@ Renders a time field.
sub toHtml {
my $self = shift;
my $value = WebGUI::DateTime::secondsToTime($self->get("value"));
my $value = $self->session->datetime->secondsToTime($self->get("value"));
$self->session->style->setScript($self->session->config->get("extrasURL").'/inputCheck.js',{ type=>'text/javascript' });
$self->get("extras") .= ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'0123456789:\')"';
return $self->SUPER::toHtml

2
lib/WebGUI/Form/TimeZone.pm
View file

@ -70,7 +70,7 @@ Renders a database connection picker control.
sub toHtml {
my $self = shift;
$self->get("options") = WebGUI::DateTime::getTimeZones();
$self->get("options") = $self->session->datetime->getTimeZones();
return $self->SUPER::toHtml();
}

42
lib/WebGUI/Group.pm
View file

@ -72,7 +72,7 @@ These methods are available from this class:
sub _create {
my $groupId = WebGUI::Id::generate();
$self->session->db->write("insert into groups (groupId,dateCreated,expireOffset,karmaThreshold) values
(".$self->session->db->quote($groupId).",".time().",314496000,1000000000)");
(".$self->session->db->quote($groupId).","$self->session->datetime->time().",314496000,1000000000)");
WebGUI::Grouping::addGroupsToGroups([3],[$groupId]);
return $groupId;
}
@ -128,7 +128,7 @@ sub autoAdd {
if (defined $value) {
$class->{_group}{"autoAdd"} = $value;
$self->session->db->write("update groups set autoAdd=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"autoAdd"};
}
@ -153,7 +153,7 @@ sub autoDelete {
if (defined $value) {
$class->{_group}{"autoDelete"} = $value;
$self->session->db->write("update groups set autoDelete=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"autoDelete"};
}
@ -238,7 +238,7 @@ sub deleteOffset {
if (defined $value) {
$class->{_group}{"deleteOffset"} = $value;
$self->session->db->write("update groups set deleteOffset=$value,
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"deleteOffset"};
}
@ -263,7 +263,7 @@ sub description {
if (defined $value) {
$class->{_group}{"description"} = $value;
$self->session->db->write("update groups set description=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"description"};
}
@ -288,7 +288,7 @@ sub expireNotify {
if (defined $value) {
$class->{_group}{"expireNotify"} = $value;
$self->session->db->write("update groups set expireNotify=$value,
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"expireNotify"};
}
@ -313,7 +313,7 @@ sub expireNotifyMessage {
if (defined $value) {
$class->{_group}{"expireNotifyMessage"} = $value;
$self->session->db->write("update groups set expireNotifyMessage=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"expireNotifyMessage"};
}
@ -339,7 +339,7 @@ sub expireNotifyOffset {
if (defined $value) {
$class->{_group}{"expireNotifyOffset"} = $value;
$self->session->db->write("update groups set expireNotifyOffset=$value,
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"expireNotifyOffset"};
}
@ -363,7 +363,7 @@ sub expireOffset {
if (defined $value) {
$class->{_group}{"expireOffset"} = $value;
$self->session->db->write("update groups set expireOffset=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"expireOffset"};
}
@ -421,7 +421,7 @@ sub karmaThreshold {
if (defined $value) {
$class->{_group}{"karmaThreshold"} = $value;
$self->session->db->write("update groups set karmaThreshold=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"karmaThreshold"};
}
@ -446,7 +446,7 @@ sub ipFilter {
if (defined $value) {
$class->{_group}{"ipFilter"} = $value;
$self->session->db->write("update groups set ipFilter=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"ipFilter"};
}
@ -471,7 +471,7 @@ sub isEditable {
if (defined $value) {
$class->{_group}{"isEditable"} = $value;
$self->session->db->write("update groups set isEditable=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"isEditable"};
}
@ -509,7 +509,7 @@ sub name {
if (defined $value) {
$class->{_group}{"groupName"} = $value;
$self->session->db->write("update groups set groupName=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"groupName"};
}
@ -567,7 +567,7 @@ sub scratchFilter {
if (defined $value) {
$class->{_group}{"scratchFilter"} = $value;
$self->session->db->write("update groups set scratchFilter=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"scratchFilter"};
}
@ -591,7 +591,7 @@ sub showInForms {
if (defined $value) {
$class->{_group}{"showInForms"} = $value;
$self->session->db->write("update groups set showInForms=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"showInForms"};
}
@ -618,7 +618,7 @@ sub dbQuery {
if (defined $value) {
$class->{_group}{"dbQuery"} = $value;
$self->session->db->write("update groups set dbQuery=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"dbQuery"};
}
@ -642,7 +642,7 @@ sub databaseLinkId {
if (defined $value) {
$class->{_group}{"databaseLinkId"} = $value;
$self->session->db->write("update groups set databaseLinkId=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"databaseLinkId"};
}
@ -666,7 +666,7 @@ sub dbCacheTimeout {
if (defined $value) {
$class->{_group}{"dbCacheTimeout"} = $value;
$self->session->db->write("update groups set dbCacheTimeout=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"dbCacheTimeout"};
}
@ -690,7 +690,7 @@ sub ldapGroup {
if (defined $value) {
$class->{_group}{"ldapGroup"} = $value;
$self->session->db->write("update groups set ldapGroup=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"ldapGroup"};
}
@ -714,7 +714,7 @@ sub ldapGroupProperty {
if (defined $value) {
$class->{_group}{"ldapGroupProperty"} = $value;
$self->session->db->write("update groups set ldapGroupProperty=".$self->session->db->quote($value).",
lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"ldapGroupProperty"};
}
@ -737,7 +737,7 @@ sub ldapRecursiveProperty {
$value = shift;
if (defined $value) {
$class->{_group}{"ldapRecursiveProperty"} = $value;
$self->session->db->write("update groups set ldapRecursiveProperty=".$self->session->db->quote($value).", lastUpdated=".time()." where groupId=".$self->session->db->quote($class->{_groupId}));
$self->session->db->write("update groups set ldapRecursiveProperty=".$self->session->db->quote($value).", lastUpdated="$self->session->datetime->time()." where groupId=".$self->session->db->quote($class->{_groupId}));
}
return $class->{_group}{"ldapRecursiveProperty"};
}

10
lib/WebGUI/Grouping.pm
View file

@ -126,10 +126,10 @@ sub addUsersToGroups {
my ($isIn) = $self->session->db->quickArray("select count(*) from groupings where groupId=".$self->session->db->quote($gid)." and userId=".$self->session->db->quote($uid));
unless ($isIn) {
$self->session->db->write("insert into groupings (groupId,userId,expireDate)
values (".$self->session->db->quote($gid).", ".$self->session->db->quote($uid).", ".(WebGUI::DateTime::time()+$expireOffset).")");
values (".$self->session->db->quote($gid).", ".$self->session->db->quote($uid).", ".($self->session->datetime->time()+$expireOffset).")");
} else {
if ($_[2]) {
userGroupExpireDate($uid,$gid,(WebGUI::DateTime::time()+$expireOffset));
userGroupExpireDate($uid,$gid,($self->session->datetime->time()+$expireOffset));
}
}
}
@ -225,7 +225,7 @@ If set to "1" then the listing will not include expired groupings. Defaults to "
sub getGroupsForUser {
my $userId = shift;
my $withoutExpired = shift;
my $clause = "and expireDate>".time() if ($withoutExpired);
my $clause = "and expireDate>"$self->session->datetime->time() if ($withoutExpired);
if ($userId eq "") {
return [];
} elsif (exists $session{gotGroupsForUser}{$userId}) {
@ -317,7 +317,7 @@ sub getUsersInGroup {
my $withoutExpired = shift;
my $clause;
if ($withoutExpired) {
$clause = "expireDate > ".time()." and ";
$clause = "expireDate > "$self->session->datetime->time()." and ";
}
$clause .= "(groupId=".$self->session->db->quote($groupId);
if ($recursive) {
@ -325,7 +325,7 @@ sub getUsersInGroup {
if ($#$groups >= 0) {
if ($withoutExpired) {
foreach my $groupId (@$groups) {
$clause .= " OR (groupId = ".$self->session->db->quote($groupId)." AND expireDate > ".time().") ";
$clause .= " OR (groupId = ".$self->session->db->quote($groupId)." AND expireDate > "$self->session->datetime->time().") ";
}
} else {
$clause .= " OR groupId IN (".$self->session->db->quoteAndJoin($groups).")";

6
lib/WebGUI/Macro/D_date.pm
View file

@ -19,7 +19,7 @@ Package WebGUI::Macro::D_date
=head1 DESCRIPTION
Macro for displaying dates formatted for reading by people using WebGUI::DateTime::epochToHuman().
Macro for displaying dates formatted for reading by people using $session->datetime->epochToHuman().
=head2 process ( format string, [ date ] )
@ -41,8 +41,8 @@ sub process {
my $session = shift;
my (@param, $temp, $time);
@param = @_;
$time = $param[1] || time();
$temp = epochToHuman($time,$param[0]);
$time = $param[1] ||$session->datetime->time();
$temp =$session->datetime->epochToHuman($time,$param[0]);
return $temp;
}

2
lib/WebGUI/Macro/LastModified.pm
View file

@ -47,7 +47,7 @@ sub process {
$format = '%z' if ($format eq "");
($time) = $session->dbSlave->quickArray("SELECT max(revisionDate) FROM assetData where assetId=".$session->db->quote($session->asset->getId));
return WebGUI::International::get('never','Macro_LastModified') if $time eq 0;
return $label.epochToHuman($time,$format) if ($time);
return $label$session->datetime->epochToHuman($time,$format) if ($time);
}
1;

2
lib/WebGUI/Mail.pm
View file

@ -92,7 +92,7 @@ sub send {
$message .= "CC: $_[3]\n" if ($_[3] && !$self->session->config->get("emailOverride"));
$message .= "BCC: $_[5]\n" if ($_[5] && !$self->session->config->get("emailOverride"));
$message .= "Subject: ".$_[1]."\n";
$message .= "Date: ".WebGUI::DateTime::epochToHuman("","%W, %d %C %y %j:%n:%s %O")."\n";
$message .= "Date: ".$self->session->datetime->epochToHuman("","%W, %d %C %y %j:%n:%s %O")."\n";
if (($_[2] =~ m/<html>/i) || ($_[2] =~ m/<a\sname=/i)) {
$message .= "Content-Type: text/html; charset=UTF-8\n";
} else {

6
lib/WebGUI/MessageLog.pm
View file

@ -138,7 +138,7 @@ sub addEntry {
if ($u->userId ne "") {
$self->session->db->write("insert into messageLog (messageLogId, userId, message, url, dateOfEntry,
subject, status) values (".$self->session->db->quote($messageLogId).",".$self->session->db->quote($u->userId).",
".$self->session->db->quote($message).",".$self->session->db->quote($url).",".time().",".$self->session->db->quote($subject).", ".$self->session->db->quote($status).")");
".$self->session->db->quote($message).",".$self->session->db->quote($url).","$self->session->datetime->time().",".$self->session->db->quote($subject).", ".$self->session->db->quote($status).")");
if ($url ne "") {
$message .= "\n".$self->session->url->append($url,'mlog='.$messageLogId);
}
@ -216,7 +216,7 @@ sub addInternationalizedEntry {
$message = $message{$u->profileField("language")};
WebGUI::Macro::process($self->session,\$message);
$self->session->db->write("insert into messageLog values (".$self->session->db->quote($messageLogId).",".$self->session->db->quote($u->userId).",
".$self->session->db->quote($message).",".$self->session->db->quote($url).",".time().",".$self->session->db->quote($message).",".$self->session->db->quote($status).")");
".$self->session->db->quote($message).",".$self->session->db->quote($url).","$self->session->datetime->time().",".$self->session->db->quote($message).",".$self->session->db->quote($status).")");
if ($url ne "") {
$message .= "\n".$self->session->url->append($url,'mlog='.$messageLogId);
}
@ -238,7 +238,7 @@ The id of the message to complete.
=cut
sub completeEntry {
$self->session->db->write("update messageLog set status='completed', dateOfEntry=".time()." where messageLogId=".$self->session->db->quote($_[0]));
$self->session->db->write("update messageLog set status='completed', dateOfEntry="$self->session->datetime->time()." where messageLogId=".$self->session->db->quote($_[0]));
}

4
lib/WebGUI/Operation/ActiveSessions.pm
View file

@ -69,8 +69,8 @@ sub www_viewActiveSessions {
while (%data = $sth->hash) {
$row[$i] = '<tr class="tableData"><td>'.$data{username}.' ('.$data{userId}.')</td>';
$row[$i] .= '<td>'.$data{sessionId}.'</td>';
$row[$i] .= '<td>'.epochToHuman($data{expires}).'</td>';
$row[$i] .= '<td>'.epochToHuman($data{lastPageView}).'</td>';
$row[$i] .= '<td>'$session->datetime->epochToHuman($data{expires}).'</td>';
$row[$i] .= '<td>'$session->datetime->epochToHuman($data{lastPageView}).'</td>';
$row[$i] .= '<td>'.$data{lastIP}.'</td>';
$row[$i] .= '<td align="center">'.deleteIcon("op=killSession;sid=$data{sessionId}").'</td></tr>';
$i++;

10
lib/WebGUI/Operation/Commerce.pm
View file

@ -560,7 +560,7 @@ sub www_listPendingTransactions {
$output .= '<td>'.$properties->{transactionId}.'</td>';
$output .= '<td>'.$properties->{gatewayId}.'</td>';
$output .= '<td>'.$properties->{gateway}.'</td>';
$output .= '<td>'.WebGUI::DateTime::epochToHuman($properties->{initDate}).'</td>';
$output .= '<td>'.$session->datetime->epochToHuman($properties->{initDate}).'</td>';
$output .= '<td><a href="'.$session->url->page('op=completePendingTransaction;tid='.$properties->{transactionId}).'">'.$i18n->get('complete pending transaction').'</a></td>';
$output .= '</tr>';
}
@ -593,9 +593,9 @@ sub www_listTransactions {
};
my $initStart = $session->form->date('initStart');
my $initStop = WebGUI::DateTime::addToTime($session->form->date('initStop'),23,59);
my $initStop = $session->datetime->addToTime($session->form->date('initStop'),23,59);
my $completionStart = $session->form->date('completionStart');
my $completionStop = WebGUI::DateTime::addToTime($session->form->date('completionStop'),23,59);
my $completionStop = $session->datetime->addToTime($session->form->date('completionStop'),23,59);
$output .= $i18n->get('selection message');
@ -640,8 +640,8 @@ sub www_listTransactions {
foreach $transaction (@transactions) {
$output .= '<tr bgcolor="#ddd">';
$output .= '<td>'.deleteIcon('op=deleteTransaction;tid='.$transaction->get('transactionId')).'</td>';
$output .= '<td>'.WebGUI::DateTime::epochToHuman($transaction->get('initDate')).'</td>';
$output .= '<td>'.WebGUI::DateTime::epochToHuman($transaction->get('completionDate')).'</td>';
$output .= '<td>'.$session->datetime->epochToHuman($transaction->get('initDate')).'</td>';
$output .= '<td>'.$session->datetime->epochToHuman($transaction->get('completionDate')).'</td>';
$output .= '<td>'.$transaction->get('amount').'</td>';
$output .= '<td>'.$transaction->get('shippingCost').'</td>';
$output .= '<td>'.$transaction->get('status').'</td>';

4
lib/WebGUI/Operation/Group.pm
View file

@ -480,7 +480,7 @@ sub www_editGrouping {
sub www_editGroupingSave {
my $session = shift;
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
WebGUI::Grouping::userGroupExpireDate($session->form->process("uid"),$session->form->process("gid"),setToEpoch($session->form->process("expireDate")));
WebGUI::Grouping::userGroupExpireDate($session->form->process("uid"),$session->form->process("gid")$session->datetime->setToEpoch($session->form->process("expireDate")));
WebGUI::Grouping::userGroupAdmin($session->form->process("uid"),$session->form->process("gid"),$session->form->process("groupAdmin"));
return www_manageUsersInGroup();
}
@ -656,7 +656,7 @@ sub www_manageUsersInGroup {
.editIcon('op=editGrouping;uid='.$row->{userId}.';gid='.$session->form->process("gid"))
.'</td>';
$output .= '<td class="tableData"><a href="'.$session->url->page('op=editUser;uid='.$row->{userId}).'">'.$row->{username}.'</a></td>';
$output .= '<td class="tableData">'.epochToHuman($row->{expireDate},"%z").'</td></tr>';
$output .= '<td class="tableData">'$session->datetime->epochToHuman($row->{expireDate},"%z").'</td></tr>';
}
$output .= '</table>'.WebGUI::Form::formFooter();
$output .= $p->getBarTraditional;

2
lib/WebGUI/Operation/LoginHistory.pm
View file

@ -47,7 +47,7 @@ sub www_viewLoginHistory {
$data{username} = WebGUI::International::get('unknown user') if ($data{userId} eq "0");
$row[$i] = '<tr class="tableData"><td>'.$data{username}.' ('.$data{userId}.')</td>';
$row[$i] .= '<td>'.$data{status}.'</td>';
$row[$i] .= '<td>'.epochToHuman($data{timeStamp},"%H:%n%p %M/%D/%y").'</td>';
$row[$i] .= '<td>'$session->datetime->epochToHuman($data{timeStamp},"%H:%n%p %M/%D/%y").'</td>';
$row[$i] .= '<td>'.$data{ipAddress}.'</td>';
$row[$i] .= '<td>'.$data{userAgent}.'</td></tr>';
$i++;

4
lib/WebGUI/Operation/MessageLog.pm
View file

@ -76,7 +76,7 @@ sub www_viewMessageLog {
my $status = _status->{$message->{status}};
$status = '<a href="'.$session->url->append($message->{url},'mlog='.$message->{messageLogId}).'">'.$status.'</a>' if ($message->{url} ne "");
$hash->{'message.status'} = $status;
$hash->{'message.dateOfEntry'} = epochToHuman($message->{dateOfEntry});
$hash->{'message.dateOfEntry'} =$session->datetime->epochToHuman($message->{dateOfEntry});
push(@msg,$hash);
}
$vars->{'message.loop'} = \@msg;
@ -110,7 +110,7 @@ sub www_viewMessageLogMessage {
$data = $session->db->quickHashRef("select * from messageLog where messageLogId=".$session->db->quote($session->form->process("mlog"))." and userId=".$session->db->quote($session->user->profileField("userId")));
$vars->{'message.subject'} = $data->{subject};
$vars->{'message.dateOfEntry'} = epochToHuman($data->{dateOfEntry});
$vars->{'message.dateOfEntry'} =$session->datetime->epochToHuman($data->{dateOfEntry});
my $status = _status->{$data->{status}};
if ($data->{url} ne "" && $data->{status} eq 'pending'){

2
lib/WebGUI/Operation/Shared.pm
View file

@ -98,7 +98,7 @@ sub secureEval {
my %trusted = (
'WebGUI::International::get' => sub {WebGUI::International::get(@_)},
'WebGUI::International::getLanguages' => sub { WebGUI::International::getLanguages(@_) },
'WebGUI::DateTime::epochToHuman' => sub { WebGUI::DateTime::epochToHuman(@_) },
'$session->datetime->epochToHuman' => sub { $session->datetime->epochToHuman(@_) },
'WebGUI::Icon::getToolbarOptions' => sub { WebGUI::Icon::getToolbarOptions(@_) },
);
foreach my $function (keys %trusted ) {

12
lib/WebGUI/Operation/Subscription.pm
View file

@ -87,7 +87,7 @@ sub www_createSubscriptionCodeBatch {
-name => 'expires',
-label => $i18n->get('codes expire'),
-hoverHelp => $i18n->get('codes expire description'),
-value => $session->form->process("expires") || WebGUI::DateTime::intervalToSeconds(1, 'months')
-value => $session->form->process("expires") || $session->datetime->intervalToSeconds(1, 'months')
);
my @sub = $session->form->selectList("subscriptionId");
$f->selectList(
@ -130,7 +130,7 @@ sub www_createSubscriptionCodeBatchSave {
return www_createSubscriptionCodeBatch(\@error) if (@error);
$creationEpoch = time();
$creationEpoch =$session->datetime->time();
$session->db->write("insert into subscriptionCodeBatch (batchId, description) values (".
$session->db->quote($batchId).", ".$session->db->quote($description).")");
@ -315,9 +315,9 @@ sub www_listSubscriptionCodes {
my $i18n = WebGUI::International->new("Subscription");
my $dcStart = $session->form->date('dcStart');
my $dcStop = WebGUI::DateTime::addToTime($session->form->date('dcStop'),23,59);
my $dcStop = $session->datetime->addToTime($session->form->date('dcStop'),23,59);
my $duStart = $session->form->date('duStart');
my $duStop = WebGUI::DateTime::addToTime($session->form->date('duStop'),23,59);
my $duStop = $session->datetime->addToTime($session->form->date('duStop'),23,59);
my $batches = $session->db->buildHashRef("select batchId, description from subscriptionCodeBatch");
$output .= $i18n->get('selection message');
@ -375,9 +375,9 @@ sub www_listSubscriptionCodes {
$output .= '<tr>';
$output .= '<td>'.$_->{batchId}.'</td>';
$output .= '<td>'.$_->{code}.'</td>';
$output .= '<td>'.WebGUI::DateTime::epochToHuman($_->{dateCreated}).'</td>';
$output .= '<td>'.$session->datetime->epochToHuman($_->{dateCreated}).'</td>';
$output .= '<td>';
$output .= WebGUI::DateTime::epochToHuman($_->{dateUsed}) if ($_->{dateUsed});
$output .= $session->datetime->epochToHuman($_->{dateUsed}) if ($_->{dateUsed});
$output .= '</td>';
$output .= '<td>'.$_->{status}.'</td>';
$output .= '</tr>';

4
lib/WebGUI/Operation/TransactionLog.pm
View file

@ -41,8 +41,8 @@ sub www_viewPurchaseHistory {
@history = @{WebGUI::Commerce::Transaction->transactionsByUser($session->user->profileField("userId"))};
foreach (@history) {
%properties = %{$_->get};
$properties{initDate} = WebGUI::DateTime::epochToHuman($properties{initDate});
$properties{completionDate} = WebGUI::DateTime::epochToHuman($properties{completionDate}) if ($properties{completionDate});
$properties{initDate} = $session->datetime->epochToHuman($properties{initDate});
$properties{completionDate} = $session->datetime->epochToHuman($properties{completionDate}) if ($properties{completionDate});
push(@historyLoop, {
(%properties),
itemLoop => $_->getItems,

10
lib/WebGUI/Operation/User.pm
View file

@ -304,8 +304,8 @@ sub www_editUser {
$tabform->getTab("account")->raw('<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr>');
$tabform->getTab("account")->readOnly(value=>$session->form->process("uid"),label=>$i18n->get(378));
$tabform->getTab("account")->readOnly(value=>$u->karma,label=>$i18n->get(537)) if ($session->setting->get("useKarma"));
$tabform->getTab("account")->readOnly(value=>epochToHuman($u->dateCreated,"%z"),label=>$i18n->get(453));
$tabform->getTab("account")->readOnly(value=>epochToHuman($u->lastUpdated,"%z"),label=>$i18n->get(454));
$tabform->getTab("account")->readOnly(value=$session->datetime->epochToHuman($u->dateCreated,"%z"),label=>$i18n->get(453));
$tabform->getTab("account")->readOnly(value=$session->datetime->epochToHuman($u->lastUpdated,"%z"),label=>$i18n->get(454));
$tabform->getTab("account")->text(
-name=>"username",
-label=>$i18n->get(50),
@ -505,12 +505,12 @@ sub www_listUsers {
$output .= '<td><a href="'.$session->url->page('op=editUser;uid='.$data->{userId})
.'">'.$data->{username}.'</a></td>';
$output .= '<td class="tableData">'.$data->{email}.'</td>';
$output .= '<td class="tableData">'.epochToHuman($data->{dateCreated},"%z").'</td>';
$output .= '<td class="tableData">'.epochToHuman($data->{lastUpdated},"%z").'</td>';
$output .= '<td class="tableData">'$session->datetime->epochToHuman($data->{dateCreated},"%z").'</td>';
$output .= '<td class="tableData">'$session->datetime->epochToHuman($data->{lastUpdated},"%z").'</td>';
my ($lastLoginStatus, $lastLogin) = $session->db->quickArray("select status,timeStamp from userLoginLog where
userId=".$session->db->quote($data->{userId})." order by timeStamp DESC");
if ($lastLogin) {
$output .= '<td class="tableData">'.epochToHuman($lastLogin).'</td>';
$output .= '<td class="tableData">'$session->datetime->epochToHuman($lastLogin).'</td>';
} else {
$output .= '<td class="tableData"> - </td>';
}

2
lib/WebGUI/PassiveProfiling.pm
View file

@ -61,7 +61,7 @@ sub add {
$self->session->db->quote($self->session->user->profileField("userId")).",".
$self->session->db->quote($self->session->var->get("sessionId")).",".
$self->session->db->quote($assetId).",".
$self->session->db->quote(WebGUI::DateTime::time()).")";
$self->session->db->quote($self->session->datetime->time()).")";
$self->session->db->write($sql);
return;
}

34
lib/WebGUI/Session.pm
View file

@ -19,11 +19,13 @@ use Apache2::Request;
use WebGUI::Config;
use WebGUI::SQL;
use WebGUI::User;
use WebGUI::Session::DateTime;
use WebGUI::Session::Env;
use WebGUI::Session::ErrorHandler;
use WebGUI::Session::Form;
use WebGUI::Session::Http;
use WebGUI::Session::Os;
use WebGUI::Session::Privilege;
use WebGUI::Session::Scratch;
use WebGUI::Session::Setting;
use WebGUI::Session::Stow;
@ -132,6 +134,22 @@ sub config {
}
#-------------------------------------------------------------------
=head2 datetime ()
Returns a WebGUI::Session::DateTime object.
=cut
sub datetime {
my $self = shift;
if (exists $self->{_datetime}) {
$self->{_datetime} = WebGUI::Session::DateTime->new($session);
}
return $self->{_datetime};
}
#-------------------------------------------------------------------
=head2 db ( )
@ -296,6 +314,22 @@ sub os {
}
#-------------------------------------------------------------------
=head2 privilege ( )
Returns a WebGUI::Session::Privilege object.
=cut
sub privilege {
my $self = shift;
unless (exists $self->{_privilege}) {
$self->{_privilege} = WebGUI::Session::Privilege->new($session);
}
return $self->{_privilege};
}
#-------------------------------------------------------------------
=head2 request ( )

129
lib/WebGUI/DateTime.pm → lib/WebGUI/Session/DateTime.pm
View file

@ -1,4 +1,4 @@
package WebGUI::DateTime;
package WebGUI::Session::DateTime;
=head1 LEGAL
@ -13,25 +13,21 @@ package WebGUI::DateTime;
-------------------------------------------------------------------
=cut
use strict;
use DateTime;
use DateTime::Format::Strptime;
use DateTime::TimeZone;
use Tie::IxHash;
use Exporter;
use strict;
use WebGUI::International;
use WebGUI::Session;
use WebGUI::Utility;
our @ISA = qw(Exporter);
our @EXPORT = qw(&localtime &time &addToTime &addToDate &epochToHuman &epochToSet &humanToEpoch &setToEpoch &monthStartEnd);
=head1 NAME
Package WebGUI::DateTime
Package WebGUI::Session::DateTime
=head1 DESCRIPTION
@ -39,32 +35,37 @@ This package provides easy to use date math functions, which are normally a comp
=head1 SYNOPSIS
use WebGUI::DateTime;
$epoch = WebGUI::DateTime::addToDate($epoch, $years, $months, $days);
$epoch = WebGUI::DateTime::addToTime($epoch, $hours, $minutes, $seconds);
($startEpoch, $endEpoch) = WebGUI::DateTime::dayStartEnd($epoch);
$dateString = WebGUI::DateTime::epochToHuman($epoch, $formatString);
$setString = WebGUI::DateTime::epochToSet($epoch);
$day = WebGUI::DateTime::getDayName($dayInteger);
$integer = WebGUI::DateTime::getDaysInMonth($epoch);
$integer = WebGUI::DateTime::getDaysInInterval($start, $end);
$integer = WebGUI::DateTime::getFirstDayInMonthPosition($epoch);
$month = WebGUI::DateTime::getMonthName($monthInteger);
$seconds = WebGUI::DateTime::getSecondsFromEpoch($seconds);
$zones = WebGUI::DateTime::getTimeZones();
$epoch = WebGUI::DateTime::humanToEpoch($dateString);
$seconds = WebGUI::DateTime::intervalToSeconds($interval, $units);
@date = WebGUI::DateTime::localtime($epoch);
($startEpoch, $endEpoch) = WebGUI::DateTime::monthStartEnd($epoch);
($interval, $units) = WebGUI::DateTime::secondsToInterval($seconds);
$timeString = WebGUI::DateTime::secondsToTime($seconds);
$epoch = WebGUI::DateTime::setToEpoch($setString);
$epoch = WebGUI::DateTime::time();
$seconds = WebGUI::DateTime::timeToSeconds($timeString);
use WebGUI::Session::DateTime;
$dt = $session->datetime;
$dt = WebGUI::Session::DateTime->new($session);
$session = $dt->session;
$epoch = $dt-$self->session->datetime->addToDate($epoch, $years, $months, $days);
$epoch = $dt-$self->session->datetime->addToTime($epoch, $hours, $minutes, $seconds);
($startEpoch, $endEpoch) = $dt->dayStartEnd($epoch);
$dateString = $dt-$self->session->datetime->epochToHuman($epoch, $formatString);
$setString = $dt-$self->session->datetime->epochToSet($epoch);
$day = $dt->getDayName($dayInteger);
$integer = $dt->getDaysInMonth($epoch);
$integer = $dt->getDaysInInterval($start, $end);
$integer = $dt->getFirstDayInMonthPosition($epoch);
$month = $dt->getMonthName($monthInteger);
$seconds = $dt->getSecondsFromEpoch($seconds);
$zones = $dt->getTimeZones();
$epoch = $dt-$self->session->datetime->humanToEpoch($dateString);
$seconds = $dt->intervalToSeconds($interval, $units);
@date = $dt-$self->session->datetime->loca$self->session->datetime->time($epoch);
($startEpoch, $endEpoch) = $dt-$self->session->datetime->monthStartEnd($epoch);
($interval, $units) = $dt->secondsToInterval($seconds);
$timeString = $dt->secondsToTime($seconds);
$epoch = $dt-$self->session->datetime->setToEpoch($setString);
$epoch = $dt-$self->session->datetime->time();
$seconds = $dt->timeToSeconds($timeString);
=head1 METHODS
These functions are available from this package:
These methods are available from this class:
=cut
@ -94,6 +95,7 @@ The number of days to add to the epoch.
=cut
sub addToDate {
my $self = shift;
my $date = DateTime->from_epoch( epoch =>shift);
my $years = shift || 0;
my $months = shift || 0;
@ -130,6 +132,7 @@ The number of seconds to add to the epoch.
=cut
sub addToTime {
my $self = shift;
my $epoch = shift;
return undef unless $epoch;
my $date = DateTime->from_epoch( epoch =>$epoch);
@ -153,6 +156,7 @@ The number of seconds since January 1, 1970.
=cut
sub dayStartEnd {
my $self = shift;
my $dt = DateTime->from_epoch( epoch => shift);
my $end = $dt->clone;
$dt->set_hour(0);
@ -205,11 +209,12 @@ A string representing the output format for the date. Defaults to '%z %Z'. You c
=cut
sub epochToHuman {
my $self = shift;
my $language = WebGUI::International::getLanguage($self->session->user->profileField("language"));
my $locale = $language->{languageAbbreviation} || "en";
$locale .= "_".$language->{locale} if ($language->{locale});
my $timeZone = $self->session->user->profileField("timeZone") || "America/Chicago";
my $dt = DateTime->from_epoch( epoch=>shift||time(), time_zone=>$timeZone, locale=>$locale );
my $dt = DateTime->from_epoch( epoch=>shift|$self->session->datetime->time(), time_zone=>$timeZone, locale=>$locale );
my $output = shift || "%z %Z";
my $temp;
#---date format preference
@ -246,7 +251,7 @@ sub epochToHuman {
$output =~ s/\~$key/\%$replacement/g;
}
#--- %M
$output = $dt->strftime($output);
$output = $dt->str$self->session->datetime->time($output);
$temp = int($dt->month);
$output =~ s/\%_varmonth_/$temp/g;
#--- return
@ -270,13 +275,14 @@ A boolean indicating that the time should be added to the output, thust turning
=cut
sub epochToSet {
my $self = shift;
my $timeZone = $self->session->user->profileField("timeZone") || "America/Chicago";
my $dt = DateTime->from_epoch( epoch =>shift, time_zone=>$timeZone);
my $withTime = shift;
if ($withTime) {
return $dt->strftime("%Y-%m-%d %H:%M:%S");
return $dt->str$self->session->datetime->time("%Y-%m-%d %H:%M:%S");
}
return $dt->strftime("%Y-%m-%d");
return $dt->str$self->session->datetime->time("%Y-%m-%d");
}
#-------------------------------------------------------------------
@ -292,6 +298,7 @@ An integer ranging from 1-7 representing the day of the week (Sunday is 1 and Sa
=cut
sub getDayName {
my $self = shift;
my $day = $_[0];
if ($day == 7) {
return WebGUI::International::get('sunday','DateTime');
@ -323,6 +330,7 @@ An epoch date.
=cut
sub getDaysInMonth {
my $self = shift;
my $dt = DateTime->from_epoch( epoch =>shift);
my $last = DateTime->last_day_of_month(year=>$dt->year, month=>$dt->month);
return $last->day;
@ -346,6 +354,7 @@ An epoch date.
=cut
sub getDaysInInterval {
my $self = shift;
my $start = DateTime->from_epoch( epoch =>shift);
my $end = DateTime->from_epoch( epoch =>shift);
my $duration = $end - $start;
@ -366,6 +375,7 @@ An epoch date.
=cut
sub getFirstDayInMonthPosition {
my $self = shift;
my $dt = DateTime->from_epoch( epoch => shift );
$dt->set_day(1);
return $dt->day_of_week;
@ -385,6 +395,7 @@ An integer ranging from 1-12 representing the month.
=cut
sub getMonthName {
my $self = shift;
if ($_[0] == 1) {
return WebGUI::International::get('january','DateTime');
} elsif ($_[0] == 2) {
@ -425,6 +436,7 @@ The number of seconds since January 1, 1970 00:00:00.
=cut
sub getSecondsFromEpoch {
my $self = shift;
my $dt = DateTime->from_epoch( epoch => shift );
my $start = $dt->clone;
$start->set_hour(0);
@ -444,6 +456,7 @@ Returns a hash reference containing name/value pairs both with the list of time
=cut
sub getTimeZones {
my $self = shift;
my %zones;
tie %zones, 'Tie::IxHash';
foreach my $zone (@{DateTime::TimeZone::all_names()}) {
@ -468,6 +481,7 @@ The human date string. YYYY-MM-DD HH:MM:SS
=cut
sub humanToEpoch {
my $self = shift;
my ($dateString,$timeString) = split(/ /,shift);
my @date = split(/-/,$dateString);
my @time = split(/:/,$timeString);
@ -493,6 +507,7 @@ A string which represents the units of the interval. The string must be 'years',
=cut
sub intervalToSeconds {
my $self = shift;
my $interval = shift;
my $units = shift;
if ($units eq "years") {
@ -525,7 +540,8 @@ The number of seconds since January 1, 1970. Defaults to now.
=cut
sub localtime {
my $dt = DateTime->from_epoch( epoch => shift || time() );
my $self = shift;
my $dt = DateTime->from_epoch( epoch => shift ||$self->session->datetime->time() );
$dt->set_time_zone($self->session->user->profileField("timeZone")|| "America/Chicago"); # assign the user's timezone
return ( $dt->year, $dt->month, $dt->day, $dt->hour, $dt->minute, $dt->second, $dt->day_of_year, $dt->day_of_week, $dt->is_dst );
}
@ -546,6 +562,7 @@ An epoch datestamp corresponding to the last month.
=cut
sub monthCount {
my $self = shift;
my $start = DateTime->from_epoch( epoch => shift );
my $end = DateTime->from_epoch( epoch => shift );
my $duration = $end - $start;
@ -566,6 +583,7 @@ The number of seconds since January 1, 1970.
=cut
sub monthStartEnd {
my $self = shift;
my $dt = DateTime->from_epoch( epoch => shift);
my $end = DateTime->last_day_of_month(year=>$dt->year, month=>$dt->month);
$dt->set_hour(0);
@ -579,6 +597,23 @@ sub monthStartEnd {
#-------------------------------------------------------------------
=head2 new ( session )
Constructor.
=head3 session
A reference to the current session.
=cut
sub new {
my $class = shift;
bless {_session=>shift}, $class;
}
#-------------------------------------------------------------------
=head2 secondsToInterval ( seconds )
Returns an interval and units derived the number of seconds.
@ -590,6 +625,7 @@ The number of seconds in the interval.
=cut
sub secondsToInterval {
my $self = shift;
my $seconds = shift;
my ($interval, $units);
if ($seconds >= 31536000) {
@ -630,6 +666,7 @@ A number of seconds.
=cut
sub secondsToTime {
my $self = shift;
my $seconds = shift;
my $timeString = sprintf("%02d",int($seconds / 3600)).":";
$seconds = $seconds % 3600;
@ -640,6 +677,19 @@ sub secondsToTime {
}
#-------------------------------------------------------------------
=head2 session ( )
Returns a reference to the current session.
=cut
sub session {
my $self = shift;
return $self->{_session};
}
#-------------------------------------------------------------------
=head2 setToEpoch ( set )
@ -653,13 +703,14 @@ A string in the format of YYYY-MM-DD or YYYY-MM-DD HH:MM:SS.
=cut
sub setToEpoch {
my $self = shift;
my $set = shift;
return undef unless $set;
my $parser = DateTime::Format::Strptime->new( pattern => '%Y-%m-%d %H:%M:%S' );
my $dt = $parser->parse_datetime($set);
my $dt = $parser->parse_dat$self->session->datetime->time($set);
unless ($dt) {
$parser = DateTime::Format::Strptime->new( pattern => '%Y-%m-%d' );
$dt = $parser->parse_datetime($set);
$dt = $parser->parse_dat$self->session->datetime->time($set);
}
# in epochToSet we apply the user's time zone, so now we have to remove it.
$dt->set_time_zone($self->session->user->profileField("timeZone")|| "America/Chicago"); # assign the user's timezone
@ -675,7 +726,8 @@ Returns an epoch date for now.
=cut
sub time {
return time();
my $self = shift;
return$self->session->datetime->time();
}
#-------------------------------------------------------------------
@ -691,6 +743,7 @@ A string that looks similar to this: 15:05:32
=cut
sub timeToSeconds {
my $self = shift;
my ($hour,$min,$sec) = split(/:/,$_[0]);
return ($hour*60*60+$min*60+$sec);
}

4
lib/WebGUI/Session/Url.pm
View file

@ -133,7 +133,7 @@ sub gateway {
my $url = $self->session->config->get("gateway").'/'.$pageUrl;
$url =~ s/\/+/\//g;
if ($self->session->setting->get("preventProxyCache") == 1) {
$url = $self->append($url,"noCache=".randint(0,1000).';'.time());
$url = $self->append($url,"noCache=".randint(0,1000).';'$self->session->datetime->time());
}
if ($pairs) {
$url = $self->append($url,$pairs);
@ -281,7 +281,7 @@ sub page {
}
$url .= $self->gateway($self->session->asset ? $self->session->asset->get("url") : $self->getRequestedUrl);
if ($self->session->setting->get("preventProxyCache") == 1 && !$skipPreventProxyCache) {
$url = $self->append($url,"noCache=".randint(0,1000).';'.time());
$url = $self->append($url,"noCache=".randint(0,1000).';'$self->session->datetime->time());
}
if ($pairs) {
$url = $self->append($url,$pairs);

10
lib/WebGUI/Session/Var.pm
View file

@ -138,13 +138,13 @@ sub new {
$self->start(1);
} else {
$self->{_var} = $self->db->quickHashRef("select * from userSession where sessionId=".$self->db->quote($sessionId));
if ($self->{_var}{expires} && $self->{_var}{expires} < time()) {
if ($self->{_var}{expires} && $self->{_var}{expires} <$self->session->datetime->time()) {
$self->end;
}
if ($self->{_var}{sessionId} ne "") {
$self->{_var}{lastPageView} = time();
$self->{_var}{lastPageView} =$self->session->datetime->time();
$self->{_var}{lastIP} = $self->env("REMOTE_ADDR");
$self->{_var}{expires} = time() + $self->setting->get("sessionTimeout");
$self->{_var}{expires} =$self->session->datetime->time() + $self->setting->get("sessionTimeout");
$self->db->setRow("userSession","sessionId",$self->{_var});
} else {
$self->start(1,$sessionId);
@ -190,8 +190,8 @@ sub start {
my $sessionId = shift;
$self->{_var} = {
sessionId=>"new",
expires=> time() + $self->session->setting->get("sessionTimeout"),
lastPageView=> time(),
expires=>$self->session->datetime->time() + $self->session->setting->get("sessionTimeout"),
lastPageView=>$self->session->datetime->time(),
lastIP => $self->env("REMOTE_ADDR"),
adminOn => 0,
userId => $userId

14
lib/WebGUI/Subscription.pm
View file

@ -30,13 +30,13 @@ Text description of how long the subscription lasts.
sub _getDuration {
my $duration = shift;
return addToDate(0,0,0,7) if $duration eq 'Weekly';
return addToDate(0,0,0,14) if $duration eq 'BiWeekly';
return addToDate(0,0,0,28) if $duration eq 'FourWeekly';
return addToDate(0,0,1,0) if $duration eq 'Monthly';
return addToDate(0,0,3,0) if $duration eq 'Quarterly';
return addToDate(0,0,6,0) if $duration eq 'HalfYearly';
return addToDate(0,1,0,0) if $duration eq 'Yearly';
return$self->session->datetime->addToDate(0,0,0,7) if $duration eq 'Weekly';
return$self->session->datetime->addToDate(0,0,0,14) if $duration eq 'BiWeekly';
return$self->session->datetime->addToDate(0,0,0,28) if $duration eq 'FourWeekly';
return$self->session->datetime->addToDate(0,0,1,0) if $duration eq 'Monthly';
return$self->session->datetime->addToDate(0,0,3,0) if $duration eq 'Quarterly';
return$self->session->datetime->addToDate(0,0,6,0) if $duration eq 'HalfYearly';
return$self->session->datetime->addToDate(0,1,0,0) if $duration eq 'Yearly';
}
#-------------------------------------------------------------------

24
lib/WebGUI/User.pm
View file

@ -55,7 +55,7 @@ These methods are available from this class:
#-------------------------------------------------------------------
sub _create {
my $userId = shift || WebGUI::Id::generate();
$self->session->db->write("insert into users (userId,dateCreated) values (".$self->session->db->quote($userId).",".time().")");
$self->session->db->write("insert into users (userId,dateCreated) values (".$self->session->db->quote($userId).","$self->session->datetime->time().")");
require WebGUI::Grouping;
WebGUI::Grouping::addUsersToGroups([$userId],[2,7]);
return $userId;
@ -105,9 +105,9 @@ sub authMethod {
if (defined $value) {
$self->uncache;
$self->{_user}{"authMethod"} = $value;
$self->{_user}{"lastUpdated"} = time();
$self->{_user}{"lastUpdated"} =$self->session->datetime->time();
$self->session->db->write("update users set authMethod=".$self->session->db->quote($value).",
lastUpdated=".time()." where userId=".$self->session->db->quote($self->{_userId}));
lastUpdated="$self->session->datetime->time()." where userId=".$self->session->db->quote($self->{_userId}));
}
return $self->{_user}{"authMethod"};
}
@ -215,7 +215,7 @@ sub karma {
$self->uncache;
$self->{_user}{karma} += $amount;
$self->session->db->write("update users set karma=karma+".$self->session->db->quote($amount)." where userId=".$self->session->db->quote($self->userId));
$self->session->db->write("insert into karmaLog values (".$self->session->db->quote($self->userId).",$amount,".$self->session->db->quote($source).",".$self->session->db->quote($description).",".time().")");
$self->session->db->write("insert into karmaLog values (".$self->session->db->quote($self->userId).",$amount,".$self->session->db->quote($source).",".$self->session->db->quote($description).","$self->session->datetime->time().")");
}
return $self->{_user}{karma};
}
@ -311,8 +311,8 @@ sub profileField {
$self->{_profile}{$fieldName} = $value;
$self->session->db->write("delete from userProfileData where userId=".$self->session->db->quote($self->{_userId})." and fieldName=".$self->session->db->quote($fieldName));
$self->session->db->write("insert into userProfileData values (".$self->session->db->quote($self->{_userId}).", ".$self->session->db->quote($fieldName).", ".$self->session->db->quote($value).")");
$self->{_user}{"lastUpdated"} = time();
$self->session->db->write("update users set lastUpdated=".time()." where userId=".$self->session->db->quote($self->{_userId}));
$self->{_user}{"lastUpdated"} =$self->session->datetime->time();
$self->session->db->write("update users set lastUpdated="$self->session->datetime->time()." where userId=".$self->session->db->quote($self->{_userId}));
}
return $self->{_profile}{$fieldName};
}
@ -335,9 +335,9 @@ sub referringAffiliate {
if (defined $value) {
$self->uncache;
$self->{_user}{"referringAffiliate"} = $value;
$self->{_user}{"lastUpdated"} = time();
$self->{_user}{"lastUpdated"} =$self->session->datetime->time();
$self->session->db->write("update users set referringAffiliate=".$self->session->db->quote($value).",
lastUpdated=".time()." where userId=".$self->session->db->quote($self->userId));
lastUpdated="$self->session->datetime->time()." where userId=".$self->session->db->quote($self->userId));
}
return $self->{_user}{"referringAffiliate"};
}
@ -360,9 +360,9 @@ sub status {
if (defined $value) {
$self->uncache;
$self->{_user}{"status"} = $value;
$self->{_user}{"lastUpdated"} = time();
$self->{_user}{"lastUpdated"} =$self->session->datetime->time();
$self->session->db->write("update users set status=".$self->session->db->quote($value).",
lastUpdated=".time()." where userId=".$self->session->db->quote($self->userId));
lastUpdated="$self->session->datetime->time()." where userId=".$self->session->db->quote($self->userId));
}
return $self->{_user}{"status"};
}
@ -399,9 +399,9 @@ sub username {
if (defined $value) {
$self->uncache;
$self->{_user}{"username"} = $value;
$self->{_user}{"lastUpdated"} = time();
$self->{_user}{"lastUpdated"} =$self->session->datetime->time();
$self->session->db->write("update users set username=".$self->session->db->quote($value).",
lastUpdated=".time()." where userId=".$self->session->db->quote($self->userId));
lastUpdated="$self->session->datetime->time()." where userId=".$self->session->db->quote($self->userId));
}
return $self->{_user}{"username"};
}