Various fixes, see CHANGELOG

git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3214 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/admin/admin_board.php

@@ -47,6 +47,11 @@ else
 		
 		$new[$config_name] = ( isset($HTTP_POST_VARS[$config_name]) ) ? $HTTP_POST_VARS[$config_name] : $default_config[$config_name];
 
+		if ($config_name == 'cookie_name')
+		{
+			$cookie_name = str_replace('.', '_', $new['cookie_name']);
+		}
+
 		if( isset($HTTP_POST_VARS['submit']) )
 		{
 			$sql = "UPDATE " . CONFIG_TABLE . " SET

phpBB/docs/CHANGELOG.html

@@ -152,6 +152,11 @@ p,ul,td {font-size:10pt;}
 <li>Fixed continuing redirect issues for broken web servers, e.g. IIS+CGI PHP</li>
 <li>Fixed inability to use ftp as a protocol for the [img] tag</li>
 <li>Fixed incorrect handling of [img] tags containing %20 encoded spaces</li>
+<li>Added check for . within cookie_name, change to _ if present</li>
+<li>Added SHOW_ONLINE constant to limit "users online" code operation to index and viewforum</li>
+<li>Added "temporary" workaround for Apache2 + PHP module ignoring "private" cache header</li>
+<li>Added workaround for modcp IP lookup and links to Anonymous user profile</li>
+<li>Fixed broken bbcode parsing of quotes containing bbcode in the "username"</li>
 <li></li>
 </ul>
 

phpBB/includes/bbcode.php

@@ -149,6 +149,14 @@ function bbencode_second_pass($text, $uid)
 	// [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts.
 	$text = bbencode_second_pass_code($text, $uid, $bbcode_tpl);
 
+	// [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff.
+	$text = str_replace("[quote:$uid]", $bbcode_tpl['quote_open'], $text);
+	$text = str_replace("[/quote:$uid]", $bbcode_tpl['quote_close'], $text);
+
+	// New one liner to deal with opening quotes with usernames...
+	// replaces the two line version that I had here before..
+	$text = preg_replace("/\[quote:$uid=\"(.*?)\"\]/si", $bbcode_tpl['quote_username_open'], $text);
+
 	// [list] and [list=x] for (un)ordered lists.
 	// unordered lists
 	$text = str_replace("[list:$uid]", $bbcode_tpl['ulist_open'], $text);
@@ -168,14 +176,6 @@ function bbencode_second_pass($text, $uid)
 	$text = preg_replace("/\[size=([1-2]?[0-9]):$uid\]/si", $bbcode_tpl['size_open'], $text);
 	$text = str_replace("[/size:$uid]", $bbcode_tpl['size_close'], $text);
 
-	// [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff.
-	$text = str_replace("[quote:$uid]", $bbcode_tpl['quote_open'], $text);
-	$text = str_replace("[/quote:$uid]", $bbcode_tpl['quote_close'], $text);
-
-	// New one liner to deal with opening quotes with usernames...
-	// replaces the two line version that I had here before..
-	$text = preg_replace("/\[quote:$uid=(?:\"?([^\"]*)\"?)\]/si", $bbcode_tpl['quote_username_open'], $text);
-
 	// [b] and [/b] for bolding text.
 	$text = str_replace("[b:$uid]", $bbcode_tpl['b_open'], $text);
 	$text = str_replace("[/b:$uid]", $bbcode_tpl['b_close'], $text);

phpBB/includes/page_header.php

@@ -87,6 +87,14 @@ $s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['
 // Get basic (usernames + totals) online
 // situation
 //
+$logged_visible_online = 0;
+$logged_hidden_online = 0;
+$guests_online = 0;
+$online_userlist = '';
+
+if (defined('SHOW_ONLINE'))
+{
+
 	$user_forum_sql = ( !empty($forum_id) ) ? "AND s.session_page = " . intval($forum_id) : '';
 	$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip
 		FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
@@ -102,11 +110,6 @@ if( !($result = $db->sql_query($sql)) )
 	$userlist_ary = array();
 	$userlist_visible = array();
 
-$logged_visible_online = 0;
-$logged_hidden_online = 0;
-$guests_online = 0;
-$online_userlist = '';
-
 	$prev_user_id = 0;
 	$prev_user_ip = '';
 
@@ -160,6 +163,7 @@ while( $row = $db->sql_fetchrow($result) )
 
 		$prev_session_ip = $row['session_ip'];
 	}
+	$db->sql_freeresult($result);
 
 	if ( empty($online_userlist) )
 	{
@@ -247,6 +251,7 @@ $l_online_users = sprintf($l_t_user_s, $total_online_users);
 	$l_online_users .= sprintf($l_r_user_s, $logged_visible_online);
 	$l_online_users .= sprintf($l_h_user_s, $logged_hidden_online);
 	$l_online_users .= sprintf($l_g_user_s, $guests_online);
+}
 
 //
 // Obtain number of new private messages
@@ -448,7 +453,16 @@ else
 	}
 }
 
