[mxbb-commits] mx_kb/includes functions_kb.php,1.33,1.34 kb_cat.php,1.15,1.16 kb_pages.php,1.5,1.6

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

Update of /cvsroot/mxbb/mx_kb/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7956/modules/mx_kb/includes

Modified Files:
	functions_kb.php kb_cat.php kb_pages.php 
Log Message:
updating

Index: kb_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/includes/kb_cat.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** kb_cat.php	9 Apr 2005 21:41:28 -0000	1.15
--- kb_cat.php	22 Sep 2005 10:09:17 -0000	1.16
***************
*** 139,148 ****
  		FROM " . KB_ARTICLES_TABLE . "
  		WHERE "; 
! 	// newssuite addon
! 	if ( $kb_config['news_operate_mode'] )
! 	{
! 		$kb_types_list = ns_auth_item( $category_id );
! 		$sql_pag .= " article_type IN " . $kb_types_list . ' AND';
! 	}
  	$sql_pag .= " article_category_id = '$category_id'";
  
--- 139,143 ----
  		FROM " . KB_ARTICLES_TABLE . "
  		WHERE "; 
! 
  	$sql_pag .= " article_category_id = '$category_id'";
  

Index: kb_pages.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/includes/kb_pages.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** kb_pages.php	21 Apr 2005 19:36:32 -0000	1.5
--- kb_pages.php	22 Sep 2005 10:09:17 -0000	1.6
***************
*** 96,103 ****
  	
  					// Extract 'what posts to view info', the cool Array ;)
! 					$kb_type_select_data = array();
! 					$kb_type_select_temp = $kb_select_par;
! 					$kb_type_select_temp = stripslashes( $kb_type_select_temp );
! 					$kb_type_select_data = eval( "return " . $kb_type_select_temp . ";" );
  					$kb_config['news_mode_operate'] = true; 
  					
--- 96,102 ----
  	
  					// Extract 'what posts to view info', the cool Array ;)
! 					$kb_type_select_data = ( !empty( $kb_select_par ) ) ? unserialize($kb_select_par) : array();
! 					
! 					
  					$kb_config['news_mode_operate'] = true; 
  					

Index: functions_kb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/includes/functions_kb.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** functions_kb.php	1 May 2005 16:39:22 -0000	1.33
--- functions_kb.php	22 Sep 2005 10:09:17 -0000	1.34
***************
*** 32,41 ****
  	$sql_stat = "SELECT * 
  			FROM " . KB_TYPES_TABLE; 
- 	// newssuite addon
- 	if ( $kb_config['news_operate_mode'] && !empty( $category_id ) )
- 	{
- 		$kb_types_list = ns_auth_item( $category_id );
- 		$sql_stat .= " WHERE id IN " . $kb_types_list;
- 	}
  
  	$sql_stat .= " ORDER BY type";
--- 32,35 ----
***************
*** 58,67 ****
  		$sql = "SELECT article_id FROM " . KB_ARTICLES_TABLE . " 
  			WHERE article_type = $type_id "; 
- 		// newssuite addon
- 		if ( $kb_config['news_operate_mode'] && !empty( $category_id ) )
- 		{
- 			$kb_types_list = ns_auth_item( $category_id );
- 			$sql .= " AND article_type IN " . $kb_types_list;
- 		}
  
  		if ( !empty( $category_id ) )
--- 52,55 ----
***************
*** 227,236 ****
  		$sql .= " AND t.approved = " . $approve;
  	} 
- 	// newssuite addon
- 	if ( $kb_config['news_operate_mode'] )
- 	{
- 		$kb_types_list = ns_auth_item( $id );
- 		$sql .= " AND t.article_type IN " . $kb_types_list;
- 	}
  
  	if ( defined( 'IN_ADMIN' ) )
--- 215,218 ----
***************
*** 351,357 ****
  			$rating_message = '(' . $rating . '/10, </span><span class="gensmall">' . $rating_votes . ' votes)';
  		} 
