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

21
search.php
View File

@@ -129,6 +129,11 @@ $phpbb_content_visibility = $phpbb_container->get('content.visibility');
/* @var $pagination \phpbb\pagination */
$pagination = $phpbb_container->get('pagination');
$template->assign_block_vars('navlinks', array(
'BREADCRUMB_NAME' => $user->lang('SEARCH'),
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}search.$phpEx"),
));
/**
* This event allows you to alter the above parameters, such as keywords and submit
*
@@ -511,6 +516,11 @@ if ($keywords || $author || $author_id || $search_id || $submit)
$l_search_title = $user->lang['SEARCH_SELF'];
break;
}
$template->assign_block_vars('navlinks', array(
'BREADCRUMB_NAME' => $l_search_title,
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}search.$phpEx", "search_id=$search_id"),
));
}
/**
@@ -710,6 +720,8 @@ if ($keywords || $author || $author_id || $search_id || $submit)
if ($sql_where)
{
$zebra = [];
if ($show_results == 'posts')
{
// @todo Joining this query to the one below?
@@ -718,7 +730,6 @@ if ($keywords || $author || $author_id || $search_id || $submit)
WHERE user_id = ' . $user->data['user_id'];
$result = $db->sql_query($sql);
$zebra = array();
while ($row = $db->sql_fetchrow($result))
{
$zebra[($row['friend']) ? 'friend' : 'foe'][] = $row['zebra_id'];
@@ -1068,6 +1079,10 @@ if ($keywords || $author || $author_id || $search_id || $submit)
$view_topic_url_params = "f=$forum_id&t=$result_topic_id" . (($u_hilit) ? "&hilit=$u_hilit" : '');
$view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params);
$folder_img = $folder_alt = $u_mcp_queue = '';
$topic_type = $posts_unapproved = 0;
$unread_topic = $topic_unapproved = $topic_deleted = false;
if ($show_results == 'topics')
{
if ($config['load_db_track'] && $author_id === $user->data['user_id'])
@@ -1075,7 +1090,6 @@ if ($keywords || $author || $author_id || $search_id || $submit)
$row['topic_posted'] = 1;
}
$folder_img = $folder_alt = $topic_type = '';
topic_status($row, $replies, (isset($topic_tracking_info[$forum_id][$row['topic_id']]) && $row['topic_last_post_time'] > $topic_tracking_info[$forum_id][$row['topic_id']]) ? true : false, $folder_img, $folder_alt, $topic_type);
$unread_topic = (isset($topic_tracking_info[$forum_id][$row['topic_id']]) && $row['topic_last_post_time'] > $topic_tracking_info[$forum_id][$row['topic_id']]) ? true : false;
@@ -1093,9 +1107,12 @@ if ($keywords || $author || $author_id || $search_id || $submit)
'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
'TOPIC_AUTHOR_FULL' => get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
'FIRST_POST_TIME' => $user->format_date($row['topic_time']),
'FIRST_POST_TIME_RFC3339' => gmdate(DATE_RFC3339, $row['topic_time']),
'LAST_POST_SUBJECT' => $row['topic_last_post_subject'],
'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']),
'LAST_POST_TIME_RFC3339' => gmdate(DATE_RFC3339, $row['topic_last_post_time']),
'LAST_VIEW_TIME' => $user->format_date($row['topic_last_view_time']),
'LAST_VIEW_TIME_RFC3339' => gmdate(DATE_RFC3339, $row['topic_last_view_time']),
'LAST_POST_AUTHOR' => get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
'LAST_POST_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
'LAST_POST_AUTHOR_FULL' => get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),