+// Work around for "current" Apache 2 + PHP module which seems to not
+// cope with private cache control setting
+if (!empty($HTTP_SERVER_VARS['SERVER_SOFTWARE']) && strstr($HTTP_SERVER_VARS['SERVER_SOFTWARE'], 'Apache/2'))
+{
+	header ('Cache-Control: no-cache, pre-check=0, post-check=0, max-age=0');
+}
+else
+{
 	header ('Cache-Control: private, pre-check=0, post-check=0, max-age=0');
+}
 header ('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
 header ('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 

phpBB/index.php

@@ -251,6 +251,7 @@ if( ( $total_categories = count($category_rows) ) )
 	//
 	// Start output of page
 	//
+	define('SHOW_ONLINE', true);
 	$page_title = $lang['Index'];
 	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 

phpBB/modcp.php

@@ -991,7 +991,7 @@ switch( $mode )
 					'POSTS' => $row['postings'] . ' ' . ( ( $row['postings'] == 1 ) ? $lang['Post'] : $lang['Posts'] ),
 					'L_SEARCH_POSTS' => sprintf($lang['Search_user_posts'], $username), 
 
-					'U_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$id"),
+					'U_PROFILE' => ($id == ANONYMOUS) ? "modcp.$phpEx?mode=ip&" . POST_POST_URL . "=" . $post_id . "&" . POST_TOPIC_URL . "=" . $topic_id . "&sid=" . $userdata['session_id'] : append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$id"),
 					'U_SEARCHPOSTS' => append_sid("search.$phpEx?search_author=" . urlencode($username) . "&showresults=topics"))
 				);
 

phpBB/viewforum.php

@@ -385,6 +385,7 @@ $nav_links['up'] = array(
 //
 // Dump out the page header and load viewforum template
 //
+define('SHOW_ONLINE', true);
 $page_title = $lang['View_forum'] . ' - ' . $forum_row['forum_name'];
 include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 

phpBB/viewtopic.php

@@ -996,11 +996,11 @@ for($i = 0; $i < $total_posts; $i++)
 
 	if ( $is_auth['auth_mod'] )
 	{
-		$temp_url = append_sid("modcp.$phpEx?mode=ip&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&amp;" . POST_TOPIC_URL . "=" . $topic_id);
+		$temp_url = "modcp.$phpEx?mode=ip&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&amp;" . POST_TOPIC_URL . "=" . $topic_id . "&amp;sid=" . $userdata['session_id'];
 		$ip_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_ip'] . '" alt="' . $lang['View_IP'] . '" title="' . $lang['View_IP'] . '" border="0" /></a>';
 		$ip = '<a href="' . $temp_url . '">' . $lang['View_IP'] . '</a>';
 
-		$temp_url = append_sid("posting.$phpEx?mode=delete&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id']);
+		$temp_url = "posting.$phpEx?mode=delete&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&amp;sid=" . $userdata['session_id'];
 		$delpost_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_delpost'] . '" alt="' . $lang['Delete_post'] . '" title="' . $lang['Delete_post'] . '" border="0" /></a>';
 		$delpost = '<a href="' . $temp_url . '">' . $lang['Delete_post'] . '</a>';
 	}
@@ -1011,7 +1011,7 @@ for($i = 0; $i < $total_posts; $i++)
 
 		if ( $userdata['user_id'] == $poster_id && $is_auth['auth_delete'] && $forum_topic_data['topic_last_post_id'] == $postrow[$i]['post_id'] )
 		{
-			$temp_url = append_sid("posting.$phpEx?mode=delete&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id']);
+			$temp_url = "posting.$phpEx?mode=delete&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&amp;sid=" . $userdata['session_id'];
 			$delpost_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_delpost'] . '" alt="' . $lang['Delete_post'] . '" title="' . $lang['Delete_post'] . '" border="0" /></a>';
 			$delpost = '<a href="' . $temp_url . '">' . $lang['Delete_post'] . '</a>';
 		}