Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 index.php,1.89,1.90 posting.php,1.136,1.137 search.php,1.54,1.55 viewforum.php,1.118,1.119 viewtopic.php,1.162,1.163
|
From: Paul S. O. <ps...@us...> - 2002-01-12 17:00:36
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5414
Modified Files:
index.php posting.php search.php viewforum.php viewtopic.php
Log Message:
Changes to topic/forum tracking ... tested for several days on test board and all seems fine, give feedback in forums
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -r1.89 -r1.90
*** index.php 2001/12/28 22:24:09 1.89
--- index.php 2002/01/12 17:00:31 1.90
***************
*** 28,32 ****
// Start session management
//
! $userdata = session_pagestart($user_ip, PAGE_INDEX, $session_length);
init_userprefs($userdata);
//
--- 28,32 ----
// Start session management
//
! $userdata = session_pagestart($user_ip, PAGE_INDEX, $board_config['session_length']);
init_userprefs($userdata);
//
***************
*** 85,88 ****
--- 85,93 ----
//
+
+ $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"]) : "";
+
+
//
// If you don't use these stats on your index
***************
*** 227,233 ****
FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
WHERE aa.auth_mod = " . TRUE . "
! AND ug.group_id = aa.group_id
! AND g.group_id = aa.group_id
! AND u.user_id = ug.user_id
ORDER BY aa.forum_id, g.group_id, u.user_id";
if(!$q_forum_mods = $db->sql_query($sql))
--- 232,238 ----
FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
WHERE aa.auth_mod = " . TRUE . "
! AND ug.group_id = aa.group_id
! AND g.group_id = aa.group_id
! AND u.user_id = ug.user_id
ORDER BY aa.forum_id, g.group_id, u.user_id";
if(!$q_forum_mods = $db->sql_query($sql))
***************
*** 323,327 ****
while( list($check_topic_id, $check_post_time) = @each($new_topic_data[$forum_id]) )
{
! if( !isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$check_topic_id"]) )
{
$unread_topics = true;
--- 328,332 ----
while( list($check_topic_id, $check_post_time) = @each($new_topic_data[$forum_id]) )
{
! if( empty($tracking_topics['' . $check_topic_id . '']) )
{
$unread_topics = true;
***************
*** 331,335 ****
else
{
! if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$check_topic_id"] < $check_post_time )
{
$unread_topics = true;
--- 336,340 ----
else
{
! if( $tracking_topics['' . $check_topic_id . ''] < $check_post_time )
{
$unread_topics = true;
***************
*** 339,345 ****
}
! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) )
{
! if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"] > $forum_last_post_time )
{
$unread_topics = false;
--- 344,350 ----
}
! if( !empty($tracking_forums['' . $forum_id . '']) )
{
! if( $tracking_forums['' . $forum_id . ''] > $forum_last_post_time )
{
$unread_topics = false;
***************
*** 474,476 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
--- 479,481 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -r1.136 -r1.137
*** posting.php 2002/01/07 18:50:30 1.136
--- posting.php 2002/01/12 17:00:32 1.137
***************
*** 35,39 ****
{
global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
! global $userdata, $session_length, $user_ip;
global $orig_word, $replacement_word;
global $starttime;
--- 35,39 ----
{
global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
! global $userdata, $user_ip;
global $orig_word, $replacement_word;
global $starttime;
***************
*** 69,73 ****
// Start session management
//
! $userdata = session_pagestart($user_ip, $forum_id, $session_length);
init_userprefs($userdata);
//
--- 69,73 ----
// Start session management
//
! $userdata = session_pagestart($user_ip, $forum_id, $board_config['session_length']);
init_userprefs($userdata);
//
***************
*** 217,225 ****
}
}
-
//
// End page specific functions
// ---------------------------
// -------------------------------------------
// Do some initial checks, set basic variables,
--- 217,228 ----
}
}
//
// End page specific functions
// ---------------------------
+
+
+
+
// -------------------------------------------
// Do some initial checks, set basic variables,
***************
*** 314,326 ****
//
- //
- // Start session management
- //
- $userdata = session_pagestart($user_ip, PAGE_POSTING, $session_length);
- init_userprefs($userdata);
- //
- // End session management
- //
//
// If the mode is set to topic review then output
--- 317,324 ----
//
+
+
+
//
// If the mode is set to topic review then output
***************
*** 338,342 ****
--- 336,354 ----
}
+
+
+
+ //
+ // Start session management
//
+ $userdata = session_pagestart($user_ip, PAGE_POSTING, $board_config['session_length']);
+ init_userprefs($userdata);
+ //
+ // End session management
+ //
+
+
+
+ //
// Set toggles for various options
//
***************
*** 370,373 ****
--- 382,392 ----
$attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']) ) ? TRUE : 0 ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? 0 : $userdata['user_attachsig'] );
+
+
+
+
+
+
+
//
// Here we do various lookups to find topic_id, forum_id, post_id etc.
***************
*** 829,832 ****
--- 848,852 ----
//
$where_sql = ( $userdata['user_id'] == ANONYMOUS ) ? "poster_ip = '$user_ip'" : "poster_id = " . $userdata['user_id'];
+
$sql = "SELECT MAX(post_time) AS last_post_time
FROM " . POSTS_TABLE . "
***************
*** 836,844 ****
$db_row = $db->sql_fetchrow($result);
! $last_post_time = $db_row['last_post_time'];
!
! if( ($current_time - $last_post_time) < $board_config['flood_interval'] )
{
! message_die(GENERAL_MESSAGE, $lang['Flood_Error']);
}
}
--- 856,865 ----
$db_row = $db->sql_fetchrow($result);
! if( $last_post_time = $db_row['last_post_time'] )
{
! if( ($current_time - $last_post_time) < $board_config['flood_interval'] )
! {
! message_die(GENERAL_MESSAGE, $lang['Flood_Error']);
! }
}
}
***************
*** 851,864 ****
$sql = "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote)
VALUES ('" . str_replace("\'", "''", $post_subject) . "', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)";
!
! if( $result = $db->sql_query($sql, BEGIN_TRANSACTION) )
! {
! $new_topic_id = $db->sql_nextid();
! }
! else
{
message_die(GENERAL_ERROR, "Error inserting data into topics table", "", __LINE__, __FILE__, $sql);
}
//
// Handle poll ...
--- 872,883 ----
$sql = "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote)
VALUES ('" . str_replace("\'", "''", $post_subject) . "', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)";
! $result = $db->sql_query($sql, BEGIN_TRANSACTION);
! if( !$result )
{
message_die(GENERAL_ERROR, "Error inserting data into topics table", "", __LINE__, __FILE__, $sql);
}
+ $new_topic_id = $db->sql_nextid();
+
//
// Handle poll ...
***************
*** 952,956 ****
if( $db->sql_query($sql, END_TRANSACTION))
{
! add_search_words($new_post_id, stripslashes($post_message));
//
--- 971,975 ----
if( $db->sql_query($sql, END_TRANSACTION))
{
! add_search_words($new_post_id, stripslashes($post_message), stripslashes($post_subject));
//
***************
*** 1089,1092 ****
--- 1108,1123 ----
}
+ $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array();
+
+ if( count($tracking_topics) == 150 && empty($tracking_topics['' . $new_topic_id . '']) )
+ {
+ asort($tracking_topics);
+ unset($tracking_topics[key($tracking_topics)]);
+ }
+
+ $tracking_topics['' . $new_topic_id . ''] = time();
+
+ setcookie($board_config['cookie_name'] . "_t", serialize($tracking_topics), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
+
//
// If we get here the post has been inserted successfully.
***************
*** 1557,1561 ****
if( $db->sql_query($sql) )
{
! add_search_words($post_id, stripslashes($post_message));
remove_unmatched_words();
--- 1588,1592 ----
if( $db->sql_query($sql) )
{
! add_search_words($post_id, stripslashes($post_message), stripslashes($post_subject));
remove_unmatched_words();
***************
*** 1681,1685 ****
else
{
! add_search_words($post_id, stripslashes($post_message));
remove_unmatched_words();
--- 1712,1716 ----
else
{
! add_search_words($post_id, stripslashes($post_message), stripslashes($post_subject));
remove_unmatched_words();
***************
*** 2141,2144 ****
--- 2172,2176 ----
"FORUM_NAME" => $forum_name,
"L_POST_A" => $page_title,
+ "L_POST_SUBJECT" => $lang['Post_subject'],
"U_VIEW_FORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))
Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** search.php 2002/01/03 11:06:22 1.54
--- search.php 2002/01/12 17:00:32 1.55
***************
*** 30,34 ****
// Start session management
//
! $userdata = session_pagestart($user_ip, PAGE_SEARCH, $session_length);
init_userprefs($userdata);
//
--- 30,34 ----
// Start session management
//
! $userdata = session_pagestart($user_ip, PAGE_SEARCH, $board_config['session_length']);
init_userprefs($userdata);
//
***************
*** 81,84 ****
--- 81,97 ----
}
+ if( isset($HTTP_POST_VARS['searchfields']) )
+ {
+ $search_msg_title = ( $HTTP_POST_VARS['searchfields'] == "all" ) ? 1 : 0;
+ }
+ else if( isset($HTTP_GET_VARS['searchfields']) )
+ {
+ $search_msg_title = ( $HTTP_GET_VARS['searchfields'] == "all" ) ? 1 : 0;
+ }
+ else
+ {
+ $search_msg_title = 0;
+ }
+
if( isset($HTTP_POST_VARS['charsreqd']) || isset($HTTP_GET_VARS['charsreqd']) )
{
***************
*** 219,223 ****
$sql = "SELECT user_id
! FROM ".USERS_TABLE."
WHERE username LIKE '" . str_replace("\'", "''", $query_author) . "'";
$result = $db->sql_query($sql);
--- 232,236 ----
$sql = "SELECT user_id
! FROM " . USERS_TABLE . "
WHERE username LIKE '" . str_replace("\'", "''", $query_author) . "'";
$result = $db->sql_query($sql);
***************
*** 337,340 ****
--- 350,355 ----
$split_search = split_words($cleaned_search);
+ $search_msg_only = ( !$search_msg_title ) ? "AND m.title_match = 0" : "";
+
$word_count = 0;
$word_match = array();
***************
*** 368,372 ****
FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m
WHERE w.word_text LIKE '$match_word'
! AND m.word_id = w.word_id";
$result = $db->sql_query($sql);
if( !$result )
--- 383,389 ----
FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m
WHERE w.word_text LIKE '$match_word'
! AND m.word_id = w.word_id
! AND w.word_common <> 1
! $search_msg_only";
$result = $db->sql_query($sql);
if( !$result )
***************
*** 587,590 ****
--- 604,612 ----
$sql .= " ORDER BY " . $sortby_sql[$sortby] . " $sortby_dir";
+ //
+ // Throw in a limit of 1500 posts/topics ...
+ //
+ $sql .= " LIMIT 1500";
+
if( !$result = $db->sql_query($sql) )
{
***************
*** 822,825 ****
--- 844,850 ----
$highlight_active = urlencode(trim($highlight_active));
+ $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();
+
for($i = 0; $i < min($per_page, count($searchset)); $i++)
{
***************
*** 834,837 ****
--- 859,865 ----
$topic_title = $searchset[$i]['topic_title'];
+ $forum_id = $searchset[$i]['forum_id'];
+ $topic_id = $searchset[$i]['topic_id'];
+
if( $showresults == "posts" )
{
***************
*** 921,924 ****
--- 949,977 ----
}
+ if( $userdata['session_logged_in'] && $searchset[$i]['post_time'] > $userdata['user_lastvisit'] )
+ {
+ if( !empty($tracking_topics['' . $topic_id . '']) && !empty($tracking_forums['' . $forum_id . '']) )
+ {
+ $topic_last_read = ( $tracking_topics['' . $topic_id . ''] > $tracking_forums['' . $forum_id . ''] ) ? $tracking_topics['' . $topic_id . ''] : $tracking_forums['' . $forum_id . ''];
+ }
+ else if( !empty($tracking_topics['' . $topic_id . '']) || !empty($tracking_forums['' . $forum_id . '']) )
+ {
+ $topic_last_read = ( !empty($tracking_topics['' . $topic_id . '']) ) ? $tracking_topics['' . $topic_id . ''] : $tracking_forums['' . $forum_id . ''];
+ }
+
+ if( $searchset[$i]['post_time'] > $topic_last_read )
+ {
+ $mini_post_img = '<img src="' . $images['icon_minipost_new'] . '" alt="' . $lang['New_post'] . '" title="' . $lang['New_post'] . '" border="0" />';
+ }
+ else
+ {
+ $mini_post_img = '<img src="' . $images['icon_minipost'] . '" alt="' . $lang['Post'] . '" title="' . $lang['Post'] . '" border="0" />';
+ }
+ }
+ else
+ {
+ $mini_post_img = '<img src="' . $images['icon_minipost'] . '" alt="' . $lang['Post'] . '" title="' . $lang['Post'] . '" border="0" />';
+ }
+
$template->assign_block_vars("searchresults", array(
"TOPIC_TITLE" => $topic_title,
***************
*** 931,934 ****
--- 984,989 ----
"MESSAGE" => $message,
+ "MINI_POST_IMG" => $mini_post_img,
+
"U_POST" => $post_url,
"U_TOPIC" => $topic_url,
***************
*** 966,972 ****
}
! $forum_id = $searchset[$i]['forum_id'];
! $topic_id = $searchset[$i]['topic_id'];
!
$replies = $searchset[$i]['topic_replies'];
--- 1021,1025 ----
}
! $views = $searchset[$i]['topic_views'];
$replies = $searchset[$i]['topic_replies'];
***************
*** 1045,1103 ****
}
! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) ||
! isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) ||
! isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
{
!
! $unread_topics = true;
!
! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) )
{
! if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"] > $topic_rowset[$i]['post_time'] )
{
- $unread_topics = false;
- }
- }
! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) )
! {
! if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"] > $topic_rowset[$i]['post_time'] )
! {
! $unread_topics = false;
}
! }
! 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'] )
{
! $unread_topics = false;
}
}
-
- if( $unread_topics )
- {
- $folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
-
- $newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
- }
else
{
! $folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
!
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />";
$newest_post_img = "";
}
-
}
! else if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] )
! {
! $folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
!
! $newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
! }
! else
{
! $folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />";
$newest_post_img = "";
--- 1098,1172 ----
}
! if( $userdata['session_logged_in'] )
{
! if( $searchset[$i]['post_time'] > $userdata['user_lastvisit'] )
{
! if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
{
! $unread_topics = true;
!
! if( !empty($tracking_topics['' . $topic_id . '']) )
! {
! if( $tracking_topics['' . $topic_id . ''] > $searchset[$i]['post_time'] )
! {
! $unread_topics = false;
! }
! }
!
! if( !empty($tracking_forums['' . $forum_id . '']) )
! {
! if( $tracking_forums['' . $forum_id . ''] > $searchset[$i]['post_time'] )
! {
! $unread_topics = false;
! }
! }
!
! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
! {
! if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"] > $searchset[$i]['post_time'] )
! {
! $unread_topics = false;
! }
! }
!
! if( $unread_topics )
! {
! $folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
!
! $newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
! }
! else
! {
! $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
!
! $folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />";
! $newest_post_img = "";
! }
!
}
! else if( $searchset[$i]['post_time'] > $userdata['user_lastvisit'] )
! {
! $folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
! $newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
! }
! else
{
! $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
! $folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />";
! $newest_post_img = "";
}
}
else
{
! $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />";
$newest_post_img = "";
}
}
! else
{
! $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />";
$newest_post_img = "";
***************
*** 1109,1126 ****
$last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
! if( $searchset[$i]['id2'] == ANONYMOUS && $searchset[$i]['post_username'] != '' )
! {
! $last_post_user = $searchset[$i]['post_username'];
! }
! else
! {
! $last_post_user = $searchset[$i]['user2'];
! }
$last_post = $last_post_time . "<br />" . $lang['by'] . " ";
$last_post .= "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $searchset[$i]['id2']) . "\">" . $last_post_user . "</a> ";
$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $searchset[$i]['topic_last_post_id']) . "#" . $searchset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>";
-
- $views = $searchset[$i]['topic_views'];
$template->assign_block_vars("searchresults", array(
--- 1178,1186 ----
$last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
! $last_post_user = ( $searchset[$i]['id2'] == ANONYMOUS && $searchset[$i]['post_username'] != '' ) ? $searchset[$i]['post_username'] : $searchset[$i]['user2'];
$last_post = $last_post_time . "<br />" . $lang['by'] . " ";
$last_post .= "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $searchset[$i]['id2']) . "\">" . $last_post_user . "</a> ";
$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $searchset[$i]['topic_last_post_id']) . "#" . $searchset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>";
$template->assign_block_vars("searchresults", array(
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -r1.118 -r1.119
*** viewforum.php 2002/01/02 19:55:45 1.118
--- viewforum.php 2002/01/12 17:00:32 1.119
***************
*** 87,91 ****
// Start session management
//
! $userdata = session_pagestart($user_ip, $forum_id, $session_length);
init_userprefs($userdata);
//
--- 87,91 ----
// Start session management
//
! $userdata = session_pagestart($user_ip, $forum_id, $board_config['session_length']);
init_userprefs($userdata);
//
***************
*** 131,137 ****
$row = $db->sql_fetchrow($result);
if( $row['last_post'] > $userdata['user_lastvisit'] )
{
! setcookie($board_config['cookie_name'] . "_f_$forum_id", time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
}
}
--- 131,147 ----
$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();
+
+ if( count($tracking_forums) == 150 && empty($tracking_forums['' . $forum_id . '']) )
+ {
+ asort($tracking_forums);
+ unset($tracking_forums[key($tracking_forums)]);
+ }
+
if( $row['last_post'] > $userdata['user_lastvisit'] )
{
! $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']);
}
}
***************
*** 149,152 ****
--- 159,167 ----
//
+
+ $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"]) : "";
+
+
//
// Do the forum Prune
***************
*** 523,536 ****
if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] )
{
! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) ||
! isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) ||
! isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
{
$unread_topics = true;
! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) )
{
! if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"] > $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
--- 538,549 ----
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"]) )
{
$unread_topics = true;
! if( !empty($tracking_topics['' . $topic_id . '']) )
{
! if( $tracking_topics['' . $topic_id . ''] > $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
***************
*** 538,544 ****
}
! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) )
{
! if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"] > $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
--- 551,557 ----
}
! if( !empty($tracking_forums['' . $forum_id . '']) )
{
! if( $tracking_forums['' . $forum_id . ''] > $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -r1.162 -r1.163
*** viewtopic.php 2002/01/09 23:35:41 1.162
--- viewtopic.php 2002/01/12 17:00:32 1.163
***************
*** 177,181 ****
// Start session management
//
! $userdata = session_pagestart($user_ip, $forum_id, $session_length);
init_userprefs($userdata);
//
--- 177,181 ----
// Start session management
//
! $userdata = session_pagestart($user_ip, $forum_id, $board_config['session_length']);
init_userprefs($userdata);
//
***************
*** 363,367 ****
for($i = 0; $i < count($previous_days); $i++)
{
! $selected = ($post_days == $previous_days[$i]) ? " selected=\"selected\"" : "";
$select_post_days .= "<option value=\"" . $previous_days[$i] . "\"$selected>" . $previous_days_text[$i] . "</option>";
}
--- 363,367 ----
for($i = 0; $i < count($previous_days); $i++)
{
! $selected = ($post_days == $previous_days[$i]) ? ' selected="selected"' : '';
$select_post_days .= "<option value=\"" . $previous_days[$i] . "\"$selected>" . $previous_days_text[$i] . "</option>";
}
***************
*** 398,404 ****
FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
WHERE p.topic_id = $topic_id
- AND p.poster_id = u.user_id
- AND p.post_id = pt.post_id
$limit_posts_time
ORDER BY p.post_time $post_time_order
LIMIT $start, ".$board_config['posts_per_page'];
--- 398,404 ----
FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
WHERE p.topic_id = $topic_id
$limit_posts_time
+ AND pt.post_id = p.post_id
+ AND u.user_id = p.poster_id
ORDER BY p.post_time $post_time_order
LIMIT $start, ".$board_config['posts_per_page'];
***************
*** 504,516 ****
//
! // Dump out the page header and load viewtopic body template
//
! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) && isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) )
{
! $topic_last_read = ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"] > $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"] ) ? $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"] : $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"];
}
! else if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) )
{
! $topic_last_read = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) ) ? $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"] : $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"];
}
else
--- 504,519 ----
//
! // Set a cookie for this topic
//
! $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( !empty($tracking_topics['' . $topic_id . '']) && !empty($tracking_forums['' . $forum_id . '']) )
{
! $topic_last_read = ( $tracking_topics['' . $topic_id . ''] > $tracking_forums['' . $forum_id . ''] ) ? $tracking_topics['' . $topic_id . ''] : $tracking_forums['' . $forum_id . ''];
}
! else if( !empty($tracking_topics['' . $topic_id . '']) || !empty($tracking_forums['' . $forum_id . '']) )
{
! $topic_last_read = ( !empty($tracking_topics['' . $topic_id . '']) ) ? $tracking_topics['' . $topic_id . ''] : $tracking_forums['' . $forum_id . ''];
}
else
***************
*** 519,527 ****
}
//
! // Set a cookie for this topic
//
- setcookie($board_config['cookie_name'] . "_t_$topic_id", time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
-
//
// Load templates
--- 522,538 ----
}
+ if( count($tracking_topics) == 150 && empty($tracking_topics['' . $topic_id . '']) )
+ {
+ asort($tracking_topics);
+ unset($tracking_topics[key($tracking_topics)]);
+ }
+
+ $tracking_topics['' . $topic_id . ''] = time();
+
+ setcookie($board_config['cookie_name'] . "_t", serialize($tracking_topics), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
+
//
! // Dump out the page header and load viewtopic body template
//
//
// Load templates
***************
*** 543,546 ****
--- 554,616 ----
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
+ //
+ // Output page header
+ //
+ $page_title = $lang['View_topic'] ." - $topic_title";
+ include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+ //
+ // End header
+ //
+
+ //
+ // 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_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_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 />";
+
+ if( $is_auth['auth_mod'] )
+ {
+ $s_auth_can .= sprintf($lang['Rules_moderate'], '<a href="' . append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a>');
+
+ $topic_mod = '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=delete") . '"><img src="' . $images['topic_mod_delete'] . '" alt="' . $lang['Delete_topic'] . '" title="' . $lang['Delete_topic'] . '" border="0" /></a> ';
+
+ $topic_mod .= '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=move"). '"><img src="' . $images['topic_mod_move'] . '" alt="' . $lang['Move_topic'] . '" title="' . $lang['Move_topic'] . '" border="0" /></a> ';
+
+ $topic_mod .= ( $forum_row['topic_status'] == TOPIC_UNLOCKED ) ? '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=lock") . '"><img src="' . $images['topic_mod_lock'] . '" alt="' . $lang['Lock_topic'] . '" title="' . $lang['Lock_topic'] . '" border="0" /></a> ' : '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=unlock") . '"><img src="' . $images['topic_mod_unlock'] . '" alt="' . $lang['Unlock_topic'] . '" title="' . $lang['Unlock_topic'] . '" border="0" /></a> ';
+
+ $topic_mod .= '<a href="' . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=split") . '"><img src="' . $images['topic_mod_split'] . '" alt="' . $lang['Split_topic'] . '" title="' . $lang['Split_topic'] . '" border="0" /></a> ';
+ }
+
+ //
+ // Topic watch information
+ //
+ $s_watching_topic = "";
+
+ if( $can_watch_topic )
+ {
+ if( $is_watching_topic )
+ {
+ $s_watching_topic = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&unwatch=topic&start=$start") . '">' . $lang['Stop_watching_topic'] . '</a>';
+ $s_watching_topic_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&unwatch=topic&start=$start") . '"><img src="' . $images['Topic_un_watch'] . '" alt="' . $lang['Stop_watching_topic'] . '" title="' . $lang['Stop_watching_topic'] . '" border="0"></a>';
+ }
+ else
+ {
+ $s_watching_topic = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&watch=topic&start=$start") . '">' . $lang['Start_watching_topic'] . '</a>';
+ $s_watching_topic_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&watch=topic&start=$start") . '"><img src="' . $images['Topic_watch'] . '" alt="' . $lang['Stop_watching_topic'] . '" title="' . $lang['Start_watching_topic'] . '" border="0"></a>';
+ }
+ }
+
+ //
+ // If we've got a hightlight set pass it on to pagination,
+ // I get annoyed when I lose my highlight after the first page.
+ //
+ $pagination = ( $highlight_active ) ? generate_pagination("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&postdays=$post_days&postorder=$post_order&highlight=" . $HTTP_GET_VARS['highlight'], $total_replies, $board_config['posts_per_page'], $start) : generate_pagination("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&postdays=$post_days&postorder=$post_order", $total_replies, $board_config['posts_per_page'], $start);
+
+ //
+ // Send vars to template
+ //
$template->assign_vars(array(
"FORUM_ID" => $forum_id,
***************
*** 548,551 ****
--- 618,623 ----
"TOPIC_ID" => $topic_id,
"TOPIC_TITLE" => $topic_title,
+ "PAGINATION" => $pagination,
+ "PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $board_config['posts_per_page'] ) + 1 ), ceil( $total_replies / $board_config['posts_per_page'] )),
"IMG_POST" => $post_img,
***************
*** 560,563 ****
--- 632,641 ----
"L_BACK_TO_TOP" => $lang['Back_to_top'],
"L_DISPLAY_POSTS" => $lang['Display_posts'],
+ "L_LOCK_TOPIC" => $lang['Lock_topic'],
+ "L_UNLOCK_TOPIC" => $lang['Unlock_topic'],
+ "L_MOVE_TOPIC" => $lang['Move_topic'],
+ "L_SPLIT_TOPIC" => $lang['Split_topic'],
+ "L_DELETE_TOPIC" => $lang['Delete_topic'],
+ "L_GOTO_PAGE" => $lang['Goto_page'],
"S_TOPIC_LINK" => POST_TOPIC_URL,
***************
*** 565,568 ****
--- 643,649 ----
"S_SELECT_POST_ORDER" => $select_post_order,
"S_POST_DAYS_ACTION" => append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&start=$start"),
+ "S_AUTH_LIST" => $s_auth_can,
+ "S_TOPIC_ADMIN" => $topic_mod,
+ "S_WATCH_TOPIC" => $s_watching_topic,
"U_VIEW_FORUM" => $view_forum_url,
***************
*** 574,588 ****
//
! // Output page header
! //
! $page_title = $lang['View_topic'] ." - $topic_title";
! include($phpbb_root_path . 'includes/page_header.'.$phpEx);
//
- // End header
- //
-
- //
- // Does this topic contain a voting element?
- //
if( !empty($forum_row['topic_vote']) )
{
--- 655,660 ----
//
! // Does this topic contain a poll?
//
if( !empty($forum_row['topic_vote']) )
{
***************
*** 1077,1161 ****
}
- //
- // 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_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_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 />";
-
- if( $is_auth['auth_mod'] )
- {
- $s_auth_can .= sprintf($lang['Rules_moderate'], "<a href=\"" . append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">", "</a>");
-
- $topic_mod = "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=delete") . "\"><img src=\"" . $images['topic_mod_delete'] . "\" alt=\"" . $lang['Delete_topic'] . "\" title=\"" . $lang['Delete_topic'] . "\" border=\"0\" /></a> ";
-
- $topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=move"). "\"><img src=\"" . $images['topic_mod_move'] . "\" alt=\"" . $lang['Move_topic'] . "\" title=\"" . $lang['Move_topic'] . "\" border=\"0\" /></a> ";
-
- if($forum_row['topic_status'] == TOPIC_UNLOCKED)
- {
- $topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=lock") . "\"><img src=\"" . $images['topic_mod_lock'] . "\" alt=\"" . $lang['Lock_topic'] . "\" title=\"" . $lang['Lock_topic'] . "\" border=\"0\" /></a> ";
- }
- else
- {
- $topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=unlock") . "\"><img src=\"" . $images['topic_mod_unlock'] . "\" alt=\"" . $lang['Unlock_topic'] . "\" title=\"" . $lang['Unlock_topic'] . "\" border=\"0\" /></a> ";
- }
- $topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=split") . "\"><img src=\"" . $images['topic_mod_split'] . "\" alt=\"" . $lang['Split_topic'] . "\" title=\"" . $lang['Split_topic'] . "\" border=\"0\" /></a> ";
- }
-
- //
- // Topic watch information
- //
- if( $can_watch_topic )
- {
- if( $is_watching_topic )
- {
- $s_watching_topic = "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&unwatch=topic&start=$start") . "\">" . $lang['Stop_watching_topic'] . "</a>";
- $s_watching_topic_img = "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&unwatch=topic&start=$start") . "\"><img src=\"" . $images['Topic_un_watch'] . "\" alt=\"" . $lang['Stop_watching_topic'] . "\" title=\"" . $lang['Stop_watching_topic'] . "\" border=\"0\"></a>";
- }
- else
- {
- $s_watching_topic = "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&watch=topic&start=$start") . "\">" . $lang['Start_watching_topic'] . "</a>";
- $s_watching_topic_img = "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&watch=topic&start=$start") . "\"><img src=\"" . $images['Topic_watch'] . "\" alt=\"" . $lang['Start_watching_topic'] . "\" title=\"" . $lang['Start_watching_topic'] . "\" border=\"0\"></a>";
- }
- }
- else
- {
- $s_watching_topic = "";
- }
-
- //
- // If we've got a hightlight set pass it on to pagination, I get annoyed when I lose my highlight after the first page.
- //
- if(isset($HTTP_GET_VARS['highlight']))
- {
- $pagination = generate_pagination("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&postdays=$post_days&postorder=$post_order&highlight=" . $HTTP_GET_VARS['highlight'], $total_replies, $board_config['posts_per_page'], $start);
- }
- else
- {
- $pagination = generate_pagination("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&postdays=$post_days&postorder=$post_order", $total_replies, $board_config['posts_per_page'], $start);
- }
-
- $template->assign_vars(array(
- "PAGINATION" => $pagination,
- "PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $board_config['posts_per_page'] ) + 1 ), ceil( $total_replies / $board_config['posts_per_page'] )),
-
- "L_LOCK_TOPIC" => $lang['Lock_topic'],
- "L_UNLOCK_TOPIC" => $lang['Unlock_topic'],
- "L_MOVE_TOPIC" => $lang['Move_topic'],
- "L_SPLIT_TOPIC" => $lang['Split_topic'],
- "L_DELETE_TOPIC" => $lang['Delete_topic'],
-
- "S_AUTH_LIST" => $s_auth_can,
- "S_TOPIC_ADMIN" => $topic_mod,
- "S_WATCH_TOPIC" => $s_watching_topic,
-
- "L_GOTO_PAGE" => $lang['Goto_page'])
- );
-
$template->pparse("body");
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
--- 1149,1155 ----
}
$template->pparse("body");
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
|
