phpbb-checkins Mailing List for phpBB (Page 602)

phpBB is the world's leading open source discussion forum software.

Brought to you by: acydburn, marshalrusty, naderman, noxwizard979

phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (193)	Nov (393)	Dec (347)
2002	Jan (401)	Feb (232)	Mar (343)	Apr (129)	May (129)	Jun (116)	Jul (189)	Aug (129)	Sep (68)	Oct (172)	Nov (298)	Dec (148)
2003	Jan (264)	Feb (210)	Mar (322)	Apr (309)	May (234)	Jun (188)	Jul (215)	Aug (161)	Sep (234)	Oct (163)	Nov (110)	Dec (7)
2004	Jan (95)	Feb (107)	Mar (55)	Apr (3)	May (49)	Jun (35)	Jul (57)	Aug (43)	Sep (56)	Oct (40)	Nov (25)	Dec (21)
2005	Jan (93)	Feb (25)	Mar (22)	Apr (72)	May (45)	Jun (24)	Jul (29)	Aug (20)	Sep (50)	Oct (93)	Nov (69)	Dec (183)
2006	Jan (185)	Feb (143)	Mar (402)	Apr (260)	May (322)	Jun (367)	Jul (234)	Aug (299)	Sep (206)	Oct (288)	Nov (338)	Dec (307)
2007	Jan (296)	Feb (250)	Mar (261)	Apr (434)	May (539)	Jun (274)	Jul (440)	Aug (190)	Sep (128)	Oct (249)	Nov (86)	Dec (51)
2008	Jan (177)	Feb (67)	Mar (61)	Apr (48)	May (56)	Jun (97)	Jul (60)	Aug (64)	Sep (151)	Oct (79)	Nov (109)	Dec (123)
2009	Jan (70)	Feb (70)	Mar (73)	Apr (80)	May (22)	Jun (193)	Jul (191)	Aug (181)	Sep (120)	Oct (48)	Nov (24)	Dec

Flat | Threaded

<< < 1 .. 600 601 602 603 604 .. 629 > >> (Page 602 of 629)

[Phpbb-checkins] CVS: phpBB2 viewonline.php,1.38,1.39

From: Paul S. O. <ps...@us...> - 2001-12-14 02:41:03

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv11561

Modified Files:
	viewonline.php 
Log Message:
Remove guest user topic tracking via cookies, update viewtopic to re-fix highlighting of search terms, add lang capability to images, various other issues, removed remote avatar size reduction

Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** viewonline.php	2001/11/16 17:27:36	1.38
--- viewonline.php	2001/12/14 02:41:00	1.39
***************
*** 78,87 ****
  //
  
! $sql = "SELECT u.user_id, u.username, u.user_allow_viewonline, s.session_page, s.session_logged_in, s.session_time
  	FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
! 	WHERE u.user_id <> " . ANONYMOUS . "
! 		AND u.user_id = s.session_user_id
! 		AND s.session_time >= " . ( time() - 300 ) . "
! 		AND s.session_logged_in = " . TRUE . "
  	ORDER BY s.session_time DESC";
  if(!$result = $db->sql_query($sql))
--- 78,87 ----
  //
  
! $sql = "SELECT u.user_id, u.username, u.user_session_time, u.user_session_page, u.user_allow_viewonline, s.session_logged_in 
  	FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
! 	WHERE s.session_logged_in = " . TRUE . " 
! 		AND u.user_id = s.session_user_id 
! 		AND u.user_id <> " . ANONYMOUS . " 
! 		AND u.user_session_time >= " . ( time() - 300 ) . " 
  	ORDER BY s.session_time DESC";
  if(!$result = $db->sql_query($sql))
***************
*** 91,95 ****
  $onlinerow_reg = $db->sql_fetchrowset($result);
  
! $sql = "SELECT session_page, session_logged_in, session_time, session_ip
  	FROM " . SESSIONS_TABLE . "
  	WHERE session_logged_in = 0
--- 91,95 ----
  $onlinerow_reg = $db->sql_fetchrowset($result);
  
! $sql = "SELECT session_page, session_logged_in, session_time 
  	FROM " . SESSIONS_TABLE . "
  	WHERE session_logged_in = 0
***************
*** 162,168 ****
  			}
  
! 			if( $onlinerow_reg[$i]['session_page'] < 1 || !$is_auth_ary[$onlinerow_reg[$i]['session_page']]['auth_view'] )
  			{
! 				switch($onlinerow_reg[$i]['session_page'])
  				{
  					case PAGE_INDEX:
--- 162,168 ----
  			}
  
! 			if( $onlinerow_reg[$i]['user_session_page'] < 1 || !$is_auth_ary[$onlinerow_reg[$i]['user_session_page']]['auth_view'] )
  			{
! 				switch($onlinerow_reg[$i]['user_session_page'])
  				{
  					case PAGE_INDEX:
***************
*** 209,214 ****
  			else
  			{
! 				$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $onlinerow_reg[$i]['session_page']);
! 				$location = $forum_data[$onlinerow_reg[$i]['session_page']];
  			}
  
--- 209,214 ----
  			else
  			{
! 				$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $onlinerow_reg[$i]['user_session_page']);
! 				$location = $forum_data[$onlinerow_reg[$i]['user_session_page']];
  			}
  
***************
*** 222,226 ****
  					"ROW_CLASS" => $row_class,
  					"USERNAME" => $username,
! 					"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['session_time'], $board_config['board_timezone']),
  					"FORUM_LOCATION" => $location,
  
--- 222,226 ----
  					"ROW_CLASS" => $row_class,
  					"USERNAME" => $username,
! 					"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['user_session_time'], $board_config['board_timezone']),
  					"FORUM_LOCATION" => $location,

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.92,1.93 sessions.php,1.39,1.40 page_header.php,1.76,1.77

From: Paul S. O. <ps...@us...> - 2001-12-14 02:39:47

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv11288/includes

Modified Files:
	functions.php sessions.php page_header.php 
Log Message:
Remove guest user topic tracking via cookies, update viewtopic to re-fix highlighting of search terms, add lang capability to images, various other issues, removed remote avatar size reduction

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -r1.92 -r1.93
*** functions.php	2001/12/11 08:43:05	1.92
--- functions.php	2001/12/14 02:39:44	1.93
***************
*** 281,302 ****
  	}
  
