[Phpbb-checkins] CVS: phpBB2 search.php,1.38,1.39 viewtopic.php,1.141,1.142 posting.php,1.108,1.109

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	search.php viewtopic.php posting.php 
Log Message:
Finally moved the bbcode_uid from posts to posts_text, DON'T FORGET TO RUN THE CONVERT SCRIPT IN /develop/ !!

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** search.php	2001/11/23 01:04:31	1.38
--- search.php	2001/11/24 17:17:04	1.39
***************
*** 650,654 ****
  			if( $show_results == "posts" )
  			{
! 				$sql = "SELECT pt.post_text, pt.post_subject, p.*, f.forum_name, t.*, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid  
  					FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt 
  					WHERE p.post_id IN ($search_results)
--- 650,654 ----
  			if( $show_results == "posts" )
  			{
! 				$sql = "SELECT pt.post_text, pt.bbcode_uid, pt.post_subject, p.*, f.forum_name, t.*, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid  
  					FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt 
  					WHERE p.post_id IN ($search_results)
***************
*** 1192,1194 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 1192,1194 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -r1.141 -r1.142
*** viewtopic.php	2001/11/24 15:57:31	1.141
--- viewtopic.php	2001/11/24 17:17:06	1.142
***************
*** 384,388 ****
  // 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
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
--- 384,388 ----
  // 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
***************
*** 1084,1086 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 1084,1086 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -r1.108 -r1.109
*** posting.php	2001/11/24 15:57:31	1.108
--- posting.php	2001/11/24 17:17:06	1.109
***************
*** 428,432 ****
  	// Go ahead and pull all data for this topic
  	//
! 	$sql = "SELECT u.username, u.user_id, p.*,  pt.post_text, pt.post_subject
  		FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  		WHERE p.topic_id = $topic_id
--- 428,432 ----
  	// Go ahead and pull all data for this topic
  	//
! 	$sql = "SELECT u.username, u.user_id, 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
***************
*** 1251,1256 ****
  		}
  
! 		$sql = "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, bbcode_uid, enable_bbcode, enable_html, enable_smilies, enable_sig)
! 			VALUES ($new_topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', '$bbcode_uid', $bbcode_on, $html_on, $smilies_on, $attach_sig)";
  		$result = ($mode == "reply") ? $db->sql_query($sql, BEGIN_TRANSACTION) : $db->sql_query($sql);
  
--- 1251,1256 ----
  		}
  
! 		$sql = "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig)
! 			VALUES ($new_topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)";
  		$result = ($mode == "reply") ? $db->sql_query($sql, BEGIN_TRANSACTION) : $db->sql_query($sql);
  
***************
*** 1259,1264 ****
  			$new_post_id = $db->sql_nextid();
  
! 			$sql = "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, post_text)
! 				VALUES ($new_post_id, '$post_subject', '$post_message')";
  
  			if( $db->sql_query($sql) )
--- 1259,1264 ----
  			$new_post_id = $db->sql_nextid();
  
! 			$sql = "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text)
! 				VALUES ($new_post_id, '$post_subject', '$bbcode_uid', '$post_message')";
  
  			if( $db->sql_query($sql) )
***************
*** 1866,1875 ****
  
  			$sql = "UPDATE " . POSTS_TABLE . "
! 				SET bbcode_uid = '$bbcode_uid', enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . "
  				WHERE post_id = $post_id";
  			if($db->sql_query($sql))
  			{
  				$sql = "UPDATE " . POSTS_TEXT_TABLE . "
! 					SET post_text = '$post_message', post_subject = '$post_subject'
  					WHERE post_id = $post_id"; 
  
--- 1866,1875 ----
  
  			$sql = "UPDATE " . POSTS_TABLE . "
! 				SET enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . "
  				WHERE post_id = $post_id";
  			if($db->sql_query($sql))
  			{
  				$sql = "UPDATE " . POSTS_TEXT_TABLE . "
! 					SET post_text = '$post_message',  bbcode_uid = '$bbcode_uid', post_subject = '$post_subject'
  					WHERE post_id = $post_id"; 
  
***************
*** 2309,2313 ****
  	{
  
! 		$sql = "SELECT p.*, pt.post_text, pt.post_subject, u.username, u.user_id, u.user_sig, t.topic_title, t.topic_type, t.topic_vote
  			FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . TOPICS_TABLE . " t, " . POSTS_TEXT_TABLE . " pt
  			WHERE p.post_id = $post_id
--- 2309,2313 ----
  	{
  
! 		$sql = "SELECT p.*, pt.post_text, pt.post_subject, pt.bbcode_uid, u.username, u.user_id, u.user_sig, t.topic_title, t.topic_type, t.topic_vote
  			FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . TOPICS_TABLE . " t, " . POSTS_TEXT_TABLE . " pt
  			WHERE p.post_id = $post_id
***************
*** 2796,2798 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 2796,2798 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>

[Phpbb-checkins] CVS: phpBB2 search.php,1.38,1.39 viewtopic.php,1.141,1.142 posting.php,1.108,1.109

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

[Phpbb-checkins] CVS: phpBB2 search.php,1.38,1.39 viewtopic.php,1.141,1.142 posting.php,1.108,1.109