aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/memberlist.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/memberlist.php')
-rw-r--r--phpBB/memberlist.php20
1 files changed, 15 insertions, 5 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 738b0be01c..07c7ceaa13 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -29,8 +29,15 @@ $username = request_var('un', '', true);
$group_id = request_var('g', 0);
$topic_id = request_var('t', 0);
+// Redirect when old mode is used
+if ($mode == 'leaders')
+{
+ send_status_line(301, 'Moved Permanently');
+ redirect(append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'));
+}
+
// Check our mode...
-if (!in_array($mode, array('', 'group', 'viewprofile', 'email', 'contact', 'searchuser', 'leaders')))
+if (!in_array($mode, array('', 'group', 'viewprofile', 'email', 'contact', 'searchuser', 'team')))
{
trigger_error('NO_MODE');
}
@@ -64,12 +71,12 @@ $sort_dir = request_var('sd', 'a');
// What do you want to do today? ... oops, I think that line is taken ...
switch ($mode)
{
- case 'leaders':
+ case 'team':
// Display a listing of board admins, moderators
include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
$page_title = $user->lang['THE_TEAM'];
- $template_html = 'memberlist_leaders.html';
+ $template_html = 'memberlist_team.html';
$sql = 'SELECT *
FROM ' . TEAMPAGE_TABLE . '
@@ -589,9 +596,12 @@ switch ($mode)
* enabled?
* @var bool foes_enabled Is the ucp foes module
* enabled?
+ * @var bool friend Is the user friend?
+ * @var bool foe Is the user foe?
* @since 3.1-A1
+ * @changed 3.1.0-b2 Added friend and foe status
*/
- $vars = array('member', 'user_notes_enabled', 'warn_user_enabled', 'zebra_enabled', 'friends_enabled', 'foes_enabled');
+ $vars = array('member', 'user_notes_enabled', 'warn_user_enabled', 'zebra_enabled', 'friends_enabled', 'foes_enabled', 'friend', 'foe');
extract($phpbb_dispatcher->trigger_event('core.memberlist_view_profile', compact($vars)));
$template->assign_vars(show_profile($member, $user_notes_enabled, $warn_user_enabled));
@@ -1623,7 +1633,7 @@ switch ($mode)
}
// Output the page
-page_header($page_title, false);
+page_header($page_title);
$template->set_filenames(array(
'body' => $template_html)