! 	if( file_exists($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.".$phpEx) )
  	{
! 		include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
  	}
! 	else
! 	{
! 		include($phpbb_root_path . 'language/lang_english/lang_main.' . $phpEx);
! 	}
  
  	if( defined("IN_ADMIN") )
  	{
! 		if( file_exists($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.".$phpEx) )
  		{
! 			include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
  		}
! 		else
  		{
! 			include($phpbb_root_path . 'language/lang_english/lang_admin.' . $phpEx);
  		}
  	}
--- 281,308 ----
  	}
  
! 	if( !file_exists($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.".$phpEx) )
  	{
! 		$board_config['default_lang'] = "english";
  	}
! 
! 	include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
  
  	if( defined("IN_ADMIN") )
  	{
! 		if( !file_exists($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.".$phpEx) )
  		{
! 			$board_config['default_lang'] = "english";
  		}
! 
! 		include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
! 	}
! 
! 	while( list($key, $value) = @each($images) )
! 	{
! 		if( strstr($value, "_lang") )
  		{
! 			$new_value = str_replace("_lang", "_" . $board_config['default_lang'], $value);
! 	
! 			$images[$key] = ( !file_exists($new_value) ) ? $new_value : str_replace("_lang", "_english", $value);
  		}
  	}
***************
*** 325,333 ****
  	$template_name = $row['template_name'] ;
  
! 	$template = new Template($phpbb_root_path . $template_path . $template_name);
  
  	if( $template )
  	{
! 		$current_template_path = $template_path . $template_name . '/';
  		@include($phpbb_root_path . $template_path . $template_name . '/' . $template_name . '.cfg');
  
--- 331,339 ----
  	$template_name = $row['template_name'] ;
  
! 	$template = new Template($phpbb_root_path . $template_path . $template_name, $db);
  
  	if( $template )
  	{
! 		$current_template_path = $template_path . $template_name;
  		@include($phpbb_root_path . $template_path . $template_name . '/' . $template_name . '.cfg');
  
***************
*** 1178,1185 ****
  }
  
- 
- 
  //
! // this does exactly what preg_quote() does in PHP 4-ish: http://www.php.net/manual/en/function.preg-quote.php
  //
  // This function is here because the 2nd paramter to preg_quote was added in some
--- 1184,1190 ----
  }
  
  //
! // this does exactly what preg_quote() does in PHP 4-ish: 
! // http://www.php.net/manual/en/function.preg-quote.php
  //
  // This function is here because the 2nd paramter to preg_quote was added in some
***************
*** 1196,1200 ****
  	return $text;
  }
- 
  
! ?>
--- 1201,1204 ----
  	return $text;
  }
  
! ?>
\ No newline at end of file

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** sessions.php	2001/12/05 00:20:56	1.39
--- sessions.php	2001/12/14 02:39:44	1.40
***************
*** 51,133 ****
  		$sessionmethod = SESSION_METHOD_GET;
  	}
  	$current_time = time();
  	$expiry_time = $current_time - $session_length;
  
  	//
! 	// Initial ban check against IP and userid
  	//
! 	ereg("(..)(..)(..)(..)", $user_ip, $user_ip_parts);
! 
! 	$sql = "SELECT ban_ip, ban_userid
! 		FROM " . BANLIST_TABLE . "
! 		WHERE ban_ip = '" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . $user_ip_parts[4] . "'
! 			OR ban_ip = '" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . "ff'
! 			OR ban_ip = '" . $user_ip_parts[1] . $user_ip_parts[2] . "ffff'
! 			OR ban_ip = '" . $user_ip_parts[1] . "ffffff'
! 			OR ban_userid = $user_id";
! 	$result = $db->sql_query($sql);
! 	if (!$result)
  	{
- 		message_die(CRITICAL_ERROR, "Couldn't obtain ban information.", "", __LINE__, __FILE__, $sql);
- 	}
- 
- 	$ban_info = $db->sql_fetchrow($result);
- 
- 	//
- 	// Check for user and ip ban ...
- 	//
- 	if($ban_info['ban_ip'] || $ban_info['ban_userid'])
- 	{
- 		message_die(CRITICAL_MESSAGE, 'You_been_banned');
- 	}
- 	else
- 	{
  		//
! 		// Try and pull the last time stored
! 		// in a cookie, if it exists
  		//
! 		if( $user_id != ANONYMOUS )
  		{
! 			//
! 			// This is a 'work-around' since I managed to 
! 			// freeze the schema without re-visiting sessions,
! 			// what's needed is a session timer in the user table
! 			// + the user_lastvisit ... damn damn damn damn and blast
! 			//
! 			$sql = "SELECT user_autologin_key, user_lastvisit 
! 				FROM " . USERS_TABLE . " 
! 				WHERE user_id = $user_id";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				message_die(CRITICAL_ERROR, "Couldn't obtain lastvisit data from user table", "", __LINE__, __FILE__, $sql);
! 			}
! 	
! 			$row = $db->sql_fetchrow($result);
  
! 			$sessiondata['lastvisit'] = $row['user_lastvisit']; 
  
! 			if( $auto_create )
  			{
! 				if( isset($sessiondata['autologinid']) )
  				{
! 					if( $sessiondata['autologinid'] == $row['user_autologin_key'] )
! 					{
! 						$login = 1;
! 						$enable_autologin = 1;
! 					}
! 					else
! 					{
! 						$login = 0;
! 						$enable_autologin = 0;
! 						$user_id = ANONYMOUS;
! 
! 						$sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
! 					}
  				}
  				else
  				{
! 					$login = 0;
! 					$enable_autologin = 0;
  					$user_id = ANONYMOUS;
  
--- 51,96 ----
  		$sessionmethod = SESSION_METHOD_GET;
  	}
+ 
  	$current_time = time();
  	$expiry_time = $current_time - $session_length;
  
  	//
! 	// Try and pull the last time stored
! 	// in a cookie, if it exists
  	//
! 	if( $user_id != ANONYMOUS )
  	{
  		//
! 		// This is a 'work-around' since I managed to 
! 		// freeze the schema without re-visiting sessions,
! 		// what's needed is a session timer in the user table
! 		// + the user_lastvisit ... damn damn damn damn and blast
  		//
! 		$sql = "SELECT user_autologin_key, user_session_time, user_email    
! 			FROM " . USERS_TABLE . " 
! 			WHERE user_id = $user_id";
! 		$result = $db->sql_query($sql);
! 		if( !$result )
  		{
! 			message_die(CRITICAL_ERROR, "Couldn't obtain lastvisit data from user table", "", __LINE__, __FILE__, $sql);
! 		}
! 
! 		$row = $db->sql_fetchrow($result);
  
! 		$sessiondata['lastvisit'] = ( $row['user_session_time'] > 0 ) ? $row['user_session_time'] : $current_time; 
  
! 		if( $auto_create )
! 		{
! 			if( isset($sessiondata['autologinid']) )
  			{
! 				if( $sessiondata['autologinid'] == $row['user_autologin_key'] )
  				{
! 					$login = 1;
! 					$enable_autologin = 1; 
  				}
  				else
  				{
! 					$login = 0; 
! 					$enable_autologin = 0; 
  					$user_id = ANONYMOUS;
  
***************
*** 137,151 ****
  			else
  			{
! 				$login = 1;
  			}
  		}
  		else
  		{
! 			$login = 0;
! 			$enable_autologin = 0;
! 
! 			$sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
  		}
  
  		$sql = "UPDATE " . SESSIONS_TABLE . "
  			SET session_user_id = $user_id, session_start = $current_time, session_last_visit = " . $sessiondata['lastvisit'] . ", session_time = $current_time, session_page = $page_id, session_logged_in = $login 
--- 100,158 ----
  			else
  			{
! 				$login = 0;
! 				$enable_autologin = 0;
! 				$user_id = ANONYMOUS;
! 
! 				$sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
  			}
  		}
  		else
  		{
! 			$login = 1;
  		}
+ 	}
+ 	else
+ 	{
+ 		$login = 0;
+ 		$enable_autologin = 0;
  
+ 		$sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
+ 	}
+ 
+ 	//
+ 	// Initial ban check against user id, IP and email address
+ 	//
+ 	ereg("(..)(..)(..)(..)", $user_ip, $user_ip_parts);
+ 
+ 	$sql = "SELECT ban_ip, ban_userid, ban_email 
+ 		FROM " . BANLIST_TABLE . "
+ 		WHERE ban_ip = '" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . $user_ip_parts[4] . "'
+ 			OR ban_ip = '" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . "ff'
+ 			OR ban_ip = '" . $user_ip_parts[1] . $user_ip_parts[2] . "ffff'
+ 			OR ban_ip = '" . $user_ip_parts[1] . "ffffff'
+ 			OR ban_userid = $user_id";
+ 	if( $user_id != ANONYMOUS )
+ 	{
+ 		$sql .= " OR ban_email LIKE '" . $row['user_email'] . "' 
+ 			OR ban_email LIKE '" . substr($row['user_email'], strpos($row['user_email'], "@")) . "'";
+ 	}
+ 	$result = $db->sql_query($sql);
+ 	if( !$result )
+ 	{
+ 		message_die(CRITICAL_ERROR, "Couldn't obtain ban information.", "", __LINE__, __FILE__, $sql);
+ 	}
+ 
+ 	$ban_info = $db->sql_fetchrow($result);
+ 
+ 	if( $ban_info['ban_ip'] || $ban_info['ban_userid'] || $ban_info['ban_email'] )
+ 	{
+ 		message_die(CRITICAL_MESSAGE, 'You_been_banned');
+ 	}
+ 
+ 	//
+ 	// Create or update the session
+ 	//
+ 	if( !$auto_create )
+ 	{
  		$sql = "UPDATE " . SESSIONS_TABLE . "
  			SET session_user_id = $user_id, session_start = $current_time, session_last_visit = " . $sessiondata['lastvisit'] . ", session_time = $current_time, session_page = $page_id, session_logged_in = $login 
***************
*** 153,201 ****
  				AND session_ip = '$user_ip'";
  		$result = $db->sql_query($sql);
! 
! 		if( !$result || !$db->sql_affectedrows() )
  		{
! 			$session_id = md5(uniqid($user_ip));
  
! 			$sql = "INSERT INTO " . SESSIONS_TABLE . "
! 				(session_id, session_user_id, session_start, session_time, session_last_visit, session_ip, session_page, session_logged_in)
! 				VALUES ('$session_id', $user_id, $current_time, $current_time, " . $sessiondata['lastvisit'] . ", '$user_ip', $page_id, $login)";
! 			$result = $db->sql_query($sql);
! 			if(!$result)
! 			{
! 				message_die(CRITICAL_ERROR, "Error creating new session : session_begin", "", __LINE__, __FILE__, $sql);
! 			}
  		}
  
! 		if( $user_id != ANONYMOUS )
  		{
! 			$autologin_sql = "";
! 			if( $enable_autologin && $sessionmethod = SESSION_METHOD_COOKIE )
! 			{
! 				mt_srand( (double) microtime() * 1000000);
! 				$autologin_key = md5(uniqid(mt_rand()));
  
! 				$sessiondata['autologinid'] = $autologin_key;
! 				$autologin_sql = ", user_autologin_key = '$autologin_key'";
! 			}
  
! 			$sql_auto = "UPDATE " . USERS_TABLE . " 
! 				SET user_lastvisit = " . time() . $autologin_sql . "  
! 				WHERE user_id = $user_id";
! 			$result = $db->sql_query($sql_auto);
! 			if(!$result)
! 			{
! 				message_die(CRITICAL_ERROR, "Couldn't update users autologin key : session_begin", "", __LINE__, __FILE__, $sql);
! 			}
  		}
  
! 		$sessiondata['userid'] = $user_id;
  
! 		$serialised_cookiedata = serialize($sessiondata);
! 		setcookie($cookiename . '_data', $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
! 		setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
  
! 		$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=" . $session_id : "";
! 	}
  
  	return $session_id;
--- 160,216 ----
  				AND session_ip = '$user_ip'";
  		$result = $db->sql_query($sql);
! 		if(!$result)
  		{
! 			message_die(CRITICAL_ERROR, "Error updating current session : session_begin", "", __LINE__, __FILE__, $sql);
! 		}
! 	}
! 	else
! 	{
! 		mt_srand( (double) microtime() * 1000000);
! 		$session_id = md5(uniqid(mt_rand()));
  
! 		$sql = "INSERT INTO " . SESSIONS_TABLE . "
! 			(session_id, session_user_id, session_start, session_time, session_last_visit, session_ip, session_page, session_logged_in)
! 			VALUES ('$session_id', $user_id, $current_time, $current_time, " . $sessiondata['lastvisit'] . ", '$user_ip', $page_id, $login)";
! 		$result = $db->sql_query($sql);
! 		if(!$result)
! 		{
! 			message_die(CRITICAL_ERROR, "Error creating new session : session_begin", "", __LINE__, __FILE__, $sql);
  		}
+ 	}
  
! 	if( $user_id != ANONYMOUS )
! 	{
! 		$autologin_sql = "";
! 		if( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE )
  		{
! 			mt_srand( (double) microtime() * 1000000);
! 			$autologin_key = md5(uniqid(mt_rand()));
  
! 			$sessiondata['autologinid'] = $autologin_key;
! 			$autologin_sql = $autologin_key;
! 		}
! 		else
! 		{
! 			$autologin_sql = "";
! 		}
  
! 		$sql_auto = "UPDATE " . USERS_TABLE . " 
! 			SET user_lastvisit = " . $sessiondata['lastvisit'] . ", user_session_time = $current_time, user_session_page = $page_id, user_autologin_key ='$autologin_id'   
! 			WHERE user_id = $user_id";
! 		$result = $db->sql_query($sql_auto);
! 		if(!$result)
! 		{
! 			message_die(CRITICAL_ERROR, "Couldn't update users autologin key : session_begin", "", __LINE__, __FILE__, $sql);
  		}
+ 	}
  
! 	$sessiondata['userid'] = $user_id;
  
! 	$serialised_cookiedata = serialize($sessiondata);
! 	setcookie($cookiename . '_data', $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
! 	setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
  
! 	$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? "sid=" . $session_id : "";
  
  	return $session_id;
***************
*** 247,252 ****
  			FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
  			WHERE s.session_id = '$session_id'
! 				AND s.session_ip = '$user_ip'
! 				AND u.user_id = s.session_user_id";
  		$result = $db->sql_query($sql);
  		if( !$result )
--- 262,267 ----
  			FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
  			WHERE s.session_id = '$session_id'
! 				AND u.user_id = s.session_user_id 
! 				AND s.session_ip = '$user_ip'";
  		$result = $db->sql_query($sql);
  		if( !$result )
***************
*** 264,309 ****
  			$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? "sid=" . $session_id : "";
  
- 			if( empty($HTTP_COOKIE_VARS[$cookiename . '_data']) )
- 			{
- 				if( !empty($userdata['user_autologin']) && $sessionmethod = SESSION_METHOD_COOKIE )
- 				{
- 					$sessiondata['autologinid'] = $autologin_key;
- 				}
- 				$sessiondata['userid'] = $user_id;
- 				$sessiondata['lastvisit'] = $userdata['session_last_visit'];
- 
- 				$serialised_cookiedata = serialize($sessiondata);
- //				session_send_cookie("_data", $serialised_cookiedata, ($current_time + 31536000));
- 				setcookie($board_config['cookie_name'] . "_data", $serialised_cookiedata, ($current_time + 31536000), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
- 				setcookie($board_config['cookie_name'] . "_sid", $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_sid"], 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
- 			}
- 
  			//
  			// Only update session DB a minute or so after last update
  			//
! 			if( $current_time - $userdata['session_time'] > 60 )
  			{
! 				$sql = "UPDATE " . SESSIONS_TABLE . " 
! 					SET session_time = $current_time, session_page = $thispage_id 
! 					WHERE session_id = '" . $userdata['session_id'] . "' 
! 						AND session_ip = '$user_ip' 
! 						AND session_user_id = " . $userdata['user_id'];
! 				$result = $db->sql_query($sql);
! 				if( !$result )
  				{
! 					message_die(CRITICAL_ERROR, "Error updating sessions table : session_pagestart", "", __LINE__, __FILE__, $sql);
! 				}
  
! 				if( $user_id != ANONYMOUS ) 
  				{
  					$sql = "UPDATE " . USERS_TABLE . " 
! 						SET user_lastvisit = $current_time
  						WHERE user_id = " . $userdata['user_id'];
- 					$result = $db->sql_query($sql);
- 					if( !$result )
- 					{
- 						message_die(CRITICAL_ERROR, "Error updating users table : session_pagestart (GET)", "", __LINE__, __FILE__, $sql);
- 					}
  				}
  
  				//
--- 279,310 ----
  			$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? "sid=" . $session_id : "";
  
  			//
  			// Only update session DB a minute or so after last update
  			//
! 			$last_update = ( $userdata['user_id'] == ANONYMOUS ) ? $userdata['session_time'] : $userdata['user_session_time'];
! 
! 			if( $current_time - $last_update > 60 )
  			{
! 				if( $userdata['user_id'] == ANONYMOUS )
  				{
! 					$sessiondata['lastvisit'] = $current_time;
  
! 					$sql = "UPDATE " . SESSIONS_TABLE . " 
! 						SET session_time = $current_time, session_page = $thispage_id 
! 						WHERE session_id = '" . $userdata['session_id'] . "' 
! 							AND session_user_id = " . $userdata['user_id'] . " 
! 							AND session_ip = '$user_ip'";
! 				}
! 				else
  				{
  					$sql = "UPDATE " . USERS_TABLE . " 
! 						SET user_session_time = $current_time, user_session_page = $thispage_id 
  						WHERE user_id = " . $userdata['user_id'];
  				}
+ 				$result = $db->sql_query($sql);
+ 				if( !$result )
+ 				{
+ 					message_die(CRITICAL_ERROR, "Error updating sessions table : session_pagestart", "", __LINE__, __FILE__, $sql);
+ 				}
  
  				//
***************
*** 312,316 ****
  				$expiry_time = $current_time - $board_config['session_length'];
  				$sql = "DELETE FROM " . SESSIONS_TABLE . " 
! 					WHERE session_time < $expiry_time";
  				$result = $db->sql_query($sql);
  				if( !$result )
--- 313,318 ----
  				$expiry_time = $current_time - $board_config['session_length'];
  				$sql = "DELETE FROM " . SESSIONS_TABLE . " 
! 					WHERE session_time < $expiry_time 
! 						AND session_id <> '$session_id'";
  				$result = $db->sql_query($sql);
  				if( !$result )
***************
*** 318,335 ****
  					message_die(CRITICAL_ERROR, "Error clearing sessions table : session_pagestart", "", __LINE__, __FILE__, $sql);
  				}
- 
- 				return $userdata;
  			}
! 			//
! 			// We didn't need to update session
! 			// so just return userdata
! 			//
  
  			return $userdata;
  		}
  	}
- 	else
- 	{
- 	}
  	//
  	// If we reach here then no (valid) session exists. So we'll create a new one,
--- 320,331 ----
  					message_die(CRITICAL_ERROR, "Error clearing sessions table : session_pagestart", "", __LINE__, __FILE__, $sql);
  				}
  			}
! 
! 			setcookie($board_config['cookie_name'] . '_data', serialize($sessiondata), ($current_time + 31536000), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
! 			setcookie($board_config['cookie_name'] . '_sid', $session_id, 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
  
  			return $userdata;
  		}
  	}
  	//
  	// If we reach here then no (valid) session exists. So we'll create a new one,
***************
*** 349,354 ****
  			FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
  			WHERE s.session_id = '$result_id'
! 				AND s.session_ip = '$user_ip'
! 				AND u.user_id = s.session_user_id";
  		$result = $db->sql_query($sql);
  		if ( !$result )
--- 345,350 ----
  			FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
  			WHERE s.session_id = '$result_id'
! 				AND u.user_id = s.session_user_id 
! 				AND s.session_ip = '$user_ip'";
  		$result = $db->sql_query($sql);
  		if ( !$result )
***************
*** 446,477 ****
  
  } // session_end()
- 
- //
- // This checks to see if we're @ the 20 cookie limit
- // if we are it re-sends the session id. This isn't a great
- // solution but it does work, although resulting in
- // more cookies being sent than necessary. Will re-evaluate
- // this in 2.2
- //
- function session_send_cookie($append_name, $set_value, $last_time)
- {
- 	global $board_config;
- 	global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID;
- 
- 	setcookie($board_config['cookie_name'] . $append_name, $set_value, $last_time, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
- 
- 	$cookie_count = 0;
- 	while( list(, $value) = each($HTTP_COOKIE_VARS) )
- 	{
- 		$cookie_count += count($value);
- 	}
- 
- 	if( $cookie_count == 20 )
- 	{
- 		setcookie($board_config['cookie_name'] . "_sid", stripslashes($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_sid"]), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
- 	}
- 
- 	return;
- }
  
  //
--- 442,445 ----

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -r1.76 -r1.77
*** page_header.php	2001/12/10 01:19:12	1.76
--- page_header.php	2001/12/14 02:39:44	1.77
***************
*** 84,88 ****
  }
  
! $s_last_visit = create_date($board_config['default_dateformat'], $userdata['session_last_visit'], $board_config['board_timezone']);
  
  //
--- 84,88 ----
  }
  
! $s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : "";
  
  //
***************
*** 93,97 ****
  	FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
  	WHERE u.user_id = s.session_user_id
! 		AND s.session_time >= ".( time() - 300 );
  $result = $db->sql_query($sql);
  if(!$result)
--- 93,99 ----
  	FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
  	WHERE u.user_id = s.session_user_id
! 		AND ( s.session_time >= ".( time() - 300 ) . " 
! 			OR u.user_session_time >= " . ( time() - 300 ) . " )  
! 	ORDER BY u.user_session_time DESC";
  $result = $db->sql_query($sql);
  if(!$result)
***************
*** 246,262 ****
  
  	"PRIVMSG_IMG" => $icon_pm,
- 	"FORUM_IMG" => $images['forum'],
- 	"FORUM_NEW_IMG" => $images['forum_new'],
- 	"FORUM_LOCKED_IMG" => $images['forum_locked'],
- 	"FOLDER_IMG" => $images['folder'],
- 	"FOLDER_NEW_IMG" => $images['folder_new'],
- 	"FOLDER_HOT_IMG" => $images['folder_hot'],
- 	"FOLDER_HOT_NEW_IMG" => $images['folder_hot_new'],
- 	"FOLDER_LOCKED_IMG" => $images['folder_locked'],
- 	"FOLDER_LOCKED_NEW_IMG" => $images['folder_locked_new'],
- 	"FOLDER_STICKY_IMG" => $images['folder_sticky'],
- 	"FOLDER_STICKY_NEW_IMG" => $images['folder_sticky_new'],
- 	"FOLDER_ANNOUNCE_IMG" => $images['folder_announce'],
- 	"FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'],
  
  	"L_USERNAME" => $lang['Username'],
--- 248,251 ----

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.149,1.150 viewforum.php,1.109,1.110 index.php,1.81,1.82 search.php,1.44,1.45

From: Paul S. O. <ps...@us...> - 2001-12-14 02:39:47

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv11288

Modified Files:
	viewtopic.php viewforum.php index.php search.php 
Log Message:
Remove guest user topic tracking via cookies, update viewtopic to re-fix highlighting of search terms, add lang capability to images, various other issues, removed remote avatar size reduction

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -r1.149 -r1.150
*** viewtopic.php	2001/12/14 02:15:32	1.149
--- viewtopic.php	2001/12/14 02:39:44	1.150
***************
*** 389,393 ****
  // Go ahead and pull all data for this topic
  //
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, p.*,  pt.post_text, pt.post_subject, pt.bbcode_uid
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
--- 389,393 ----
  // Go ahead and pull all data for this topic
  //
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, u.user_allowavatar, p.*,  pt.post_text, pt.post_subject, pt.bbcode_uid
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
***************
*** 741,762 ****
  	$post_date = create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']);
  
! 	$poster_posts = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Posts'] . ": " . $postrow[$i]['user_posts'] : "";
  
! 	$poster_from = ($postrow[$i]['user_from'] && $postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Location'] . ": " . $postrow[$i]['user_from'] : "";
  
! 	$poster_joined = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Joined'] . ": " . create_date($lang['DATE_FORMAT'], $postrow[$i]['user_regdate'], $board_config['board_timezone']) : "";
  
! 	if( $postrow[$i]['user_avatar_type'] && $poster_id != ANONYMOUS )
  	{
  		switch( $postrow[$i]['user_avatar_type'] )
  		{
  			case USER_AVATAR_UPLOAD:
! 				$poster_avatar = ( $board_config['avatar_upload_db'] ) ? "<img src=\"avatar.$phpEx?p=" . $postrow[$i]['post_id'] . "\" alt=\"\" />" : "<img src=\"" . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" border=\"\" />";
  				break;
  			case USER_AVATAR_REMOTE:
! 				$poster_avatar = "<img src=\"" . $postrow[$i]['user_avatar'] . "\" width=\"".$board_config['avatar_max_width']."\" height=\"".$board_config['avatar_max_height']."\" alt=\"\" border=\"\" />";
  				break;
  			case USER_AVATAR_GALLERY:
! 				$poster_avatar = "<img src=\"" . $board_config['avatar_gallery_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" border=\"\" />";
  				break;
  		}
--- 741,762 ----
  	$post_date = create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']);
  
! 	$poster_posts = ( $postrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Posts'] . ": " . $postrow[$i]['user_posts'] : "";
  
! 	$poster_from = ( $postrow[$i]['user_from'] && $postrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Location'] . ": " . $postrow[$i]['user_from'] : "";
  
! 	$poster_joined = ( $postrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Joined'] . ": " . create_date($lang['DATE_FORMAT'], $postrow[$i]['user_regdate'], $board_config['board_timezone']) : "";
  
! 	if( $postrow[$i]['user_avatar_type'] && $poster_id != ANONYMOUS && $postrow[$i]['user_allowavatar'] )
  	{
  		switch( $postrow[$i]['user_avatar_type'] )
  		{
  			case USER_AVATAR_UPLOAD:
! 				$poster_avatar = ( $board_config['avatar_upload_db'] ) ? "<img src=\"avatar.$phpEx?p=" . $postrow[$i]['post_id'] . "\" alt=\"\" />" : "<img src=\"" . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
  				break;
  			case USER_AVATAR_REMOTE:
! 				$poster_avatar = "<img src=\"" . $postrow[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
  				break;
  			case USER_AVATAR_GALLERY:
! 				$poster_avatar = "<img src=\"" . $board_config['avatar_gallery_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
  				break;
  		}
***************
*** 940,951 ****
  
  	//
- 	// Highlight active words (primarily for search)
- 	//
- 	if( $highlight_active )
- 	{
- 		$message = preg_replace($highlight_match, $highlight_replace, $message);
- 	}
- 
- 	//
  	// If the board has HTML off but the post has HTML
  	// on then we process it, else leave it alone
--- 940,943 ----
***************
*** 989,993 ****
  
  	$message = make_clickable($message);
! 	
  	//
  	// Replace naughty words
--- 981,993 ----
  
  	$message = make_clickable($message);
! 
! 	//
! 	// Highlight active words (primarily for search)
! 	//
! 	if( $highlight_active )
! 	{
! 		$message = preg_replace($highlight_match, $highlight_replace, $message);
! 	}
! 
  	//
  	// Replace naughty words

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -r1.109 -r1.110
*** viewforum.php	2001/12/14 02:19:57	1.109
--- viewforum.php	2001/12/14 02:39:44	1.110
***************
*** 113,138 ****
  if( $mark_read == "topics" )
  {
! 	$sql = "SELECT MAX(post_time) AS last_post 
! 		FROM " . POSTS_TABLE . " 
! 		WHERE forum_id = $forum_id";
! 	if( !$result = $db->sql_query($sql) )
  	{
! 		message_die(GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql);
! 	}
! 
! 	if( $db->sql_numrows($result) )
! 	{
! 		$row = $db->sql_fetchrow($result);
  
! 		if( $row['last_post'] > $userdata['session_last_visit'] )
  		{
! 			setcookie($board_config['cookie_name'] . "_f_$forum_id", time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
! //			session_send_cookie("_f_$forum_id", time(), 0);
  		}
- 	}
  
! 	$template->assign_vars(array(
! 		"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> ");
--- 113,140 ----
  if( $mark_read == "topics" )
  {
! 	if( $userdata['session_logged_in'] )
  	{
! 		$sql = "SELECT MAX(post_time) AS last_post 
! 			FROM " . POSTS_TABLE . " 
! 			WHERE forum_id = $forum_id";
! 		if( !$result = $db->sql_query($sql) )
! 		{
! 			message_die(GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql);
! 		}
  
! 		if( $db->sql_numrows($result) )
  		{
! 			$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']);
! 			}
  		}
  
! 		$template->assign_vars(array(
! 			"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> ");
***************
*** 359,362 ****
--- 361,375 ----
  	"IMG_POST" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'],
  
+ 	"FOLDER_IMG" => $images['folder'],
+ 	"FOLDER_NEW_IMG" => $images['folder_new'],
+ 	"FOLDER_HOT_IMG" => $images['folder_hot'],
+ 	"FOLDER_HOT_NEW_IMG" => $images['folder_hot_new'],
+ 	"FOLDER_LOCKED_IMG" => $images['folder_locked'],
+ 	"FOLDER_LOCKED_NEW_IMG" => $images['folder_locked_new'],
+ 	"FOLDER_STICKY_IMG" => $images['folder_sticky'],
+ 	"FOLDER_STICKY_NEW_IMG" => $images['folder_sticky_new'],
+ 	"FOLDER_ANNOUNCE_IMG" => $images['folder_announce'],
+ 	"FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'],
+ 
  	"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'], 
***************
*** 500,535 ****
  			}
  
! 			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'] . "\" />";
--- 513,565 ----
  			}
  
! 			if( $userdata['session_logged_in'] )
  			{
+ 				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&amp;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['session_last_visit'] ) 
  				{
  					$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
***************
*** 537,556 ****
  					$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;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['session_last_visit'] ) 
! 			{
! 				$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&amp;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'];
--- 567,578 ----
  					$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;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
  			{
  				$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
***************
*** 644,646 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
--- 666,668 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** index.php	2001/12/10 01:19:12	1.81
--- index.php	2001/12/14 02:39:44	1.82
***************
*** 34,37 ****
--- 34,43 ----
  //
  
+ while( list($key, $value) = @each($images) )
+ {
+ 
+ 
+ }
+ 
  $viewcat = (!empty($HTTP_GET_VARS['viewcat'])) ? $HTTP_GET_VARS['viewcat'] : -1;
  
***************
*** 50,70 ****
  if( $mark_read == "forums" )
  {
! 	$sql = "SELECT MAX(post_time) AS last_post 
! 		FROM " . POSTS_TABLE;
! 	if(!$result = $db->sql_query($sql))
  	{
! 		message_die(GENERAL_ERROR, "Could not query new topic information", "", __LINE__, __FILE__, $sql);
! 	}
  
! 	if( $forum_count = $db->sql_numrows($result) )
! 	{
! 		$mark_read_list = $db->sql_fetchrow($result);
  
! 		$last_post_time = $mark_read_list['last_post'];
  
! 		if( $last_post_time > $userdata['session_last_visit'] ) 
! 		{
! 			setcookie($board_config['cookie_name'] . "_f_all", time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
! //			session_send_cookie("_f_all", time(), 0);
  		}
  	}
--- 56,78 ----
  if( $mark_read == "forums" )
  {
! 	if( $userdata['session_logged_in'] )
  	{
! 		$sql = "SELECT MAX(post_time) AS last_post 
! 			FROM " . POSTS_TABLE;
! 		if(!$result = $db->sql_query($sql))
! 		{
! 			message_die(GENERAL_ERROR, "Could not query new topic information", "", __LINE__, __FILE__, $sql);
! 		}
  
! 		if( $forum_count = $db->sql_numrows($result) )
! 		{
! 			$mark_read_list = $db->sql_fetchrow($result);
  
! 			$last_post_time = $mark_read_list['last_post'];
  
! 			if( $last_post_time > $userdata['user_lastvisit'] ) 
! 			{
! 				setcookie($board_config['cookie_name'] . "_f_all", time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
! 			}
  		}
  	}
***************
*** 172,189 ****
  	$forum_rows = $db->sql_fetchrowset($q_forums);
  
! 	$sql = "SELECT f.forum_id, t.topic_id, p.post_time
! 		FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p
! 		WHERE t.forum_id = f.forum_id
! 			AND p.post_id = t.topic_last_post_id
! 			AND p.post_time > " . $userdata['session_last_visit'] . " 
! 			AND t.topic_moved_id IS NULL";
! 	if(!$new_topic_ids = $db->sql_query($sql))
  	{
! 		message_die(GENERAL_ERROR, "Could not query new topic information", "", __LINE__, __FILE__, $sql);
! 	}
  
! 	while( $topic_data = $db->sql_fetchrow($new_topic_ids) )
! 	{
! 		$new_topic_data[$topic_data['forum_id']][$topic_data['topic_id']] = $topic_data['post_time'];
  	}
  
--- 180,200 ----
  	$forum_rows = $db->sql_fetchrowset($q_forums);
  
! 	if( $userdata['session_logged_in'] )
  	{
! 		$sql = "SELECT f.forum_id, t.topic_id, p.post_time
! 			FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p
! 			WHERE t.forum_id = f.forum_id
! 				AND p.post_id = t.topic_last_post_id
! 				AND p.post_time > " . $userdata['session_last_visit'] . " 
! 				AND t.topic_moved_id IS NULL";
! 		if(!$new_topic_ids = $db->sql_query($sql))
! 		{
! 			message_die(GENERAL_ERROR, "Could not query new topic information", "", __LINE__, __FILE__, $sql);
! 		}
  
! 		while( $topic_data = $db->sql_fetchrow($new_topic_ids) )
! 		{
! 			$new_topic_data[$topic_data['forum_id']][$topic_data['topic_id']] = $topic_data['post_time'];
! 		}
  	}
  
***************
*** 237,240 ****
--- 248,255 ----
  		"NEWEST_USER" => sprintf($lang['Newest_user'], "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$newest_uid") . "\">", $newest_user, "</a>"), 
  
+ 		"FORUM_IMG" => $images['forum'],
+ 		"FORUM_NEW_IMG" => $images['forum_new'],
+ 		"FORUM_LOCKED_IMG" => $images['forum_locked'],
+ 
  		"L_FORUM_LOCKED" => $lang['Forum_is_locked'],
  		"L_MARK_FORUMS_READ" => $lang['Mark_all_forums'], 
***************
*** 277,320 ****
  				{
  					$unread_topics = false;
! 					if( count($new_topic_data[$forum_id]) )
  					{
! 						$forum_last_post_time = 0;
! 
! 						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"]) )
! 							{
! //								echo "NOT SET :: $forum_id  :: $check_topic_id <BR>\n";
! 								$unread_topics = true;
! 								$forum_last_post_time = max($check_post_time, $forum_last_post_time);
  
! 							}
! 							else
  							{
! 								if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$check_topic_id"] < $check_post_time )
  								{
- //									echo "SET :: $forum_id  :: $check_topic_id <BR>\n";
  									$unread_topics = true;
  									$forum_last_post_time = max($check_post_time, $forum_last_post_time);
  								}
  							}
- 						}
  
! 						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;
  							}
- 						}
  
! 						if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
! 						{
! 							if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"] > $forum_last_post_time )
  							{
! 								$unread_topics = false;
  							}
- 						}
  
  					}
  
--- 292,336 ----
  				{
  					$unread_topics = false;
! 					if( $userdata['session_logged_in'] )
  					{
! 						if( count($new_topic_data[$forum_id]) )
  						{
! 							$forum_last_post_time = 0;
  
! 							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;
  									$forum_last_post_time = max($check_post_time, $forum_last_post_time);
+ 
  								}
+ 								else
+ 								{
+ 									if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$check_topic_id"] < $check_post_time )
+ 									{
+ 										$unread_topics = true;
+ 										$forum_last_post_time = max($check_post_time, $forum_last_post_time);
+ 									}
+ 								}
  							}
  
! 							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;
! 								}
  							}
  
! 							if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
  							{
! 								if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"] > $forum_last_post_time )
! 								{
! 									$unread_topics = false;
! 								}
  							}
  
+ 						}
  					}
  
***************
*** 325,329 ****
  				$topics = $forum_rows[$j]['forum_topics'];
  
! 				if($forum_rows[$j]['username'] != "" && $forum_rows[$j]['post_time'] > 0)
  				{
  					$last_post_time = create_date($board_config['default_dateformat'], $forum_rows[$j]['post_time'], $board_config['board_timezone']);
--- 341,345 ----
  				$topics = $forum_rows[$j]['forum_topics'];
  
! 				if( $forum_rows[$j]['username'] != "" && $forum_rows[$j]['post_time'] > 0 )
  				{
  					$last_post_time = create_date($board_config['default_dateformat'], $forum_rows[$j]['post_time'], $board_config['board_timezone']);

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** search.php	2001/12/11 09:13:03	1.44
--- search.php	2001/12/14 02:39:44	1.45
***************
*** 266,273 ****
  		if( $search_id == "newposts" )
  		{
! 			$sql = "SELECT post_id 
! 				FROM " . POSTS_TABLE . " 
! 				WHERE post_time >= " . $userdata['session_last_visit'] . " 
! 				ORDER BY post_time DESC";
  		}
  		else if( $search_id == "egosearch" )
--- 266,280 ----
  		if( $search_id == "newposts" )
  		{
! 			if( $userdata['session_logged_in'] )
! 			{
! 				$sql = "SELECT post_id 
! 					FROM " . POSTS_TABLE . " 
! 					WHERE post_time >= " . $userdata['user_lastvisit'] . " 
! 					ORDER BY post_time DESC";
! 			}
! 			else
! 			{
! 				message_die(GENERAL_MESSAGE, $lang['No_search_match']);
! 			}
  		}
  		else if( $search_id == "egosearch" )
***************
*** 556,560 ****
  	// Define common SQL
  	//
! 	$sql_fields = ( $show_results == "posts") ? "pt.post_text, pt.post_subject, p.post_id, p.post_time, p.post_username, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, t.topic_views, t.topic_replies, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid" : "f.forum_id, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, t.topic_views, t.topic_replies, t.topic_last_post_id, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username" ;
  
  	$sql_from = ( $show_results == "posts") ? FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt" : FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . USERS_TABLE . " u2";
--- 563,567 ----
  	// Define common SQL
  	//
! 	$sql_fields = ( $show_results == "posts") ? "pt.post_text, pt.bbcode_uid, pt.post_subject, p.post_id, p.post_time, p.post_username, p.enable_bbcode, p.enable_html, p.enable_smilies, p.enable_sig, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, t.topic_views, t.topic_replies, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid" : "f.forum_id, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, t.topic_views, t.topic_replies, t.topic_last_post_id, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username" ;
  
  	$sql_from = ( $show_results == "posts") ? FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt" : FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . USERS_TABLE . " u2";
***************
*** 883,887 ****
  			if( $showresults == "posts" )
  			{
! 				if($return_chars != 0 )
  				{
  					$bbcode_uid = $searchset[$i]['bbcode_uid'];
--- 890,894 ----
  			if( $showresults == "posts" )
  			{
! 				if( $return_chars )
  				{
  					$bbcode_uid = $searchset[$i]['bbcode_uid'];
***************
*** 910,920 ****
  						$user_sig_bbcode_uid = $searchset[$i]['user_sig_bbcode_uid'];
  
- 						
- 
- 						if( count($search_string) )
- 						{
- 							$message = preg_replace($search_string, $replace_string, $message);
- 						}
- 
  						if( !$board_config['allow_html'] )
  						{
--- 917,920 ----
***************
*** 946,949 ****
--- 946,955 ----
  						
  						$message = make_clickable($message);
+ 
+ 						if( count($search_string) )
+ 						{
+ 							$message = preg_replace($search_string, $replace_string, $message);
+ 						}
+ 
  					}

[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.108,1.109

From: Bart v. B. <ba...@us...> - 2001-12-14 02:20:00

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv7260

Modified Files:
	viewforum.php 
Log Message:
Announce and Sticky are never shown as locked

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -r1.108 -r1.109
*** viewforum.php	2001/12/10 00:17:20	1.108
--- viewforum.php	2001/12/14 02:19:57	1.109
***************
*** 471,481 ****
  		else
  		{
! 			if( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED )
  			{
- 				$folder = $images['folder_locked'];
- 				$folder_new = $images['folder_locked_new'];
- 			}
- 			else if( $topic_rowset[$i]['topic_type'] == POST_ANNOUNCE )
- 			{
  				$folder = $images['folder_announce'];
  				$folder_new = $images['folder_announce_new'];
--- 471,476 ----
  		else
  		{
! 			if( $topic_rowset[$i]['topic_type'] == POST_ANNOUNCE )
  			{
  				$folder = $images['folder_announce'];
  				$folder_new = $images['folder_announce_new'];
***************
*** 486,489 ****
--- 481,489 ----
  				$folder_new = $images['folder_sticky_new'];
  			}
+ 			else if( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED )
+ 			{
+ 				$folder = $images['folder_locked'];
+ 				$folder_new = $images['folder_locked_new'];
+ 			}
  			else
  			{
***************
*** 644,646 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 644,646 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.148,1.149

From: Bart v. B. <ba...@us...> - 2001-12-14 02:15:36

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv6391

Modified Files:
	viewtopic.php 
Log Message:
Avatar size is fixed for remote avatars

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -r1.148 -r1.149
*** viewtopic.php	2001/12/12 19:54:47	1.148
--- viewtopic.php	2001/12/14 02:15:32	1.149
***************
*** 755,759 ****
  				break;
  			case USER_AVATAR_REMOTE:
! 				$poster_avatar = "<img src=\"" . $postrow[$i]['user_avatar'] . "\" alt=\"\" border=\"\" />";
  				break;
  			case USER_AVATAR_GALLERY:
--- 755,759 ----
  				break;
  			case USER_AVATAR_REMOTE:
! 				$poster_avatar = "<img src=\"" . $postrow[$i]['user_avatar'] . "\" width=\"".$board_config['avatar_max_width']."\" height=\"".$board_config['avatar_max_height']."\" alt=\"\" border=\"\" />";
  				break;
  			case USER_AVATAR_GALLERY:

[Phpbb-checkins] CVS: phpBB2/db/schemas ms_access_primer.zip,1.4,1.5

From: Paul S. O. <ps...@us...> - 2001-12-14 02:12:00

Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv5677/db/schemas

Modified Files:
	ms_access_primer.zip 
Log Message:
Updated schema for session stuff + fix for mysql search result id

Index: ms_access_primer.zip
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/ms_access_primer.zip,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
Binary files /tmp/cvsCMrlnc and /tmp/cvsYB7a1d differ

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_schema.sql,1.9,1.10 mysql_schema.sql,1.7,1.8 postgres_schema.sql,1.6,1.7

From: Paul S. O. <ps...@us...> - 2001-12-14 02:10:33

Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv5455/db/schemas

Modified Files:
	mssql_schema.sql mysql_schema.sql postgres_schema.sql 
Log Message:
Updated schema for session stuff + fix for mysql search result id

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** mssql_schema.sql	2001/12/11 02:41:47	1.9
--- mssql_schema.sql	2001/12/14 02:10:30	1.10
***************
*** 313,316 ****
--- 313,319 ----
  	[user_password] [varchar] (32) NOT NULL ,
  	[user_autologin_key] [varchar] (32) NULL ,
+ 	[user_session_time] [int] NOT NULL ,
+ 	[user_session_page] [smallint] NOT NULL ,
+ 	[user_lastvisit] [int] NOT NULL ,
  	[user_regdate] [int] NOT NULL ,
  	[user_level] [smallint] NOT NULL ,
***************
*** 320,324 ****
  	[user_lang] [varchar] (255) NULL ,
  	[user_dateformat] [varchar] (14) NOT NULL ,
- 	[user_lastvisit] [int] NOT NULL ,
  	[user_new_privmsg] [smallint] NOT NULL ,
  	[user_unread_privmsg] [smallint] NOT NULL ,
--- 323,326 ----
***************
*** 568,571 ****
--- 570,575 ----
  	CONSTRAINT [DF_phpbb_users_user_level] DEFAULT (0) FOR [user_level],
  	CONSTRAINT [DF_phpbb_users_user_posts] DEFAULT (0) FOR [user_posts],
+ 	CONSTRAINT [DF_phpbb_users_user_session_time] DEFAULT (0) FOR [user_session_time],
+ 	CONSTRAINT [DF_phpbb_users_user_session_page] DEFAULT (0) FOR [user_session_page],
  	CONSTRAINT [DF_phpbb_users_user_lastvisit] DEFAULT (0) FOR [user_lastvisit],
  	CONSTRAINT [DF_phpbb_users_user_new_privmsg] DEFAULT (0) FOR [user_new_privmsg],
***************
*** 635,638 ****
--- 639,645 ----
  
   CREATE  INDEX [IX_phpbb_topics_watch] ON [phpbb_topics_watch]([topic_id], [user_id]) ON [PRIMARY]
+ GO
+ 
+  CREATE  INDEX [IX_phpbb_users] ON [phpbb_users]([user_session_time]) ON [PRIMARY]
  GO
  

Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** mysql_schema.sql	2001/12/11 02:41:47	1.7
--- mysql_schema.sql	2001/12/14 02:10:30	1.8
***************
*** 244,248 ****
  #
  CREATE TABLE phpbb_search_results (
!   search_id mediumint(8) UNSIGNED NOT NULL default '0',
    session_id char(32) NOT NULL default '',
    search_array text NOT NULL,
--- 244,248 ----
  #
  CREATE TABLE phpbb_search_results (
!   search_id int(11) UNSIGNED NOT NULL default '0',
    session_id char(32) NOT NULL default '',
    search_array text NOT NULL,
***************
*** 459,462 ****
--- 459,465 ----
     user_password varchar(32) NOT NULL,
     user_autologin_key varchar(32),
+    user_session_time int(11) DEFAULT '0' NOT NULL, 
+    user_session_page smallint(5) DEFAULT '0' NOT NULL, 
+    user_lastvisit int(11) DEFAULT '0' NOT NULL, 
     user_regdate int(11) DEFAULT '0' NOT NULL, 
     user_level tinyint(4) DEFAULT '0',
***************
*** 466,470 ****
     user_lang varchar(255),
     user_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL,
-    user_lastvisit int(11) DEFAULT '0' NOT NULL, 
     user_new_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL, 
     user_unread_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL, 
--- 469,472 ----
***************
*** 498,502 ****
     user_actkey varchar(32),
     user_newpasswd varchar(32),
!    PRIMARY KEY (user_id)
  );
  
--- 500,505 ----
     user_actkey varchar(32),
     user_newpasswd varchar(32),
!    PRIMARY KEY (user_id), 
!    KEY user_session_time (user_session_time)
  );
  

Index: postgres_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_schema.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** postgres_schema.sql	2001/12/10 21:53:27	1.6
--- postgres_schema.sql	2001/12/14 02:10:30	1.7
***************
*** 448,451 ****
--- 448,454 ----
     user_password varchar(32) DEFAULT '' NOT NULL,
     user_autologin_key varchar(32),
+    user_session_time int4 DEFAULT '0' NOT NULL, 
+    user_session_page int2 DEFAULT '0' NOT NULL, 
+    user_lastvisit int4 DEFAULT '0' NOT NULL, 
     user_email varchar(255),
     user_icq varchar(15),
***************
*** 461,465 ****
     user_msnm varchar(255),
     user_posts int4 DEFAULT '0' NOT NULL,
-    user_lastvisit int4 DEFAULT '0' NOT NULL, 
     user_new_privmsg int2 DEFAULT '0' NOT NULL, 
     user_unread_privmsg int2 DEFAULT '0' NOT NULL, 
--- 464,467 ----
***************
*** 488,491 ****
--- 490,495 ----
     CONSTRAINT phpbb_users_pkey PRIMARY KEY (user_id)
  );
+ 
+ CREATE  INDEX user_session_time_phpbb_users_index ON phpbb_users (user_session_time);
  
  /* --------------------------------------------------------

[Phpbb-checkins] CVS: phpBB2 update_to_RC1.php,NONE,1.1

From: Paul S. O. <ps...@us...> - 2001-12-14 02:07:25

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv4950

Added Files:
	update_to_RC1.php 
Log Message:
This file must be run before using any of the updated session stuff, also fixes the search results problem

--- NEW FILE ---
<html>
<body>
<?php

$phpbb_root_path = "./";
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx);

$sql = array();

switch(SQL_LAYER)
{
	case 'mysql':
	case 'mysql4':
		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
			ADD COLUMN user_session_time int(11) DEFAULT '0' NOT NULL, 
			ADD COLUMN user_session_page smallint(5) DEFAULT '0' NOT NULL, 
			ADD INDEX (user_session_time)";
		$sql[] = "ALTER TABLE " . SEARCH_TABLE . " 
			MODIFY search_id int(11) NOT NULL";
		break;

	case 'postgresql':
		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
			ADD COLUMN user_session_time int4";
		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
			ADD COLUMN user_session_page int2";
		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
			ALTER COLUMN user_session_time SET DEFAULT '0'";
		$sql[] = "ALTER TABLE " . USERS_TABLE . " 
			ALTER COLUMN user_session_page SET DEFAULT '0'";
		$sql[] = "CREATE INDEX user_session_time_" . $table_prefix . "users_index 
			ON " . USERS_TABLE . " (user_session_time)";
		break;

	case 'mssql-odbc':
	case 'mssql':
		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
			user_session_time int NOT NULL, 
			user_session_page smallint NOT NULL, 
			CONSTRAINT [DF_" . $table_prefix . "users_user_session_time] DEFAULT (0) FOR [user_session_time],
			CONSTRAINT [DF_" . $table_prefix . "users_user_session_page] DEFAULT (0) FOR [user_session_page]";
		$sql[] = "CREATE INDEX [IX_" . $table_prefix . "users] 
			ON [" . USERS_TABLE . "]([user_session_time]) ON [PRIMARY]";
		break;

	case 'msaccess':
		$sql[] = "ALTER TABLE " . USERS_TABLE . " ADD 
			user_session_time int NOT NULL, 
			user_session_page smallint NOT NULL";
		$sql[] = "CREATE INDEX user_session_time 
			ON " . USERS_TABLE . " (user_session_time)";
		break;

	default:
		die("No DB LAYER found!");
		break;
}

	for($i = 0; $i < count($sql); $i++)
	{
		echo "Running :: " . $sql[$i] . "<br />\n";

		$result = $db->sql_query($sql[$i]);

		if( !$result )
		{
			$error = $db->sql_error();
			die("Failed executing statement<br />\nError :: " . $error['message'] . "<br />\nSQL :: " . $sql[$i]);
		}

	}

	echo "\n<br /><br />\nCOMPLETE! Please delete this file before continuing!<br />\n";

?>
</body>
</html>

[Phpbb-checkins] CVS: phpBB2/develop search_fill.php,1.5,1.6

From: Bart v. B. <ba...@us...> - 2001-12-14 01:59:27

Update of /cvsroot/phpbb/phpBB2/develop
In directory usw-pr-cvs1:/tmp/cvs-serv3718

Modified Files:
	search_fill.php 
Log Message:
Changed fixed table name to constant

Index: search_fill.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/search_fill.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** search_fill.php	2001/12/14 01:58:21	1.5
--- search_fill.php	2001/12/14 01:59:24	1.6
***************
*** 276,280 ****
  			// Get the word_id's out of the DB (to see if they are already there)
  			$sql = "SELECT word_id, word_text
! 				FROM phpbb_search_wordlist
  				WHERE word_text IN ($sql_select)
  				GROUP BY word_text";
--- 276,280 ----
  			// Get the word_id's out of the DB (to see if they are already there)
  			$sql = "SELECT word_id, word_text
! 				FROM ".SEARCH_WORD_TABLE." 
  				WHERE word_text IN ($sql_select)
  				GROUP BY word_text";

[Phpbb-checkins] CVS: phpBB2/develop search_fill.php,1.4,1.5

From: Bart v. B. <ba...@us...> - 2001-12-14 01:58:25

Update of /cvsroot/phpbb/phpBB2/develop
In directory usw-pr-cvs1:/tmp/cvs-serv3501

Modified Files:
	search_fill.php 
Log Message:
Changed fixed table name to constant

Index: search_fill.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/search_fill.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** search_fill.php	2001/12/11 08:43:04	1.4
--- search_fill.php	2001/12/14 01:58:21	1.5
***************
*** 125,129 ****
  	if( $delete_common)
  	{
! 		$sql = "DELETE FROM phpbb_search_wordmatch 
  			WHERE word_id IN ($common_word_ids)";
  		$result = $db->sql_query($sql); 
--- 125,129 ----
  	if( $delete_common)
  	{
! 		$sql = "DELETE FROM ".SEARCH_MATCH_TABLE." 
  			WHERE word_id IN ($common_word_ids)";
  		$result = $db->sql_query($sql); 
***************
*** 216,220 ****
  	{
  
! 	//	$sql = "LOCK TABLES phpbb_posts_text WRITE";
  	//	$result = $db->sql_query($sql); 
  		print "\n<p>\n<a href='$PHP_SELF?batchstart=$batchstart'>Restart from posting $batchstart</a><br>\n";
--- 216,220 ----
  	{
  
! 	//	$sql = "LOCK TABLES ".POST_TEXT_TABLE." WRITE";
  	//	$result = $db->sql_query($sql); 
  		print "\n<p>\n<a href='$PHP_SELF?batchstart=$batchstart'>Restart from posting $batchstart</a><br>\n";

[Phpbb-checkins] CVS: phpBB2/templates/Euclid overall_header.tpl,1.3,1.4

From: Paul S. O. <ps...@us...> - 2001-12-14 01:44:30

Update of /cvsroot/phpbb/phpBB2/templates/Euclid
In directory usw-pr-cvs1:/tmp/cvs-serv21792/templates/Euclid

Modified Files:
	overall_header.tpl 
Log Message:
Updates to remove search new for anonymous users ... will soon become pointless

Index: overall_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/Euclid/overall_header.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** overall_header.tpl	2001/12/10 14:48:11	1.3
--- overall_header.tpl	2001/12/14 00:47:29	1.4
***************
*** 87,91 ****
  		<td width="100%"><table width="100%" cellspacing="1" cellpadding="4" border="0">
  			<tr>
! 				<td><span class="gensmall">{LAST_VISIT_DATE} / <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a></span></td>
  				<td align="right"><span class="gensmall">{CURRENT_TIME}</span></td>
  			</tr>
--- 87,95 ----
  		<td width="100%"><table width="100%" cellspacing="1" cellpadding="4" border="0">
  			<tr>
! 				<td><span class="gensmall">
! 				<!-- BEGIN switch_user_logged_in -->
! 				{LAST_VISIT_DATE} / <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a>
! 				<!-- END switch_user_logged_in -->
! 				</span></td>
  				<td align="right"><span class="gensmall">{CURRENT_TIME}</span></td>
  			</tr>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver index_body.tpl,1.11,1.12

From: Paul S. O. <ps...@us...> - 2001-12-14 01:42:56

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv21792/templates/subSilver

Modified Files:
	index_body.tpl 
Log Message:
Updates to remove search new for anonymous users ... will soon become pointless

Index: index_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/index_body.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** index_body.tpl	2001/12/05 00:20:56	1.11
--- index_body.tpl	2001/12/14 00:47:29	1.12
***************
*** 4,13 ****
  <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center">
    <tr> 
! 	<td align="left" valign="bottom"><span class="gensmall">{LAST_VISIT_DATE}<br />{CURRENT_TIME}<br /><br /></span><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
  	<td align="right" valign="bottom" class="gensmall">
  		<!-- BEGIN switch_user_logged_in -->
! 		<a href="{U_SEARCH_SELF}" class="gensmall">{L_SEARCH_SELF}</a><br />
  		<!-- END switch_user_logged_in -->
! 		<a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a><br /><a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a></td>
    </tr>
  </table>
--- 4,17 ----
  <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center">
    <tr> 
! 	<td align="left" valign="bottom"><span class="gensmall">
! 	<!-- BEGIN switch_user_logged_in -->
! 	{LAST_VISIT_DATE}<br />
! 	<!-- END switch_user_logged_in -->
! 	{CURRENT_TIME}<br /><br /></span><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
  	<td align="right" valign="bottom" class="gensmall">
  		<!-- BEGIN switch_user_logged_in -->
! 		<a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br /><a href="{U_SEARCH_SELF}" class="gensmall">{L_SEARCH_SELF}</a><br />
  		<!-- END switch_user_logged_in -->
! 		<a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a></td>
    </tr>
  </table>

[Phpbb-checkins] CVS: phpBB2 upgrade.php,1.6,1.7

From: Bart v. B. <ba...@us...> - 2001-12-13 19:40:05

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv30868

Modified Files:
	upgrade.php 
Log Message:
Some minor updates and bugfixes in Upgrade. Added smiley conversion

Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** upgrade.php	2001/12/06 18:04:38	1.6
--- upgrade.php	2001/12/13 19:40:00	1.7
***************
*** 28,31 ****
--- 28,32 ----
  	include('config.'.$phpEx);
  	include('includes/constants.'.$phpEx);
+ 	include('includes/functions.'.$phpEx);
  }
  // Force the DB type to be MySQL
***************
*** 34,37 ****
--- 35,66 ----
  include('includes/bbcode.'.$phpEx);
  
+ //
+ // Set smiley path
+ // Uncomment the following line to set the path manually
+ //$smiley_path = '/forums/images/smiles/';
+ if(!isset($smiley_path))
+ {
+ 	// Did we get a path through the URL?
+ 	if(isset($HTTP_GET_VARS['smiley_path']))
+ 	{
+ 		$smiley_path = $HTTP_GET_VARS['smiley_path'];
+ 	}
+ 	else
+ 	{
+ 		// Check the current directory name
+ 		$base_dir = dirname($PHP_SELF);
+ 		if ($base_dir != '/phpBB2' && $base_dir != '\phpBB2')
+ 		{
+ 			// User isn't installing in the default /phpBB2/ dir, probably installing in 1.4 dir?
+ 			$smiley_path = $base_dir . '/images/smiles/';
+ 		}
+ 		else
+ 		{
+ 			// Fall back to the default 1.4 path
+ 			$smiley_path = '/phpBB/images/smiles/';
+ 		}
+ 	}
+ }
+ 
  set_time_limit(0); // Unlimited execution time
  
***************
*** 84,87 ****
--- 113,146 ----
  }
  
+ function smiley_replace($text)
+ {
+ 	global $db;
+ 	global $smiley_path;
+ 
+ 	static $search, $replace, $init;
+ 
+ 
+ 	// Did we get the smiley info in a previous call?
+ 	if($init != 1)
+ 	{
+ 		$sql = "
+ 			SELECT
+ 				DISTINCT(smile_url), 
+ 				code 
+ 			FROM ".SMILIES_TABLE." 
+ 			ORDER BY length(code) ASC";
+ 		$result = query($sql, "Unable to get list of smilies from the DB");
+ 		while($row = $db->sql_fetchrow($result))
+ 		{
+ 			$search_string = phpbb_preg_quote('<IMG SRC="' . $smiley_path . $row['smile_url'] .'">', '/');
+ 			$search[] = "/$search_string/";
+ 			$replace[] = $row['code'];
+ 		}
+ 		$init = 1;
+ 	}
+ 	return preg_replace($search, $replace, $text);
+ 	
+ }
+ 
  function common_footer()
  {
***************
*** 346,349 ****
--- 405,409 ----
  */
  
+ 
  if(isset($next))
  {
***************
*** 669,677 ****
  		common_header();
  
  		$sql = "ALTER TABLE ".POSTS_TABLE." 
- 			ADD bbcode_uid char(10) NOT NULL,
  			ADD enable_sig tinyint(1) DEFAULT '1' NOT NULL";
! 		print "Adding bbcode_uid field to ".POSTS_TABLE.".<br>\n";
! 		$result = query($sql, "Couldn't get add bbcode_uid field to ".POSTS_TABLE.".");
  		
  		$sql = "
--- 729,746 ----
  		common_header();
  
+ 		// Initialize the smiley replace arrays.
+ 		// Not a really clean way to do this but it works.
+ 		// Doing this because of some table locking issues.
+ 		smiley_replace("init");
+ 
  		$sql = "ALTER TABLE ".POSTS_TABLE." 
  			ADD enable_sig tinyint(1) DEFAULT '1' NOT NULL";
! 		print "Adding enable_sig field to ".POSTS_TABLE.".<br>\n";
! 		$result = query($sql, "Couldn't add enable_sig field to ".POSTS_TABLE.".");
! 		
! 		$sql = "ALTER TABLE ".POSTS_TEXT_TABLE." 
! 			ADD bbcode_uid char(10) NOT NULL";
! 		print "Adding bbcode_uid field to ".POSTS_TEXT_TABLE.".<br>\n";
! 		$result = query($sql, "Couldn't add bbcode_uid field to ".POSTS_TABLE.".");
  		
  		$sql = "
***************
*** 696,708 ****
  			$sql = "
  				SELECT 
! 					pt.*,
! 					p.bbcode_uid
! 				FROM "
! 					.POSTS_TEXT_TABLE." pt,"
! 					.POSTS_TABLE." p
! 				WHERE pt.post_id = p.post_id
! 				&& pt.post_id BETWEEN $batchstart AND $batchend";
  			$result = query($sql, "Couldn't get ". POSTS_TEXT_TABLE .".post_id $batchstart to $batchend");
! 			lock_tables(1, array(POSTS_TABLE, POSTS_TEXT_TABLE));
  			while($row = mysql_fetch_array($result))
  			{
--- 765,775 ----
  			$sql = "
  				SELECT 
! 					*
! 				FROM ".
! 					POSTS_TEXT_TABLE."
! 				WHERE
! 					post_id BETWEEN $batchstart AND $batchend";
  			$result = query($sql, "Couldn't get ". POSTS_TEXT_TABLE .".post_id $batchstart to $batchend");
! 			lock_tables(1, array(POSTS_TEXT_TABLE, POSTS_TABLE));
  			while($row = mysql_fetch_array($result))
  			{
***************
*** 722,725 ****
--- 789,793 ----
  				$uid = make_bbcode_uid();
  				// do 2.x first-pass encoding..
+ 				$row['post_text'] = smiley_replace($row['post_text']);
  				$row['post_text'] = bbencode_first_pass($row['post_text'], $uid);
  				$row['post_text'] = addslashes($row['post_text']);
***************
*** 736,746 ****
  
  				$sql = "UPDATE ".POSTS_TEXT_TABLE." 
! 					SET post_text = '$checksig' 
  					WHERE post_id = ".$row['post_id'];
  				query($sql, "Couldn't update ".POSTS_TEXT_TABLE." table with new BBcode for post_id ".$row['post_id']);
  				$sql = "UPDATE ".POSTS_TABLE." 
! 					SET bbcode_uid = '$uid', enable_sig = $enable_sig
  					WHERE post_id = ".$row['post_id'];
! 				query($sql, "Couldn't update ".POSTS_TABLE." table with bbcode_uid of post_id ".$row['post_id']);
  			}
  			lock_tables(0);
--- 804,814 ----
  
  				$sql = "UPDATE ".POSTS_TEXT_TABLE." 
! 					SET post_text = '$checksig' , bbcode_uid = '$uid'
  					WHERE post_id = ".$row['post_id'];
  				query($sql, "Couldn't update ".POSTS_TEXT_TABLE." table with new BBcode for post_id ".$row['post_id']);
  				$sql = "UPDATE ".POSTS_TABLE." 
! 					SET enable_sig = $enable_sig
  					WHERE post_id = ".$row['post_id'];
! 				query($sql, "Couldn't update ".POSTS_TABLE." table with signature status for post with post_id: ".$row['post_id']);
  			}
  			lock_tables(0);

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.147,1.148

From: Bart v. B. <ba...@us...> - 2001-12-12 19:54:51

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv32078

Modified Files:
	viewtopic.php 
Log Message:
Small change to make HTML source of viewtopic more readable

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -r1.147 -r1.148
*** viewtopic.php	2001/12/11 09:13:03	1.147
--- viewtopic.php	2001/12/12 19:54:47	1.148
***************
*** 1011,1015 ****
  	// till recently it wasn't XHTML compliant)
  	//
! 	$message = str_replace("\n", "<br />", $message);
  
  	//
--- 1011,1015 ----
  	// till recently it wasn't XHTML compliant)
  	//
! 	$message = str_replace("\n", "\n<br />", $message);
  
  	//

[Phpbb-checkins] CVS: phpBB2/templates/Euclid profile_add_body.tpl,1.1,1.2 profile_send_email.tpl,1.1,1.2 search_body.tpl,1.1,1.2

From: Paul S. O. <ps...@us...> - 2001-12-11 14:02:35

Update of /cvsroot/phpbb/phpBB2/templates/Euclid
In directory usw-pr-cvs1:/tmp/cvs-serv18520/templates/Euclid

Modified Files:
	profile_add_body.tpl profile_send_email.tpl search_body.tpl 
Log Message:
More updates

Index: profile_add_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/Euclid/profile_add_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** profile_add_body.tpl	2001/12/10 00:58:50	1.1
--- profile_add_body.tpl	2001/12/11 14:02:33	1.2
***************
*** 8,14 ****
  <table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
  	<tr>
! 		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
  			<tr>
! 				<td class="cat" colspan="2"><span class="cattitle"><b>{L_REGISTRATION_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
  			</tr>
  			<tr>
--- 8,14 ----
  <table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
  	<tr>
! 		<td class="tablebg"><table width="100%" cellspacing="1" cellpadding="3" border="0">
  			<tr>
! 				<td class="cat" colspan="2" height="30"><span class="cattitle"><b>{L_REGISTRATION_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
  			</tr>
  			<tr>
***************
*** 29,33 ****
  			</tr>
  			<tr>
! 				<td class="cat" colspan="2"><span class="cattitle"><b>{L_PROFILE_INFO}</b></span><br /><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
  			</tr>
  			<tr>
--- 29,33 ----
  			</tr>
  			<tr>
! 				<td class="cat" colspan="2" height="30"><span class="cattitle"><b>{L_PROFILE_INFO}</b></span><br /><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
  			</tr>
  			<tr>
***************
*** 68,72 ****
  			</tr>
  			<tr>
! 				<td class="cat" colspan="2"><span class="cattitle"><b>{L_PREFERENCES}</b></span></td>
  			</tr>
  			<tr>
--- 68,72 ----
  			</tr>
  			<tr>
! 				<td class="cat" colspan="2" height="30"><span class="cattitle"><b>{L_PREFERENCES}</b></span></td>
  			</tr>
  			<tr>
***************
*** 124,128 ****
  			<!-- BEGIN avatarblock -->
  			<tr>
! 				<td class="cat" colspan="2"><span class="cattitle"><b>{L_AVATAR_PANEL}</b></span></td>
  			</tr>
  			<tr>
--- 124,128 ----
  			<!-- BEGIN avatarblock -->
  			<tr>
! 				<td class="cat" colspan="2" height="30"><span class="cattitle"><b>{L_AVATAR_PANEL}</b></span></td>
  			</tr>
  			<tr>
***************
*** 158,162 ****
  			<!-- END avatarblock -->
  			<tr>
! 			   	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="liteoptiontable" type="reset" value="{L_RESET}" /></td>
  			</tr>
  		</table></td>
--- 158,162 ----
  			<!-- END avatarblock -->
  			<tr>
! 			   	<td class="cat" colspan="2" height="30" align="center">{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="liteoptiontable" type="reset" value="{L_RESET}" /></td>
  			</tr>
  		</table></td>

Index: profile_send_email.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/Euclid/profile_send_email.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** profile_send_email.tpl	2001/12/10 00:58:50	1.1
--- profile_send_email.tpl	2001/12/11 14:02:33	1.2
***************
*** 32,86 ****
  {ERROR_BOX}
  
! <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr>
! 		<td align="left"><span  class="nav"><a href="{U_INDEX}" class="nav">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
  	</tr>
  </table>
  
! <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
! 	<tr> 
! 		<th class="thHead" colspan="2" height="25"><b>{L_SEND_EMAIL_MSG}</b></th>
! 	</tr>
! 	<tr> 
! 		<td class="row1" width="22%"><span class="gen"><b>{L_RECIPIENT}</b></span></td>
! 		<td class="row2" width="78%"><span class="gen"><b>{USERNAME}</b></span> </td>
! 	</tr>
! 	<tr> 
! 		<td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td>
! 		<td class="row2" width="78%"><span class="gen"><input type="text" name="subject" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" value="{SUBJECT}" /></span> </td>
! 	</tr>
! 	<tr> 
! 		<td class="row1" valign="top"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br /><span class="gensmall">{L_MESSAGE_BODY_DESC}</span></td>
! 		<td class="row2"><span class="gen"><textarea name="message" rows="25" cols="40" wrap="virtual" style="width:500px" tabindex="3" class="post">{MESSAGE}</textarea></span></td>
! 	</tr>
! 	<tr> 
! 		<td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td>
! 		<td class="row2"><table cellspacing="0" cellpadding="1" border="0">
  			<tr> 
! 				<td><input type="checkbox" name="cc_email"  value="1" checked="checked" /></td>
! 				<td><span class="gen">{L_CC_EMAIL}</span></td>
  			</tr>
  		</table></td>
  	</tr>
- 	<tr>
- 		<td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} 
- 		<!-- Spell checker option part 2: You must sign up for free at www.spellchecker.net to use this option -->
- 		<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
- 		<!-- Remember to uncomment the link to the javascript file at the top of this template -->
- 		<!-- input type="button" tabindex="4" class="liteoption" name="spellcheck" value="{L_SPELLCHECK}" onClick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB/spellcheck/sproxy.php', true);" / -->
- 		<!-- End spellchecker option -->
- 		&nbsp;<input type="submit" tabindex="6" name="submit" class="mainoption" value="{L_SEND_EMAIL}" /></td>
- 	</tr>
  </table>
  
! <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
! 	<tr> 
! 		<td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
! 	</tr>
! </table></form>
  
! <table width="100%" cellspacing="2" border="0" align="center">
! 	<tr>
! 		<td valign="top" align="right">{JUMPBOX}</td>
  	</tr>
  </table>
--- 32,87 ----
  {ERROR_BOX}
  
! <table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
  	<tr>
! 		<td><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
  	</tr>
  </table>
  
! <table width="98%" cellspacing="0" cellpadding="0" border="0" align="center">
! 	<tr>
! 		<td class="tablebg"><table width="100%" cellspacing="1" cellpadding="3" border="0">
  			<tr> 
! 				<td class="cat" colspan="2" height="30" align="center"><span class="cattitle">{L_SEND_EMAIL_MSG}</span></td>
  			</tr>
+ 			<tr> 
+ 				<td class="row1" width="22%"><span class="gen"><b>{L_RECIPIENT}</b></span></td>
+ 				<td class="row2" width="78%"><span class="gen"><b>{USERNAME}</b></span> </td>
+ 			</tr>
+ 			<tr> 
+ 				<td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td>
+ 				<td class="row2" width="78%"><span class="courier"><input type="text" name="subject" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" value="{SUBJECT}" /></span></td>
+ 			</tr>
+ 			<tr> 
+ 				<td class="row1" valign="top"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br /><span class="gensmall">{L_MESSAGE_BODY_DESC}</span></td>
+ 				<td class="row2"><span class="courier"><textarea name="message" rows="25" cols="40" wrap="virtual" style="width:500px" tabindex="3" class="post">{MESSAGE}</textarea></span></td>
+ 			</tr>
+ 			<tr> 
+ 				<td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td>
+ 				<td class="row2"><table cellspacing="0" cellpadding="1" border="0">
+ 					<tr> 
+ 						<td><input type="checkbox" name="cc_email"  value="1" checked="checked" /></td>
+ 						<td><span class="gen">{L_CC_EMAIL}</span></td>
+ 					</tr>
+ 				</table></td>
+ 			</tr>
+ 			<tr>
+ 				<td class="cat" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} 
+ 				<!-- Spell checker option part 2: You must sign up for free at www.spellchecker.net to use this option -->
+ 				<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
+ 				<!-- Remember to uncomment the link to the javascript file at the top of this template -->
+ 				<!-- input type="button" tabindex="4" class="liteoption" name="spellcheck" value="{L_SPELLCHECK}" onClick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB/spellcheck/sproxy.php', true);" / -->&nbsp;
+ 				<!-- End spellchecker option -->
+ 				<input class="mainoptiontable" type="submit" tabindex="6" name="submit" value="{L_SEND_EMAIL}" /></td>
+ 			</tr>
  		</table></td>
  	</tr>
  </table>
  
! </form>
  
! <table width="98%" cellspacing="2" cellpadding="0" border="0" align="center">
! 	<tr> 
! 		<td valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
! 		<td align="right">{JUMPBOX}</td>
  	</tr>
  </table>

Index: search_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/Euclid/search_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search_body.tpl	2001/12/10 00:58:50	1.1
--- search_body.tpl	2001/12/11 14:02:33	1.2
***************
*** 1,6 ****
  
! <form action="{S_SEARCH_ACTION}" method="POST">
  
! <table width="98%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr> 
  		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
--- 1,6 ----
  
! <form action="{S_SEARCH_ACTION}" method="post">
  
! <table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
  	<tr> 
  		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
***************
*** 12,16 ****
  		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
  			<tr>
! 				<th colspan="4" height="25">{L_SEARCH_QUERY}</th>
  			</tr>
  			<tr> 
--- 12,16 ----
  		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
  			<tr>
! 				<td class="cat" colspan="4" height="30" align="center"><span class="cattitle">{L_SEARCH_QUERY}</span></td>
  			</tr>
  			<tr> 
***************
*** 23,27 ****
  			</tr>
  			<tr> 
! 				<th colspan="4" height="25">{L_SEARCH_OPTIONS}</th>
  			</tr>
  			<tr>
--- 23,27 ----
  			</tr>
  			<tr> 
! 				<td class="cat" colspan="4" height="30" align="center"><span class="cattitle">{L_SEARCH_OPTIONS}</span></td>
  			</tr>
  			<tr>
***************
*** 29,33 ****
  				<td class="row2"><span class="gensmall"><select class="post" name="searchforum">{S_FORUM_OPTIONS}</select></span></td>
  				<td class="row1" align="right"><span class="gen">{L_RETURN_FIRST}</span></td>
! 				<td class="row2"><span class="gensmall"><select class="post" name="charsreqd">{S_CHARACTER_OPTIONS}</select></span><span class="gen">{L_CHARACTERS}</span></td>
  			</tr>
  			<tr> 
--- 29,33 ----
  				<td class="row2"><span class="gensmall"><select class="post" name="searchforum">{S_FORUM_OPTIONS}</select></span></td>
  				<td class="row1" align="right"><span class="gen">{L_RETURN_FIRST}</span></td>
! 				<td class="row2"><span class="gensmall"><select class="post" name="charsreqd">{S_CHARACTER_OPTIONS}</select></span> <span class="gen">{L_CHARACTERS}</span></td>
  			</tr>
  			<tr> 
***************
*** 39,49 ****
  			<tr> 
  				<td class="row1" align="right" nowrap="nowrap"><span class="gen">{L_DISPLAY_RESULTS}:&nbsp;</span></td>
! 				<td class="row2" nowrap="nowrap"><input type="radio" name="showresults" value="posts" /><span class="gen">{L_POSTS}<input type="radio" name="showresults" value="topics" checked="checked" />
! 		{L_TOPICS}</span></td>
  				<td class="row1" align="right" nowrap="nowrap"><span class="gen">{L_SEARCH_PREVIOUS}:&nbsp;</span></td>
  				<td class="row2" valign="middle"><span class="gensmall"><select class="post" name="resultdays">{S_TIME_OPTIONS}</select></span></td>
  			</tr>
  			<tr> 
! 				<td class="cat" colspan="4" align="center" height="28">{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" value="{L_SEARCH}" /></td>
  			</tr>
  		</table></td>
--- 39,48 ----
  			<tr> 
  				<td class="row1" align="right" nowrap="nowrap"><span class="gen">{L_DISPLAY_RESULTS}:&nbsp;</span></td>
! 				<td class="row2" nowrap="nowrap"><input type="radio" name="showresults" value="posts" /><span class="gen">{L_POSTS}<input type="radio" name="showresults" value="topics" checked="checked" />{L_TOPICS}</span></td>
  				<td class="row1" align="right" nowrap="nowrap"><span class="gen">{L_SEARCH_PREVIOUS}:&nbsp;</span></td>
  				<td class="row2" valign="middle"><span class="gensmall"><select class="post" name="resultdays">{S_TIME_OPTIONS}</select></span></td>
  			</tr>
  			<tr> 
! 				<td class="cat" colspan="4" height="30" align="center">{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" value="{L_SEARCH}" /></td>
  			</tr>
  		</table></td>
***************
*** 53,59 ****
  <table width="98%" cellspacing="2" border="0" align="center">
  	<tr>
! 		<td align="right" valign="middle"><span class="gensmall">{S_TIMEZONE}</span><br /><br /></td>
! 	<tr>
! 	<tr>
  		<td align="right" valign="top">{JUMPBOX}</td>
  	</tr>
--- 52,56 ----
  <table width="98%" cellspacing="2" border="0" align="center">
  	<tr>
! 		<td valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
  		<td align="right" valign="top">{JUMPBOX}</td>
  	</tr>

[Phpbb-checkins] CVS: phpBB2/includes bbcode.php,1.18,1.19

From: Nathan C. <na...@us...> - 2001-12-11 09:13:06

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv11817/includes

Modified Files:
	bbcode.php 
Log Message:
bug #489842 -- some pages were doing bbencode_second and make_click in a bad order.

Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** bbcode.php	2001/12/06 23:39:16	1.18
--- bbcode.php	2001/12/11 09:13:04	1.19
***************
*** 579,582 ****
--- 579,583 ----
  function make_clickable($text)
  {
+ 
  	// pad it with a space so we can match things at the start of the 1st line.
  	$ret = " " . $text;

[Phpbb-checkins] CVS: phpBB2 search.php,1.43,1.44 viewtopic.php,1.146,1.147

From: Nathan C. <na...@us...> - 2001-12-11 09:13:06

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv11817

Modified Files:
	search.php viewtopic.php 
Log Message:
bug #489842 -- some pages were doing bbencode_second and make_click in a bad order.

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** search.php	2001/12/11 08:43:04	1.43
--- search.php	2001/12/11 09:13:03	1.44
***************
*** 910,914 ****
  						$user_sig_bbcode_uid = $searchset[$i]['user_sig_bbcode_uid'];
  
! 						$message = make_clickable($message);
  
  						if( count($search_string) )
--- 910,914 ----
  						$user_sig_bbcode_uid = $searchset[$i]['user_sig_bbcode_uid'];
  
! 						
  
  						if( count($search_string) )
***************
*** 942,947 ****
  						if( $searchset[$i]['enable_sig'] )
  						{
! 							$message .= "<br /><br />_________________<br />" . make_clickable($user_sig);
  						}
  					}
  
--- 942,949 ----
  						if( $searchset[$i]['enable_sig'] )
  						{
! 							$message .= "<br /><br />_________________<br />" . $user_sig;
  						}
+ 						
+ 						$message = make_clickable($message);
  					}
  

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -r1.146 -r1.147
*** viewtopic.php	2001/12/11 08:43:04	1.146
--- viewtopic.php	2001/12/11 09:13:03	1.147
***************
*** 938,942 ****
  	// output
  	//
- 	$message = make_clickable($message);
  
  	//
--- 938,941 ----
***************
*** 986,992 ****
  	if( $postrow[$i]['enable_sig'] && $user_sig != "" )
  	{
! 		$message .= "<br /><br />_________________<br />" . make_clickable($user_sig);
  	}
  
  	//
  	// Replace naughty words
--- 985,993 ----
  	if( $postrow[$i]['enable_sig'] && $user_sig != "" )
  	{
! 		$message .= "<br /><br />_________________<br />" . $user_sig;
  	}
  
+ 	$message = make_clickable($message);
+ 	
  	//
  	// Replace naughty words

[Phpbb-checkins] CVS: phpBB2 posting.php,1.122,1.123 privmsg.php,1.60,1.61

From: Nathan C. <na...@us...> - 2001-12-11 08:55:20

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv6514

Modified Files:
	posting.php privmsg.php 
Log Message:
bug #490286: undoing bbencode_first_pass() when bbcode was disabled is fruitless.

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -r1.122 -r1.123
*** posting.php	2001/12/11 08:43:04	1.122
--- posting.php	2001/12/11 08:55:17	1.123
***************
*** 2354,2357 ****
--- 2354,2358 ----
  			$post_message = $postrow['post_text'];
  			$post_bbcode_uid = $postrow['bbcode_uid'];
+ 			$post_bbcode_enabled = ($postrow['enable_bbcode'] == 1);
  
  			if( $mode == "editpost" )
***************
*** 2366,2370 ****
  			}
  
! 			$post_message = preg_replace("/\:(([a-z0-9]:)?)$post_bbcode_uid/si", "", $post_message);
  			$post_message = str_replace("<br />", "\n", $post_message);
  			$post_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $post_message);
--- 2367,2374 ----
  			}
  
! 			if ($post_bbcode_enabled)
! 			{
! 				$post_message = preg_replace("/\:(([a-z0-9]:)?)$post_bbcode_uid/si", "", $post_message);
! 			}
  			$post_message = str_replace("<br />", "\n", $post_message);
  			$post_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $post_message);

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** privmsg.php	2001/11/29 22:51:34	1.60
--- privmsg.php	2001/12/11 08:55:17	1.61
***************
*** 1218,1222 ****
  		if( $mode == "edit" )
  		{
! 			$sql = "SELECT pm.privmsgs_id, pm.privmsgs_subject, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id, u.user_sig 
  				FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u
  				WHERE pm.privmsgs_id = $privmsg_id
--- 1218,1222 ----
  		if( $mode == "edit" )
  		{
! 			$sql = "SELECT pm.*, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id, u.user_sig 
  				FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u
  				WHERE pm.privmsgs_id = $privmsg_id
***************
*** 1239,1244 ****
  			$privmsg_message = $privmsg['privmsgs_text'];
  			$privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
  
! 			$privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message);
  			$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
  			$privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message);
--- 1239,1249 ----
  			$privmsg_message = $privmsg['privmsgs_text'];
  			$privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
+ 			$privmsg_bbcode_enabled = ($privmsg['privmsgs_enable_bbcode'] == 1);
  
! 			if ($privmsg_bbcode_enabled)
! 			{
! 				$privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message);
! 			}
! 			
  			$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
  			$privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message);

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.91,1.92

From: Nathan C. <na...@us...> - 2001-12-11 08:43:08

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv4052/includes

Modified Files:
	functions.php 
Log Message:
bug #488067: no, preg_quote() didn't always have 2 args.

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** functions.php	2001/12/11 02:21:51	1.91
--- functions.php	2001/12/11 08:43:05	1.92
***************
*** 840,844 ****
  	for($i = 0; $i < count($smilies); $i++)
  	{
! 		$orig[] = "/(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code'], "/") . "(?=.\\W|\\W.|\\W$)/i";
  		$repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0">';
  	}
--- 840,844 ----
  	for($i = 0; $i < count($smilies); $i++)
  	{
! 		$orig[] = "/(?<=.\\W|\\W.|^\\W)" . phpbb_preg_quote($smilies[$i]['code'], "/") . "(?=.\\W|\\W.|\\W$)/i";
  		$repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0">';
  	}
***************
*** 888,892 ****
  		for($i = 0; $i < count($word_list); $i++)
  		{
! 			$word = str_replace("\*", "\w*?", preg_quote($word_list[$i]['word'], "#"));
  
  			$orig_word[] = "#\b(" . $word . ")\b#i";
--- 888,892 ----
  		for($i = 0; $i < count($word_list); $i++)
  		{
! 			$word = str_replace("\*", "\w*?", phpbb_preg_quote($word_list[$i]['word'], "#"));
  
  			$orig_word[] = "#\b(" . $word . ")\b#i";
***************
*** 1177,1180 ****
--- 1177,1200 ----
  
  }
+ 
+ 
+ 
+ //
+ // this does exactly what preg_quote() does in PHP 4-ish: http://www.php.net/manual/en/function.preg-quote.php
+ //
+ // This function is here because the 2nd paramter to preg_quote was added in some
+ // version of php 4.0.x.. So we use this in order to maintain compatibility with
+ // earlier versions of PHP.
+ // 
+ // If you just need the 1-parameter preg_quote call, then don't bother using this.
+ //
+ function phpbb_preg_quote($str, $delimiter)
+ {
+ 	$text = preg_quote($str);
+ 	$text = str_replace($delimiter, "\\" . $delimiter, $text);
+ 	
+ 	return $text;
+ }
+ 
  
  ?>

[Phpbb-checkins] CVS: phpBB2/develop search_fill.php,1.3,1.4

From: Nathan C. <na...@us...> - 2001-12-11 08:43:08

Update of /cvsroot/phpbb/phpBB2/develop
In directory usw-pr-cvs1:/tmp/cvs-serv4052/develop

Modified Files:
	search_fill.php 
Log Message:
bug #488067: no, preg_quote() didn't always have 2 args.

Index: search_fill.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/develop/search_fill.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** search_fill.php	2001/11/29 15:27:48	1.3
--- search_fill.php	2001/12/11 08:43:04	1.4
***************
*** 147,150 ****
--- 147,151 ----
  include($phpbb_root_path . 'includes/constants.'.$phpEx);
  include($phpbb_root_path . 'includes/db.'.$phpEx);
+ include($phpbb_root_path . 'includes/functions.'.$phpEx);
  
  print "<html>\n<body>\n";
***************
*** 163,167 ****
  { 
  	$filter_word = trim(strtolower($stopword_array[$j])); 
! 	$search[] = "/\b" . preg_quote($filter_word, "/") . "\b/is";
  	$replace[] = '';
  } 
--- 164,168 ----
  { 
  	$filter_word = trim(strtolower($stopword_array[$j])); 
! 	$search[] = "/\b" . phpbb_preg_quote($filter_word, "/") . "\b/is";
  	$replace[] = '';
  } 
***************
*** 170,174 ****
  { 
  	list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j]))); 
! 	$search[] = "/\b" . preg_quote(trim($match_synonym), "/") . "\b/is";
  	$replace[] = " " . trim($replace_synonym) . " ";
  } 
--- 171,175 ----
  { 
  	list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j]))); 
! 	$search[] = "/\b" . phpbb_preg_quote(trim($match_synonym), "/") . "\b/is";
  	$replace[] = " " . trim($replace_synonym) . " ";
  } 
***************
*** 314,318 ****
  
  /*
! 			//$phrase_string = preg_replace("/\b" . preg_quote($word[$j], "/") . "\b/is", $word_id, $phrase_string);
  			$phrase_string = trim(preg_replace("/ {2,}/s", " ", str_replace(array("*", "'"), " ", $phrase_string)));
  
--- 315,319 ----
  
  /*
! 			//$phrase_string = preg_replace("/\b" . phpbb_preg_quote($word[$j], "/") . "\b/is", $word_id, $phrase_string);
  			$phrase_string = trim(preg_replace("/ {2,}/s", " ", str_replace(array("*", "'"), " ", $phrase_string)));

[Phpbb-checkins] CVS: phpBB2 posting.php,1.121,1.122 search.php,1.42,1.43 viewtopic.php,1.145,1.146

From: Nathan C. <na...@us...> - 2001-12-11 08:43:08

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv4052

Modified Files:
	posting.php search.php viewtopic.php 
Log Message:
bug #488067: no, preg_quote() didn't always have 2 args.

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -r1.121 -r1.122
*** posting.php	2001/12/05 00:00:39	1.121
--- posting.php	2001/12/11 08:43:04	1.122
***************
*** 71,75 ****
  		{ 
  			$filter_word = trim(strtolower($stopword_list[$j])); 
! 			$entry =  preg_replace("/\b" . preg_quote($filter_word, "/") . "\b/is", " ", $entry); 
  		} 
  	}
--- 71,75 ----
  		{ 
  			$filter_word = trim(strtolower($stopword_list[$j])); 
! 			$entry =  preg_replace("/\b" . phpbb_preg_quote($filter_word, "/") . "\b/is", " ", $entry); 
  		} 
  	}
***************
*** 80,84 ****
  		{ 
  			list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j]))); 
! 			$entry =  preg_replace("/\b" . preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry); 
  		} 
  	}
--- 80,84 ----
  		{ 
  			list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j]))); 
! 			$entry =  preg_replace("/\b" . phpbb_preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry); 
  		} 
  	}

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** search.php	2001/12/10 00:17:20	1.42
--- search.php	2001/12/11 08:43:04	1.43
***************
*** 65,69 ****
  			if( $filter_word != "and" && $filter_word != "or" && $filter_word != "not" )
  			{
! 				$entry =  preg_replace("/\b" . preg_quote($filter_word, "/") . "\b/is", " ", $entry); 
  			}
  		} 
--- 65,69 ----
  			if( $filter_word != "and" && $filter_word != "or" && $filter_word != "not" )
  			{
! 				$entry =  preg_replace("/\b" . phpbb_preg_quote($filter_word, "/") . "\b/is", " ", $entry); 
  			}
  		} 
***************
*** 84,88 ****
  				$replace_synonym != "and" && $replace_synonym != "or" && $replace_synonym != "not" )
  			{
! 				$entry =  preg_replace("/\b" . preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry); 
  			}
  		} 
--- 84,88 ----
  				$replace_synonym != "and" && $replace_synonym != "or" && $replace_synonym != "not" )
  			{
! 				$entry =  preg_replace("/\b" . phpbb_preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry); 
  			}
  		} 
***************
*** 849,853 ****
  				$highlight_active .= " " . $split_word;
  
! 				$search_string[] = "#\b(" . str_replace("\*", ".*?", preg_quote($split_word, "#")) . ")(?!.*?<\/a>)(?!.*?\[/url\])\b#i";
  				$replace_string[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>";
  
--- 849,853 ----
  				$highlight_active .= " " . $split_word;
  
! 				$search_string[] = "#\b(" . str_replace("\*", ".*?", phpbb_preg_quote($split_word, "#")) . ")(?!.*?<\/a>)(?!.*?\[/url\])\b#i";
  				$replace_string[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>";
  
***************
*** 858,862 ****
  					if( $replace_synonym == $split_word )
  					{
! 						$search_string[] = "#\b(" . str_replace("\*", ".*?", preg_quote($replace_synonym, "#")) . ")(?!.*?<\/a>)(?!.*?\[/url\])\b#i";
  						$replace_string[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>";
  
--- 858,862 ----
  					if( $replace_synonym == $split_word )
  					{
! 						$search_string[] = "#\b(" . str_replace("\*", ".*?", phpbb_preg_quote($replace_synonym, "#")) . ")(?!.*?<\/a>)(?!.*?\[/url\])\b#i";
  						$replace_string[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>";
  

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -r1.145 -r1.146
*** viewtopic.php	2001/12/05 00:20:52	1.145
--- viewtopic.php	2001/12/11 08:43:04	1.146
***************
*** 549,553 ****
  		if( trim($words[$i]) != "" )
  		{
! 			$highlight_match[] = "#\b(" . str_replace("\*", ".*?", preg_quote($words[$i], "#")) . ")(?!.*?<\/a>)(?!.*?\[/url\])\b#i";
  			$highlight_replace[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>";
  		}
--- 549,553 ----
  		if( trim($words[$i]) != "" )
  		{
! 			$highlight_match[] = "#\b(" . str_replace("\*", ".*?", phpbb_preg_quote($words[$i], "#")) . ")(?!.*?<\/a>)(?!.*?\[/url\])\b#i";
  			$highlight_replace[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>";
  		}

[Phpbb-checkins] CVS: phpBB2/templates/Euclid error_body.tpl,1.2,1.3

From: Paul S. O. <ps...@us...> - 2001-12-11 02:55:02

Update of /cvsroot/phpbb/phpBB2/templates/Euclid
In directory usw-pr-cvs1:/tmp/cvs-serv2732/templates/Euclid

Modified Files:
	error_body.tpl 
Log Message:
Updates?

Index: error_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/Euclid/error_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** error_body.tpl	2001/12/10 13:14:25	1.2
--- error_body.tpl	2001/12/11 02:54:59	1.3
***************
*** 1,10 ****
  
! <table width="98%" cellpadding="0" cellspacing="1" border="0" align="center">
  	<tr>
  		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
  			<tr>
! 				<td class="row1" width="100%" align="center"><span class="gen">{ERROR_MESSAGE}</span></td>
  			</tr>
  		</table></td>
      </tr>
  </table>
--- 1,12 ----
  
! <table width="98%" cellspacing="0" cellpadding="0" border="0" align="center">
  	<tr>
  		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
  			<tr>
! 				<td class="row1" height="30" align="center"><span class="gen"><b>{ERROR_MESSAGE}</b></span></td>
  			</tr>
  		</table></td>
      </tr>
  </table>
+ 
+ <br clear="all" />

[Phpbb-checkins] CVS: phpBB2/db/schemas mysql_schema.sql,1.6,1.7 mssql_schema.sql,1.8,1.9

From: Paul S. O. <ps...@us...> - 2001-12-11 02:41:49

Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv31665/db/schemas

Modified Files:
	mysql_schema.sql mssql_schema.sql 
Log Message:
Fixed bug #490611

Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** mysql_schema.sql	2001/12/10 21:53:27	1.6
--- mysql_schema.sql	2001/12/11 02:41:47	1.7
***************
*** 427,431 ****
     topic_type tinyint(3) DEFAULT '0' NOT NULL,
     topic_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
!    topic_moved_id mediumint(8) UNSIGNED,
     PRIMARY KEY (topic_id),
     KEY forum_id (forum_id),
--- 427,431 ----
     topic_type tinyint(3) DEFAULT '0' NOT NULL,
     topic_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
!    topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
     PRIMARY KEY (topic_id),
     KEY forum_id (forum_id),

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** mssql_schema.sql	2001/12/01 01:20:10	1.8
--- mssql_schema.sql	2001/12/11 02:41:47	1.9
***************
*** 288,292 ****
  	[topic_type] [smallint] NOT NULL ,
  	[topic_vote] [smallint] NOT NULL ,
! 	[topic_last_post_id] [int] NULL ,
  	[topic_moved_id] [int] NULL 
  ) ON [PRIMARY]
--- 288,292 ----
  	[topic_type] [smallint] NOT NULL ,
  	[topic_vote] [smallint] NOT NULL ,
! 	[topic_last_post_id] [int] NOT NULL ,
  	[topic_moved_id] [int] NULL 
  ) ON [PRIMARY]
***************
*** 561,565 ****
  	CONSTRAINT [DF_phpbb_topics_topic_status] DEFAULT (0) FOR [topic_status],
  	CONSTRAINT [DF_phpbb_topics_topic_type] DEFAULT (0) FOR [topic_type],
! 	CONSTRAINT [DF_phpbb_topics_topic_vote] DEFAULT (0) FOR [topic_vote]
  GO
  
--- 561,566 ----
  	CONSTRAINT [DF_phpbb_topics_topic_status] DEFAULT (0) FOR [topic_status],
  	CONSTRAINT [DF_phpbb_topics_topic_type] DEFAULT (0) FOR [topic_type],
! 	CONSTRAINT [DF_phpbb_topics_topic_vote] DEFAULT (0) FOR [topic_vote], 
! 	CONSTRAINT [DF_phpbb_topics_topic_moved_id] DEFAULT (0) FOR topic_moved_id
  GO

[Phpbb-checkins] CVS: phpBB2/templates/subSilver modcp_split.tpl,1.3,1.4

From: Paul S. O. <ps...@us...> - 2001-12-11 02:21:55

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv27942/templates/subSilver

Modified Files:
	modcp_split.tpl 
Log Message:
More updates for Euclid, minor update to subSilver, fixed bug #490798

Index: modcp_split.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/modcp_split.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** modcp_split.tpl	2001/11/18 14:02:25	1.3
--- modcp_split.tpl	2001/12/11 02:21:52	1.4
***************
*** 22,26 ****
  	<tr> 
  	  <td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td>
! 	  <td class="row2" colspan="2"><span class="courier">{FORUM_INPUT}</span></td>
  	</tr>
  	<tr> 
--- 22,26 ----
  	<tr> 
  	  <td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td>
! 	  <td class="row2" colspan="2"><span class="courier">{S_FORUM_SELECT}</span></td>
  	</tr>
  	<tr> 
***************
*** 49,53 ****
  		<table width="100%" cellspacing="0" cellpadding="3" border="0">
  		  <tr> 
! 			<td valign="middle"><img src="images/icon_minipost.gif" alt="Post image icon"><span class="postdetails">{L_POSTED}: 
  			  {postrow.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
  		  </tr>
--- 49,53 ----
  		<table width="100%" cellspacing="0" cellpadding="3" border="0">
  		  <tr> 
! 			<td valign="middle"><img src="templates/subSilver/images/icon_minipost.gif" alt="Post image icon"><span class="postdetails">{L_POSTED}: 
  			  {postrow.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
  		  </tr>
***************
*** 55,65 ****
  			<td valign="top"> 
  			  <hr size="1" />
! 			  <span class="postbody">{postrow.MESSAGE}</span></td>
  		  </tr>
  		</table>
  	  </td>
! 	  <td width="5%" align="center" class="{postrow.ROW_CLASS}">&nbsp; 
! 		<input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" />
! 		&nbsp;</td>
  	</tr>
  	<tr> 
--- 55,63 ----
  			<td valign="top"> 
  			  <hr size="1" />
! 			  <span class="postbody">{postrow.MESSAGE}</span></td> 
  		  </tr>
  		</table>
  	  </td>
! 	  <td width="5%" align="center" class="{postrow.ROW_CLASS}"><input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" /></td>
  	</tr>
  	<tr>

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.61,1.62

From: Paul S. O. <ps...@us...> - 2001-12-11 02:21:54

Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv27942/language/lang_english

Modified Files:
	lang_main.php 
Log Message:
More updates for Euclid, minor update to subSilver, fixed bug #490798

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** lang_main.php	2001/12/07 08:59:06	1.61
--- lang_main.php	2001/12/11 02:21:51	1.62
***************
*** 47,51 ****
  $lang['Topic'] = "Topic";
  $lang['Topics'] = "Topics";
- $lang['Reply'] = "Reply";
  $lang['Replies'] = "Replies";
  $lang['Views'] = "Views";
--- 47,50 ----
***************
*** 83,87 ****
  $lang['Disabled'] = "Disabled";
  $lang['Error'] = "Error";
- $lang['Success'] = "Success";
  
  $lang['Next'] = "Next";
--- 82,85 ----
***************
*** 306,310 ****
  $lang['Empty_subject'] = "You must specify a subject when posting a new topic";
  $lang['Empty_message'] = "You must enter a message when posting";
- $lang['Announce_and_sticky'] = "You cannot post a topic that is both an announcement and a sticky topic";
  $lang['Forum_locked'] = "This forum is locked you cannot post, reply to or edit topics";
  $lang['Topic_locked'] = "This topic is locked you cannot edit posts or make replies";
--- 304,307 ----
***************
*** 716,720 ****
  // Viewonline
  //
- $lang['Who_is_online'] = "Who is online";
  $lang['Reg_users_online'] = "There are %d Registered and "; // There ae 5 Registered and
  $lang['Hidden_users_online'] = "%d Hidden users online"; // 6 Hidden users online
--- 713,716 ----
***************
*** 755,758 ****
--- 751,755 ----
  $lang['Topics_Moved'] = "The selected topics have been moved";
  $lang['Topics_Unlocked'] = "The selected topics have been unlocked";
+ $lang['No_Topics_Moved'] = "No topics were moved";
  
  $lang['Confirm_delete_topic'] = "Are you sure you want to remove the selected topic/s?";

7 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 600 601 602 603 604 .. 629 > >> (Page 602 of 629)