[mxbb-commits] mx_phpCA/includes ads_comment.php, 1.1, 1.2 ads_comment_temp.php, 1.1, 1.2 ads_item.

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

Update of /cvsroot/mxbb/mx_phpCA/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18718/includes

Modified Files:
	ads_comment.php ads_comment_temp.php ads_item.php 
	ads_item_block.php ads_search.php 
Log Message:
hmmm...i have no idea what i have done ;)

Index: ads_item.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_item.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ads_item.php	6 Jun 2007 22:24:43 -0000	1.1
--- ads_item.php	28 Jan 2008 21:58:52 -0000	1.2
***************
*** 29,33 ****
  if ( view_allowed($ads_config['view_level']) == FALSE )
  {
! 	if ( !$userdata['session_logged_in'] ) 
  	{
  		mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=" . this_ads_loginurl()));
--- 29,33 ----
  if ( view_allowed($ads_config['view_level']) == FALSE )
  {
! 	if ( !$userdata['session_logged_in'] )
  	{
  		mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=" . this_ads_loginurl()));
***************
*** 49,56 ****

  // Get the row from the adverts table
! $sql = "SELECT * 
! 		FROM ". ADS_ADVERTS_TABLE ." 
  		WHERE id = '$id'";
! 		
  $result = $db->sql_query($sql);
  $adverts_row = $db->sql_fetchrow($result);
--- 49,56 ----

  // Get the row from the adverts table
! $sql = "SELECT *
! 		FROM ". ADS_ADVERTS_TABLE ."
  		WHERE id = '$id'";
! 
  $result = $db->sql_query($sql);
  $adverts_row = $db->sql_fetchrow($result);
***************
*** 80,84 ****

  // Update the views counter
! $sql = "UPDATE ". ADS_ADVERTS_TABLE ." 
  		SET views = views + 1
  		WHERE id = $id";
--- 80,84 ----

  // Update the views counter
! $sql = "UPDATE ". ADS_ADVERTS_TABLE ."
  		SET views = views + 1
  		WHERE id = $id";
***************
*** 93,97 ****

  // Get the row from the categories table
! $sql = "SELECT * 
  		FROM ". ADS_CATEGORIES_TABLE ."
  		WHERE cat_category = '".addslashes($category)."'
--- 93,97 ----

  // Get the row from the categories table
! $sql = "SELECT *
  		FROM ". ADS_CATEGORIES_TABLE ."
  		WHERE cat_category = '".addslashes($category)."'
***************
*** 113,120 ****
  // Get the row from the details table

! $sql = "SELECT * 
! 		FROM ". ADS_DETAILS_TABLE ." 
  		WHERE id = '$id'";
! 		
  $result = $db->sql_query($sql);
  $details_row = $db->sql_fetchrow($result);
--- 113,120 ----
  // Get the row from the details table

! $sql = "SELECT *
! 		FROM ". ADS_DETAILS_TABLE ."
  		WHERE id = '$id'";
! 
  $result = $db->sql_query($sql);
  $details_row = $db->sql_fetchrow($result);
***************
*** 152,156 ****
  {
  	// Get advertisers details from phpBB
! 	$profiledata = get_userdata($user_id); 

  	$temp_url = append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id");
--- 152,156 ----
  {
  	// Get advertisers details from phpBB
! 	$profiledata = mx_get_userdata($user_id);

  	$temp_url = append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id");
***************
*** 162,171 ****
  	$pm = '<a href="' . $temp_url . '">' . $lang['Send_private_message'] . '</a>';

! 	if ( !empty($profiledata['user_viewemail']) || $userdata['user_level'] == ADMIN ) 
! 	{ 
!    	$email_uri = ( $board_config['board_email_form'] ) ? append_sid($phpbb_root_path . "profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $user_id) : 'mailto:' . $profiledata['user_email']; 

! 		$email_img = '<a href="' . $email_uri . '"><img src="' . $mx_images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>'; 
! 		$email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>';	
  	}
  	else
--- 162,171 ----
  	$pm = '<a href="' . $temp_url . '">' . $lang['Send_private_message'] . '</a>';

! 	if ( !empty($profiledata['user_viewemail']) || $userdata['user_level'] == ADMIN )
! 	{
!    	$email_uri = ( $board_config['board_email_form'] ) ? append_sid($phpbb_root_path . "profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $user_id) : 'mailto:' . $profiledata['user_email'];

! 		$email_img = '<a href="' . $email_uri . '"><img src="' . $mx_images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>';
! 		$email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>';
  	}
  	else
***************
*** 262,266 ****
  {
  	// Get recipients details from phpBB
! 	$profiledata = get_userdata($edit_user_id); 

  	$edit_details = sprintf($lang['last_edited_by'], $profiledata['username'], date($lang['DATE_FORMAT'],$edit_time), $edit_count);
--- 262,266 ----
  {
  	// Get recipients details from phpBB
! 	$profiledata = mx_get_userdata($edit_user_id);

  	$edit_details = sprintf($lang['last_edited_by'], $profiledata['username'], date($lang['DATE_FORMAT'],$edit_time), $edit_count);
***************
*** 269,273 ****
  {
  	// Get recipients details from phpBB
! 	//$profiledata = get_userdata($edit_user_id); 

  	$edit_details = '';
--- 269,273 ----
  {
  	// Get recipients details from phpBB
! 	//$profiledata = mx_get_userdata($edit_user_id);

  	$edit_details = '';
***************
*** 282,312 ****

! $template->set_filenames(array('item_page' => 'ads_item.tpl')); 

  // Do not allow details to be input for basic ads
  if ( $ad_type_code != 1 )
! {			
  	$template->assign_block_vars('not_basic_ad',array());

  	// Set the custom field template variables
! 	for ($counter = 1; $counter <= 10; $counter += 1) 
  	{
  		$field_val = $details_row['field_'.$counter];
  		$field_desc = $category_row['cat_field_'.$counter.'_desc'];
! 	
  		if ($field_val != '')
  			{$template->assign_block_vars( 'custom_field', array(	'FIELD_VAL' => $field_val,
! 																		 			'FIELD_DESC' => $field_desc));} 
  	}
  }

  // Get rows from the images table
! $sql = "SELECT * 
! 		FROM ". ADS_IMAGES_TABLE ." 
  		WHERE id = '$id'
  		AND img_deleted_ind = 0";

! $sql2 = "SELECT * 
! 		FROM ". ADS_ADVERTS_TABLE ." 
  		WHERE ebay_id = '$ebay_id'
  		LIMIT 1";
--- 282,312 ----

! $template->set_filenames(array('item_page' => 'ads_item.tpl'));

  // Do not allow details to be input for basic ads
  if ( $ad_type_code != 1 )
! {
  	$template->assign_block_vars('not_basic_ad',array());

  	// Set the custom field template variables
! 	for ($counter = 1; $counter <= 10; $counter += 1)
  	{
  		$field_val = $details_row['field_'.$counter];
  		$field_desc = $category_row['cat_field_'.$counter.'_desc'];
! 
  		if ($field_val != '')
  			{$template->assign_block_vars( 'custom_field', array(	'FIELD_VAL' => $field_val,
! 																		 			'FIELD_DESC' => $field_desc));}
  	}
  }

  // Get rows from the images table
! $sql = "SELECT *
! 		FROM ". ADS_IMAGES_TABLE ."
  		WHERE id = '$id'
  		AND img_deleted_ind = 0";

! $sql2 = "SELECT *
! 		FROM ". ADS_ADVERTS_TABLE ."
  		WHERE ebay_id = '$ebay_id'
  		LIMIT 1";
***************
*** 318,322 ****
  if ($db->sql_numrows($result)>0)
  {
! 	while ($row = $db->sql_fetchrow($result)) 
  	{
  		$medium_img_url = ADS_IMAGES_PATH .'ad'.$id.'_img'.$row['img_seq_no'].'_medium.jpg';
--- 318,322 ----
  if ($db->sql_numrows($result)>0)
  {
! 	while ($row = $db->sql_fetchrow($result))
  	{
  		$medium_img_url = ADS_IMAGES_PATH .'ad'.$id.'_img'.$row['img_seq_no'].'_medium.jpg';
***************
*** 324,328 ****
  //		$image = popup($medium_img_url, $large_img_url, $title);
  		$image = "<a onClick=\"window.open('$large_img_url','','scrollbars=yes,resizable=no,width=804,height=610')\" target='_blank'><img src='$medium_img_url' border='0' alt='$title'></a>";
! 		$template->assign_block_vars('imagerow', array(	'IMAGE' => $image)); 
  	}
  	$template->assign_block_vars('switch_images_found',array());
--- 324,328 ----
  //		$image = popup($medium_img_url, $large_img_url, $title);
  		$image = "<a onClick=\"window.open('$large_img_url','','scrollbars=yes,resizable=no,width=804,height=610')\" target='_blank'><img src='$medium_img_url' border='0' alt='$title'></a>";
! 		$template->assign_block_vars('imagerow', array(	'IMAGE' => $image));
  	}
  	$template->assign_block_vars('switch_images_found',array());
***************
*** 331,335 ****
  if ( $db->sql_numrows($result2) > 0 )
  {
! 	while ($row2 = $db->sql_fetchrow($result2)) 
  	{
  		$ebay_id = $row2['ebay_id'];
--- 331,335 ----
  if ( $db->sql_numrows($result2) > 0 )
  {
! 	while ($row2 = $db->sql_fetchrow($result2))
  	{
  		$ebay_id = $row2['ebay_id'];
***************
*** 358,366 ****
  			if ($webmasterplan_site != '0')
  			{
! 				$banner    = '<IMG SRC="http://banners.webmasterplan.com/view.asp?site=' . $webmasterplan_site . '&ref=' . $ebay_ref . '&b=' . rand(23, 43) . '&tnb=23" BORDER="0" WIDTH="100" HEIGHT="100">'; 
  			}
  			else
  			{
! 				$banner    = '<IMG SRC="' . $mx_images['ebayimage'] . '" BORDER="0" WIDTH="100" HEIGHT="100">'; 
  			}

--- 358,366 ----
  			if ($webmasterplan_site != '0')
  			{
! 				$banner    = '<IMG SRC="http://banners.webmasterplan.com/view.asp?site=' . $webmasterplan_site . '&ref=' . $ebay_ref . '&b=' . rand(23, 43) . '&tnb=23" BORDER="0" WIDTH="100" HEIGHT="100">';
  			}
  			else
  			{
! 				$banner    = '<IMG SRC="' . $mx_images['ebayimage'] . '" BORDER="0" WIDTH="100" HEIGHT="100">';
  			}

***************
*** 370,374 ****
  			'IMAGE'			=> $ref_image));
  		}
! 	}	
  }

--- 370,374 ----
  			'IMAGE'			=> $ref_image));
  		}
! 	}
  }

***************
*** 389,393 ****

  // Set the rest of the template variables
! $template->assign_vars(array(	

  	'U_ADS_ITEM' => append_sid(this_ads_mxurl("ads_mode=ads_item&id=$id")),
--- 389,393 ----

  // Set the rest of the template variables
! $template->assign_vars(array(

  	'U_ADS_ITEM' => append_sid(this_ads_mxurl("ads_mode=ads_item&id=$id")),
***************
*** 474,482 ****
  	'USERNAME' => $username));

! $template->pparse('item_page'); 

  		if ( !is_object($mx_block))
  		{
  			include($mx_root_path . 'includes/page_tail.'.$phpEx);
! 		}	
  ?>
\ No newline at end of file
--- 474,482 ----
  	'USERNAME' => $username));

! $template->pparse('item_page');

  		if ( !is_object($mx_block))
  		{
  			include($mx_root_path . 'includes/page_tail.'.$phpEx);
! 		}
  ?>
\ No newline at end of file

Index: ads_comment.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_comment.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ads_comment.php	6 Jun 2007 22:24:39 -0000	1.1
--- ads_comment.php	28 Jan 2008 21:58:51 -0000	1.2
***************
*** 39,43 ****
  	// Start session management
  	//
! 	$mx_user->init($user_ip, PAGE_INDEX); 
  	//
  	// End session management
--- 39,43 ----
  	// Start session management
  	//
! 	$mx_user->init($user_ip, PAGE_INDEX);
  	//
  	// End session management
***************
*** 127,131 ****
  // ------------------------------------

! $sql = "SELECT COUNT(comment_id) AS comments_count 
  		FROM ". ADS_COMMENTS_TABLE ."
  		WHERE comment_ad_id = $ad_id
--- 127,131 ----
  // ------------------------------------

! $sql = "SELECT COUNT(comment_id) AS comments_count
  		FROM ". ADS_COMMENTS_TABLE ."
  		WHERE comment_ad_id = $ad_id
***************
*** 180,185 ****
  	// ------------------------------------

! 	$sql = "SELECT user_id, username 
! 			FROM ". USERS_TABLE ." 
  			WHERE user_id = $user_id";

--- 180,185 ----
  	// ------------------------------------

! 	$sql = "SELECT user_id, username
! 			FROM ". USERS_TABLE ."
  			WHERE user_id = $user_id";

***************
*** 195,199 ****
  		mx_message_die(GENERAL_ERROR, $lang['user_does_not_exist']);
  	}
! 	
  	$username = $row['username'];
  }
--- 195,199 ----
  		mx_message_die(GENERAL_ERROR, $lang['user_does_not_exist']);
  	}
! 
  	$username = $row['username'];
  }
***************
*** 203,207 ****
  // ------------------------------------

! $sql = "SELECT * 
  		FROM ". ADS_IMAGES_TABLE ."
  		WHERE id = $ad_id
--- 203,207 ----
  // ------------------------------------

! $sql = "SELECT *
  		FROM ". ADS_IMAGES_TABLE ."
  		WHERE id = $ad_id
***************
*** 213,225 ****
  if ( $db->sql_numrows($result) > 0 )
  {
! 	while ($row = $db->sql_fetchrow($result)) 
  	{
  		$img_url = ADS_IMAGES_PATH ."ad".$ad_id."_img".$row["img_seq_no"]."_thumb.jpg";
  	}
! }		
  else
  {
  	$img_url = $mx_images['noimage'];
! } 

  // ------------------------------------
--- 213,225 ----
  if ( $db->sql_numrows($result) > 0 )
  {
! 	while ($row = $db->sql_fetchrow($result))
  	{
  		$img_url = ADS_IMAGES_PATH ."ad".$ad_id."_img".$row["img_seq_no"]."_thumb.jpg";
  	}
! }
  else
  {
  	$img_url = $mx_images['noimage'];
! }

  // ------------------------------------
***************
*** 363,367 ****
  		for ($i = 0; $i < count($commentrow); $i++)
  		{
! 			if ( ($commentrow[$i]['user_id'] == ADS_GUEST) 
  			or ($commentrow[$i]['username'] == '') )
  			{
--- 363,367 ----
  		for ($i = 0; $i < count($commentrow); $i++)
  		{
! 			if ( ($commentrow[$i]['user_id'] == ADS_GUEST)
  			or ($commentrow[$i]['username'] == '') )
  			{
***************
*** 401,405 ****
  				'POSTER' => $poster,
  				'TIME' => create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']),
! 				'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://network-tools.com/default.asp?host=' . decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '',

  				'TEXT' => nl2br($commentrow[$i]['comment_text']),
--- 401,405 ----
  				'POSTER' => $poster,
  				'TIME' => create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']),
! 				'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://network-tools.com/default.asp?host=' . phpBB2::decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . phpBB2::decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '',

  				'TEXT' => nl2br($commentrow[$i]['comment_text']),

Index: ads_search.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_search.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ads_search.php	6 Jun 2007 22:24:48 -0000	1.1
--- ads_search.php	28 Jan 2008 21:58:52 -0000	1.2
***************
*** 39,43 ****
  	// Start session management
  	//
! 	$mx_user->init($user_ip, PAGE_INDEX); 
  	//
  	// End session management
--- 39,43 ----
  	// Start session management
  	//
! 	$mx_user->init($user_ip, PAGE_INDEX);
  	//
  	// End session management
***************
*** 63,67 ****
  if ( search_allowed($ads_config['search_level']) == FALSE )
  {
! 	if ( !$userdata['session_logged_in'] ) 
  	{
  		mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=" . this_ads_loginurl("ads_mode=ads_search")));
--- 63,67 ----
  if ( search_allowed($ads_config['search_level']) == FALSE )
  {
! 	if ( !$userdata['session_logged_in'] )
  	{
  		mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=" . this_ads_loginurl("ads_mode=ads_search")));
***************
*** 84,95 ****
  		}

! 	$template->set_filenames(array('search_page' => 'ads_search.tpl')); 

! 	$sql = 'SELECT * 
  			FROM '. ADS_CATEGORIES_TABLE .'
  			ORDER BY cat_category, cat_sub_category ASC';

  	$result = $db->sql_query($sql);
! 	while ($row = $db->sql_fetchrow($result)) 
  	{
  		$option = $row['cat_category'].'>>'.$row['cat_sub_category'];
--- 84,95 ----
  		}

! 	$template->set_filenames(array('search_page' => 'ads_search.tpl'));

! 	$sql = 'SELECT *
  			FROM '. ADS_CATEGORIES_TABLE .'
  			ORDER BY cat_category, cat_sub_category ASC';

  	$result = $db->sql_query($sql);
! 	while ($row = $db->sql_fetchrow($result))
  	{
  		$option = $row['cat_category'].'>>'.$row['cat_sub_category'];
***************
*** 97,101 ****
  	}

! 	$template->assign_vars(array(	

  		'U_ADS_INDEX' => append_sid(this_ads_mxurl()),
--- 97,101 ----
  	}

! 	$template->assign_vars(array(

  		'U_ADS_INDEX' => append_sid(this_ads_mxurl()),
***************
*** 109,120 ****
  		'L_SEARCH_FOR_ALL_TERMS' => $lang['search_for_all_terms'],
  		'L_SEARCH_FOR_USERNAME' => $lang['search_for_username'],
! 		'L_SEARCH_FOR_AD_ID' => $lang['search_for_ad_id'], 
  		'L_SEARCH_OPTIONS' => $lang['search_options'],
  		'L_CAT_SUB_CAT' => $lang['cat_sub_cat'],
  		'L_ALL' => $lang['all'],
  		'L_AD_STATUS' => $lang['ad_status'],
! 		'L_ACTIVE' => $lang['active'],										
! 		'L_SOLD' => $lang['sold'],										
! 		'L_EXPIRED' => $lang['expired'],										
  		'L_SORT_BY' => $lang['sort_by'],

--- 109,120 ----
  		'L_SEARCH_FOR_ALL_TERMS' => $lang['search_for_all_terms'],
  		'L_SEARCH_FOR_USERNAME' => $lang['search_for_username'],
! 		'L_SEARCH_FOR_AD_ID' => $lang['search_for_ad_id'],
  		'L_SEARCH_OPTIONS' => $lang['search_options'],
  		'L_CAT_SUB_CAT' => $lang['cat_sub_cat'],
  		'L_ALL' => $lang['all'],
  		'L_AD_STATUS' => $lang['ad_status'],
! 		'L_ACTIVE' => $lang['active'],
! 		'L_SOLD' => $lang['sold'],
! 		'L_EXPIRED' => $lang['expired'],
  		'L_SORT_BY' => $lang['sort_by'],

***************
*** 130,151 ****
  		'SITE_NAME' => $board_config['sitename']));

! 	$template->pparse('search_page'); 

  		if ( !is_object($mx_block))
  		{
  			include($mx_root_path . 'includes/page_tail.'.$phpEx);
! 		}	
  }
  else
  {
  	// Process search
! 	
  	// Check for a search parameter
! 	if ( !isset($HTTP_POST_VARS['search_term']) 
  	and  !isset($HTTP_GET_VARS['search_term'])
! 	and  !isset($HTTP_POST_VARS['search_name']) 
! 	and  !isset($HTTP_GET_VARS['search_name']) 
! 	and  !isset($HTTP_POST_VARS['search_id']) 
! 	and  !isset($HTTP_GET_VARS['search_id']) ) 
  	{
  		mx_message_die(GENERAL_ERROR, $lang['invalid_request']);
--- 130,151 ----
  		'SITE_NAME' => $board_config['sitename']));

! 	$template->pparse('search_page');

  		if ( !is_object($mx_block))
  		{
  			include($mx_root_path . 'includes/page_tail.'.$phpEx);
! 		}
  }
  else
  {
  	// Process search
! 
  	// Check for a search parameter
! 	if ( !isset($HTTP_POST_VARS['search_term'])
  	and  !isset($HTTP_GET_VARS['search_term'])
! 	and  !isset($HTTP_POST_VARS['search_name'])
! 	and  !isset($HTTP_GET_VARS['search_name'])
! 	and  !isset($HTTP_POST_VARS['search_id'])
! 	and  !isset($HTTP_GET_VARS['search_id']) )
  	{
  		mx_message_die(GENERAL_ERROR, $lang['invalid_request']);
***************
*** 167,172 ****
  			include($mx_root_path . 'includes/page_header.'.$phpEx);
  		}
! 	
! 	$template->set_filenames(array('search_results' => 'ads_search_results.tpl')); 

  	// Sanitize input variables
--- 167,172 ----
  			include($mx_root_path . 'includes/page_header.'.$phpEx);
  		}
! 
! 	$template->set_filenames(array('search_results' => 'ads_search_results.tpl'));

  	// Sanitize input variables
***************
*** 181,185 ****
  	}

! 	if ( isset($HTTP_POST_VARS['search_name']) ) 
  	{
  		$search_name = htmlspecialchars($HTTP_POST_VARS['search_name']);
--- 181,185 ----
  	}

! 	if ( isset($HTTP_POST_VARS['search_name']) )
  	{
  		$search_name = htmlspecialchars($HTTP_POST_VARS['search_name']);
***************
*** 191,195 ****
  	}

! 	if ( isset($HTTP_POST_VARS['search_id']) ) 
  	{
  		$search_id = intval($HTTP_POST_VARS['search_id']);
--- 191,195 ----
  	}

! 	if ( isset($HTTP_POST_VARS['search_id']) )
  	{
  		$search_id = intval($HTTP_POST_VARS['search_id']);
***************
*** 274,280 ****
  		// Trim whitespace from the search term
  		$search_term = trim($search_term);
! 	
  		// Separate key-phrases into keywords
! 		$trimmed_array = explode(' ',$search_term); 

  		if ( $HTTP_POST_VARS['search_terms'] ) // This is the any/all indicator
--- 274,280 ----
  		// Trim whitespace from the search term
  		$search_term = trim($search_term);
! 
  		// Separate key-phrases into keywords
! 		$trimmed_array = explode(' ',$search_term);

  		if ( $HTTP_POST_VARS['search_terms'] ) // This is the any/all indicator
***************
*** 300,306 ****
  		}

! 		$sql= "SELECT * 
  				FROM ". ADS_ADVERTS_TABLE ."
! 				WHERE $sql1 
  				OR $sql2";
  	}
--- 300,306 ----
  		}

! 		$sql= "SELECT *
  				FROM ". ADS_ADVERTS_TABLE ."
! 				WHERE $sql1
  				OR $sql2";
  	}
***************
*** 311,316 ****
  		// Trim whitespace from the search name
  		$search_name = trim($search_name);
! 		
! 		$sql= "SELECT * 
  				FROM ". ADS_ADVERTS_TABLE ."
  				WHERE username = '$search_name'";
--- 311,316 ----
  		// Trim whitespace from the search name
  		$search_name = trim($search_name);
! 
! 		$sql= "SELECT *
  				FROM ". ADS_ADVERTS_TABLE ."
  				WHERE username = '$search_name'";
***************
*** 320,324 ****
  	if ( !empty($search_id) )
  	{
! 		$sql= "SELECT * 
  				FROM ". ADS_ADVERTS_TABLE ."
  				WHERE id = '$search_id'";
--- 320,324 ----
  	if ( !empty($search_id) )
  	{
! 		$sql= "SELECT *
  				FROM ". ADS_ADVERTS_TABLE ."
  				WHERE id = '$search_id'";
***************
*** 383,387 ****
  	$result = $db->sql_query($sql);

! 	while ($row = $db->sql_fetchrow($result)) 
  	{
  		$id = $row['id'];
--- 383,387 ----
  	$result = $db->sql_query($sql);

! 	while ($row = $db->sql_fetchrow($result))
  	{
  		$id = $row['id'];
***************
*** 394,398 ****
  		$views = $row['views'];

! 		$profiledata = get_userdata($user_id); 

  		if ( $user_id != ANONYMOUS )
--- 394,398 ----
  		$views = $row['views'];

! 		$profiledata = mx_get_userdata($user_id);

  		if ( $user_id != ANONYMOUS )
***************
*** 407,419 ****
  		// Check to see if an image exists for this ad

! 		$sql2 = "SELECT * 
  				FROM ". ADS_IMAGES_TABLE ."
! 				WHERE id = '$id' 
  				AND img_deleted_ind = 0
  				LIMIT 0,1";
  		//global $ebay_id, $mx_images;

! 		$sql3 = "SELECT * 
! 				FROM ". ADS_ADVERTS_TABLE ." 
  				WHERE ebay_id = '$ebay_id'
  				LIMIT 0,1";
--- 407,419 ----
  		// Check to see if an image exists for this ad

! 		$sql2 = "SELECT *
  				FROM ". ADS_IMAGES_TABLE ."
! 				WHERE id = '$id'
  				AND img_deleted_ind = 0
  				LIMIT 0,1";
  		//global $ebay_id, $mx_images;

! 		$sql3 = "SELECT *
! 				FROM ". ADS_ADVERTS_TABLE ."
  				WHERE ebay_id = '$ebay_id'
  				LIMIT 0,1";
***************
*** 426,437 ****
  		if ( $db->sql_numrows($result2) > 0 )
  		{
! 			while ($row2 = $db->sql_fetchrow($result2)) 
  			{
  				$img_url = ADS_IMAGES_PATH ."ad".$id."_img".$row2["img_seq_no"]."_thumb.jpg";
  			}
  		}
! 		elseif ( $db->sql_numrows($result3) > 0 ) 
  		{
! 			while ($row3 = $db->sql_fetchrow($result3)) 
  			{
  				$ebay_id = $row3['ebay_id'];
--- 426,437 ----
  		if ( $db->sql_numrows($result2) > 0 )
  		{
! 			while ($row2 = $db->sql_fetchrow($result2))
  			{
  				$img_url = ADS_IMAGES_PATH ."ad".$id."_img".$row2["img_seq_no"]."_thumb.jpg";
  			}
  		}
! 		elseif ( $db->sql_numrows($result3) > 0 )
  		{
! 			while ($row3 = $db->sql_fetchrow($result3))
  			{
  				$ebay_id = $row3['ebay_id'];
***************
*** 443,465 ****
  				}
  			}
! 		}	
  		else
  		{
  			$img_url = $mx_images['noimage'];
! 		} 

- 		if ( $row['status'] == 'sold' ) 
- 		{ 
- 			$status2 = $lang['sold']; 
- 		} 
- 			elseif ( $row['status'] == 'expired' ) 
- 		{ 
- 			$status2 = $lang['expired']; 
- 		} 
- 			elseif ( $row['status'] == 'active' ) 
- 		{ 
- 			$status2 = ''; 
- 		} 
- 		
  		$template->assign_block_vars('advertrow', array(

--- 443,465 ----
  				}
  			}
! 		}
  		else
  		{
  			$img_url = $mx_images['noimage'];
! 		}
! 
! 		if ( $row['status'] == 'sold' )
! 		{
! 			$status2 = $lang['sold'];
! 		}
! 			elseif ( $row['status'] == 'expired' )
! 		{
! 			$status2 = $lang['expired'];
! 		}
! 			elseif ( $row['status'] == 'active' )
! 		{
! 			$status2 = '';
! 		}

  		$template->assign_block_vars('advertrow', array(

***************
*** 472,480 ****
  			'SHORT_DESC' => nl2br($row['short_desc']),
  			'DATE_ADDED' => date($lang['DATE_FORMAT'],$time),
! 			'STATUS' => $status2, 
  			'PRICE' => $row['price'],
  			'EBAY_ID' => $row['ebay_id'],
  			'VIEWS' => $row['views'],
! 			'IMAGE' => $img_url)); 
  	}

--- 472,480 ----
  			'SHORT_DESC' => nl2br($row['short_desc']),
  			'DATE_ADDED' => date($lang['DATE_FORMAT'],$time),
! 			'STATUS' => $status2,
  			'PRICE' => $row['price'],
  			'EBAY_ID' => $row['ebay_id'],
  			'VIEWS' => $row['views'],
! 			'IMAGE' => $img_url));
  	}

***************
*** 482,486 ****
  	{
  		$ads_count = 1;
! 	} 

  	// Encode the fields
--- 482,486 ----
  	{
  		$ads_count = 1;
! 	}

  	// Encode the fields
***************
*** 491,495 ****

  	$template->assign_vars(array(
! 	
  		'U_ADS_INDEX' => append_sid(this_ads_mxurl()),

--- 491,495 ----

  	$template->assign_vars(array(
! 
  		'U_ADS_INDEX' => append_sid(this_ads_mxurl()),

***************
*** 501,505 ****
  		'L_PRICE' => $lang['price'],
  		'L_EBAY_ID' => $lang['ebay_id'],
! 		'L_AD_STATUS' => $lang['ad_status'], 
  		'L_USERNAME' => $lang['username'],
  		'L_IMAGE' => $lang['image'],
--- 501,505 ----
  		'L_PRICE' => $lang['price'],
  		'L_EBAY_ID' => $lang['ebay_id'],
! 		'L_AD_STATUS' => $lang['ad_status'],
  		'L_USERNAME' => $lang['username'],
  		'L_IMAGE' => $lang['image'],
***************
*** 511,520 ****
  		'PAGE_STRING' => $page_string));

! 	$template->pparse('search_results'); 

  		if ( !is_object($mx_block))
  		{
  			include($mx_root_path . 'includes/page_tail.'.$phpEx);
! 		}		
! }	
  ?>
\ No newline at end of file
--- 511,520 ----
  		'PAGE_STRING' => $page_string));

! 	$template->pparse('search_results');

  		if ( !is_object($mx_block))
  		{
  			include($mx_root_path . 'includes/page_tail.'.$phpEx);
! 		}
! }
  ?>
\ No newline at end of file

Index: ads_item_block.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_item_block.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ads_item_block.php	6 Jun 2007 22:24:43 -0000	1.1
--- ads_item_block.php	28 Jan 2008 21:58:52 -0000	1.2
***************
*** 26,30 ****
  	// Start session management
  	//
! 	$mx_user->init($user_ip, PAGE_INDEX); 
  	//
  	// End session management
--- 26,30 ----
  	// Start session management
  	//
! 	$mx_user->init($user_ip, PAGE_INDEX);
  	//
  	// End session management
***************
*** 57,63 ****
  	if( is_object($mx_block))
  	{
! 		$is_block = TRUE;	
  	}
!   
    	global $images, $mx_images, $postrow;
  }
--- 57,63 ----
  	if( is_object($mx_block))
  	{
! 		$is_block = TRUE;
  	}
! 
    	global $images, $mx_images, $postrow;
  }
***************
*** 110,114 ****
  	{
  		mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl(), true));
! 	}	
  	else
  	{
--- 110,114 ----
  	{
  		mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl(), true));
