1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 15:16:16 +02:00

Show legend if group coloured and not hidden

git-svn-id: file:///svn/phpbb/trunk@4433 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-08-25 16:48:31 +00:00
parent 056af19ae6
commit 7947c4e92c
2 changed files with 4 additions and 4 deletions

View File

@ -27,7 +27,6 @@ include($phpbb_root_path . 'common.'.$phpEx);
// Get posted/get info // Get posted/get info
$mark_read = (isset($_REQUEST['mark'])) ? $_REQUEST['mark'] : ''; $mark_read = (isset($_REQUEST['mark'])) ? $_REQUEST['mark'] : '';
// Start session management // Start session management
$user->start(); $user->start();
$auth->acl($user->data); $auth->acl($user->data);
@ -101,7 +100,7 @@ else
$sql = 'SELECT group_name, group_colour, group_type $sql = 'SELECT group_name, group_colour, group_type
FROM ' . GROUPS_TABLE . " FROM ' . GROUPS_TABLE . "
WHERE group_colour <> '' WHERE group_colour <> ''
AND group_display = 1"; AND group_type <> " . GROUP_HIDDEN;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$legend = ''; $legend = '';

View File

@ -28,11 +28,12 @@ include($phpbb_root_path . 'common.'.$phpEx);
// Start session management // Start session management
$user->start(); $user->start();
$auth->acl($user->data); $auth->acl($user->data);
$user->setup(); $user->setup();
// Get and set some variables // 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_key = (!empty($_REQUEST['sk'])) ? htmlspecialchars($_REQUEST['sk']) : 'b';
$sort_dir = (!empty($_REQUEST['sd'])) ? htmlspecialchars($_REQUEST['sd']) : 'd'; $sort_dir = (!empty($_REQUEST['sd'])) ? htmlspecialchars($_REQUEST['sd']) : 'd';
@ -245,7 +246,7 @@ unset($vars_online);
$sql = "SELECT group_name, group_colour, group_type $sql = "SELECT group_name, group_colour, group_type
FROM " . GROUPS_TABLE . " FROM " . GROUPS_TABLE . "
WHERE group_colour <> '' WHERE group_colour <> ''
AND group_display = 1"; AND group_type <> " . GROUP_HIDDEN;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$legend = ''; $legend = '';