diff --git a/phpBB/includes/forums_display.php b/phpBB/includes/forums_display.php
index 7810118158..ced439881c 100644
--- a/phpBB/includes/forums_display.php
+++ b/phpBB/includes/forums_display.php
@@ -1,6 +1,6 @@
$left_id AND left_id < $right_id" : '';
+ $sql = 'SELECT * FROM ' . FORUMS_TABLE . $where_sql . ' ORDER BY left_id ASC';
+ $result = $db->sql_query($sql);
+
+ $cat_header =
+ while ($row = $db->sql_fetchrow($result))
+ {
+
+ }
+
+}
+
foreach ($forum_rows as $row)
{
extract($row);
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 555a2f0774..04993251c1 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -19,7 +19,7 @@
*
***************************************************************************/
-function sql_addslashes($msg)
+function sql_escape($msg)
{
return str_replace("'", "''", str_replace('\\', '\\\\', $msg));
}
@@ -80,79 +80,6 @@ function get_forum_branch($forum_id, $type = 'all', $order = 'descending', $incl
return $rows;
}
-function forum_nav_links(&$forum_id, &$forum_data)
-{
- global $SID, $template, $phpEx, $auth;
-
- $type = 'parent';
- $forum_rows = array();
-
- if (!($forum_branch = get_forum_branch($forum_id)))
- {
- trigger_error($user->lang['Forum_not_exist']);
- }
-
- $s_has_subforums = FALSE;
- foreach ($forum_branch as $row)
- {
- if ($type == 'parent')
- {
- $link = ($row['forum_status'] == ITEM_CATEGORY) ? 'index.' . $phpEx . $SID . '&c=' . $row['forum_id'] : 'viewforum.' . $phpEx . $SID . '&f=' . $row['forum_id'];
-
- $template->assign_block_vars('navlinks', array(
- 'FORUM_NAME' => $row['forum_name'],
- 'U_VIEW_FORUM' => $link
- ));
-
- if ($row['forum_id'] == $forum_id)
- {
- $branch_root_id = 0;
- $forum_data = $row;
- $type = 'child';
- }
- }
- else
- {
- if ($row['parent_id'] == $forum_data['forum_id'])
- {
- // Root-level forum
- $forum_rows[] = $row;
- $parent_id = $row['forum_id'];
-
- if ($row['forum_status'] == ITEM_CATEGORY)
- {
- $branch_root_id = $row['forum_id'];
- }
- else
- {
- $s_has_subforums = TRUE;
- }
- }
- elseif ($row['parent_id'] == $branch_root_id)
- {
- // Forum directly under a category
- $forum_rows[] = $row;
- $parent_id = $row['forum_id'];
-
- if ($row['forum_status'] != ITEM_CATEGORY)
- {
- $s_has_subforums = TRUE;
- }
- }
- elseif ($row['forum_status'] != ITEM_CATEGORY)
- {
- // Subforum
- if ($auth->acl_get('f_list', $row['forum_id']))
- {
- $subforums[$parent_id][] = $row;
- }
- }
- }
- }
-
- return $s_has_subforums;
-}
-
// Obtain list of moderators of each forum
// First users, then groups ... broken into two queries
// We could cache this ... certainly into a DB table. Would
@@ -167,7 +94,14 @@ function get_moderators(&$forum_moderators, $forum_id = false)
{
global $SID, $db, $acl_options, $phpEx;
- $forum_sql = ( $forum_id ) ? 'AND m.forum_id = ' . $forum_id : '';
+ if (is_array($forum_id))
+ {
+ $forum_sql = 'AND a.forum_id IN (' . implode(', ', $forum_id) . ')';
+ }
+ else
+ {
+ $forum_sql = ( $forum_id ) ? 'AND a.forum_id = ' . $forum_id : '';
+ }
/*
$sql = "SELECT m.forum_id, u.user_id, u.username, g.group_id, g.group_name
FROM phpbb_moderators m
@@ -182,12 +116,12 @@ function get_moderators(&$forum_moderators, $forum_id = false)
$forum_moderators[$row['forum_id']][] = ( !empty($row['user_id']) ) ? '' . $row['username'] . ' ' : '' . $row['group_name'] . ' ';
}*/
- $sql = "SELECT au.forum_id, u.user_id, u.username
- FROM " . ACL_OPTIONS_TABLE . " o, " . ACL_USERS_TABLE . " au, " . USERS_TABLE . " u
- WHERE au.auth_option_id = o.auth_option_id
- AND au.user_id = u.user_id
+ $sql = "SELECT a.forum_id, u.user_id, u.username
+ FROM " . ACL_OPTIONS_TABLE . " o, " . ACL_USERS_TABLE . " a, " . USERS_TABLE . " u
+ WHERE a.auth_option_id = o.auth_option_id
+ AND a.user_id = u.user_id
AND o.auth_value = 'm_'
- AND au.auth_allow_deny = 1
+ AND a.auth_allow_deny = 1
$forum_sql";
$result = $db->sql_query($sql);
@@ -196,12 +130,12 @@ function get_moderators(&$forum_moderators, $forum_id = false)
$forum_moderators[$row['forum_id']][] = '' . $row['username'] . ' ';
}
- $sql = "SELECT ag.forum_id, g.group_name, g.group_id
- FROM " . ACL_OPTIONS_TABLE . " o, " . ACL_GROUPS_TABLE . " ag, " . GROUPS_TABLE . " g
- WHERE ag.auth_option_id = o.auth_option_id
- AND ag.group_id = g.group_id
+ $sql = "SELECT a.forum_id, g.group_name, g.group_id
+ FROM " . ACL_OPTIONS_TABLE . " o, " . ACL_GROUPS_TABLE . " a, " . GROUPS_TABLE . " g
+ WHERE a.auth_option_id = o.auth_option_id
+ AND a.group_id = g.group_id
AND o.auth_value = 'm_'
- AND ag.auth_allow_deny = 1
+ AND a.auth_allow_deny = 1
AND g.group_type <> " . GROUP_HIDDEN . "
$forum_sql";
$result = $db->sql_query($sql);
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index b58078e2ae..51992613bd 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -99,7 +99,7 @@ class session
if ($u_ip == $s_ip)
{
// Only update session DB a minute or so after last update or if page changes
- if (($current_time - $this->data['session_time'] > 60 || $this->data['session_page'] != $user_page) && $update)
+ if (($current_time - $this->data['session_time'] > 60 || $this->data['session_page'] != $this->page) && $update)
{
$sql = "UPDATE " . SESSIONS_TABLE . "
SET session_time = $current_time, session_page = '$this->page'
diff --git a/phpBB/index.php b/phpBB/index.php
index 7e224d830b..a64363e10a 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -112,98 +112,14 @@ if ($cat_id == 0)
$sql = 'SELECT * FROM ' . FORUMS_TABLE . ' ORDER BY left_id';
}
-else
-{
- $is_nav = TRUE;
- if (!$auth->acl_get('f_list', $cat_id))
- {
- // TODO: Deal with hidden categories
- message_die(ERROR, $user->lang['Category_not_exist']);
- }
- // NOTE: make sure that categories post count is set to 0
- $sql = 'SELECT SUM(forum_posts) AS total
- FROM ' . FORUMS_TABLE . '
- WHERE post_count_inc = 1';
-
- $result = $db->sql_query($sql);
- $total_posts = $db->sql_fetchfield('total', 0, $result);
-
- $result = $db->sql_query('SELECT left_id, right_id, parent_id FROM ' . FORUMS_TABLE . ' WHERE forum_id = ' . $cat_id);
- $catrow = $db->sql_fetchrow($result);
-
- switch (SQL_LAYER)
- {
- case 'oracle':
- $sql = 'SELECT f.*, u.username
- FROM ' . FORUMS_TABLE . ' f, ' . USERS_TABLE . 'u
- WHERE (f.left_id BETWEEN ' . $catrow['left_id'] . ' AND ' . $catrow['right_id'] . '
- OR ' . $catrow['left_id'] . ' BETWEEN f.left_id AND f.right_id)
- AND f.forum_last_poster_id = u.user_id(+)
- ORDER BY left_id';
- break;
-
- default:
- $sql = 'SELECT f.*, u.username
- FROM ' . FORUMS_TABLE . ' f
- LEFT JOIN ' . USERS_TABLE . ' u ON f.forum_last_poster_id = u.user_id
- WHERE f.left_id BETWEEN ' . $catrow['left_id'] . ' AND ' . $catrow['right_id'] . '
- OR ' . $catrow['left_id'] . ' BETWEEN f.left_id AND f.right_id
- ORDER BY f.left_id';
- }
-}
-
-$result = $db->sql_query($sql);
-while ($row = $db->sql_fetchrow($result))
-{
- if (!$cat_id && $row['post_count_inc'])
- {
- $total_posts += $row['forum_posts'];
- }
-
- if ($row['forum_id'] == $cat_id)
- {
- $nav_forums[] = $row;
- $forum_rows[] = $row;
- $is_nav = FALSE;
- }
- elseif ($is_nav)
- {
- $nav_forums[] = $row;
- }
- else
- {
- if ($row['parent_id'] == $cat_id)
- {
- // Root-level forum
- $forum_rows[] = $row;
- $parent_id = $row['forum_id'];
-
- if (!$cat_id && $row['forum_status'] == ITEM_CATEGORY)
- {
- $branch_root_id = $row['forum_id'];
- }
- }
- elseif ($row['parent_id'] == $branch_root_id)
- {
- // Forum directly under a category
- $forum_rows[] = $row;
- $parent_id = $row['forum_id'];
- }
- elseif ($row['display_on_index'] && $row['forum_status'] != ITEM_CATEGORY)
- {
- // Subforum, store it for direct linking
- if ($auth->acl_get('f_list', $row['forum_id']))
- {
- $subforums[$parent_id][] = $row;
- }
- }
- }
-}
-
-$root_id = ($cat_id) ? $catrow['parent_id'] : 0;
-include($phpbb_root_path . 'includes/forums_display.' . $phpEx);
+include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+display_forums(array(
+ 'forum_id' => 0,
+ 'left_id' => 0,
+ 'right_id' => 0
+));
if ($total_posts == 0)
{
@@ -227,17 +143,6 @@ $template->assign_vars(array(
'FORUM_NEW_IMG' => $user->img('forum_new', $user->lang['New_posts']),
'FORUM_LOCKED_IMG' => $user->img('forum_locked', $user->lang['No_new_posts_locked']),
- 'L_FORUM' => $user->lang['Forum'],
- 'L_TOPICS' => $user->lang['Topics'],
- 'L_REPLIES' => $user->lang['Replies'],
- 'L_VIEWS' => $user->lang['Views'],
- 'L_POSTS' => $user->lang['Posts'],
- 'L_LASTPOST' => $user->lang['Last_Post'],
- 'L_MODERATORS' => $user->lang['Moderators'],
- 'L_NO_NEW_POSTS' => $user->lang['No_new_posts'],
- 'L_NEW_POSTS' => $user->lang['New_posts'],
- 'L_NO_NEW_POSTS_LOCKED' => $user->lang['No_new_posts_locked'],
- 'L_NEW_POSTS_LOCKED' => $user->lang['New_posts_locked'],
'L_ONLINE_EXPLAIN' => $user->lang['Online_explain'],
'L_VIEW_MODERATORS' => $user->lang['View_moderators'],
diff --git a/phpBB/templates/subSilver/index_body.html b/phpBB/templates/subSilver/index_body.html
index 01faf2efb8..ba1f612999 100644
--- a/phpBB/templates/subSilver/index_body.html
+++ b/phpBB/templates/subSilver/index_body.html
@@ -29,22 +29,7 @@
{forumrow.CAT_NAME}
-
-
-
- {forumrow.FORUM_FOLDER_IMG}
- {forumrow.FORUM_NAME} {forumrow.FORUM_DESC} {forumrow.L_SUBFORUM} {forumrow.SUBFORUMS}{forumrow.TOPICS} {forumrow.POSTS} {forumrow.LAST_POST}
- {forumrow.MODERATORS}
-
-
+
{forumrow.FORUM_FOLDER_IMG}
@@ -59,18 +44,6 @@
{forumrow.MODERATORS}
-
-
- {forumrow.FORUM_FOLDER_IMG}
- {forumrow.FORUM_NAME} {forumrow.FORUM_DESC} {forumrow.L_SUBFORUM} {forumrow.SUBFORUMS}
-
-
{L_NO_FORUMS}
{L_TOPICS}
@@ -108,5 +114,6 @@
{S_AUTH_LIST}
+
\ No newline at end of file
diff --git a/phpBB/templates/subSilver/viewforum_subforum.html b/phpBB/templates/subSilver/viewforum_subforum.html
index 5b6bae8770..3d0539181b 100644
--- a/phpBB/templates/subSilver/viewforum_subforum.html
+++ b/phpBB/templates/subSilver/viewforum_subforum.html
@@ -1,33 +1,19 @@
-
- {L_SUBFORUM}
+
+ {L_FORUM}
{L_TOPICS}
{L_POSTS}
- {L_LASTPOST}
+ {L_LASTPOST}
+ {L_MODERATORS}
- {forumrow.CAT_NAME}
+ {forumrow.FORUM_NAME}
-
-
-
- {forumrow.FORUM_FOLDER_IMG}
- {forumrow.FORUM_NAME} {forumrow.FORUM_DESC} {forumrow.L_SUBFORUM} {forumrow.SUBFORUMS}{forumrow.TOPICS} {forumrow.POSTS} {forumrow.LAST_POST}
-
-
-
+
- {forumrow.FORUM_FOLDER_IMG}
{forumrow.FORUM_NAME} {forumrow.FORUM_DESC} {forumrow.TOPICS} {forumrow.POSTS} {forumrow.LAST_POST}
-
-
-
-
- {forumrow.FORUM_FOLDER_IMG}
- {forumrow.FORUM_NAME} {forumrow.FORUM_DESC} {forumrow.L_SUBFORUM} {forumrow.SUBFORUMS}
+ {forumrow.MODERATORS}
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index a742c01290..a1ace3d8f9 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -22,14 +22,6 @@
define('IN_PHPBB', true);
$phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc');
-
-if (preg_match('/^c([0-9]+)$/', $_POST['f'], $m))
-{
- $header_location = (@preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE'))) ? 'Refresh: 0; URL=' : 'Location: ';
- header($header_location . "index.$phpEx?sid=" . $_GET['sid'] . '&c=' . $m[1]);
- exit;
-}
-
include($phpbb_root_path . 'common.'.$phpEx);
// Start initial var setup
@@ -108,7 +100,7 @@ if ($forum_data['parent_id'] > 0)
}
$sql = 'UPDATE ' . FORUMS_TABLE . "
- SET forum_parents = '" . sql_addslashes(serialize($forum_parents)) . "'
+ SET forum_parents = '" . sql_escape(serialize($forum_parents)) . "'
WHERE parent_id = " . $forum_data['parent_id'];
$db->sql_query($sql);
}
@@ -131,293 +123,234 @@ $template->assign_block_vars('navlinks', array(
'U_VIEW_FORUM' => 'viewforum.' . $phpEx . $SID . '&f=' . $forum_id
));
+$template->assign_vars(array(
+ 'FORUM_ID' => $forum_id,
+ 'FORUM_NAME' => $forum_data['forum_name']
+));
-// Get forum children
-if ($forum_data['left_id'] != $forum_data['right_id'] - 1)
+if ($forum_data['forum_postable'])
{
- $sql = 'SELECT *
- FROM ' . FORUMS_TABLE . '
- WHERE left_id > ' . $forum_data['left_id'] . ' AND left_id < ' . $forum_data['right_id'] . '
- ORDER BY left_id ASC';
- $result = $db->sql_query($sql);
+ // Topic read tracking cookie info
+ $mark_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_t'])) : array();
+ $mark_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_f'])) : array();
- $type = 'parent';
- $forum_rows = array();
-
- while ($row = $db->sql_fetchrow($result))
+ // Handle marking posts
+ if ($mark_read == 'topics')
{
-/*
- if ($type == 'parent')
+ if ($user->data['user_id'] != ANONYMOUS)
{
+ $mark_forums[$forum_id] = time();
- if ($row['forum_status'] == ITEM_CATEGORY)
- {
- $link = 'index.' . $phpEx . $SID . '&c=' . $row['forum_id'];
- }
- else
- {
- $link = 'viewforum.' . $phpEx . $SID . '&f=' . $row['forum_id'];
- }
+ setcookie($config['cookie_name'] . '_f', serialize($mark_forums), 0, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']);
- $template->assign_block_vars('navlinks', array(
- 'FORUM_NAME' => $row['forum_name'],
- 'U_VIEW_FORUM' => $link
- ));
+ $template->assign_vars(array(
+ 'META' => '', ' ');
+ trigger_error($message);
+ }
+ // End handle marking posts
+
+ // Do the forum Prune
+ if ($auth->acl_gets('m_prune', 'a_', $forum_id) && $config['prune_enable'])
+ {
+ if ($forum_data['prune_next'] < time() && $forum_data['prune_enable'])
+ {
+ require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
+ auto_prune($forum_id);
+ }
+ }
+ // End of forum prune
+
+ // Forum rules, subscription info and word censors
+ $s_watching_forum = '';
+ $s_watching_forum_img = '';
+ $notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL;
+ watch_topic_forum('forum', $s_watching_forum, $s_watching_forum_img, $user->data['user_id'], $forum_id, $notify_status);
+
+ $s_forum_rules = '';
+ get_forum_rules('forum', $s_forum_rules, $forum_id);
+
+ $orig_word = array();
+ $replacement_word = array();
+ obtain_word_list($orig_word, $replacement_word);
+
+ // Topic ordering options
+ $previous_days = array(0 => $user->lang['All_Topics'], 1 => $user->lang['1_Day'], 7 => $user->lang['7_Days'], 14 => $user->lang['2_Weeks'], 30 => $user->lang['1_Month'], 90 => $user->lang['3_Months'], 180 => $user->lang['6_Months'], 364 => $user->lang['1_Year']);
+ $sort_by_text = array('a' => $user->lang['Author'], 't' => $user->lang['Post_time'], 'r' => $user->lang['Replies'], 's' => $user->lang['Subject'], 'v' => $user->lang['Views']);
+ $sort_by = array('a' => 'u.username', 't' => 't.topic_last_post_id', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views');
+
+ if (isset($_POST['sort']))
+ {
+ if (!empty($_POST['sort_days']))
+ {
+ $sort_days = (!empty($_POST['sort_days'])) ? intval($_POST['sort_days']) : intval($_GET['sort_days']);
+ $min_topic_time = time() - ( $sort_days * 86400 );
+
+ //
+ // ref type on as rows as topics ... also not great
+ //
+ $sql = "SELECT COUNT(topic_id) AS forum_topics
+ FROM " . TOPICS_TABLE . "
+ WHERE forum_id = $forum_id
+ AND topic_last_post_time >= $min_topic_time";
+ $result = $db->sql_query($sql);
+
+ $start = 0;
+ $topics_count = ($row = $db->sql_fetchrow($result)) ? $row['forum_topics'] : 0;
+ $limit_topics_time = "AND t.topic_last_post_time >= $min_topic_time";
}
else
{
-*/
- if ($row['parent_id'] == $forum_data['forum_id'])
- {
- // Root-level forum
- $forum_rows[] = $row;
- $parent_id = $row['forum_id'];
-
- if ($row['forum_status'] == ITEM_CATEGORY)
- {
- $branch_root_id = $row['forum_id'];
- }
- else
- {
- $s_has_subforums = TRUE;
- }
- }
- elseif ($row['parent_id'] == $branch_root_id)
- {
- // Forum directly under a category
- $forum_rows[] = $row;
- $parent_id = $row['forum_id'];
-
- if ($row['forum_status'] != ITEM_CATEGORY)
- {
- $s_has_subforums = TRUE;
- }
- }
- elseif ($row['forum_status'] != ITEM_CATEGORY)
- {
- // Subforum
- if ($auth->acl_get('f_list', $row['forum_id']))
- {
- $subforums[$parent_id][] = $row;
- }
- }
-/*
+ $topics_count = ($forum_data['forum_topics']) ? $forum_data['forum_topics'] : 1;
}
-*/
- }
- $db->sql_freeresult();
-}
-// Topic read tracking cookie info
-$mark_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_t'])) : array();
-$mark_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_f'])) : array();
-
-// Handle marking posts
-if ($mark_read == 'topics')
-{
- if ($user->data['user_id'] != ANONYMOUS)
- {
- $mark_forums[$forum_id] = time();
-
- setcookie($config['cookie_name'] . '_f', serialize($mark_forums), 0, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']);
-
- $template->assign_vars(array(
- 'META' => '', ' ');
- trigger_error($message);
-}
-// End handle marking posts
-
-// Do the forum Prune
-if ($auth->acl_gets('m_prune', 'a_', $forum_id) && $config['prune_enable'])
-{
- if ($forum_data['prune_next'] < time() && $forum_data['prune_enable'])
- {
- require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
- auto_prune($forum_id);
- }
-}
-// End of forum prune
-
-// Forum rules, subscription info and word censors
-$s_watching_forum = '';
-$s_watching_forum_img = '';
-$notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL;
-watch_topic_forum('forum', $s_watching_forum, $s_watching_forum_img, $user->data['user_id'], $forum_id, $notify_status);
-
-$s_forum_rules = '';
-get_forum_rules('forum', $s_forum_rules, $forum_id);
-
-$orig_word = array();
-$replacement_word = array();
-obtain_word_list($orig_word, $replacement_word);
-
-// Topic ordering options
-$previous_days = array(0 => $user->lang['All_Topics'], 1 => $user->lang['1_Day'], 7 => $user->lang['7_Days'], 14 => $user->lang['2_Weeks'], 30 => $user->lang['1_Month'], 90 => $user->lang['3_Months'], 180 => $user->lang['6_Months'], 364 => $user->lang['1_Year']);
-$sort_by_text = array('a' => $user->lang['Author'], 't' => $user->lang['Post_time'], 'r' => $user->lang['Replies'], 's' => $user->lang['Subject'], 'v' => $user->lang['Views']);
-$sort_by = array('a' => 'u.username', 't' => 't.topic_last_post_id', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views');
-
-if (isset($_POST['sort']))
-{
- if (!empty($_POST['sort_days']))
- {
- $sort_days = (!empty($_POST['sort_days'])) ? intval($_POST['sort_days']) : intval($_GET['sort_days']);
- $min_topic_time = time() - ( $sort_days * 86400 );
-
- //
- // ref type on as rows as topics ... also not great
- //
- $sql = "SELECT COUNT(topic_id) AS forum_topics
- FROM " . TOPICS_TABLE . "
- WHERE forum_id = $forum_id
- AND topic_last_post_time >= $min_topic_time";
- $result = $db->sql_query($sql);
-
- $start = 0;
- $topics_count = ($row = $db->sql_fetchrow($result)) ? $row['forum_topics'] : 0;
- $limit_topics_time = "AND t.topic_last_post_time >= $min_topic_time";
+ $sort_key = (isset($_POST['sort_key'])) ? $_POST['sort_key'] : $_GET['sort_key'];
+ $sort_dir = (isset($_POST['sort_dir'])) ? $_POST['sort_dir'] : $_GET['sort_dir'];
}
else
{
$topics_count = ($forum_data['forum_topics']) ? $forum_data['forum_topics'] : 1;
+ $limit_topics_time = '';
+
+ $sort_days = 0;
+ $sort_key = 't';
+ $sort_dir = 'd';
}
- $sort_key = (isset($_POST['sort_key'])) ? $_POST['sort_key'] : $_GET['sort_key'];
- $sort_dir = (isset($_POST['sort_dir'])) ? $_POST['sort_dir'] : $_GET['sort_dir'];
-}
-else
-{
- $topics_count = ($forum_data['forum_topics']) ? $forum_data['forum_topics'] : 1;
- $limit_topics_time = '';
+ $sort_order = $sort_by[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
- $sort_days = 0;
- $sort_key = 't';
- $sort_dir = 'd';
-}
-
-$sort_order = $sort_by[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
-
-$select_sort_days = '';
-foreach ($previous_days as $day => $text)
-{
- $selected = ($sort_days == $day) ? ' selected="selected"' : '';
- $select_sort_days .= '' . $text . ' ';
-}
-$select_sort_days .= ' ';
-
-$select_sort = '';
-foreach ($sort_by_text as $key => $text)
-{
- $selected = ($sort_key == $key) ? ' selected="selected"' : '';
- $select_sort .= '' . $text . ' ';
-}
-$select_sort .= ' ';
-
-$select_sort_dir = '';
-$select_sort_dir .= ($sort_dir == 'a') ? '' . $user->lang['Ascending'] . ' ' . $user->lang['Descending'] . ' ' : '' . $user->lang['Ascending'] . ' ' . $user->lang['Descending'] . ' ';
-$select_sort_dir .= ' ';
-
-$post_alt = (intval($forum_data['forum_status']) == ITEM_LOCKED) ? 'Forum_locked' : 'Post_new_topic';
-
-// Basic pagewide vars
-$template->assign_vars(array(
- 'FORUM_ID' => $forum_id,
- 'FORUM_NAME' => $forum_data['forum_name'],
- 'POST_IMG' => (intval($forum_data['forum_status']) == ITEM_LOCKED) ? $user->img('post_locked', $post_alt) : $user->img('post_new', $post_alt),
- 'PAGINATION' => generate_pagination("viewforum.$phpEx$SID&f=$forum_id&topicdays=$topic_days", $topics_count, $config['topics_per_page'], $start),
- 'PAGE_NUMBER' => sprintf($user->lang['Page_of'], (floor( $start / $config['topics_per_page'] ) + 1), ceil( $topics_count / $config['topics_per_page'] )),
- 'MOD_CP' => ($auth->acl_gets('m_', 'a_', $forum_id)) ? sprintf($user->lang['MCP'], '', ' ') : '',
-
- 'FOLDER_IMG' => $user->img('folder', 'No_new_posts'),
- 'FOLDER_NEW_IMG' => $user->img('folder_new', 'New_posts'),
- 'FOLDER_HOT_IMG' => $user->img('folder_hot', 'No_new_posts_hot'),
- 'FOLDER_HOT_NEW_IMG' => $user->img('folder_hot_new', 'New_posts_hot'),
- 'FOLDER_LOCKED_IMG' => $user->img('folder_locked', 'No_new_posts_locked'),
- 'FOLDER_LOCKED_NEW_IMG' => $user->img('folder_locked_new', 'New_posts_locked'),
- 'FOLDER_STICKY_IMG' => $user->img('folder_sticky', 'Post_Sticky'),
- 'FOLDER_STICKY_NEW_IMG' => $user->img('folder_sticky_new', 'Post_Sticky'),
- 'FOLDER_ANNOUNCE_IMG' => $user->img('folder_announce', 'Post_Announcement'),
- 'FOLDER_ANNOUNCE_NEW_IMG' => $user->img('folder_announce_new', 'Post_Announcement'),
-
- 'L_TOPICS' => $user->lang['Topics'],
- 'L_REPLIES' => $user->lang['Replies'],
- 'L_VIEWS' => $user->lang['Views'],
- 'L_POSTS' => $user->lang['Posts'],
- 'L_LASTPOST' => $user->lang['Last_Post'],
- 'L_RATING' => $user->lang['Rating'],
- 'L_VIEW_MODERATORS' => $user->lang['View_moderators'],
- 'L_DISPLAY_TOPICS' => $user->lang['Display_topics'],
- 'L_SORT_BY' => $user->lang['Sort_by'],
- 'L_MARK_TOPICS_READ' => $user->lang['Mark_all_topics'],
- 'L_NO_NEW_POSTS' => $user->lang['No_new_posts'],
- 'L_NEW_POSTS' => $user->lang['New_posts'],
- 'L_NO_NEW_POSTS_LOCKED' => $user->lang['No_new_posts_locked'],
- 'L_NEW_POSTS_LOCKED' => $user->lang['New_posts_locked'],
- 'L_NO_NEW_POSTS_HOT' => $user->lang['No_new_posts_hot'],
- 'L_NEW_POSTS_HOT' => $user->lang['New_posts_hot'],
- 'L_ANNOUNCEMENT' => $user->lang['Post_Announcement'],
- 'L_STICKY' => $user->lang['Post_Sticky'],
- 'L_POSTED' => $user->lang['Posted'],
- 'L_JOINED' => $user->lang['Joined'],
- 'L_AUTHOR' => $user->lang['Author'],
- 'L_NO_TOPICS' => ( $forum_data['forum_status'] == FORUM_LOCKED ) ? $user->lang['Forum_locked'] : $user->lang['No_topics_post_one'],
- 'L_GOTO_PAGE' => $user->lang['Goto_page'],
-
- 'S_SELECT_SORT_DIR' => $select_sort_dir,
- 'S_SELECT_SORT_KEY' => $select_sort,
- 'S_SELECT_SORT_DAYS'=> $select_sort_days,
- 'S_AUTH_LIST' => $s_forum_rules,
- 'S_WATCH_FORUM' => $s_watching_forum,
- 'S_FORUM_ACTION' => 'viewforum.' . $phpEx . $SID . '&f=' . $forum_id . "&start=$start",
-
- 'U_POST_NEW_TOPIC' => 'posting.' . $phpEx . $SID . '&mode=post&f=' . $forum_id,
- 'U_VIEW_MODERATORS' => 'memberslist.' . $phpEx . $SID . '&mode=moderators&f=' . $forum_id,
- 'U_MARK_READ' => 'viewforum.' . $phpEx . $SID . '&f=' . $forum_id . '&mark=topics')
-);
-
-// Topic icons
-$sql = "SELECT *
- FROM " . ICONS_TABLE . "
- WHERE icons_id > 1";
-$result = $db->sql_query($sql);
-
-$topic_icons = array();
-if ($row = $db->sql_fetchrow($result))
-{
- do
+ $select_sort_days = '';
+ foreach ($previous_days as $day => $text)
{
- $topic_icons[$row['icons_id']]['img'] = $row['icons_url'];
- $topic_icons[$row['icons_id']]['width'] = $row['icons_width'];
- $topic_icons[$row['icons_id']]['height'] = $row['icons_height'];
+ $selected = ($sort_days == $day) ? ' selected="selected"' : '';
+ $select_sort_days .= '' . $text . ' ';
}
- while ($row = $db->sql_fetchrow($result));
-}
+ $select_sort_days .= ' ';
-// Grab all the basic data. If we're not on page 1 we also grab any
-// announcements that may exist.
-$total_topics = 0;
-$topic_rowset = array();
+ $select_sort = '';
+ foreach ($sort_by_text as $key => $text)
+ {
+ $selected = ($sort_key == $key) ? ' selected="selected"' : '';
+ $select_sort .= '' . $text . ' ';
+ }
+ $select_sort .= ' ';
+
+ $select_sort_dir = '';
+ $select_sort_dir .= ($sort_dir == 'a') ? '' . $user->lang['Ascending'] . ' ' . $user->lang['Descending'] . ' ' : '' . $user->lang['Ascending'] . ' ' . $user->lang['Descending'] . ' ';
+ $select_sort_dir .= ' ';
+
+ $post_alt = (intval($forum_data['forum_status']) == ITEM_LOCKED) ? 'Forum_locked' : 'Post_new_topic';
+
+ // Basic pagewide vars
+ $template->assign_vars(array(
+ 'S_IS_POSTABLE' => TRUE,
+ 'POST_IMG' => (intval($forum_data['forum_status']) == ITEM_LOCKED) ? $user->img('post_locked', $post_alt) : $user->img('post_new', $post_alt),
+ 'PAGINATION' => generate_pagination("viewforum.$phpEx$SID&f=$forum_id&topicdays=$topic_days", $topics_count, $config['topics_per_page'], $start),
+ 'PAGE_NUMBER' => sprintf($user->lang['Page_of'], (floor( $start / $config['topics_per_page'] ) + 1), ceil( $topics_count / $config['topics_per_page'] )),
+ 'MOD_CP' => ($auth->acl_gets('m_', 'a_', $forum_id)) ? sprintf($user->lang['MCP'], '', ' ') : '',
+
+ 'FOLDER_IMG' => $user->img('folder', 'No_new_posts'),
+ 'FOLDER_NEW_IMG' => $user->img('folder_new', 'New_posts'),
+ 'FOLDER_HOT_IMG' => $user->img('folder_hot', 'No_new_posts_hot'),
+ 'FOLDER_HOT_NEW_IMG' => $user->img('folder_hot_new', 'New_posts_hot'),
+ 'FOLDER_LOCKED_IMG' => $user->img('folder_locked', 'No_new_posts_locked'),
+ 'FOLDER_LOCKED_NEW_IMG' => $user->img('folder_locked_new', 'New_posts_locked'),
+ 'FOLDER_STICKY_IMG' => $user->img('folder_sticky', 'Post_Sticky'),
+ 'FOLDER_STICKY_NEW_IMG' => $user->img('folder_sticky_new', 'Post_Sticky'),
+ 'FOLDER_ANNOUNCE_IMG' => $user->img('folder_announce', 'Post_Announcement'),
+ 'FOLDER_ANNOUNCE_NEW_IMG' => $user->img('folder_announce_new', 'Post_Announcement'),
+
+ 'L_TOPICS' => $user->lang['Topics'],
+ 'L_REPLIES' => $user->lang['Replies'],
+ 'L_VIEWS' => $user->lang['Views'],
+ 'L_POSTS' => $user->lang['Posts'],
+ 'L_LASTPOST' => $user->lang['Last_Post'],
+ 'L_RATING' => $user->lang['Rating'],
+ 'L_VIEW_MODERATORS' => $user->lang['View_moderators'],
+ 'L_DISPLAY_TOPICS' => $user->lang['Display_topics'],
+ 'L_SORT_BY' => $user->lang['Sort_by'],
+ 'L_MARK_TOPICS_READ' => $user->lang['Mark_all_topics'],
+ 'L_NO_NEW_POSTS' => $user->lang['No_new_posts'],
+ 'L_NEW_POSTS' => $user->lang['New_posts'],
+ 'L_NO_NEW_POSTS_LOCKED' => $user->lang['No_new_posts_locked'],
+ 'L_NEW_POSTS_LOCKED' => $user->lang['New_posts_locked'],
+ 'L_NO_NEW_POSTS_HOT' => $user->lang['No_new_posts_hot'],
+ 'L_NEW_POSTS_HOT' => $user->lang['New_posts_hot'],
+ 'L_ANNOUNCEMENT' => $user->lang['Post_Announcement'],
+ 'L_STICKY' => $user->lang['Post_Sticky'],
+ 'L_POSTED' => $user->lang['Posted'],
+ 'L_JOINED' => $user->lang['Joined'],
+ 'L_AUTHOR' => $user->lang['Author'],
+ 'L_NO_TOPICS' => ( $forum_data['forum_status'] == FORUM_LOCKED ) ? $user->lang['Forum_locked'] : $user->lang['No_topics_post_one'],
+ 'L_GOTO_PAGE' => $user->lang['Goto_page'],
+
+ 'S_SELECT_SORT_DIR' => $select_sort_dir,
+ 'S_SELECT_SORT_KEY' => $select_sort,
+ 'S_SELECT_SORT_DAYS'=> $select_sort_days,
+ 'S_AUTH_LIST' => $s_forum_rules,
+ 'S_WATCH_FORUM' => $s_watching_forum,
+ 'S_FORUM_ACTION' => 'viewforum.' . $phpEx . $SID . '&f=' . $forum_id . "&start=$start",
+
+ 'U_POST_NEW_TOPIC' => 'posting.' . $phpEx . $SID . '&mode=post&f=' . $forum_id,
+ 'U_VIEW_MODERATORS' => 'memberslist.' . $phpEx . $SID . '&mode=moderators&f=' . $forum_id,
+ 'U_MARK_READ' => 'viewforum.' . $phpEx . $SID . '&f=' . $forum_id . '&mark=topics')
+ );
+
+ // Topic icons
+ $sql = "SELECT *
+ FROM " . ICONS_TABLE . "
+ WHERE icons_id > 1";
+ $result = $db->sql_query($sql);
+
+ $topic_icons = array();
+ if ($row = $db->sql_fetchrow($result))
+ {
+ do
+ {
+ $topic_icons[$row['icons_id']]['img'] = $row['icons_url'];
+ $topic_icons[$row['icons_id']]['width'] = $row['icons_width'];
+ $topic_icons[$row['icons_id']]['height'] = $row['icons_height'];
+ }
+ while ($row = $db->sql_fetchrow($result));
+ }
+
+ // Grab all the basic data. If we're not on page 1 we also grab any
+ // announcements that may exist.
+ $total_topics = 0;
+ $topic_rowset = array();
+
+ if ( $start )
+ {
+ $sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as id2
+ FROM " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . USERS_TABLE . " u2
+ WHERE t.forum_id = $forum_id
+ AND t.topic_type = " . POST_ANNOUNCE . "
+ AND u.user_id = t.topic_poster
+ AND u2.user_id = t.topic_last_poster_id
+ ORDER BY $sort_order
+ LIMIT " . $config['topics_per_page'];
+ $result = $db->sql_query($sql);
+
+ while( $row = $db->sql_fetchrow($result) )
+ {
+ $topic_rowset[] = $row;
+ $total_topics++;
+ }
+ $db->sql_freeresult($result);
+ }
-if ( $start )
-{
$sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as id2
FROM " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . USERS_TABLE . " u2
WHERE t.forum_id = $forum_id
- AND t.topic_type = " . POST_ANNOUNCE . "
+ AND t.topic_approved = 1
AND u.user_id = t.topic_poster
AND u2.user_id = t.topic_last_poster_id
- ORDER BY $sort_order
- LIMIT " . $config['topics_per_page'];
+ $limit_topics_time
+ ORDER BY t.topic_type DESC, $sort_order
+ LIMIT $start, " . $config['topics_per_page'];
$result = $db->sql_query($sql);
while( $row = $db->sql_fetchrow($result) )
@@ -426,171 +359,153 @@ if ( $start )
$total_topics++;
}
$db->sql_freeresult($result);
-}
-$sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as id2
- FROM " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . USERS_TABLE . " u2
- WHERE t.forum_id = $forum_id
- AND t.topic_approved = 1
- AND u.user_id = t.topic_poster
- AND u2.user_id = t.topic_last_poster_id
- $limit_topics_time
- ORDER BY t.topic_type DESC, $sort_order
- LIMIT $start, " . $config['topics_per_page'];
-$result = $db->sql_query($sql);
-
-while( $row = $db->sql_fetchrow($result) )
-{
- $topic_rowset[] = $row;
- $total_topics++;
-}
-$db->sql_freeresult($result);
-
-// Okay, lets dump out the page ...
-if ($total_topics)
-{
- for($i = 0; $i < $total_topics; $i++)
+ // Okay, lets dump out the page ...
+ if ($total_topics)
{
- $topic_id = $topic_rowset[$i]['topic_id'];
-
- // Type and folder
- $topic_type = '';
- if ($topic_rowset[$i]['topic_status'] == TOPIC_MOVED)
+ for($i = 0; $i < $total_topics; $i++)
{
- $topic_type = $user->lang['Topic_Moved'] . ' ';
- $topic_id = $topic_rowset[$i]['topic_moved_id'];
+ $topic_id = $topic_rowset[$i]['topic_id'];
- $folder_image = 'folder';
- $folder_alt = 'Topic_Moved';
- $newest_post_img = '';
- }
- else
- {
- switch ($topic_rowset[$i]['topic_type'])
+ // Type and folder
+ $topic_type = '';
+ if ($topic_rowset[$i]['topic_status'] == TOPIC_MOVED)
{
- case POST_ANNOUNCE:
- $topic_type = $user->lang['Topic_Announcement'] . ' ';
- $folder = 'folder_announce';
- $folder_new = 'folder_announce_new';
- break;
- case POST_STICKY:
- $topic_type = $user->lang['Topic_Sticky'] . ' ';
- $folder = 'folder_sticky';
- $folder_new = 'folder_sticky_new';
- break;
- case ITEM_LOCKED:
- $folder = 'folder_locked';
- $folder_new = 'folder_locked_new';
- break;
- default:
- if ($replies >= intval($config['hot_threshold']))
- {
- $folder = 'folder_hot';
- $folder_new = 'folder_hot_new';
- }
- else
- {
- $folder = 'folder';
- $folder_new = 'folder_new';
- }
- break;
+ $topic_type = $user->lang['Topic_Moved'] . ' ';
+ $topic_id = $topic_rowset[$i]['topic_moved_id'];
+
+ $folder_image = 'folder';
+ $folder_alt = 'Topic_Moved';
+ $newest_post_img = '';
}
-
- $unread_topic = false;
- if ($user->data['user_id'] && $topic_rowset[$i]['topic_last_post_time'] > $user->data['session_last_visit'])
+ else
{
- $unread_topic = true;
- }
-
- $newest_post_img = ($unread_topic) ? '' . $user->img('goto_post_newest', 'View_newest_post') . ' ' : '';
- $folder_img = ($unread_topic) ? $folder_new : $folder;
- $folder_alt = ($unread_topic) ? 'New_posts' : (($topic_rowset[$i]['topic_status'] == ITEM_LOCKED) ? 'Topic_locked' : 'No_new_posts');
-
- }
-
- if (intval($topic_rowset[$i]['poll_start']))
- {
- $topic_type .= $user->lang['Topic_Poll'] . ' ';
- }
-
- $replies = $topic_rowset[$i]['topic_replies'];
-
- // Goto message
- if (($replies + 1 ) > intval($config['posts_per_page']))
- {
- $total_pages = ceil(($replies + 1) / intval($config['posts_per_page']));
- $goto_page = ' [ ' . $user->img('goto_post', 'Goto_page') . $user->lang['Goto_page'] . ': ';
-
- $times = 1;
- for($j = 0; $j < $replies + 1; $j += intval($config['posts_per_page']))
- {
- $goto_page .= '' . $times . ' ';
- if ($times == 1 && $total_pages > 4)
+ switch ($topic_rowset[$i]['topic_type'])
{
- $goto_page .= ' ... ';
- $times = $total_pages - 3;
- $j += ($total_pages - 4) * intval($config['posts_per_page']);
+ case POST_ANNOUNCE:
+ $topic_type = $user->lang['Topic_Announcement'] . ' ';
+ $folder = 'folder_announce';
+ $folder_new = 'folder_announce_new';
+ break;
+ case POST_STICKY:
+ $topic_type = $user->lang['Topic_Sticky'] . ' ';
+ $folder = 'folder_sticky';
+ $folder_new = 'folder_sticky_new';
+ break;
+ case ITEM_LOCKED:
+ $folder = 'folder_locked';
+ $folder_new = 'folder_locked_new';
+ break;
+ default:
+ if ($replies >= intval($config['hot_threshold']))
+ {
+ $folder = 'folder_hot';
+ $folder_new = 'folder_hot_new';
+ }
+ else
+ {
+ $folder = 'folder';
+ $folder_new = 'folder_new';
+ }
+ break;
}
- else if ($times < $total_pages)
+
+ $unread_topic = false;
+ if ($user->data['user_id'] && $topic_rowset[$i]['topic_last_post_time'] > $user->data['session_last_visit'])
{
- $goto_page .= ', ';
+ $unread_topic = true;
}
- $times++;
+
+ $newest_post_img = ($unread_topic) ? '' . $user->img('goto_post_newest', 'View_newest_post') . ' ' : '';
+ $folder_img = ($unread_topic) ? $folder_new : $folder;
+ $folder_alt = ($unread_topic) ? 'New_posts' : (($topic_rowset[$i]['topic_status'] == ITEM_LOCKED) ? 'Topic_locked' : 'No_new_posts');
+
}
- $goto_page .= ' ] ';
+
+ if (intval($topic_rowset[$i]['poll_start']))
+ {
+ $topic_type .= $user->lang['Topic_Poll'] . ' ';
+ }
+
+ $replies = $topic_rowset[$i]['topic_replies'];
+
+ // Goto message
+ if (($replies + 1 ) > intval($config['posts_per_page']))
+ {
+ $total_pages = ceil(($replies + 1) / intval($config['posts_per_page']));
+ $goto_page = ' [ ' . $user->img('goto_post', 'Goto_page') . $user->lang['Goto_page'] . ': ';
+
+ $times = 1;
+ for($j = 0; $j < $replies + 1; $j += intval($config['posts_per_page']))
+ {
+ $goto_page .= '' . $times . ' ';
+ if ($times == 1 && $total_pages > 4)
+ {
+ $goto_page .= ' ... ';
+ $times = $total_pages - 3;
+ $j += ($total_pages - 4) * intval($config['posts_per_page']);
+ }
+ else if ($times < $total_pages)
+ {
+ $goto_page .= ', ';
+ }
+ $times++;
+ }
+ $goto_page .= ' ] ';
+ }
+ else
+ {
+ $goto_page = '';
+ }
+
+ // Generate all the URIs ...
+ $view_topic_url = 'viewtopic.' . $phpEx . $SID . '&f=' . $forum_id . '&t=' . $topic_id;
+
+ $topic_author = ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? '' : '';
+ $topic_author .= ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? $topic_rowset[$i]['username'] : (($topic_rowset[$i]['topic_first_poster_name'] != '') ? $topic_rowset[$i]['topic_first_poster_name'] : $user->lang['Guest']);
+
+ $topic_author .= ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? ' ' : '';
+
+ $first_post_time = $user->format_date($topic_rowset[$i]['topic_time'], $config['board_timezone']);
+
+ $last_post_time = $user->format_date($topic_rowset[$i]['topic_last_post_time']);
+
+ $last_post_author = ($topic_rowset[$i]['id2'] == ANONYMOUS) ? (($topic_rowset[$i]['topic_last_poster_name'] != '') ? $topic_rowset[$i]['topic_last_poster_name'] . ' ' : $user->lang['Guest'] . ' ') : '' . $topic_rowset[$i]['user2'] . ' ';
+
+ $last_post_url = '' . $user->img('goto_post_latest', 'View_latest_post') . ' ';
+
+ // Send vars to template
+ $template->assign_block_vars('topicrow', array(
+ 'FORUM_ID' => $forum_id,
+ 'TOPIC_ID' => $topic_id,
+ 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt),
+ 'TOPIC_AUTHOR' => $topic_author,
+ 'NEWEST_POST_IMG' => $newest_post_img,
+ 'FIRST_POST_TIME' => $first_post_time,
+ 'LAST_POST_TIME' => $last_post_time,
+ 'LAST_POST_AUTHOR' => $last_post_author,
+ 'LAST_POST_IMG' => $last_post_url,
+ 'GOTO_PAGE' => $goto_page,
+ 'REPLIES' => $topic_rowset[$i]['topic_replies'],
+ 'VIEWS' => $topic_rowset[$i]['topic_views'],
+ 'TOPIC_TITLE' => (count($orig_word)) ? preg_replace($orig_word, $replacement_word, $topic_rowset[$i]['topic_title']) : $topic_rowset[$i]['topic_title'],
+ 'TOPIC_TYPE' => $topic_type,
+ 'TOPIC_ICON' => (!empty($topic_rowset[$i]['topic_icon']) ) ? '' : '';
- $topic_author .= ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? $topic_rowset[$i]['username'] : (($topic_rowset[$i]['topic_first_poster_name'] != '') ? $topic_rowset[$i]['topic_first_poster_name'] : $user->lang['Guest']);
-
- $topic_author .= ($topic_rowset[$i]['user_id'] != ANONYMOUS) ? ' ' : '';
-
- $first_post_time = $user->format_date($topic_rowset[$i]['topic_time'], $config['board_timezone']);
-
- $last_post_time = $user->format_date($topic_rowset[$i]['topic_last_post_time']);
-
- $last_post_author = ($topic_rowset[$i]['id2'] == ANONYMOUS) ? (($topic_rowset[$i]['topic_last_poster_name'] != '') ? $topic_rowset[$i]['topic_last_poster_name'] . ' ' : $user->lang['Guest'] . ' ') : '' . $topic_rowset[$i]['user2'] . ' ';
-
- $last_post_url = '' . $user->img('goto_post_latest', 'View_latest_post') . ' ';
-
- // Send vars to template
- $template->assign_block_vars('topicrow', array(
- 'FORUM_ID' => $forum_id,
- 'TOPIC_ID' => $topic_id,
- 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt),
- 'TOPIC_AUTHOR' => $topic_author,
- 'NEWEST_POST_IMG' => $newest_post_img,
- 'FIRST_POST_TIME' => $first_post_time,
- 'LAST_POST_TIME' => $last_post_time,
- 'LAST_POST_AUTHOR' => $last_post_author,
- 'LAST_POST_IMG' => $last_post_url,
- 'GOTO_PAGE' => $goto_page,
- 'REPLIES' => $topic_rowset[$i]['topic_replies'],
- 'VIEWS' => $topic_rowset[$i]['topic_views'],
- 'TOPIC_TITLE' => (count($orig_word)) ? preg_replace($orig_word, $replacement_word, $topic_rowset[$i]['topic_title']) : $topic_rowset[$i]['topic_title'],
- 'TOPIC_TYPE' => $topic_type,
- 'TOPIC_ICON' => (!empty($topic_rowset[$i]['topic_icon']) ) ? '