[Phpbb-checkins] CVS: phpBB2/admin admin_forum_prune.php,1.21,1.22

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

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

Modified Files:
	admin_forum_prune.php 
Log Message:
more changes

Index: admin_forum_prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forum_prune.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** admin_forum_prune.php	2 Apr 2002 14:04:18 -0000	1.21
--- admin_forum_prune.php	2 Apr 2002 14:53:44 -0000	1.22
***************
*** 71,75 ****
  if( !($result = $db->sql_query($sql)) )
  {
! 	message_die(GENERAL_ERROR, "Couldn't obtain list of forums for pruning", "", __LINE__, __FILE__, $sql);
  }
  
--- 71,75 ----
  if( !($result = $db->sql_query($sql)) )
  {
! 	message_die(GENERAL_ERROR, 'Could not obtain list of forums for pruning', '', __LINE__, __FILE__, $sql);
  }
  
***************
*** 97,119 ****
  	{
  		$p_result = prune($forum_rows[$i]['forum_id'], $prunedate);
  	
  		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
  	
! 		$template->assign_block_vars("prune_results", array(
! 			"ROW_COLOR" => "#" . $row_color, 
! 			"ROW_CLASS" => $row_class, 
! 			"FORUM_NAME" => $forum_rows[$i]['forum_name'],
! 			"FORUM_TOPICS" => $p_result['topics'],
! 			"FORUM_POSTS" => $p_result['posts'])
  		);
  	}
  
  	$template->assign_vars(array(
! 		"L_FORUM_PRUNE" => $lang['Forum_Prune'],
! 		"L_FORUM" => $lang['Forum'],
! 		"L_TOPICS_PRUNED" => $lang['Topics_pruned'],
! 		"L_POSTS_PRUNED" => $lang['Posts_pruned'],
! 		"L_PRUNE_RESULT" => $lang['Prune_success'])
  	);
  }
--- 97,120 ----
  	{
  		$p_result = prune($forum_rows[$i]['forum_id'], $prunedate);
+ 		sync('forum', $forum_rows[$i]['forum_id']);
  	
  		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
  	
! 		$template->assign_block_vars('prune_results', array(
! 			'ROW_COLOR' => '#' . $row_color, 
! 			'ROW_CLASS' => $row_class, 
! 			'FORUM_NAME' => $forum_rows[$i]['forum_name'],
! 			'FORUM_TOPICS' => $p_result['topics'],
! 			'FORUM_POSTS' => $p_result['posts'])
  		);
  	}
  
  	$template->assign_vars(array(
! 		'L_FORUM_PRUNE' => $lang['Forum_Prune'],
! 		'L_FORUM' => $lang['Forum'],
! 		'L_TOPICS_PRUNED' => $lang['Topics_pruned'],
! 		'L_POSTS_PRUNED' => $lang['Posts_pruned'],
! 		'L_PRUNE_RESULT' => $lang['Prune_success'])
  	);
  }
***************
*** 130,134 ****
  		//
  		$template->set_filenames(array(
! 			"body" => "admin/forum_prune_select_body.tpl")
  		);
  
--- 131,135 ----
  		//
  		$template->set_filenames(array(
! 			'body' => 'admin/forum_prune_select_body.tpl')
  		);
  
***************
*** 146,155 ****
  		//
  		$template->assign_vars(array(
! 			"L_FORUM_PRUNE" => $lang['Forum_Prune'],
! 			"L_SELECT_FORUM" => $lang['Select_a_Forum'], 
! 			"L_LOOK_UP" => $lang['Look_up_Forum'],
  
! 			"S_FORUMPRUNE_ACTION" => append_sid("admin_forum_prune.$phpEx"),
! 			"S_FORUMS_SELECT" => $select_list)
  		);
  	}
--- 147,156 ----
  		//
  		$template->assign_vars(array(
! 			'L_FORUM_PRUNE' => $lang['Forum_Prune'],
! 			'L_SELECT_FORUM' => $lang['Select_a_Forum'], 
! 			'L_LOOK_UP' => $lang['Look_up_Forum'],
  
! 			'S_FORUMPRUNE_ACTION' => append_sid("admin_forum_prune.$phpEx"),
! 			'S_FORUMS_SELECT' => $select_list)
  		);
  	}
***************
*** 162,166 ****
  		//
  		$template->set_filenames(array(
! 			"body" => "admin/forum_prune_body.tpl")
  		);
  
--- 163,167 ----
  		//
  		$template->set_filenames(array(
! 			'body' => 'admin/forum_prune_body.tpl')
  		);
  
***************
*** 176,188 ****
  		//
  		$template->assign_vars(array(
! 			"FORUM_NAME" => $forum_name,
  
! 			"L_FORUM_PRUNE" => $lang['Forum_Prune'], 
! 			"L_FORUM_PRUNE_EXPLAIN" => $lang['Forum_Prune_explain'], 
! 			"L_DO_PRUNE" => $lang['Do_Prune'],
! 
! 			"S_FORUMPRUNE_ACTION" => append_sid("admin_forum_prune.$phpEx"),
! 			"S_PRUNE_DATA" => $prune_data,
! 			"S_HIDDEN_VARS" => $hidden_input)
  		);
  	}
--- 177,189 ----
  		//
  		$template->assign_vars(array(
! 			'FORUM_NAME' => $forum_name,
  
! 			'L_FORUM_PRUNE' => $lang['Forum_Prune'], 
! 			'L_FORUM_PRUNE_EXPLAIN' => $lang['Forum_Prune_explain'], 
! 			'L_DO_PRUNE' => $lang['Do_Prune'],
! 
! 			'S_FORUMPRUNE_ACTION' => append_sid("admin_forum_prune.$phpEx"),
! 			'S_PRUNE_DATA' => $prune_data,
! 			'S_HIDDEN_VARS' => $hidden_input)
  		);
  	}
***************
*** 191,195 ****
  // Actually output the page here.
  //
! $template->pparse("body");
  
  include('page_footer_admin.'.$phpEx);
--- 192,196 ----
  // Actually output the page here.
  //
! $template->pparse('body');
  
  include('page_footer_admin.'.$phpEx);