! 	}
  	else
  	{
***************
*** 149,157 ****
  }

! $template->set_filenames(array('ads_item_page' => 'ads_item_block.tpl')); 

  // SQL for adverts table
! $sql = "SELECT category, sub_category, COUNT(sub_category) AS number 
! 		FROM ". ADS_ADVERTS_TABLE ." 
  		WHERE expiry_date > $current_time
  		GROUP BY category, sub_category";
--- 149,157 ----
  }

! $template->set_filenames(array('ads_item_page' => 'ads_item_block.tpl'));

  // SQL for adverts table
! $sql = "SELECT category, sub_category, COUNT(sub_category) AS number
! 		FROM ". ADS_ADVERTS_TABLE ."
  		WHERE expiry_date > $current_time
  		GROUP BY category, sub_category";
***************
*** 159,168 ****
  $result = $db->sql_query($sql);

! while ($row = $db->sql_fetchrow($result)) 
  {
  	$sub_category_ar[$row['category'].'_'.$row['sub_category']] = $row['number'];
  }

! $sql = 'SELECT * 
  		FROM '. ADS_CATEGORIES_TABLE .'
  		ORDER BY cat_category, cat_sub_category ASC';
--- 159,168 ----
  $result = $db->sql_query($sql);

! while ($row = $db->sql_fetchrow($result))
  {
  	$sub_category_ar[$row['category'].'_'.$row['sub_category']] = $row['number'];
  }

