Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 index.php,1.91,1.92 viewforum.php,1.123,1.124 viewtopic.php,1.167,1.168
|
From: Paul S. O. <ps...@us...> - 2002-01-28 17:20:43
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5466
Modified Files:
index.php viewforum.php viewtopic.php
Log Message:
Fix various var not set warnings ... many thanks go to The Horta for pointing out and offering fixes for many of these
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** index.php 2002/01/27 00:55:20 1.91
--- index.php 2002/01/28 17:20:40 1.92
***************
*** 28,32 ****
// Start session management
//
! $userdata = session_pagestart($user_ip, PAGE_INDEX, $board_config['session_length']);
init_userprefs($userdata);
//
--- 28,32 ----
// Start session management
//
! $userdata = session_pagestart($user_ip, PAGE_INDEX);
init_userprefs($userdata);
//
***************
*** 195,198 ****
--- 195,199 ----
}
+ $new_topic_data = array();
while( $topic_data = $db->sql_fetchrow($result) )
{
***************
*** 325,329 ****
if( $userdata['session_logged_in'] )
{
! if( count($new_topic_data[$forum_id]) )
{
$forum_last_post_time = 0;
--- 326,330 ----
if( $userdata['session_logged_in'] )
{
! if( !empty($new_topic_data[$forum_id]) )
{
$forum_last_post_time = 0;
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -r1.123 -r1.124
*** viewforum.php 2002/01/27 13:14:15 1.123
--- viewforum.php 2002/01/28 17:20:40 1.124
***************
*** 87,91 ****
// Start session management
//
! $userdata = session_pagestart($user_ip, $forum_id, $board_config['session_length']);
init_userprefs($userdata);
//
--- 87,91 ----
// Start session management
//
! $userdata = session_pagestart($user_ip, $forum_id);
init_userprefs($userdata);
//
***************
*** 222,225 ****
--- 222,226 ----
}
+ $l_moderators = ( count($moderators) == 1 ) ? $lang['Moderator'] : $lang['Moderators'];
$forum_moderators = ( count($moderators) ) ? implode(", ", $moderators) : $lang['None'];
unset($moderators);
***************
*** 387,402 ****
"FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'],
! "L_MODERATOR" => ( $total_mods == 1 ) ? $lang['Moderator'] : $lang['Moderators'],
"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'],
! "U_MARK_READ" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&mark=topics"),
!
! "S_AUTH_LIST" => $s_auth_can,
! "S_AUTH_READ_IMG" => $s_auth_read_img,
! "S_AUTH_POST_IMG" => $s_auth_post_img,
! "S_AUTH_REPLY_IMG" => $s_auth_reply_img,
! "S_AUTH_EDIT_IMG" => $s_auth_edit_img,
! "S_AUTH_MOD_IMG" => $s_auth_mod_img)
);
//
--- 388,396 ----
"FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'],
! "L_MODERATOR" => $l_moderators,
"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'],
! "U_MARK_READ" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&mark=topics"))
);
//
Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -r1.167 -r1.168
*** viewtopic.php 2002/01/27 22:13:17 1.167
--- viewtopic.php 2002/01/28 17:20:40 1.168
***************
*** 177,181 ****
// Start session management
//
! $userdata = session_pagestart($user_ip, $forum_id, $board_config['session_length']);
init_userprefs($userdata);
//
--- 177,181 ----
// Start session management
//
! $userdata = session_pagestart($user_ip, $forum_id);
init_userprefs($userdata);
//
***************
*** 378,381 ****
--- 378,382 ----
else
{
+ $post_order = "asc";
$post_time_order = "ASC";
}
***************
*** 418,426 ****
FROM " . RANKS_TABLE . "
ORDER BY rank_special, rank_min";
! if(!$ranks_result = $db->sql_query($sql))
{
message_die(GENERAL_ERROR, "Couldn't obtain ranks information.", "", __LINE__, __FILE__, $sql);
}
! $ranksrow = $db->sql_fetchrowset($ranksresult);
//
--- 419,427 ----
FROM " . RANKS_TABLE . "
ORDER BY rank_special, rank_min";
! if( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, "Couldn't obtain ranks information.", "", __LINE__, __FILE__, $sql);
}
! $ranksrow = $db->sql_fetchrowset($result);
//
***************
*** 507,535 ****
// 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
{
! $topic_last_read = $userdata['session_last_visit'];
! }
! 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']);
//
--- 508,539 ----
// Set a cookie for this topic
//
! if( $userdata['session_logged_in'] )
{
! $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
! {
! $topic_last_read = $userdata['user_lastvisit'];
! }
! 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']);
! }
//
***************
*** 596,605 ****
{
$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>';
}
}
--- 600,609 ----
{
$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 = ( isset($images['Topic_un_watch']) ) ? '<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 = ( isset($images['Topic_watch']) ) ? '<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>' : '';
}
}
***************
*** 1137,1141 ****
"EDIT_IMG" => $edit_img,
"QUOTE_IMG" => $quote_img,
- "PMSG_IMG" => $pmsg_img,
"IP_IMG" => $ip_img,
"DELETE_IMG" => $delpost_img,
--- 1141,1144 ----
|
