From 2f50dea9f79d7bb57b9d37323498d426a7d2bd50 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Sat, 28 Apr 2001 22:46:00 +0000 Subject: [PATCH] Minor updates git-svn-id: file:///svn/phpbb/trunk@210 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/page_header.php | 19 ++++++++++--------- phpBB/templates/Default/index_footer.tpl | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index 9d4233d788..8d6a34f5e0 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -67,33 +67,34 @@ else $sql = "SELECT u.username, u.user_id, s.session_logged_in FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s WHERE u.user_id = s.session_user_id - AND s.session_time >= '".(time()-300)."'"; + AND s.session_time >= '".(time()-300)."' + "; $result = $db->sql_query($sql); if(!$result) { error_die(SQL_QUERY, "Couldn't obtain user/online information.", __LINE__, __FILE__); } -$total_online = $db->sql_numrows($result); $logged_online = 0; $guests_online = 0; -$userlist = ""; -$i = 0; while($row = $db->sql_fetchrow($result)) { if($row['session_logged_in']) { - $userlist .= ($i == $total_online && $total_online > 1) ? "and " : ""; - $userlist .= "" . $row['username'] . ""; - $userlist .= ($i < $total_online-1) ? ", " : ""; - + $userlist_ary[] = "" . $row['username'] . ""; $logged_online++; } else { $guests_online++; } - $i++; +} +$userlist = ""; +for($i = 0; $i < $logged_online; $i++) +{ + $userlist .= ($i == $logged_online - 1 && $logged_online > 1) ? " and " : ""; + $userlist .= $userlist_ary[$i]; + $userlist .= ($i < $logged_online - 2) ? ", " : ""; } $l_r_user_s = ($logged_online == 1) ? $l_user : $l_users; diff --git a/phpBB/templates/Default/index_footer.tpl b/phpBB/templates/Default/index_footer.tpl index 6b413345b0..4070588c1b 100644 --- a/phpBB/templates/Default/index_footer.tpl +++ b/phpBB/templates/Default/index_footer.tpl @@ -2,7 +2,7 @@ - +
= {L_NEWPOSTS}{S_TIMEZONE}{S_TIMEZONE}
= {L_NONEWPOSTS}