[Phpbb-checkins] CVS: phpBB2/admin admin_forums.php,1.30,1.31

[Paul S. O. <ps...@us...>]

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

Modified Files:
	admin_forums.php 
Log Message:
Fix bug #487265

Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** admin_forums.php	2001/11/29 08:45:54	1.30
--- admin_forums.php	2001/11/29 22:45:13	1.31
***************
*** 716,720 ****
  			$to_id = intval($HTTP_POST_VARS['to_id']);
  
! 			if (isset($to_id))
  			{
  				$sql = "SELECT *
--- 716,720 ----
  			$to_id = intval($HTTP_POST_VARS['to_id']);
  
! 			if (!empty($to_id))
  			{
  				$sql = "SELECT *
***************
*** 742,746 ****
  				WHERE cat_id = $from_id";
  				
- 			echo $sql;
  			if( !$result = $db->sql_query($sql) )
  			{
--- 742,745 ----
***************
*** 856,915 ****
  	}
  
- 	$forum_rows = $db->sql_fetchrowset($q_forums);
- 
  	if( $total_forums = $db->sql_numrows($q_forums) )
  	{
! 		//
! 		// Okay, let's build the index
! 		//
! 		$gen_cat = array();
  
! 		for($i = 0; $i < $total_categories; $i++)
! 		{
! 			$cat_id = $category_rows[$i]['cat_id'];
  
! 			$template->assign_block_vars("catrow", array( 
! 				'S_ADD_FORUM_SUBMIT' => "addforum[$cat_id]", 
! 				'S_ADD_FORUM_NAME' => "forumname[$cat_id]", 
! 
! 				'CAT_ID' => $cat_id,
! 				'CAT_DESC' => $category_rows[$i]['cat_title'],
! 
! 				'U_CAT_EDIT' => append_sid("admin_forums.$phpEx?mode=editcat&amp;cat_id=$cat_id"),
! 				'U_CAT_DELETE' => append_sid("admin_forums.$phpEx?mode=deletecat&cat_id=$cat_id"),
! 				'U_CAT_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=cat_order&move=-15&cat_id=$cat_id"),
! 				'U_CAT_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=cat_order&move=15&cat_id=$cat_id"),
! 				'U_VIEWCAT' => append_sid($phpbb_root_path."index.$phpEx?viewcat=$cat_id"))
! 			);
  
! 			for($j = 0; $j < $total_forums; $j++)
! 			{
! 				$forum_id = $forum_rows[$j]['forum_id'];
! 				
! 				if ($forum_rows[$j]['cat_id'] == $cat_id)
! 				{
  
! 					$template->assign_block_vars("catrow.forumrow",	array(
! 						'FORUM_NAME' => $forum_rows[$j]['forum_name'],
! 						'FORUM_DESC' => $forum_rows[$j]['forum_desc'],
! 						'ROW_COLOR' => $row_color,
! 						'NUM_TOPICS' => $forum_rows[$j]['forum_topics'],
! 						'NUM_POSTS' => $forum_rows[$j]['forum_posts'],
! 
! 						'U_VIEWFORUM' => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&amp;" . $forum_rows[$j]['forum_posts']),
! 						'U_FORUM_EDIT' => append_sid("admin_forums.$phpEx?mode=editforum&amp;forum_id=$forum_id"),
! 						'U_FORUM_DELETE' => append_sid("admin_forums.$phpEx?mode=deleteforum&amp;forum_id=$forum_id"),
! 						'U_FORUM_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=forum_order&amp;move=-15&forum_id=$forum_id"),
! 						'U_FORUM_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=forum_order&amp;move=15&forum_id=$forum_id"),
! 						'U_FORUM_RESYNC' => append_sid("admin_forums.$phpEx?mode=forum_sync&amp;forum_id=$forum_id"))
! 					);
  
! 				}// if ... forumid == catid
! 				
! 			} // for ... forums
  
! 		} // for ... categories
  
! 	}// if ... total_forums
  
  }// if ... total_categories
--- 855,913 ----
  	}
  
  	if( $total_forums = $db->sql_numrows($q_forums) )
  	{
! 		$forum_rows = $db->sql_fetchrowset($q_forums);
! 	}
  
! 	//
! 	// Okay, let's build the index
! 	//
! 	$gen_cat = array();
  
! 	for($i = 0; $i < $total_categories; $i++)
! 	{
! 		$cat_id = $category_rows[$i]['cat_id'];
  
! 		$template->assign_block_vars("catrow", array( 
! 			'S_ADD_FORUM_SUBMIT' => "addforum[$cat_id]", 
! 			'S_ADD_FORUM_NAME' => "forumname[$cat_id]", 
! 
! 			'CAT_ID' => $cat_id,
! 			'CAT_DESC' => $category_rows[$i]['cat_title'],
! 
! 			'U_CAT_EDIT' => append_sid("admin_forums.$phpEx?mode=editcat&amp;cat_id=$cat_id"),
! 			'U_CAT_DELETE' => append_sid("admin_forums.$phpEx?mode=deletecat&cat_id=$cat_id"),
! 			'U_CAT_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=cat_order&move=-15&cat_id=$cat_id"),
! 			'U_CAT_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=cat_order&move=15&cat_id=$cat_id"),
! 			'U_VIEWCAT' => append_sid($phpbb_root_path."index.$phpEx?viewcat=$cat_id"))
! 		);
  
! 		for($j = 0; $j < $total_forums; $j++)
! 		{
! 			$forum_id = $forum_rows[$j]['forum_id'];
! 			
! 			if ($forum_rows[$j]['cat_id'] == $cat_id)
! 			{
  
! 				$template->assign_block_vars("catrow.forumrow",	array(
! 					'FORUM_NAME' => $forum_rows[$j]['forum_name'],
! 					'FORUM_DESC' => $forum_rows[$j]['forum_desc'],
! 					'ROW_COLOR' => $row_color,
! 					'NUM_TOPICS' => $forum_rows[$j]['forum_topics'],
! 					'NUM_POSTS' => $forum_rows[$j]['forum_posts'],
! 
! 					'U_VIEWFORUM' => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&amp;" . $forum_rows[$j]['forum_posts']),
! 					'U_FORUM_EDIT' => append_sid("admin_forums.$phpEx?mode=editforum&amp;forum_id=$forum_id"),
! 					'U_FORUM_DELETE' => append_sid("admin_forums.$phpEx?mode=deleteforum&amp;forum_id=$forum_id"),
! 					'U_FORUM_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=forum_order&amp;move=-15&forum_id=$forum_id"),
! 					'U_FORUM_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=forum_order&amp;move=15&forum_id=$forum_id"),
! 					'U_FORUM_RESYNC' => append_sid("admin_forums.$phpEx?mode=forum_sync&amp;forum_id=$forum_id"))
! 				);
  
! 			}// if ... forumid == catid
! 			
! 		} // for ... forums
  
! 	} // for ... categories
  
  }// if ... total_categories