[mxbb-commits] mx_phpCA adverts.php,1.1,1.2

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

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

Modified Files:
	adverts.php 
Log Message:
hmmm...i have no idea what i have done ;)

Index: adverts.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpCA/adverts.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** adverts.php	6 Jun 2007 22:24:35 -0000	1.1
--- adverts.php	28 Jan 2008 21:58:51 -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;
  }
***************
*** 154,158 ****
  	{
  		mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl(), true));
! 	}	
  	else
  	{
--- 154,158 ----
  	{
  		mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl(), true));
! 	}
  	else
  	{
***************
*** 203,211 ****
  }
  
! $template->set_filenames(array('adverts_page' => 'adverts.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";
--- 203,211 ----
  }
  
! $template->set_filenames(array('adverts_page' => 'adverts.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";
***************
*** 213,222 ****
  $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';
--- 213,222 ----
  $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';
***************
*** 225,229 ****
  
  
! while ($row = $db->sql_fetchrow($result)) 
  {
  	$category = $row['cat_category'];
--- 225,229 ----
  
  
! while ($row = $db->sql_fetchrow($result))
  {
  	$category = $row['cat_category'];
***************
*** 246,254 ****
  			'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_mxurl("ads_mode=ads_index&category=$u_category&sub_category=$u_sub_category"))."'>$sub_category</a>"; 
  	$sub_category_img = $mx_images['folder'];
  
--- 246,254 ----
  			'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_mxurl("ads_mode=ads_index&category=$u_category&sub_category=$u_sub_category"))."'>$sub_category</a>";
  	$sub_category_img = $mx_images['folder'];
  
***************
*** 266,270 ****
  
  /*
! while ($row = $db->sql_fetchrow($result)) 
  {
  	$category = $row['cat_category'];
--- 266,270 ----
  
  /*
! while ($row = $db->sql_fetchrow($result))
  {
  	$category = $row['cat_category'];
***************
*** 278,286 ****
  	{
  		$category_url = append_sid("adverts.$phpEx?category=$u_category");
! 		$template->assign_block_vars('categoryrow', array('CATEGORY' => "<b><a href='$category_url'>$category</a></b><br>")); 
  		$save_category = $category;
  	}
  
! 	$sub_category_temp = "<a href='".append_sid("adverts.$phpEx?category=$u_category&sub_category=$u_sub_category")."'>$sub_category</a>"; 
  
  	if ( $sub_category_ar[$save_category.'_'.$sub_category] )
--- 278,286 ----
  	{
  		$category_url = append_sid("adverts.$phpEx?category=$u_category");
! 		$template->assign_block_vars('categoryrow', array('CATEGORY' => "<b><a href='$category_url'>$category</a></b><br>"));
  		$save_category = $category;
  	}
  
! 	$sub_category_temp = "<a href='".append_sid("adverts.$phpEx?category=$u_category&sub_category=$u_sub_category")."'>$sub_category</a>";
  
  	if ( $sub_category_ar[$save_category.'_'.$sub_category] )
***************
*** 302,311 ****
  	$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'
--- 302,311 ----
  	$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'
***************
*** 314,324 ****
  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";
--- 314,324 ----
  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";
***************
*** 331,338 ****
  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
--- 331,338 ----
  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
***************
*** 342,356 ****
  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
--- 342,356 ----
  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
***************
*** 362,366 ****
  if ( $db->sql_numrows($result) > 0 )
  {
! 	while ($row = $db->sql_fetchrow($result)) 
  	{
  		$id = $row['id'];
--- 362,366 ----
  if ( $db->sql_numrows($result) > 0 )
  {
! 	while ($row = $db->sql_fetchrow($result))
  	{
  		$id = $row['id'];
***************
*** 368,372 ****
  		$ebay_id = $row['ebay_id'];
  
! 		$profiledata = get_userdata($user_id); 
  
  		if ( $user_id != ANONYMOUS )
--- 368,372 ----
  		$ebay_id = $row['ebay_id'];
  
! 		$profiledata = mx_get_userdata($user_id);
  
  		if ( $user_id != ANONYMOUS )
***************
*** 402,429 ****
  
  		// Count the comments
! 		$sql2 = "SELECT COUNT(comment_id) AS comments_count 
! 		      FROM ". ADS_COMMENTS_TABLE ." 
!    		   WHERE comment_ad_id = '$id' 
! 		      GROUP BY comment_ad_id 
! 		      LIMIT 1"; 
  
! 		$result2 = $db->sql_query($sql2); 
! 		$row2 = $db->sql_fetchrow($result2); 
  
! 		if ( empty($row2) ) 
! 		{ 
! 		   $total_comments = 0; 
! 		} 
! 		else 
! 		{ 
! 		   $total_comments = $row2['comments_count']; 
  		}
! 		
  		// 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";
--- 402,429 ----
  
  		// Count the comments
! 		$sql2 = "SELECT COUNT(comment_id) AS comments_count
! 		      FROM ". ADS_COMMENTS_TABLE ."
!    		   WHERE comment_ad_id = '$id'
! 		      GROUP BY comment_ad_id
! 		      LIMIT 1";
  
! 		$result2 = $db->sql_query($sql2);
! 		$row2 = $db->sql_fetchrow($result2);
  
! 		if ( empty($row2) )
! 		{
! 		   $total_comments = 0;
  		}
! 		else
! 		{
! 		   $total_comments = $row2['comments_count'];
! 		}
! 
  		// 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";
***************
*** 431,436 ****
  			//global $ebay_id, $mx_images;
  
! 			$sql3 = "SELECT * 
! 					FROM ". ADS_ADVERTS_TABLE ." 
  					WHERE ebay_id = '$ebay_id'
  					LIMIT ".$start.", ".$ads_config['ads_per_page'];
--- 431,436 ----
  			//global $ebay_id, $mx_images;
  
! 			$sql3 = "SELECT *
! 					FROM ". ADS_ADVERTS_TABLE ."
  					WHERE ebay_id = '$ebay_id'
  					LIMIT ".$start.", ".$ads_config['ads_per_page'];
***************
*** 443,454 ****
  			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,454 ----
  			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'];
***************
*** 463,467 ****
  
  			$template->assign_block_vars('imagerow', array(
! 		
  			'U_ADS_ITEM'		=> append_sid(this_ads_mxurl("ads_mode=ads_item&id=".$row['id'])),
  			'U_PROFILE'		=> $profile,
--- 463,467 ----
  
  			$template->assign_block_vars('imagerow', array(
! 
  			'U_ADS_ITEM'		=> append_sid(this_ads_mxurl("ads_mode=ads_item&id=".$row['id'])),
  			'U_PROFILE'		=> $profile,
***************
*** 477,486 ****
  			'COMMENTS'		=> $total_comments,
  			'IMAGE'			=> ( !empty($img_url) ? $img_url : $mx_images['noimage'] )
! 			)); 
  		}
  		else
  		{
  			$template->assign_block_vars('noimagerow', array(
! 		
  			'U_ADS_ITEM'	=> append_sid(this_ads_mxurl("ads_mode=ads_item&id=".$row['id'])),
  			'U_PROFILE'		=> $profile,
--- 477,486 ----
  			'COMMENTS'		=> $total_comments,
  			'IMAGE'			=> ( !empty($img_url) ? $img_url : $mx_images['noimage'] )
! 			));
  		}
  		else
  		{
  			$template->assign_block_vars('noimagerow', array(
! 
  			'U_ADS_ITEM'	=> append_sid(this_ads_mxurl("ads_mode=ads_item&id=".$row['id'])),
  			'U_PROFILE'		=> $profile,
***************
*** 493,502 ****
  			'PRICE'			=> $row['price'],
  			'VIEWS'			=> $row['views'],
! 			'COMMENTS'		=> $total_comments)); 
  		}
  	}
  }
  else
! {	
  	$template->assign_block_vars('switch_no_items_found',array());
  }
--- 493,502 ----
  			'PRICE'			=> $row['price'],
  			'VIEWS'			=> $row['views'],
! 			'COMMENTS'		=> $total_comments));
  		}
  	}
  }
  else
! {
  	$template->assign_block_vars('switch_no_items_found',array());
  }
***************
*** 537,541 ****
  $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_mxurl()),
--- 537,541 ----
  $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_mxurl()),
***************
*** 547,551 ****
  	'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'],
--- 547,551 ----
  	'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'],
***************
*** 564,568 ****
  	'MSG_NEWAD' => $mx_images['msg_newad'],
  	'GOTO_STRING' => $goto_string,
! 	'PAGE_STRING' => $page_string, 
  	'POINTER' => $pointer,
  	'POINTER2' => $pointer2,
--- 564,568 ----
  	'MSG_NEWAD' => $mx_images['msg_newad'],
  	'GOTO_STRING' => $goto_string,
! 	'PAGE_STRING' => $page_string,
  	'POINTER' => $pointer,
  	'POINTER2' => $pointer2,
***************
*** 570,574 ****
  	'SUB_CATEGORY' => stripslashes(str_replace("''", "\'", $inp_sub_category))));
  
! $template->pparse('adverts_page'); 
  
  if ( !is_object($mx_block))
--- 570,574 ----
  	'SUB_CATEGORY' => stripslashes(str_replace("''", "\'", $inp_sub_category))));
  
! $template->pparse('adverts_page');
  
  if ( !is_object($mx_block))
***************
*** 576,580 ****
  	include($mx_root_path . 'includes/page_tail.'.$phpEx);
   }
! 	
  // +-------------------------------------------------------------+
  // |    Powered by phpCA Classified Ads 0.5.6 (c) 2006 PeteMan   |
--- 576,580 ----
  	include($mx_root_path . 'includes/page_tail.'.$phpEx);
   }
! 
  // +-------------------------------------------------------------+
  // |    Powered by phpCA Classified Ads 0.5.6 (c) 2006 PeteMan   |