! 		// Newssuite operation mode
! 		// if ( ns_auth_item($article_cat, $type_id) && ns_auth_cat($article_cat))
! 		// {
  		$template->assign_block_vars( $block_name, array( 'ARTICLE' => $article ,
  				'ARTICLE_DESCRIPTION' => $article_description,
--- 333,337 ----
  			$rating_message = '(' . $rating . '/10, </span><span class="gensmall">' . $rating_votes . ' votes)';
  		} 
! 
  		$template->assign_block_vars( $block_name, array( 'ARTICLE' => $article ,
  				'ARTICLE_DESCRIPTION' => $article_description,
***************
*** 494,498 ****
  		}
  
! 		if ( ns_auth_item( $article_cat, $type_id ) && ns_auth_cat( $article_cat )  && $kb_is_auth[$article_cat]['auth_view'])
  		{
  			$i++;
--- 474,478 ----
  		}
  
! 		if ( ns_auth_cat( $article_cat )  && $kb_is_auth[$article_cat]['auth_view'])
  		{
  			$i++;
***************
*** 530,540 ****
  		FROM " . KB_ARTICLES_TABLE . "
  		WHERE "; 
- 
- 	// newssuite addon
- 	if ( $kb_config['news_operate_mode'] )
- 	{
- 		$kb_types_list = ns_auth_item( $category_id );
- 		$sql .= " article_type IN " . $kb_types_list . ' AND';
- 	}
  	
  	$sql .= " article_category_id = '$category_id' AND approved = '1'";
--- 510,513 ----
***************
*** 924,932 ****
  				WHERE "; 
  			
- 			if ( $kb_config['news_operate_mode'] )
- 			{
- 				$kb_types_list = ns_auth_item( $category['category_id'] );
- 				$sql_num .= " article_type IN " . $kb_types_list . ' AND';
- 			}
  			$sql_num .= " article_category_id = " . $category['category_id'] . " AND approved = '1'";
  			
--- 897,900 ----
***************
*** 1023,1033 ****
  				FROM " . KB_ARTICLES_TABLE . "
  				WHERE "; 
- 			// newssuite addon
  			
- 			if ( $kb_config['news_operate_mode'] )
- 			{
- 				$kb_types_list = ns_auth_item( $category['category_id'] );
- 				$sql_num .= " article_type IN " . $kb_types_list . ' AND';
- 			}
  			$sql_num .= " article_category_id = " . $category['category_id'];
  			
--- 991,995 ----
***************
*** 1900,1904 ****
  function ns_auth_cat( $cat_id )
  {
! 	global $news_type_select_data, $kb_type_select_data, $kb_config;
  
  	if ( !MXBB_MODULE || MXBB_27x )
--- 1862,1866 ----
  function ns_auth_cat( $cat_id )
  {
! 	global $kb_type_select_data, $kb_config;
  
  	if ( !MXBB_MODULE || MXBB_27x )
***************
*** 1907,1959 ****
  	}
  		
! 	$tmp_kb = $kb_type_select_data[$cat_id]['forum_news'] == 1;
! 	$tmp_news = true;
! 
! 	if ( $kb_config['news_operate_mode'] )
! 	{
! 		$tmp_news = $news_type_select_data[$cat_id]['forum_news'] == 1;
! 	}
! 
! 	return $tmp_kb && $tmp_news;
! }
! 
! function ns_auth_item( $cat_id, $item_type = 0 )
! {
! 	global $news_type_select_data, $kb_config;
! 	
! 	if ( !MXBB_MODULE || MXBB_27x)
! 	{
! 		return true;
! 	}
! 		
! 	$item_types_array = kb_get_types();
! 	$validated_types = array();
! 
! 	$ii = 0;
! 	$item_types_list = '(';
! 	for( $z = 0; $z < ( count( $item_types_array[0] ) ); $z++ )
! 	{
! 		if ( $news_type_select_data[$cat_id][$item_types_array[0][$z]] )
! 		{
! 			$ii++;
! 			$validated_types[] = $item_types_array[1][$z];
! 			$item_types_list .= ( ( $ii == 1 ) ? $item_types_array[1][$z] : ',' . $item_types_array[1][$z] );
! 		}
! 	}
! 	$item_types_list .= ')';
! 
! 	if ( $item_type == 0 )
! 	{
! 		return $item_types_list;
! 	}
  
! 	if ( in_array( $item_type, $validated_types ) || !$kb_config['news_operate_mode'] )
! 	{
! 		return true;
! 	}
! 	else
! 	{
! 		return false;
! 	}
  }
  
--- 1869,1875 ----
  	}
  		
! 	$tmp_kb = $kb_type_select_data[$cat_id] == 1;
  
! 	return $tmp_kb;
  }