From c02be62ea1394c6affc96c93fd82464017f49b4b Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Mon, 15 Aug 2016 18:09:23 +0200 Subject: [ticket/14573] Add Memberlist breadcrumbs PHPBB3-14573 --- phpBB/memberlist.php | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'phpBB/memberlist.php') diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index b26d7c8f94..b9bf0fde69 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -364,6 +364,11 @@ switch ($mode) } } + $template->assign_block_vars('navlinks', array( + 'FORUM_NAME' => $page_title, + 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=team"), + )); + $template->assign_vars(array( 'PM_IMG' => $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE'])) ); @@ -461,6 +466,11 @@ switch ($mode) break; } + $template->assign_block_vars('navlinks', array( + 'FORUM_NAME' => $page_title, + 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=$action&u=$user_id"), + )); + // Send vars to the template $template->assign_vars(array( 'IM_CONTACT' => $row[$sql_field], @@ -865,6 +875,15 @@ switch ($mode) $page_title = sprintf($user->lang['VIEWING_PROFILE'], $member['username']); $template_html = 'memberlist_view.html'; + $template->assign_block_vars('navlinks', array( + 'FORUM_NAME' => $user->lang('MEMBERLIST'), + 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx"), + )); + $template->assign_block_vars('navlinks', array( + 'FORUM_NAME' => $member['username'], + 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u=$user_id"), + )); + break; case 'contactadmin': @@ -914,6 +933,41 @@ switch ($mode) $template_html = $form->get_template_file(); $form->render($template); + if ($user_id) + { + $navlink_name = $user->lang('SEND_EMAIL'); + $navlink_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=email&u=$user_id"); + } + else if ($topic_id) + { + $sql = 'SELECT f.parent_id, f.forum_parents, f.left_id, f.right_id, f.forum_type, f.forum_name, f.forum_id, f.forum_desc, f.forum_desc_uid, f.forum_desc_bitfield, f.forum_desc_options, f.forum_options, t.topic_title + FROM ' . FORUMS_TABLE . ' as f, + ' . TOPICS_TABLE . ' as t + WHERE t.forum_id = f.forum_id'; + $result = $db->sql_query($sql); + $topic_data = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + generate_forum_nav($topic_data); + $template->assign_block_vars('navlinks', array( + 'FORUM_NAME' => $topic_data['topic_title'], + 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id"), + )); + + $navlink_name = $user->lang('EMAIL_TOPIC'); + $navlink_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=email&t=$topic_id"); + } + else if ($mode === 'contactadmin') + { + $navlink_name = $user->lang('CONTACT_ADMIN'); + $navlink_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contactadmin"); + } + + $template->assign_block_vars('navlinks', array( + 'FORUM_NAME' => $navlink_name, + 'U_VIEW_FORUM' => $navlink_url, + )); + break; case 'livesearch': @@ -951,6 +1005,11 @@ switch ($mode) $page_title = $user->lang['MEMBERLIST']; $template_html = 'memberlist_body.html'; + $template->assign_block_vars('navlinks', array( + 'FORUM_NAME' => $page_title, + 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx"), + )); + /* @var $pagination \phpbb\pagination */ $pagination = $phpbb_container->get('pagination'); @@ -1256,6 +1315,11 @@ switch ($mode) unset($module); } + $template->assign_block_vars('navlinks', array( + 'FORUM_NAME' => $group_helper->get_name($group_row['group_name']), + 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=group&g=$group_id"), + )); + $template->assign_vars(array( 'GROUP_DESC' => generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']), 'GROUP_NAME' => $group_helper->get_name($group_row['group_name']), -- cgit v1.2.1 From 9f20ff7b9e998688c06737a546fbcaabd87b22ef Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Mon, 18 Jun 2018 19:46:37 +0200 Subject: [ticket/12591] Improve breadcrumb naming and extend it's usage PHPBB3-12591 --- phpBB/memberlist.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'phpBB/memberlist.php') diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index b9bf0fde69..2f2c823feb 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -365,8 +365,8 @@ switch ($mode) } $template->assign_block_vars('navlinks', array( - 'FORUM_NAME' => $page_title, - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=team"), + 'BREADCRUMB_NAME' => $page_title, + 'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=team"), )); $template->assign_vars(array( @@ -467,8 +467,8 @@ switch ($mode) } $template->assign_block_vars('navlinks', array( - 'FORUM_NAME' => $page_title, - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=$action&u=$user_id"), + 'BREADCRUMB_NAME' => $page_title, + 'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=$action&u=$user_id"), )); // Send vars to the template @@ -876,12 +876,12 @@ switch ($mode) $template_html = 'memberlist_view.html'; $template->assign_block_vars('navlinks', array( - 'FORUM_NAME' => $user->lang('MEMBERLIST'), - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx"), + 'BREADCRUMB_NAME' => $user->lang('MEMBERLIST'), + 'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx"), )); $template->assign_block_vars('navlinks', array( - 'FORUM_NAME' => $member['username'], - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u=$user_id"), + 'BREADCRUMB_NAME' => $member['username'], + 'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u=$user_id"), )); break; @@ -950,8 +950,8 @@ switch ($mode) generate_forum_nav($topic_data); $template->assign_block_vars('navlinks', array( - 'FORUM_NAME' => $topic_data['topic_title'], - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id"), + 'BREADCRUMB_NAME' => $topic_data['topic_title'], + 'U_BREADCRUMB' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id"), )); $navlink_name = $user->lang('EMAIL_TOPIC'); @@ -964,8 +964,8 @@ switch ($mode) } $template->assign_block_vars('navlinks', array( - 'FORUM_NAME' => $navlink_name, - 'U_VIEW_FORUM' => $navlink_url, + 'BREADCRUMB_NAME' => $navlink_name, + 'U_BREADCRUMB' => $navlink_url, )); break; @@ -1006,8 +1006,8 @@ switch ($mode) $template_html = 'memberlist_body.html'; $template->assign_block_vars('navlinks', array( - 'FORUM_NAME' => $page_title, - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx"), + 'BREADCRUMB_NAME' => $page_title, + 'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx"), )); /* @var $pagination \phpbb\pagination */ @@ -1316,8 +1316,8 @@ switch ($mode) } $template->assign_block_vars('navlinks', array( - 'FORUM_NAME' => $group_helper->get_name($group_row['group_name']), - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=group&g=$group_id"), + 'BREADCRUMB_NAME' => $group_helper->get_name($group_row['group_name']), + 'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=group&g=$group_id"), )); $template->assign_vars(array( -- cgit v1.2.1 From d191eed760cc1e8c6cc799b68afe59f7405ea986 Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Fri, 27 Dec 2019 19:40:54 +0100 Subject: [ticket/16273] Check whether the index exists in memberlist - PHP 7.4 PHPBB3-16273 --- phpBB/memberlist.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/memberlist.php') diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 43b58969a5..e28e18beba 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -656,8 +656,8 @@ switch ($mode) $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); - $foe = ($row['foe']) ? true : false; - $friend = ($row['friend']) ? true : false; + $foe = $row['foe'] ?? false; + $friend = $row['friend'] ?? false; $db->sql_freeresult($result); if ($config['load_onlinetrack']) @@ -670,7 +670,7 @@ switch ($mode) $db->sql_freeresult($result); $member['session_time'] = (isset($row['session_time'])) ? $row['session_time'] : 0; - $member['session_viewonline'] = (isset($row['session_viewonline'])) ? $row['session_viewonline'] : 0; + $member['session_viewonline'] = (isset($row['session_viewonline'])) ? $row['session_viewonline'] : 0; unset($row); } -- cgit v1.2.1 From ebf7e9f45f00bfff184980d7edd3efa765df1c4b Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Sat, 28 Dec 2019 01:47:12 +0100 Subject: [ticket/16273] Check whether the index exists in memberlist - PHP 7.4 Cast to bool PHPBB3-16273 --- phpBB/memberlist.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/memberlist.php') diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index e28e18beba..35c218cd8c 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -656,8 +656,8 @@ switch ($mode) $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); - $foe = $row['foe'] ?? false; - $friend = $row['friend'] ?? false; + $foe = (bool) $row['foe'] ?? false; + $friend = (bool) $row['friend'] ?? false; $db->sql_freeresult($result); if ($config['load_onlinetrack']) -- cgit v1.2.1 From cf450bd01fcdb100ffd2f50ef6e2040156edc887 Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Wed, 1 Jan 2020 02:11:19 +0100 Subject: [ticket/16273] Check whether the index exists in memberlist - PHP 7.4 PHPBB3-16273 --- phpBB/memberlist.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'phpBB/memberlist.php') diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 35c218cd8c..e933b54c17 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -653,11 +653,12 @@ switch ($mode) FROM ' . ZEBRA_TABLE . " WHERE zebra_id = $user_id AND user_id = {$user->data['user_id']}"; - $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); - $foe = (bool) $row['foe'] ?? false; - $friend = (bool) $row['friend'] ?? false; + + $foe = $row ? (bool) $row['foe'] : false; + $friend = $row ? (bool) $row['friend'] : false; + $db->sql_freeresult($result); if ($config['load_onlinetrack']) -- cgit v1.2.1