diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-08-25 16:48:31 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-08-25 16:48:31 +0000 |
| commit | 7947c4e92cd30e8fa508984f0474b9d77a027cd6 (patch) | |
| tree | 797f7b77692ee1a21cf3b56684531f8f24c94518 | |
| parent | 056af19ae6298af7dfb9dcbc9d058e545dc5d2ff (diff) | |
| download | forums-7947c4e92cd30e8fa508984f0474b9d77a027cd6.tar forums-7947c4e92cd30e8fa508984f0474b9d77a027cd6.tar.gz forums-7947c4e92cd30e8fa508984f0474b9d77a027cd6.tar.bz2 forums-7947c4e92cd30e8fa508984f0474b9d77a027cd6.tar.xz forums-7947c4e92cd30e8fa508984f0474b9d77a027cd6.zip | |
Show legend if group coloured and not hidden
git-svn-id: file:///svn/phpbb/trunk@4433 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/index.php | 3 | ||||
| -rw-r--r-- | phpBB/viewonline.php | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/index.php b/phpBB/index.php index 8f4f7530b7..0bc0cd6a8a 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -27,7 +27,6 @@ include($phpbb_root_path . 'common.'.$phpEx); // Get posted/get info $mark_read = (isset($_REQUEST['mark'])) ? $_REQUEST['mark'] : ''; - // Start session management $user->start(); $auth->acl($user->data); @@ -101,7 +100,7 @@ else $sql = 'SELECT group_name, group_colour, group_type FROM ' . GROUPS_TABLE . " WHERE group_colour <> '' - AND group_display = 1"; + AND group_type <> " . GROUP_HIDDEN; $result = $db->sql_query($sql); $legend = ''; diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 066beabbdc..65c3623c25 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -28,11 +28,12 @@ include($phpbb_root_path . 'common.'.$phpEx); // Start session management $user->start(); $auth->acl($user->data); - $user->setup(); // Get and set some variables +$start = (isset($_GET['start'])) ? intval($_GET['start']) : ((isset($_GET['page'])) ? (intval($_GET['page']) - 1) * $config['topics_per_page'] : 0); + $sort_key = (!empty($_REQUEST['sk'])) ? htmlspecialchars($_REQUEST['sk']) : 'b'; $sort_dir = (!empty($_REQUEST['sd'])) ? htmlspecialchars($_REQUEST['sd']) : 'd'; @@ -245,7 +246,7 @@ unset($vars_online); $sql = "SELECT group_name, group_colour, group_type FROM " . GROUPS_TABLE . " WHERE group_colour <> '' - AND group_display = 1"; + AND group_type <> " . GROUP_HIDDEN; $result = $db->sql_query($sql); $legend = ''; |