! $sql = 'SELECT *
  		FROM '. ADS_CATEGORIES_TABLE .'
  		ORDER BY cat_category, cat_sub_category ASC';
***************
*** 170,174 ****
  $result = $db->sql_query($sql);

! while ($row = $db->sql_fetchrow($result)) 
  {
  	$category = $row['cat_category'];
--- 170,174 ----
  $result = $db->sql_query($sql);

! while ($row = $db->sql_fetchrow($result))
  {
  	$category = $row['cat_category'];
***************
*** 186,194 ****
  			'CAT_IMG' => $cat_img,
  			'CATEGORY' => "<b><a href='$category_url'>$category</a></b><br>"
! 		)); 
  		$save_category = $category;
  	}

! 	$sub_category_temp = "<a href='".append_sid(this_ads_portalurl("ads_mode=ads_index&category=$u_category&sub_category=$u_sub_category"))."'>$sub_category</a>"; 
  	$sub_category_img = $mx_images['folder'];

--- 186,194 ----
  			'CAT_IMG' => $cat_img,
  			'CATEGORY' => "<b><a href='$category_url'>$category</a></b><br>"
! 		));
  		$save_category = $category;
  	}

! 	$sub_category_temp = "<a href='".append_sid(this_ads_portalurl("ads_mode=ads_index&category=$u_category&sub_category=$u_sub_category"))."'>$sub_category</a>";
  	$sub_category_img = $mx_images['folder'];

