Changeset 729

Timestamp:

11/12/08 23:05:14 (2 months ago)

Author:

Paul

Message:

See note to r.719

Location:

fluxbb/branches/fluxbb-1.3-dev/upload

Files:

• include/search_functions.php (modified) (9 diffs)
• lang/English/search.php (modified) (6 diffs)
• lang/English/topic.php (modified) (3 diffs)
• search.php (modified) (21 diffs)

fluxbb/branches/fluxbb-1.3-dev/upload/include/search_functions.php

@@ -387 +387 @@
                         ),
                         'WHERE'         => 't.id IN('.$search_results.')',
-                        'ORDER BY'      => $sort_by_sql . ' ' . $sort_dir
+                        'ORDER BY'      => 't.sticky DESC, '.$sort_by_sql . ' ' . $sort_dir
                 );
 
@@ -761 +761 @@
 function generate_search_crumbs($action = null)
 {
-        global $forum_page, $lang_common, $lang_search, $forum_url, $forum_user, $num_hits, $search_set, $search_id, $show_as;
+        global $forum_page, $lang_common, $lang_forum, $lang_topic, $lang_search, $forum_url, $forum_user, $num_hits, $search_set, $search_id, $show_as;
 
         $return = ($hook = get_hook('sf_fn_generate_search_crumbs_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
@@ -771 +771 @@
                 case 'show_new':
                         $forum_page['crumbs'][] = $lang_search['Topics with new'];
-                        $forum_page['items_info'] = generate_items_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['main_hd'] = end($forum_page['crumbs']).'<br /><small>'.sprintf($lang_search['Topic results head'], $num_hits).'</small>';
                         $forum_page['main_options']['defined_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['User defined search'].'</a></span>';
                         $forum_page['main_options']['mark_all'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['mark_read'], generate_form_token('markread'.$forum_user['id'])).'">'.$lang_common['Mark all as read'].'</a></span>';
@@ -778 +778 @@
                 case 'show_recent':
                         $forum_page['crumbs'][] = $lang_search['Recently active topics'];
-                        $forum_page['items_info'] = generate_items_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['main_hd'] = end($forum_page['crumbs']).'<br /><small>'.sprintf($lang_search['Topic results head'], $num_hits).'</small>';
                         $forum_page['main_options']['defined_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['User defined search'].'</a></span>';
                         break;
@@ -784 +784 @@
                 case 'show_unanswered':
                         $forum_page['crumbs'][] = $lang_search['Unanswered topics'];
-                        $forum_page['items_info'] = generate_items_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['main_hd'] = end($forum_page['crumbs']).'<br /><small>'.sprintf($lang_search['Topic results head'], $num_hits).'</small>';
                         $forum_page['main_options']['defined_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['User defined search'].'</a></span>';
                         break;
@@ -790 +790 @@
                 case 'show_user_posts':
                         $forum_page['crumbs'][] = sprintf($lang_search['Posts by'], $search_set[0]['pposter'], ($forum_page['start_from'] + 1), $num_hits);
-                        $forum_page['items_info'] = generate_items_info($lang_search['Posts found'], ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['main_hd'] = end($forum_page['crumbs']).'<br /><small>'.sprintf($lang_search['Posts results head'], $num_hits).'</small>';
                         $forum_page['main_options']['user_topics'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search_user_topics'], $search_id).'">'.sprintf($lang_search['Topics by'], $search_set[0]['pposter']).'</a></span>';
                         $forum_page['main_options']['defined_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['User defined search'].'</a></span>';
@@ -797 +797 @@
                 case 'show_user_topics':
                         $forum_page['crumbs'][] = sprintf($lang_search['Topics by'], $search_set[0]['poster']);
-                        $forum_page['items_info'] = generate_items_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['main_hd'] = end($forum_page['crumbs']).'<br /><small>'.sprintf($lang_search['Topic results head'], $num_hits).'</small>';
                         $forum_page['main_options']['user_posts'] =  '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search_user_posts'], $search_id).'">'.sprintf($lang_search['Posts by'], $search_set[0]['poster']).'</a></span>';
                         $forum_page['main_options']['defined_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['User defined search'].'</a></span>';
@@ -804 +804 @@
                 case 'show_subscriptions':
                         $forum_page['crumbs'][] = $lang_search['Subscriptions'];
-                        $forum_page['items_info'] = generate_items_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['main_hd'] = end($forum_page['crumbs']).'<br /><small>'.sprintf($lang_search['Topic results head'], $num_hits).'</small>';
                         $forum_page['main_options']['defined_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['User defined search'].'</a></span>';
                         break;
@@ -810 +810 @@
                 default:
                         $forum_page['crumbs'][] = $lang_search['Search results'];
-                        $forum_page['items_info'] = generate_items_info((($show_as == 'topics') ? $lang_search['Topics found'] : $lang_search['Posts found']), ($forum_page['start_from'] + 1), $num_hits);
+
+                        if ($show_as == 'topics')
+                                $forum_page['main_hd'] = end($forum_page['crumbs']).'<br /><small>'.sprintf($lang_search['Topic results head'], $num_hits).'</small>';
+                        else
+                                $forum_page['main_hd'] = end($forum_page['crumbs']).'<br /><small>'.sprintf($lang_search['Posts results head'], $num_hits).'</small>';
+
                         $forum_page['main_options']['new_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['Perform new search'].'</a></span>';
                         break;

fluxbb/branches/fluxbb-1.3-dev/upload/lang/English/search.php

@@ -7 +7 @@
 'No search permission'          =>      'You do not have permission to use the search feature.',
 'Search flood'                          =>      'At least %s seconds have to pass between searches. Please wait a while and try searching again.',
-'Search legend'                         =>      'Search criteria:',
-'Results legend'                        =>      'Search results:',
-'Search info'                           =>      'You may search forums for posts by keyword, author\'s username or both.',
-'Keywords info'                         =>      'You may search for a single keyword or for multiple keywords separated by spaces.',
-'Refine info'                           =>      'You may use <strong>AND</strong>, <strong>OR</strong> and <strong>NOT</strong> to refine your searches by keyword.',
-'Wildcard info'                         =>      'Use the wildcard character <strong>*</strong> for partial keyword or username matches.',
-'Forum default info'            =>      'By default all forums are searched. You may narrow your search by selecting one or more forums to search.',
-'Forum require info'            =>      'You may choose to search one or more forums. You must select at least one forum to search.',
-'Keyword search'                        =>      'Keyword or words:',
-'Author search'                         =>      'Author\'s username:',
-'Forum search'                          =>      'Select forums to search:',
-'Forum search default'          =>      'If no forums are selected then all forums will be searched.',
+'Search head'                           =>      'Search forums for posts by one or more keywords, author\'s username or both.',
+'Keyword search'                        =>      'Keyword or words',
+'Keyword help'                          =>      'Separate multiple keywords with spaces. Use <strong>AND</strong>, <strong>OR</strong> and <strong>NOT</strong> to refine your search. Use the wildcard character <strong>*</strong> for partial matches.',
+'Author search'                         =>      'Author\'s username',
+'Author help'                           =>      'Use the wildcard character <strong>*</strong> for partial matches.',
+'Forum search'                          =>      'Select forums to search',
+'Forum search default'          =>      'If no forums are selected then all forums will be searched',
 'Forum search require'          =>      'You must select at least one forum to search.',
-'Sort by'                                       =>      'Sort results by:',
-'Sort order'                            =>      'Results sort order:',
+'Sort by'                                       =>      'Sort results by',
+'Sort order'                            =>      'Results sort order',
 'Sort by post time'                     =>      'Post time',
 'Sort by author'                        =>      'Author',
@@ -28 +23 @@
 'Ascending'                                     =>      'Ascending',
 'Descending'                            =>      'Descending',
-'Display results'                       =>      'Display results:',
+'Display results'                       =>      'Display results',
 'Show as topics'                        =>      'As topics',
 'Show as posts'                         =>      'As posts',
@@ -35 +30 @@
 
 // Results
+'Topic results head'            =>      '%s topics found',
+'Posts results head'            =>      '%s posts found',
 'Search results'                        =>      'Search results',
 'Topics with new'                       =>      'Topics with new posts',
@@ -40 +37 @@
 'Unanswered topics'                     =>      'Unanswered topics',
 'Subscriptions'                         =>      'Subscriptions',
-'Topics found'                          =>      'Topics found',
-'Posts found'                           =>      'Posts found',
 'Topics by'                                     =>      'Topics by %s',
 'Posts by'                                      =>      'Posts by %s',
@@ -48 +43 @@
 'Perform new search'            =>      'Perform new search',
 'Search options'                        =>      'Search options',
-'Location'                                      =>      'Forum: %s',
 'No terms'                                      =>      'You have to enter at least one keyword and/or an author to search for.',
 'No hits'                                       =>      'Your search returned no hits.',
@@ -60 +54 @@
 'Go to forum'                           =>      'Go to forum',
 'Go to topic'                           =>      'Go to topic',
-'Go to profile'                         =>      'Go to %s\'s profile'
+'Go to profile'                         =>      'Go to %s\'s profile',
+'Topics head'                           =>      'Topics',
+'Replies label'                         =>      'Replies',
+'Last post label'                       =>      'Last post',
+'Forum label'                           =>      'Forum',
+'Info separator'                        =>      ':',
+'by poster'                                     =>      'by %s',
+'Topic starter'                         =>      'by %s',
+'New posts'                                     =>      'New posts',
+'Topic navigation'                      =>      '( %s )',
+'Pages'                                         =>      'Pages',
+'Sticky'                                        =>      '[Sticky]',
+'Closed'                                        =>      '[Closed]',
+'You have posted'                       =>      'You have posted in this topic.',
+'New posts info'                        =>      'Go to the first new post since your last visit.',
+'Topic byline'                          =>      '<span>Topic by </span>%s',
+'Reply byline'                          =>      '<span>Reply by </span>%s',
+'Search reply'                          =>      '[ Posted in %s - %s reply ]',
+'Search replies'                        =>      '[ Posted in %s - %s replies ]',
+'Topic title'                           =>      'Topic: %s',
+'Reply title'                           =>      'Re: %s',
+'Posts'                                         =>      'Posts',
+'Permalink post'                        =>      'Permanent link to this post',
+'Permalink topic'                       =>      'Permanent link to this topic',
+'Go to profile'                         =>      'Go to %s\'s profile',
 
 );

fluxbb/branches/fluxbb-1.3-dev/upload/lang/English/topic.php

@@ -6 +6 @@
 'Topic byline'                  =>      '<span>Topic by </span>%s',
 'Reply byline'                  =>      '<span>Reply by </span>%s',
-'Search replies'                =>      '(%s replies, posted in %s)',
 'Post reply'                    =>      'Post reply',
 'Topic closed'                  =>      '[ Closed ]',
@@ -35 +34 @@
 'RSS topic feed'                =>      'RSS Topic Feed',
 'Quick post'                    =>      'Quick reply to this topic',
-'Write message'                 =>      'Write message',
 'Post'                                  =>      'Post',
 'Permalink post'                =>      'Permanent link to this post',
@@ -42 +40 @@
 'Move'                                  =>      'Move topic',
 'Topic options'                 =>      'Topic options',
+'Moderator options'             =>      'Moderator options',
 'Open'                                  =>  'Open topic',
 'Close'                                 =>  'Close topic',

fluxbb/branches/fluxbb-1.3-dev/upload/search.php

@@ -148 +148 @@
         }
 
-        // Setup main heading
-        if ($forum_page['num_pages'] > 1)
-                $forum_page['main_head_pages'] = sprintf($lang_common['Page info'], $forum_page['page'], $forum_page['num_pages']);
-
         // Setup main options header
         $forum_page['main_options_head'] = $lang_search['Search options'];
 
-
         ($hook = get_hook('se_results_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -168 +163 @@
         if ($show_as == 'topics')
         {
-                // Load the forum.php language file
-                require FORUM_ROOT.'lang/'.$forum_user['language'].'/forum.php';
-
-                $forum_page['item_header'] = array();
-                $forum_page['item_header']['subject']['title'] = '<strong class="subject-title">'.$lang_forum['Topics'].'</strong>';
-                $forum_page['item_header']['info']['replies'] = '<strong class="info-replies">'.$lang_forum['replies'].'</strong>';
-                $forum_page['item_header']['info']['lastpost'] = '<strong class="info-lastpost">'.$lang_forum['last post'].'</strong>';
-
-                ($hook = get_hook('se_results_topics_pre_item_header_output')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
-
-?>
-        <div class="main-pagehead">
-                <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
-        </div>
-        <div class="main-subhead">
-                <p class="item-summary forum-noview"><span><?php printf($lang_forum['Search subtitle'], implode(' ', $forum_page['item_header']['subject']), implode(', ', $forum_page['item_header']['info'])) ?></span></p>
-        </div>
-        <div class="main-content main-forum forum-noview">
+                $forum_page['cur_sticky'] = '2';
+
+?>
+        <div id="main-forum" class="content">
+                <div class="section section-1 seforum">
+                        <div class="section-hd">
+                                <h2 class="hn"><span><?php echo $lang_search['Topics head'] ?></span></h2>
+                        </div>
 <?php
 
@@ -191 +176 @@
         else
         {
-                // Load the topic.php language file
-                require FORUM_ROOT.'lang/'.$forum_user['language'].'/topic.php';
-
-?>
-        <div class="main-pagehead">
-                <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
-        </div>
-        <div class="main-content main-topic">
-<?php
-
-        }
-
-        $forum_page['item_count'] = 0;
+
+?>
+        <div id="main-topic" class="content">
+                <div class="section section-1 posts">
+                        <div class="section-hd">
+                                <h2 class="hn"><span><?php echo $lang_search['Posts'] ?></span></h2>
+                        </div>
+<?php
+
+        }
+
+        $forum_page['item_count'] = $forum_page['group_count'] = 0;
 
         if ($show_as == 'posts')
@@ -216 +200 @@
                 ($hook = get_hook('se_results_loop_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
-                ++$forum_page['item_count'];
-
                 if ($forum_config['o_censoring'] == '1')
                         $search_set[$i]['subject'] = censor_words($search_set[$i]['subject']);
@@ -223 +205 @@
                 if ($show_as == 'posts')
                 {
+                        ++$forum_page['item_count'];
+
                         // Generate the result heading
                         $forum_page['post_ident'] = array();
                         $forum_page['post_ident']['num']        = '<span class="post-num">'.forum_number_format($forum_page['start_from'] + $forum_page['item_count']).'</span>';
-                        $forum_page['post_ident']['byline'] = '<span class="post-byline">'.sprintf((($search_set[$i]['pid'] == $search_set[$i]['first_post_id']) ? $lang_topic['Topic byline'] : $lang_topic['Reply byline']), '<strong>'.forum_htmlencode($search_set[$i]['pposter']).'</strong>').'</span>';
-                        $forum_page['post_ident']['link'] = '<span class="post-link"><a class="permalink" rel="bookmark" title="'.$lang_topic['Permalink post'].'" href="'.forum_link($forum_url['post'], $search_set[$i]['pid']).'">'.format_time($search_set[$i]['pposted']).'</a></span>';
+                        $forum_page['post_ident']['byline'] = '<span class="post-byline">'.sprintf((($search_set[$i]['pid'] == $search_set[$i]['first_post_id']) ? $lang_search['Topic byline'] : $lang_search['Reply byline']), '<strong>'.forum_htmlencode($search_set[$i]['pposter']).'</strong>').'</span>';
+                        $forum_page['post_ident']['link'] = '<span class="post-link"><a class="permalink" rel="bookmark" title="'.$lang_search['Permalink post'].'" href="'.forum_link($forum_url['post'], $search_set[$i]['pid']).'">'.format_time($search_set[$i]['pposted']).'</a></span>';
 
                         ($hook = get_hook('se_results_posts_row_pre_item_ident_merge')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
                         // Generate the topic title
-                        $forum_page['item_subject'] = '<a class="permalink" rel="bookmark" title="'.$lang_topic['Permalink topic'].'" href="'.forum_link($forum_url['topic'], array($search_set[$i]['tid'], sef_friendly($search_set[$i]['subject']))).'">'.sprintf((($search_set[$i]['pid'] == $search_set[$i]['first_post_id']) ? $lang_topic['Topic title'] : $lang_topic['Reply title']), forum_htmlencode($search_set[$i]['subject'])).'</a> <small>'.sprintf($lang_topic['Search replies'], forum_number_format($search_set[$i]['num_replies']), '<a href="'.forum_link($forum_url['forum'], array($search_set[$i]['forum_id'], sef_friendly($search_set[$i]['forum_name']))).'">'.forum_htmlencode($search_set[$i]['forum_name']).'</a>').'</small>';
+                        $forum_page['item_subject'] = '<a class="permalink" rel="bookmark" title="'.$lang_search['Permalink topic'].'" href="'.forum_link($forum_url['topic'], array($search_set[$i]['tid'], sef_friendly($search_set[$i]['subject']))).'">'.sprintf((($search_set[$i]['pid'] == $search_set[$i]['first_post_id']) ? $lang_search['Topic title'] : $lang_search['Reply title']), forum_htmlencode($search_set[$i]['subject'])).'</a> <small>'.sprintf((($search_set[$i]['num_replies'] == 1) ? $lang_search['Search reply'] : $lang_search['Search replies']), '<a href="'.forum_link($forum_url['forum'], array($search_set[$i]['forum_id'], sef_friendly($search_set[$i]['forum_name']))).'">'.forum_htmlencode($search_set[$i]['forum_name']).'</a>', forum_number_format($search_set[$i]['num_replies'])).'</small>';
 
                         // Generate author identification
@@ -242 +226 @@
 
                         if ($search_set[$i]['pid'] != $search_set[$i]['first_post_id'])
-                                $forum_page['post_actions']['topic'] = '<span><a class="permalink" rel="bookmark" title="'.$lang_topic['Permalink topic'].'" href="'.forum_link($forum_url['topic'], array($search_set[$i]['tid'], sef_friendly($search_set[$i]['subject']))).'">'.$lang_search['Go to topic'].'<span>: '.forum_htmlencode($search_set[$i]['subject']).'</span></a></span>';
-
-                        $forum_page['post_actions']['post'] = '<span><a class="permalink" rel="bookmark" title="'.$lang_topic['Permalink post'].'" href="'.forum_link($forum_url['post'], $search_set[$i]['pid']).'">'.$lang_search['Go to post'].'<span> '.forum_number_format($forum_page['start_from'] + $forum_page['item_count']).'</span></a></span>';
+                                $forum_page['post_actions']['topic'] = '<span><a class="permalink" rel="bookmark" title="'.$lang_search['Permalink topic'].'" href="'.forum_link($forum_url['topic'], array($search_set[$i]['tid'], sef_friendly($search_set[$i]['subject']))).'">'.$lang_search['Go to topic'].'<span>: '.forum_htmlencode($search_set[$i]['subject']).'</span></a></span>';
+
+                        $forum_page['post_actions']['post'] = '<span><a class="permalink" rel="bookmark" title="'.$lang_search['Permalink post'].'" href="'.forum_link($forum_url['post'], $search_set[$i]['pid']).'">'.$lang_search['Go to post'].'<span> '.forum_number_format($forum_page['start_from'] + $forum_page['item_count']).'</span></a></span>';
 
                         $forum_page['message'] = parse_message($search_set[$i]['message'], $search_set[$i]['hide_smilies']);
@@ -267 +251 @@
 
 ?>
-        <div class="<?php echo implode(' ', $forum_page['item_status']) ?> resultpost">
-                <div class="posthead">
-                        <h3 class="hn post-ident"><?php echo implode(' ', $forum_page['post_ident']) ?></h3>
-                        <h4 class="hn post-title"><span><?php echo $forum_page['item_subject'] ?></span></h4>
-                </div>
-                <div class="postbody">
-                        <div class="post-entry">
-                                <div class="entry-content">
-                                        <?php echo $forum_page['message'] ?>
-                                </div>
+                        <div class="<?php echo implode(' ', $forum_page['item_status']) ?> resultpost">
+                                <div class="posthead">
+                                        <div class="post-ident">
+                                                <h3 class="hn"><?php echo implode(' ', $forum_page['post_ident']) ?></h3>
+                                                <h4 class="hn post-title"><span><?php echo $forum_page['item_subject'] ?></span></h4>
+                                        </div>
+                                </div>
+                                <div class="postbody">
+                                        <div class="post-content">
+                                                <div class="post-entry">
+                                                        <div class="entry-content">
+                                                                <?php echo $forum_page['message'] ?>
+                                                        </div>
 <?php ($hook = get_hook('se_results_posts_row_new_post_entry_data')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                        </div>
-                </div>
-                <div class="postfoot">
-                        <div class="post-options">
-                                <p class="post-actions"><?php echo implode(' ', $forum_page['post_actions']) ?></p>
-                        </div>
-                </div>
-        </div>
+                                                </div>
+                                        </div>
+                                </div>
+                                <div class="postfoot">
+                                        <div class="post-options">
+                                                <p class="post-actions"><?php echo implode(' ', $forum_page['post_actions']) ?></p>
+                                        </div>
+                                </div>
+                        </div>
 <?php
 
@@ -291 +279 @@
                 else
                 {
+
+                        if ($forum_page['cur_sticky'] != $search_set[$i]['sticky'])
+                        {
+                                ++$forum_page['group_count'];
+
+                                if (($search_set[$i]['sticky'] != '2') && ($forum_page['item_count'] != 0))
+                                        echo "\t\t\t".'</div>'."\n";
+
+                                ($hook = get_hook('se_results_topics_pre_caption_output')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
+
+?>
+                        <div class="rep-group<?php echo ($forum_page['group_count'] == 1) ? ' rep-group-1' : '' ?><?php echo ($search_set[$i]['sticky'] == '1') ? ' rep-group-sticky' : '' ?>">
+<?php
+
+                                $forum_page['cur_sticky'] = $search_set[$i]['sticky'];
+                                $forum_page['item_count'] = 0;
+                        }
+
+                        ++$forum_page['item_count'];
+
                         // Start from scratch
-                        $forum_page['item_subject'] = $forum_page['item_body'] = $forum_page['item_status'] = $forum_page['item_nav'] = $forum_page['item_title'] = $forum_page['item_title_status'] = array();
+                        $forum_page['item_subject'] = $forum_page['rep_item'] = $forum_page['item_status'] = $forum_page['item_nav'] = $forum_page['item_title'] = $forum_page['item_title_status'] = array();
                         $forum_page['item_indicator'] = '';
 
                         // Assemble the Topic heading
+                        if ($search_set[$i]['sticky'] == '1')
+                        {
+                                $forum_page['item_title_status']['sticky'] = '<em class="sticky">'.$lang_search['Sticky'].'</em>';
+                                $forum_page['item_status']['sticky'] = 'rep-item-sticky';
+                        }
+
+                        if ($search_set[$i]['closed'] != '0')
+                        {
+                                $forum_page['item_title_status']['closed'] = '<em class="closed">'.$lang_search['Closed'].'</em>';
+                                $forum_page['item_status']['closed'] = 'rep-item-closed';
+                        }
 
                         // Should we display the dot or not? :)
                         if (!$forum_user['is_guest'] && $forum_config['o_show_dot'] == '1' && $search_set[$i]['has_posted'] > 0)
-                        {
-                                $forum_page['item_title']['posted'] = '<span class="posted-mark">'.$lang_forum['You posted indicator'].'</span>';
                                 $forum_page['item_status']['posted'] = 'posted';
-                        }
-
-                        $forum_page['item_title']['link'] = '<strong><a href="'.forum_link($forum_url['topic'], array($search_set[$i]['tid'], sef_friendly($search_set[$i]['subject']))).'">'.forum_htmlencode($search_set[$i]['subject']).'</a></strong>';
+
+                        ($hook = get_hook('se_results_topics_row_pre_item_title_status_merge')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
+
+                        if (!empty($forum_page['item_title_status']))
+                                $forum_page['item_title']['status'] = '<span class="item-status">'.implode(' ', $forum_page['item_title_status']).'</span>';
+
+                        $forum_page['item_title']['link'] = '<strong><a href="'.forum_link($forum_url['topic'], array($search_set[$i]['tid'], sef_friendly($search_set[$i]['subject']))).'"'.((isset($forum_page['item_status']['posted'])) ? ' title="'.$lang_search['You have posted'].'"' : '').'>'.forum_htmlencode($search_set[$i]['subject']).'</a></strong>';
 
                         $forum_page['item_pages'] = ceil(($search_set[$i]['num_replies'] + 1) / $forum_user['disp_posts']);
 
                         if ($forum_page['item_pages'] > 1)
-                                $forum_page['item_nav']['pages'] = '<span>'.$lang_forum['Pages'].'&#160;</span>'.paginate($forum_page['item_pages'], -1, $forum_url['topic'], $lang_common['Page separator'], array($search_set[$i]['tid'], sef_friendly($search_set[$i]['subject'])));
+                                $forum_page['item_nav']['pages'] = '<span>'.$lang_search['Pages'].'&#160;</span>'.paginate($forum_page['item_pages'], -1, $forum_url['topic'], $lang_common['Page separator'], array($search_set[$i]['tid'], sef_friendly($search_set[$i]['subject'])));
 
                         // Does this topic contain posts we haven't read? If so, tag it accordingly.
                         if (!$forum_user['is_guest'] && $search_set[$i]['last_post'] > $forum_user['last_visit'] && (!isset($tracked_topics['topics'][$search_set[$i]['tid']]) || $tracked_topics['topics'][$search_set[$i]['tid']] < $search_set[$i]['last_post']) && (!isset($tracked_topics['forums'][$search_set[$i]['forum_id']]) || $tracked_topics['forums'][$search_set[$i]['forum_id']] < $search_set[$i]['last_post']))
                         {
-                                $forum_page['item_nav']['new'] = '<em class="item-newposts"><a href="'.forum_link($forum_url['topic_new_posts'], array($search_set[$i]['tid'], sef_friendly($search_set[$i]['subject']))).'" title="'.$lang_forum['New posts info'].'">'.$lang_forum['New posts'].'</a></em>';
+                                $forum_page['item_nav']['new'] = '<em class="item-newposts"><a href="'.forum_link($forum_url['topic_new_posts'], array($search_set[$i]['tid'], sef_friendly($search_set[$i]['subject']))).'" title="'.$lang_search['New posts info'].'">'.$lang_search['New posts'].'</a></em>';
                                 $forum_page['item_status']['new'] = 'new';
                         }
@@ -321 +342 @@
 
                         if (!empty($forum_page['item_nav']))
-                                $forum_page['item_title']['nav'] = '<span class="item-nav">'.sprintf($lang_forum['Topic navigation'], implode('&#160;&#160;', $forum_page['item_nav'])).'</span>';
+                                $forum_page['item_title']['nav'] = '<span class="item-nav">'.sprintf($lang_search['Topic navigation'], implode('&#160;&#160;', $forum_page['item_nav'])).'</span>';
+
+                        $forum_page['item_title']['starter'] = '<cite class="item-starter">'.sprintf($lang_search['Topic starter'], forum_htmlencode($search_set[$i]['poster'])).'</cite>';
 
                         ($hook = get_hook('se_results_topics_row_pre_item_title_merge')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
-                        $forum_page['item_body']['subject']['title'] = '<h3 class="hn"><span class="item-num">'.forum_number_format($forum_page['start_from'] + $forum_page['item_count']).'</span> '.implode(' ', $forum_page['item_title']).'</h3>';
-
-
-                        if ($search_set[$i]['sticky'] == '1')
-                        {
-                                $forum_page['item_subject_status']['sticky'] = $lang_forum['Sticky'];
-                                $forum_page['item_status']['sticky'] = 'sticky';
-                        }
-
-                        if ($search_set[$i]['closed'] != '0')
-                        {
-                                $forum_page['i