Merge commit 'b8845e25fa' into WebGUI8. Up to 7.10.0

This commit is contained in:
Colin Kuskie 2010-09-22 07:58:06 -07:00
commit 0180b11064
45 changed files with 480 additions and 46 deletions

View file

@ -86,7 +86,7 @@ sub www_viewActiveSessions {
and users.userId<>1 order by users.username,userSession.lastPageView desc");
my $pn = $p->getPageNumber;
foreach my $data (@{ $p->getPageData() }) {
$output = '<tr class="tableData"><td>'.$data->{username}.' ('.$data->{userId}.')</td>';
$output .= '<tr class="tableData"><td>'.$data->{username}.' ('.$data->{userId}.')</td>';
$output .= '<td>'.$data->{sessionId}.'</td>';
$output .= '<td>'.$session->datetime->epochToHuman($data->{expires}).'</td>';
$output .= '<td>'.$session->datetime->epochToHuman($data->{lastPageView}).'</td>';