***************
*** 213,222 ****
  	$start = 0;
  }
! 	
  // Get the total number of ads
  if ( !empty($inp_category) && !empty($inp_sub_category) )
  {
! 	$sql = "SELECT * 
! 		FROM ". ADS_ADVERTS_TABLE ." 
  		WHERE expiry_date > $current_time
  		AND category = '$inp_category'
--- 213,222 ----
  	$start = 0;
  }
! 
  // Get the total number of ads
  if ( !empty($inp_category) && !empty($inp_sub_category) )
  {
! 	$sql = "SELECT *
! 		FROM ". ADS_ADVERTS_TABLE ."
  		WHERE expiry_date > $current_time
  		AND category = '$inp_category'
***************
*** 225,235 ****
  else if ( !empty($inp_category) )
  {
! 	$sql = "SELECT * 
! 		FROM ". ADS_ADVERTS_TABLE ." 
  		WHERE expiry_date > $current_time
  		AND category = '$inp_category'";}
! else	
  {
! 	$sql = "SELECT * 
  		FROM ". ADS_ADVERTS_TABLE ."
  		WHERE expiry_date > $current_time";
--- 225,235 ----
  else if ( !empty($inp_category) )
  {
! 	$sql = "SELECT *
! 		FROM ". ADS_ADVERTS_TABLE ."
  		WHERE expiry_date > $current_time
  		AND category = '$inp_category'";}
! else
  {
! 	$sql = "SELECT *
  		FROM ". ADS_ADVERTS_TABLE ."
  		WHERE expiry_date > $current_time";
***************
*** 242,249 ****
  if ( $inp_category and $inp_sub_category )
  {
! 	$sql = "SELECT * 
! 			FROM ". ADS_ADVERTS_TABLE ." 
! 			WHERE category = '$inp_category' 
! 			AND sub_category = '$inp_sub_category' 
  			AND expiry_date > $current_time
  			ORDER BY premium_ad_ind DESC, id DESC
--- 242,249 ----
  if ( $inp_category and $inp_sub_category )
  {
! 	$sql = "SELECT *
! 			FROM ". ADS_ADVERTS_TABLE ."
! 			WHERE category = '$inp_category'
! 			AND sub_category = '$inp_sub_category'
  			AND expiry_date > $current_time
  			ORDER BY premium_ad_ind DESC, id DESC
***************
*** 253,267 ****
  if ( $inp_category )
  {
! 	$sql = "SELECT * 
! 			FROM ". ADS_ADVERTS_TABLE ." 
! 			WHERE category = '$inp_category' 
  			AND expiry_date > $current_time
  			ORDER BY premium_ad_ind DESC, id DESC
  			LIMIT ".$start.", ".$ads_config['ads_per_page'];
  }
! else	
  {
! 	$sql = "SELECT * 
! 			FROM ". ADS_ADVERTS_TABLE ." 
  			WHERE expiry_date > $current_time
  			ORDER BY premium_ad_ind DESC, id DESC
--- 253,267 ----
  if ( $inp_category )
  {
! 	$sql = "SELECT *
! 			FROM ". ADS_ADVERTS_TABLE ."
! 			WHERE category = '$inp_category'
  			AND expiry_date > $current_time
  			ORDER BY premium_ad_ind DESC, id DESC
  			LIMIT ".$start.", ".$ads_config['ads_per_page'];
  }
! else
  {
! 	$sql = "SELECT *
! 			FROM ". ADS_ADVERTS_TABLE ."
  			WHERE expiry_date > $current_time
  			ORDER BY premium_ad_ind DESC, id DESC
***************
*** 273,282 ****
  if ( $db->sql_numrows($result) > 0 )
  {
! 	while ($row = $db->sql_fetchrow($result)) 
  	{
  		$id = $row['id'];
  		$user_id = $row['user_id'];

! 		$profiledata = get_userdata($user_id); 

  		if ( $user_id != ANONYMOUS )
--- 273,282 ----
  if ( $db->sql_numrows($result) > 0 )
  {
! 	while ($row = $db->sql_fetchrow($result))
  	{
  		$id = $row['id'];
  		$user_id = $row['user_id'];

! 		$profiledata = mx_get_userdata($user_id);

  		if ( $user_id != ANONYMOUS )
***************
*** 310,320 ****
  			$premium_ad = '';
  		}
! 			
  		// Check to see if an image exists for this ad
  		if ( $ads_config['images'] == 1 )
  		{
! 			$sql2 = "SELECT * 
  					FROM ". ADS_IMAGES_TABLE ."
! 					WHERE id = '$id' 
  					AND img_deleted_ind = 0
  					LIMIT 0,1";
--- 310,320 ----
  			$premium_ad = '';
  		}
! 
  		// Check to see if an image exists for this ad
  		if ( $ads_config['images'] == 1 )
  		{
! 			$sql2 = "SELECT *
  					FROM ". ADS_IMAGES_TABLE ."
! 					WHERE id = '$id'
  					AND img_deleted_ind = 0
  					LIMIT 0,1";
***************
*** 324,339 ****
  			if ( $db->sql_numrows($result2) > 0 )
  			{
! 				while ($row2 = $db->sql_fetchrow($result2)) 
  				{
  					$img_url = ADS_IMAGES_PATH ."ad".$id."_img".$row2["img_seq_no"]."_thumb.jpg";
  				}
! 			}		
  			else
  			{
  				$img_url = $mx_images['noimage'];
! 			} 

  			$template->assign_block_vars('imagerow', array(
! 		
  			'U_ADS_ITEM'	=> append_sid(this_ads_portalurl("ads_mode=ads_item&id=".$row['id'])),
  			'U_PROFILE'		=> $profile,
--- 324,339 ----
  			if ( $db->sql_numrows($result2) > 0 )
  			{
! 				while ($row2 = $db->sql_fetchrow($result2))
  				{
  					$img_url = ADS_IMAGES_PATH ."ad".$id."_img".$row2["img_seq_no"]."_thumb.jpg";
  				}
! 			}
  			else
  			{
  				$img_url = $mx_images['noimage'];
! 			}

  			$template->assign_block_vars('imagerow', array(
! 
  			'U_ADS_ITEM'	=> append_sid(this_ads_portalurl("ads_mode=ads_item&id=".$row['id'])),
  			'U_PROFILE'		=> $profile,
***************
*** 348,357 ****
  			'VIEWS'			=> $row['views'],
  			'COMMENTS'		=> $total_comments,
! 			'IMAGE'			=> $img_url)); 
  		}
  		else
  		{
  			$template->assign_block_vars('noimagerow', array(
! 		
  			'U_ADS_ITEM'	=> append_sid(this_ads_portalurl("ads_mode=ads_item&id=".$row['id'])),
  			'U_PROFILE'		=> $profile,
--- 348,357 ----
  			'VIEWS'			=> $row['views'],
  			'COMMENTS'		=> $total_comments,
! 			'IMAGE'			=> $img_url));
  		}
  		else
  		{
  			$template->assign_block_vars('noimagerow', array(
! 
  			'U_ADS_ITEM'	=> append_sid(this_ads_portalurl("ads_mode=ads_item&id=".$row['id'])),
  			'U_PROFILE'		=> $profile,
***************
*** 365,374 ****
  			'EBAY_ID'			=> $row['ebay_id'],
  			'VIEWS'			=> $row['views'],
! 			'COMMENTS'		=> $total_comments)); 
  		}
  	}
  }
  else
! {	
  	$template->assign_block_vars('switch_no_items_found',array());
  }
--- 365,374 ----
  			'EBAY_ID'			=> $row['ebay_id'],
  			'VIEWS'			=> $row['views'],
! 			'COMMENTS'		=> $total_comments));
  		}
  	}
  }
  else
! {
  	$template->assign_block_vars('switch_no_items_found',array());
  }
***************
*** 409,413 ****
  $page_string = sprintf($lang['Page_of'], ( floor( $start / $ads_config['ads_per_page'] ) + 1 ), ceil( $ads_count / $ads_config['ads_per_page'] ));

! $template->assign_vars(array(	

  	'U_ADS_INDEX' => append_sid(this_ads_portalurl()),
--- 409,413 ----
  $page_string = sprintf($lang['Page_of'], ( floor( $start / $ads_config['ads_per_page'] ) + 1 ), ceil( $ads_count / $ads_config['ads_per_page'] ));

! $template->assign_vars(array(

  	'U_ADS_INDEX' => append_sid(this_ads_portalurl()),
***************
*** 419,423 ****
  	'U_RSS2' => append_sid($module_root_path . "adverts." . $phpEx . "?ads_mode=ads_rss2" . '&sid=' . $userdata['session_id']),
  	'IMG_RSS2' => $mx_images['ads_rss2'],
! 	
  	'L_CATEGORIES' => $lang['categories'],
  	'L_TITLE' => $lang['title'],
--- 419,423 ----
  	'U_RSS2' => append_sid($module_root_path . "adverts." . $phpEx . "?ads_mode=ads_rss2" . '&sid=' . $userdata['session_id']),
  	'IMG_RSS2' => $mx_images['ads_rss2'],
! 
  	'L_CATEGORIES' => $lang['categories'],
  	'L_TITLE' => $lang['title'],
***************
*** 437,441 ****
  	'MSG_NEWAD' => $mx_images['msg_newad'],
  	'GOTO_STRING' => $goto_string,
! 	'PAGE_STRING' => $page_string, 
  	'POINTER' => $pointer,
  	'POINTER2' => $pointer2,
--- 437,441 ----
  	'MSG_NEWAD' => $mx_images['msg_newad'],
  	'GOTO_STRING' => $goto_string,
! 	'PAGE_STRING' => $page_string,
  	'POINTER' => $pointer,
  	'POINTER2' => $pointer2,
***************
*** 443,447 ****
  	'SUB_CATEGORY' => stripslashes(str_replace("''", "\'", $inp_sub_category))));

! $template->pparse('ads_item_page'); 

  if ( !is_object($mx_block))
--- 443,447 ----
  	'SUB_CATEGORY' => stripslashes(str_replace("''", "\'", $inp_sub_category))));

! $template->pparse('ads_item_page');

  if ( !is_object($mx_block))
***************
*** 449,453 ****
  	include($mx_root_path . 'includes/page_tail.'.$phpEx);
   }
! 	
  // +-------------------------------------------------------------+
  // |    Powered by phpCA Classified Ads 0.5.6 (c) 2006 PeteMan   |
--- 449,453 ----
  	include($mx_root_path . 'includes/page_tail.'.$phpEx);
   }
! 
  // +-------------------------------------------------------------+
  // |    Powered by phpCA Classified Ads 0.5.6 (c) 2006 PeteMan   |

Index: ads_comment_temp.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpCA/includes/ads_comment_temp.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ads_comment_temp.php	6 Jun 2007 22:24:41 -0000	1.1
--- ads_comment_temp.php	28 Jan 2008 21:58:52 -0000	1.2
***************
*** 39,43 ****
  	// Start session management
  	//
! 	$mx_user->init($user_ip, PAGE_INDEX); 
  	//
  	// End session management
--- 39,43 ----
  	// Start session management
  	//
! 	$mx_user->init($user_ip, PAGE_INDEX);
  	//
  	// End session management
***************
*** 126,130 ****
  // ------------------------------------

! $sql = "SELECT COUNT(comment_id) AS comments_count 
  		FROM ". ADS_COMMENTS_TABLE ."
  		WHERE comment_ad_id = $ad_id
--- 126,130 ----
  // ------------------------------------

! $sql = "SELECT COUNT(comment_id) AS comments_count
  		FROM ". ADS_COMMENTS_TABLE ."
  		WHERE comment_ad_id = $ad_id
***************
*** 179,184 ****
  	// ------------------------------------

! 	$sql = "SELECT user_id, username 
! 			FROM ". USERS_TABLE ." 
  			WHERE user_id = $user_id";

--- 179,184 ----
  	// ------------------------------------

! 	$sql = "SELECT user_id, username
! 			FROM ". USERS_TABLE ."
  			WHERE user_id = $user_id";

***************
*** 194,198 ****
  		mx_message_die(GENERAL_ERROR, $lang['user_does_not_exist']);
  	}
! 	
  	$username = $row['username'];
  }
--- 194,198 ----
  		mx_message_die(GENERAL_ERROR, $lang['user_does_not_exist']);
  	}
! 
  	$username = $row['username'];
  }
***************
*** 202,206 ****
  // ------------------------------------

! $sql = "SELECT * 
  		FROM ". ADS_IMAGES_TABLE ."
  		WHERE id = $ad_id
--- 202,206 ----
  // ------------------------------------

! $sql = "SELECT *
  		FROM ". ADS_IMAGES_TABLE ."
  		WHERE id = $ad_id
***************
*** 212,224 ****
  if ( $db->sql_numrows($result) > 0 )
  {
! 	while ($row = $db->sql_fetchrow($result)) 
  	{
  		$img_url = ADS_IMAGES_PATH ."ad".$ad_id."_img".$row["img_seq_no"]."_thumb.jpg";
  	}
! }		
  else
  {
  	$img_url = $mx_images['noimage'];
! } 

  // ------------------------------------
--- 212,224 ----
  if ( $db->sql_numrows($result) > 0 )
  {
! 	while ($row = $db->sql_fetchrow($result))
  	{
  		$img_url = ADS_IMAGES_PATH ."ad".$ad_id."_img".$row["img_seq_no"]."_thumb.jpg";
  	}
! }
  else
  {
  	$img_url = $mx_images['noimage'];
! }

  // ------------------------------------
***************
*** 362,366 ****
  		for ($i = 0; $i < count($commentrow); $i++)
  		{
! 			if ( ($commentrow[$i]['user_id'] == ADS_GUEST) 
  			or ($commentrow[$i]['username'] == '') )
  			{
--- 362,366 ----
  		for ($i = 0; $i < count($commentrow); $i++)
  		{
! 			if ( ($commentrow[$i]['user_id'] == ADS_GUEST)
  			or ($commentrow[$i]['username'] == '') )
  			{
***************
*** 400,404 ****
  				'POSTER' => $poster,
  				'TIME' => create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']),
! 				'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '',

  				'TEXT' => nl2br($commentrow[$i]['comment_text']),
--- 400,404 ----
  				'POSTER' => $poster,
  				'TIME' => create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']),
! 				'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . phpBB2::decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . phpBB2::decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '',

  				'TEXT' => nl2br($commentrow[$i]['comment_text']),
***************
*** 594,599 ****

  		// Get recipients details from phpBB
! 		$profiledata = get_userdata($user_id); 
! 		$recip_email = $profiledata['user_email']; 

  		$subject = 'XXX SUBJECT XXX';
--- 594,599 ----

  		// Get recipients details from phpBB
! 		$profiledata = mx_get_userdata($user_id);
! 		$recip_email = $profiledata['user_email'];

  		$subject = 'XXX SUBJECT XXX';
***************
*** 605,622 ****
  		$emailer->from($board_config['board_email']);
  		$emailer->replyto($board_config['board_email']);
! 					
  		$emailer->use_template('admin_send_email', $user_lang);
  		$emailer->email_address($recip_email);
  		$emailer->set_subject($subject);
  		$emailer->extra_headers($email_headers);
! 					
  		$emailer->assign_vars(array(
! 			'SITENAME' => $board_config['sitename'], 
! 			'BOARD_EMAIL' => $board_config['board_email'], 
  			'MESSAGE' => $message));

  		$emailer->send();
  		$emailer->reset();
! 		
  		$user_id_array[] = $user_id;
  	}
--- 605,622 ----
  		$emailer->from($board_config['board_email']);
  		$emailer->replyto($board_config['board_email']);
! 
  		$emailer->use_template('admin_send_email', $user_lang);
  		$emailer->email_address($recip_email);
  		$emailer->set_subject($subject);
  		$emailer->extra_headers($email_headers);
! 
  		$emailer->assign_vars(array(
! 			'SITENAME' => $board_config['sitename'],
! 			'BOARD_EMAIL' => $board_config['board_email'],
  			'MESSAGE' => $message));

  		$emailer->send();
  		$emailer->reset();
! 
  		$user_id_array[] = $user_id;
  	}
***************
*** 629,638 ****

  	$sql = "SELECT comment_user_id
! 			FROM ". ADS_COMMENTS_TABLE ." 
  			WHERE comment_ad_id= $ad_id";

  	$result = $db->sql_query($sql);

! 	while ($row = $db->sql_fetchrow($result)) 
  	{
  		$comment_user_id = $row['comment_user_id'];
--- 629,638 ----

  	$sql = "SELECT comment_user_id
! 			FROM ". ADS_COMMENTS_TABLE ."
  			WHERE comment_ad_id= $ad_id";

  	$result = $db->sql_query($sql);

! 	while ($row = $db->sql_fetchrow($result))
  	{
  		$comment_user_id = $row['comment_user_id'];
***************
*** 647,652 ****

  			// Get recipients details from phpBB
! 			$profiledata = get_userdata($comment_user_id); 
! 			$recip_email = $profiledata['user_email']; 

  			$subject = 'XXX SUBJECT XXX';
--- 647,652 ----

  			// Get recipients details from phpBB
! 			$profiledata = mx_get_userdata($comment_user_id);
! 			$recip_email = $profiledata['user_email'];

  			$subject = 'XXX SUBJECT XXX';
***************
*** 658,670 ****
  			$emailer->from($board_config['board_email']);
  			$emailer->replyto($board_config['board_email']);
! 					
  			$emailer->use_template('admin_send_email', $user_lang);
  			$emailer->email_address($recip_email);
  			$emailer->set_subject($subject);
  			$emailer->extra_headers($email_headers);
! 					
  			$emailer->assign_vars(array(
! 				'SITENAME' => $board_config['sitename'], 
! 				'BOARD_EMAIL' => $board_config['board_email'], 
  				'MESSAGE' => $message));

--- 658,670 ----
  			$emailer->from($board_config['board_email']);
  			$emailer->replyto($board_config['board_email']);
! 
  			$emailer->use_template('admin_send_email', $user_lang);
  			$emailer->email_address($recip_email);
  			$emailer->set_subject($subject);
  			$emailer->extra_headers($email_headers);
! 
  			$emailer->assign_vars(array(
! 				'SITENAME' => $board_config['sitename'],
! 				'BOARD_EMAIL' => $board_config['board_email'],
  				'MESSAGE' => $message));

[mxbb-commits] mx_phpCA/includes ads_comment.php, 1.1, 1.2 ads_comment_temp.php, 1.1, 1.2 ads_item.

[mxbb-commits] mx_phpCA/includes ads_comment.php, 1.1, 1.2 ads_comment_temp.php, 1.1, 1.2 ads_item.php, 1.1, 1.2 ads_item_block.php, 1.1, 1.2 ads_search.php, 1.1, 1.2