A few coding style alterations

git-svn-id: file:///svn/phpbb/trunk@2384 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-03-21 01:38:45 +00:00
parent f422531c0a
commit 1a36478d59

View file

@ -21,35 +21,35 @@
***************************************************************************/ ***************************************************************************/
define('IN_PHPBB', true); define('IN_PHPBB', true);
$phpbb_root_path = "./"; $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx); include($phpbb_root_path . 'common.'.$phpEx);
// //
// Start initial var setup // Start initial var setup
// //
if( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]) ) if ( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]) )
{ {
$forum_id = ( isset($HTTP_GET_VARS[POST_FORUM_URL]) ) ? intval($HTTP_GET_VARS[POST_FORUM_URL]) : intval($HTTP_POST_VARS[POST_FORUM_URL]); $forum_id = ( isset($HTTP_GET_VARS[POST_FORUM_URL]) ) ? intval($HTTP_GET_VARS[POST_FORUM_URL]) : intval($HTTP_POST_VARS[POST_FORUM_URL]);
} }
else if( isset($HTTP_GET_VARS['forum'])) else if ( isset($HTTP_GET_VARS['forum']))
{ {
$forum_id = $HTTP_GET_VARS['forum']; $forum_id = $HTTP_GET_VARS['forum'];
} }
else else
{ {
$forum_id = ""; $forum_id = '';
} }
$start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
if( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) ) if ( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) )
{ {
$mark_read = (isset($HTTP_POST_VARS['mark'])) ? $HTTP_POST_VARS['mark'] : $HTTP_GET_VARS['mark']; $mark_read = (isset($HTTP_POST_VARS['mark'])) ? $HTTP_POST_VARS['mark'] : $HTTP_GET_VARS['mark'];
} }
else else
{ {
$mark_read = ""; $mark_read = '';
} }
// //
// End initial var setup // End initial var setup
@ -59,14 +59,14 @@ else
// Check if the user has actually sent a forum ID with his/her request // Check if the user has actually sent a forum ID with his/her request
// If not give them a nice error page. // If not give them a nice error page.
// //
if( !empty($forum_id) ) if ( !empty($forum_id) )
{ {
$sql = "SELECT * $sql = "SELECT *
FROM " . FORUMS_TABLE . " FROM " . FORUMS_TABLE . "
WHERE forum_id = $forum_id"; WHERE forum_id = $forum_id";
if( !$result = $db->sql_query($sql) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql);
} }
} }
else else
@ -78,7 +78,7 @@ else
// If the query doesn't return any rows this isn't a valid forum. Inform // If the query doesn't return any rows this isn't a valid forum. Inform
// the user. // the user.
// //
if( !($forum_row = $db->sql_fetchrow($result)) ) if ( !($forum_row = $db->sql_fetchrow($result)) )
{ {
message_die(GENERAL_MESSAGE, 'Forum_not_exist'); message_die(GENERAL_MESSAGE, 'Forum_not_exist');
} }
@ -98,7 +98,7 @@ init_userprefs($userdata);
$is_auth = array(); $is_auth = array();
$is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_row); $is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_row);
if( !$is_auth['auth_read'] || !$is_auth['auth_view'] ) if ( !$is_auth['auth_read'] || !$is_auth['auth_view'] )
{ {
if ( !$userdata['session_logged_in'] ) if ( !$userdata['session_logged_in'] )
{ {
@ -119,60 +119,58 @@ if( !$is_auth['auth_read'] || !$is_auth['auth_view'] )
// //
// Handle marking posts // Handle marking posts
// //
if( $mark_read == "topics" ) if ( $mark_read == 'topics' )
{ {
if( $userdata['session_logged_in'] ) if ( $userdata['session_logged_in'] )
{ {
$sql = "SELECT MAX(post_time) AS last_post $sql = "SELECT MAX(post_time) AS last_post
FROM " . POSTS_TABLE . " FROM " . POSTS_TABLE . "
WHERE forum_id = $forum_id"; WHERE forum_id = $forum_id";
if( !$result = $db->sql_query($sql) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql);
} }
if( $db->sql_numrows($result) ) if ( $row = $db->sql_fetchrow($result) )
{ {
$row = $db->sql_fetchrow($result); $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : array();
$tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array();
$tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array(); if ( ( count($tracking_forums) + count($tracking_topics) ) >= 150 && empty($tracking_forums[$forum_id]) )
$tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array();
if( ( count($tracking_forums) + count($tracking_topics) ) >= 150 && empty($tracking_forums['' . $forum_id . '']) )
{ {
asort($tracking_forums); asort($tracking_forums);
unset($tracking_forums[key($tracking_forums)]); unset($tracking_forums[key($tracking_forums)]);
} }
if( $row['last_post'] > $userdata['user_lastvisit'] ) if ( $row['last_post'] > $userdata['user_lastvisit'] )
{ {
$tracking_forums['' . $forum_id . ''] = time(); $tracking_forums[$forum_id] = time();
setcookie($board_config['cookie_name'] . "_f", serialize($tracking_forums), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); setcookie($board_config['cookie_name'] . '_f', serialize($tracking_forums), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
} }
} }
$template->assign_vars(array( $template->assign_vars(array(
"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">') 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
); );
} }
$message = $lang['Topics_marked_read'] . "<br /><br />" . sprintf($lang['Click_return_forum'], "<a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">", "</a> "); $message = $lang['Topics_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_forum'], '<a href="' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a> ');
message_die(GENERAL_MESSAGE, $message); message_die(GENERAL_MESSAGE, $message);
} }
// //
// End handle marking posts // End handle marking posts
// //
$tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : ""; $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : '';
$tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : ""; $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : '';
// //
// Do the forum Prune // Do the forum Prune
// //
if( $is_auth['auth_mod'] && $board_config['prune_enable'] ) if ( $is_auth['auth_mod'] && $board_config['prune_enable'] )
{ {
if( $forum_row['prune_next'] < time() && $forum_row['prune_enable'] ) if ( $forum_row['prune_next'] < time() && $forum_row['prune_enable'] )
{ {
include($phpbb_root_path . 'includes/prune.'.$phpEx); include($phpbb_root_path . 'includes/prune.'.$phpEx);
auto_prune($forum_id); auto_prune($forum_id);
@ -197,9 +195,9 @@ $sql = "SELECT u.user_id, u.username
AND u.user_id = ug.user_id AND u.user_id = ug.user_id
GROUP BY u.user_id, u.username GROUP BY u.user_id, u.username
ORDER BY u.user_id"; ORDER BY u.user_id";
if(!$result = $db->sql_query($sql)) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql);
} }
$moderators = array(); $moderators = array();
@ -218,9 +216,9 @@ $sql = "SELECT g.group_id, g.group_name
AND g.group_id = aa.group_id AND g.group_id = aa.group_id
GROUP BY g.group_id, g.group_name GROUP BY g.group_id, g.group_name
ORDER BY g.group_id"; ORDER BY g.group_id";
if(!$result = $db->sql_query($sql)) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql);
} }
while( $row = $db->sql_fetchrow($result) ) while( $row = $db->sql_fetchrow($result) )
@ -229,7 +227,7 @@ while( $row = $db->sql_fetchrow($result) )
} }
$l_moderators = ( count($moderators) == 1 ) ? $lang['Moderator'] : $lang['Moderators']; $l_moderators = ( count($moderators) == 1 ) ? $lang['Moderator'] : $lang['Moderators'];
$forum_moderators = ( count($moderators) ) ? implode(", ", $moderators) : $lang['None']; $forum_moderators = ( count($moderators) ) ? implode(', ', $moderators) : $lang['None'];
unset($moderators); unset($moderators);
// //
@ -240,7 +238,7 @@ unset($moderators);
$previous_days = array(0, 1, 7, 14, 30, 90, 180, 364); $previous_days = array(0, 1, 7, 14, 30, 90, 180, 364);
$previous_days_text = array($lang['All_Topics'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']); $previous_days_text = array($lang['All_Topics'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']);
if( !empty($HTTP_POST_VARS['topicdays']) || !empty($HTTP_GET_VARS['topicdays']) ) if ( !empty($HTTP_POST_VARS['topicdays']) || !empty($HTTP_GET_VARS['topicdays']) )
{ {
$topic_days = ( !empty($HTTP_POST_VARS['topicdays']) ) ? $HTTP_POST_VARS['topicdays'] : $HTTP_GET_VARS['topicdays']; $topic_days = ( !empty($HTTP_POST_VARS['topicdays']) ) ? $HTTP_POST_VARS['topicdays'] : $HTTP_GET_VARS['topicdays'];
$min_topic_time = time() - ($topic_days * 86400); $min_topic_time = time() - ($topic_days * 86400);
@ -251,16 +249,16 @@ if( !empty($HTTP_POST_VARS['topicdays']) || !empty($HTTP_GET_VARS['topicdays'])
AND p.post_id = t.topic_last_post_id AND p.post_id = t.topic_last_post_id
AND p.post_time >= $min_topic_time"; AND p.post_time >= $min_topic_time";
if( !$result = $db->sql_query($sql) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain limited topics count information", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain limited topics count information', '', __LINE__, __FILE__, $sql);
} }
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
$topics_count = $row['forum_topics']; $topics_count = $row['forum_topics'];
$limit_topics_time = "AND p.post_time >= $min_topic_time"; $limit_topics_time = "AND p.post_time >= $min_topic_time";
if( !empty($HTTP_POST_VARS['topicdays']) ) if ( !empty($HTTP_POST_VARS['topicdays']) )
{ {
$start = 0; $start = 0;
} }
@ -269,17 +267,17 @@ else
{ {
$topics_count = $forum_row['forum_topics']; $topics_count = $forum_row['forum_topics'];
$limit_topics_time = ""; $limit_topics_time = '';
$topic_days = 0; $topic_days = 0;
} }
$select_topic_days = "<select name=\"topicdays\">"; $select_topic_days = '<select name="topicdays">';
for($i = 0; $i < count($previous_days); $i++) for($i = 0; $i < count($previous_days); $i++)
{ {
$selected = ($topic_days == $previous_days[$i]) ? " selected=\"selected\"" : ""; $selected = ($topic_days == $previous_days[$i]) ? ' selected="selected"' : '';
$select_topic_days .= "<option value=\"" . $previous_days[$i] . "\"$selected>" . $previous_days_text[$i] . "</option>"; $select_topic_days .= '<option value="' . $previous_days[$i] . '"' . $selected . '>' . $previous_days_text[$i] . '</option>';
} }
$select_topic_days .= "</select>"; $select_topic_days .= '</select>';
// //
@ -294,9 +292,9 @@ $sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as i
AND p.poster_id = u2.user_id AND p.poster_id = u2.user_id
AND t.topic_type = " . POST_ANNOUNCE . " AND t.topic_type = " . POST_ANNOUNCE . "
ORDER BY t.topic_last_post_id DESC "; ORDER BY t.topic_last_post_id DESC ";
if( !$result = $db->sql_query($sql) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql);
} }
$topic_rowset = array(); $topic_rowset = array();
@ -324,9 +322,9 @@ $sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as i
$limit_topics_time $limit_topics_time
ORDER BY t.topic_type DESC, t.topic_last_post_id DESC ORDER BY t.topic_type DESC, t.topic_last_post_id DESC
LIMIT $start, ".$board_config['topics_per_page']; LIMIT $start, ".$board_config['topics_per_page'];
if( !$result = $db->sql_query($sql) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql);
} }
$total_topics = 0; $total_topics = 0;
@ -354,26 +352,26 @@ obtain_word_list($orig_word, $replacement_word);
// Post URL generation for templating vars // Post URL generation for templating vars
// //
$template->assign_vars(array( $template->assign_vars(array(
"L_DISPLAY_TOPICS" => $lang['Display_topics'], 'L_DISPLAY_TOPICS' => $lang['Display_topics'],
"U_POST_NEW_TOPIC" => append_sid("posting.$phpEx?mode=newtopic&amp;" . POST_FORUM_URL . "=$forum_id"), 'U_POST_NEW_TOPIC' => append_sid("posting.$phpEx?mode=newtopic&amp;" . POST_FORUM_URL . "=$forum_id"),
"S_SELECT_TOPIC_DAYS" => $select_topic_days, 'S_SELECT_TOPIC_DAYS' => $select_topic_days,
"S_POST_DAYS_ACTION" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&amp;start=$start")) 'S_POST_DAYS_ACTION' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&amp;start=$start"))
); );
// //
// User authorisation levels output // User authorisation levels output
// //
$s_auth_can = ( ( $is_auth['auth_post'] ) ? $lang['Rules_post_can'] : $lang['Rules_post_cannot'] ) . "<br />"; $s_auth_can = ( ( $is_auth['auth_post'] ) ? $lang['Rules_post_can'] : $lang['Rules_post_cannot'] ) . '<br />';
$s_auth_can .= ( ( $is_auth['auth_reply'] ) ? $lang['Rules_reply_can'] : $lang['Rules_reply_cannot'] ) . "<br />"; $s_auth_can .= ( ( $is_auth['auth_reply'] ) ? $lang['Rules_reply_can'] : $lang['Rules_reply_cannot'] ) . '<br />';
$s_auth_can .= ( ( $is_auth['auth_edit'] ) ? $lang['Rules_edit_can'] : $lang['Rules_edit_cannot'] ) . "<br />"; $s_auth_can .= ( ( $is_auth['auth_edit'] ) ? $lang['Rules_edit_can'] : $lang['Rules_edit_cannot'] ) . '<br />';
$s_auth_can .= ( ( $is_auth['auth_delete'] ) ? $lang['Rules_delete_can'] : $lang['Rules_delete_cannot'] ) . "<br />"; $s_auth_can .= ( ( $is_auth['auth_delete'] ) ? $lang['Rules_delete_can'] : $lang['Rules_delete_cannot'] ) . '<br />';
$s_auth_can .= ( ( $is_auth['auth_vote'] ) ? $lang['Rules_vote_can'] : $lang['Rules_vote_cannot'] ) . "<br />"; $s_auth_can .= ( ( $is_auth['auth_vote'] ) ? $lang['Rules_vote_can'] : $lang['Rules_vote_cannot'] ) . '<br />';
if( $is_auth['auth_mod'] ) if ( $is_auth['auth_mod'] )
{ {
$s_auth_can .= sprintf($lang['Rules_moderate'], "<a href=\"" . append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">", "</a>"); $s_auth_can .= sprintf($lang['Rules_moderate'], '<a href="' . append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a>');
} }
// //
@ -387,51 +385,51 @@ $nav_links['up'] = array(
// //
// Dump out the page header and load viewforum template // Dump out the page header and load viewforum template
// //
$page_title = $lang['View_forum'] . " - " . $forum_row['forum_name']; $page_title = $lang['View_forum'] . ' - ' . $forum_row['forum_name'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx); include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
"body" => "viewforum_body.tpl", 'body' => 'viewforum_body.tpl',
"jumpbox" => "jumpbox.tpl") 'jumpbox' => 'jumpbox.tpl')
); );
$jumpbox = make_jumpbox(); $jumpbox = make_jumpbox();
$template->assign_vars(array( $template->assign_vars(array(
"L_GO" => $lang['Go'], 'L_GO' => $lang['Go'],
"L_JUMP_TO" => $lang['Jump_to'], 'L_JUMP_TO' => $lang['Jump_to'],
"L_SELECT_FORUM" => $lang['Select_forum'], 'L_SELECT_FORUM' => $lang['Select_forum'],
"S_JUMPBOX_LIST" => $jumpbox, 'S_JUMPBOX_LIST' => $jumpbox,
"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx")) 'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
); );
$template->assign_var_from_handle("JUMPBOX", "jumpbox"); $template->assign_var_from_handle('JUMPBOX', 'jumpbox');
$template->assign_vars(array( $template->assign_vars(array(
"FORUM_ID" => $forum_id, 'FORUM_ID' => $forum_id,
"FORUM_NAME" => $forum_row['forum_name'], 'FORUM_NAME' => $forum_row['forum_name'],
"MODERATORS" => $forum_moderators, 'MODERATORS' => $forum_moderators,
"IMG_POST" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'], 'IMG_POST' => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'],
"FOLDER_IMG" => $images['folder'], 'FOLDER_IMG' => $images['folder'],
"FOLDER_NEW_IMG" => $images['folder_new'], 'FOLDER_NEW_IMG' => $images['folder_new'],
"FOLDER_HOT_IMG" => $images['folder_hot'], 'FOLDER_HOT_IMG' => $images['folder_hot'],
"FOLDER_HOT_NEW_IMG" => $images['folder_hot_new'], 'FOLDER_HOT_NEW_IMG' => $images['folder_hot_new'],
"FOLDER_LOCKED_IMG" => $images['folder_locked'], 'FOLDER_LOCKED_IMG' => $images['folder_locked'],
"FOLDER_LOCKED_NEW_IMG" => $images['folder_locked_new'], 'FOLDER_LOCKED_NEW_IMG' => $images['folder_locked_new'],
"FOLDER_STICKY_IMG" => $images['folder_sticky'], 'FOLDER_STICKY_IMG' => $images['folder_sticky'],
"FOLDER_STICKY_NEW_IMG" => $images['folder_sticky_new'], 'FOLDER_STICKY_NEW_IMG' => $images['folder_sticky_new'],
"FOLDER_ANNOUNCE_IMG" => $images['folder_announce'], 'FOLDER_ANNOUNCE_IMG' => $images['folder_announce'],
"FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'], 'FOLDER_ANNOUNCE_NEW_IMG' => $images['folder_announce_new'],
"L_MODERATOR" => $l_moderators, 'L_MODERATOR' => $l_moderators,
"L_MARK_TOPICS_READ" => $lang['Mark_all_topics'], 'L_MARK_TOPICS_READ' => $lang['Mark_all_topics'],
"L_POST_NEW_TOPIC" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'], 'L_POST_NEW_TOPIC' => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'],
"S_AUTH_LIST" => $s_auth_can, 'S_AUTH_LIST' => $s_auth_can,
"U_VIEW_FORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL ."=$forum_id"), 'U_VIEW_FORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL ."=$forum_id"),
"U_MARK_READ" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&amp;mark=topics")) 'U_MARK_READ' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&amp;mark=topics"))
); );
// //
// End header // End header
@ -454,25 +452,25 @@ if( $total_topics )
if( $topic_type == POST_ANNOUNCE ) if( $topic_type == POST_ANNOUNCE )
{ {
$topic_type = $lang['Topic_Announcement'] . " "; $topic_type = $lang['Topic_Announcement'] . ' ';
} }
else if( $topic_type == POST_STICKY ) else if( $topic_type == POST_STICKY )
{ {
$topic_type = $lang['Topic_Sticky'] . " "; $topic_type = $lang['Topic_Sticky'] . ' ';
} }
else else
{ {
$topic_type = ""; $topic_type = '';
} }
if( $topic_rowset[$i]['topic_vote'] ) if( $topic_rowset[$i]['topic_vote'] )
{ {
$topic_type .= $lang['Topic_Poll'] . " "; $topic_type .= $lang['Topic_Poll'] . ' ';
} }
if( $topic_rowset[$i]['topic_status'] == TOPIC_MOVED ) if( $topic_rowset[$i]['topic_status'] == TOPIC_MOVED )
{ {
$topic_type = $lang['Topic_Moved'] . " "; $topic_type = $lang['Topic_Moved'] . ' ';
$topic_id = $topic_rowset[$i]['topic_moved_id']; $topic_id = $topic_rowset[$i]['topic_moved_id'];
$folder_image = '<img src="' . $images['folder'] . '" alt="' . $lang['No_new_posts'] . '" title="' . $lang['No_new_posts'] . '" />'; $folder_image = '<img src="' . $images['folder'] . '" alt="' . $lang['No_new_posts'] . '" title="' . $lang['No_new_posts'] . '" />';
@ -509,34 +507,34 @@ if( $total_topics )
} }
} }
$newest_post_img = ""; $newest_post_img = '';
if( $userdata['session_logged_in'] ) if( $userdata['session_logged_in'] )
{ {
if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] ) if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] )
{ {
if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) ) if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) )
{ {
$unread_topics = true; $unread_topics = true;
if( !empty($tracking_topics['' . $topic_id . '']) ) if( !empty($tracking_topics[$topic_id]) )
{ {
if( $tracking_topics['' . $topic_id . ''] >= $topic_rowset[$i]['post_time'] ) if( $tracking_topics[$topic_id] >= $topic_rowset[$i]['post_time'] )
{ {
$unread_topics = false; $unread_topics = false;
} }
} }
if( !empty($tracking_forums['' . $forum_id . '']) ) if( !empty($tracking_forums[$forum_id]) )
{ {
if( $tracking_forums['' . $forum_id . ''] >= $topic_rowset[$i]['post_time'] ) if( $tracking_forums[$forum_id] >= $topic_rowset[$i]['post_time'] )
{ {
$unread_topics = false; $unread_topics = false;
} }
} }
if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) ) if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) )
{ {
if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"] >= $topic_rowset[$i]['post_time'] ) if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] >= $topic_rowset[$i]['post_time'] )
{ {
$unread_topics = false; $unread_topics = false;
} }
@ -580,7 +578,7 @@ if( $total_topics )
if( ( $replies + 1 ) > $board_config['posts_per_page'] ) if( ( $replies + 1 ) > $board_config['posts_per_page'] )
{ {
$total_pages = ceil(($replies+1)/$board_config['posts_per_page']); $total_pages = ceil( ( $replies + 1 ) / $board_config['posts_per_page'] );
$goto_page = ' [ <img src="' . $images['icon_gotopost'] . '" alt="' . $lang['Goto_page'] . '" title="' . $lang['Goto_page'] . '" />' . $lang['Goto_page'] . ': '; $goto_page = ' [ <img src="' . $images['icon_gotopost'] . '" alt="' . $lang['Goto_page'] . '" title="' . $lang['Goto_page'] . '" />' . $lang['Goto_page'] . ': ';
$times = 1; $times = 1;
@ -624,29 +622,29 @@ if( $total_topics )
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars("topicrow", array( $template->assign_block_vars("topicrow", array(
"FORUM_ID" => $forum_id, 'FORUM_ID' => $forum_id,
"TOPIC_ID" => $topic_id, 'TOPIC_ID' => $topic_id,
"FOLDER" => $folder_image, 'FOLDER' => $folder_image,
"TOPIC_POSTER" => $topic_poster, 'TOPIC_POSTER' => $topic_poster,
"GOTO_PAGE" => $goto_page, 'GOTO_PAGE' => $goto_page,
"REPLIES" => $replies, 'REPLIES' => $replies,
"NEWEST_POST_IMG" => $newest_post_img, 'NEWEST_POST_IMG' => $newest_post_img,
"TOPIC_TITLE" => $topic_title, 'TOPIC_TITLE' => $topic_title,
"TOPIC_TYPE" => $topic_type, 'TOPIC_TYPE' => $topic_type,
"VIEWS" => $views, 'VIEWS' => $views,
"LAST_POST" => $last_post, 'LAST_POST' => $last_post,
"ROW_COLOR" => $row_color, 'ROW_COLOR' => $row_color,
"ROW_CLASS" => $row_class, 'ROW_CLASS' => $row_class,
"U_VIEW_TOPIC" => $view_topic_url) 'U_VIEW_TOPIC' => $view_topic_url)
); );
} }
$template->assign_vars(array( $template->assign_vars(array(
"PAGINATION" => generate_pagination("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&amp;topicdays=$topic_days", $topics_count, $board_config['topics_per_page'], $start), 'PAGINATION' => generate_pagination("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&amp;topicdays=$topic_days", $topics_count, $board_config['topics_per_page'], $start),
"PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $topics_count / $board_config['topics_per_page'] )), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $topics_count / $board_config['topics_per_page'] )),
"L_GOTO_PAGE" => $lang['Goto_page']) 'L_GOTO_PAGE' => $lang['Goto_page'])
); );
} }
@ -655,23 +653,23 @@ else
// //
// No topics // No topics
// //
$no_topics_msg = ($forum_row['forum_status'] == FORUM_LOCKED) ? $lang['Forum_locked'] : $lang['No_topics_post_one']; $no_topics_msg = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['No_topics_post_one'];
$template->assign_vars(array( $template->assign_vars(array(
"L_NO_TOPICS" => $no_topics_msg) 'L_NO_TOPICS' => $no_topics_msg)
); );
$template->assign_block_vars("notopicsrow", array() ); $template->assign_block_vars('notopicsrow', array() );
} }
// //
// Parse the page and print // Parse the page and print
// //
$template->pparse("body"); $template->pparse('body');
// //
// Page footer // Page footer
// //
include($phpbb_root_path . 'includes/page_tail.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
?> ?>