gauvain/san-reymoros
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tentative de régler le bordel

Browse Source
This commit is contained in:
Gauvain Boiché
2020-03-31 15:58:31 +02:00
parent a1864c0414
commit 459b46df7b
345 changed files with 10758 additions and 4066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
memberlist.php
View File

@@ -364,6 +364,11 @@ switch ($mode)
}
}
$template->assign_block_vars('navlinks', array(
'BREADCRUMB_NAME' => $page_title,
'U_BREADCRUMB' => 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(
'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
$template->assign_vars(array(
'IM_CONTACT' => $row[$sql_field],
@@ -643,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 = ($row['foe']) ? true : false;
$friend = ($row['friend']) ? true : false;
$foe = $row ? (bool) $row['foe'] : false;
$friend = $row ? (bool) $row['friend'] : false;
$db->sql_freeresult($result);
if ($config['load_onlinetrack'])
@@ -660,7 +671,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);
}
@@ -865,6 +876,15 @@ switch ($mode)
$page_title = sprintf($user->lang['VIEWING_PROFILE'], $member['username']);
$template_html = 'memberlist_view.html';
$template->assign_block_vars('navlinks', array(
'BREADCRUMB_NAME' => $user->lang('MEMBERLIST'),
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx"),
));
$template->assign_block_vars('navlinks', array(
'BREADCRUMB_NAME' => $member['username'],
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u=$user_id"),
));
break;
case 'contactadmin':
@@ -914,6 +934,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(
'BREADCRUMB_NAME' => $topic_data['topic_title'],
'U_BREADCRUMB' => 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(
'BREADCRUMB_NAME' => $navlink_name,
'U_BREADCRUMB' => $navlink_url,
));
break;
case 'livesearch':
@@ -951,6 +1006,11 @@ switch ($mode)
$page_title = $user->lang['MEMBERLIST'];
$template_html = 'memberlist_body.html';
$template->assign_block_vars('navlinks', array(
'BREADCRUMB_NAME' => $page_title,
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx"),
));
/* @var $pagination \phpbb\pagination */
$pagination = $phpbb_container->get('pagination');
@@ -1073,7 +1133,18 @@ switch ($mode)
if ($active_time !== false)
{
$sql_where .= " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . $active_time;
if ($active_select === 'lt' && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0)
{
$sql_where .= ' AND u.user_lastvisit = 0';
}
else if ($active_select === 'gt')
{
$sql_where .= ' AND u.user_lastvisit ' . $find_key_match[$active_select] . ' ' . $active_time;
}
else
{
$sql_where .= ' AND (u.user_lastvisit > 0 AND u.user_lastvisit < ' . $active_time . ')';
}
}
}
@@ -1223,18 +1294,18 @@ switch ($mode)
$avatar_img = phpbb_get_group_avatar($group_row);
// ... same for group rank
$user_rank_data = array(
$group_rank_data = array(
'title' => null,
'img' => null,
'img_src' => null,
);
if ($group_row['group_rank'])
{
$user_rank_data = phpbb_get_user_rank($group_row, false);
$group_rank_data = $group_helper->get_rank($group_row);
if ($user_rank_data['img'])
if ($group_rank_data['img'])
{
$user_rank_data['img'] .= '<br />';
$group_rank_data['img'] .= '<br />';
}
}
// include modules for manage groups link display or not
@@ -1256,16 +1327,21 @@ switch ($mode)
unset($module);
}
$template->assign_block_vars('navlinks', array(
'BREADCRUMB_NAME' => $group_helper->get_name($group_row['group_name']),
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=group&amp;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']),
'GROUP_COLOR' => $group_row['group_colour'],
'GROUP_TYPE' => $user->lang['GROUP_IS_' . $group_row['l_group_type']],
'GROUP_RANK' => $user_rank_data['title'],
'GROUP_RANK' => $group_rank_data['title'],
'AVATAR_IMG' => $avatar_img,
'RANK_IMG' => $user_rank_data['img'],
'RANK_IMG_SRC' => $user_rank_data['img_src'],
'RANK_IMG' => $group_rank_data['img'],
'RANK_IMG_SRC' => $group_rank_data['img_src'],
'U_PM' => ($auth->acl_get('u_sendpm') && $auth->acl_get('u_masspm_group') && $group_row['group_receive_pm'] && $config['allow_privmsg'] && $config['allow_mass_pm']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;g=' . $group_id) : '',
'U_MANAGE' => ($can_manage_group) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_groups&amp;mode=manage') : false,)
@@ -1664,7 +1740,7 @@ switch ($mode)
}
// do we need to display contact fields as such
$use_contact_fields = false;
$use_contact_fields = true;
/**
* Modify list of users before member row is created