migrating datetime api for session
This commit is contained in:
parent
c4354c1ff1
commit
9520b4ce48
52 changed files with 435 additions and 332 deletions
|
|
@ -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++;
|
||||
|
|
|
|||
|
|
@ -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>';
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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++;
|
||||
|
|
|
|||
|
|
@ -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'){
|
||||
|
|
|
|||
|
|
@ -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 ) {
|
||||
|
|
|
|||
|
|
@ -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>';
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -304,8 +304,8 @@ sub www_editUser {
|
|||
$tabform->getTab("account")->raw('<tr><td width="170"> </td><td> </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>';
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue