[mxbb-commits] core/modules/mx_rebuild_search_tables/admin admin_rebuild_mx_search.php, 1.14, 1.15 admin_rebuild_search.php, 1.12, 1.13

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2665/modules/mx_rebuild_search_tables/admin

Modified Files:
	admin_rebuild_mx_search.php admin_rebuild_search.php 
Log Message:
SOME FIX

Index: admin_rebuild_mx_search.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/admin/admin_rebuild_mx_search.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** admin_rebuild_mx_search.php	15 Jul 2008 22:04:55 -0000	1.14
--- admin_rebuild_mx_search.php	27 Aug 2008 22:26:48 -0000	1.15
***************
*** 146,150 ****
  	if (($start + $num_rows) != $total_num_rows)
  	{
! 		$form_action = append_sid ("admin_rebuild_mx_search.$phpEx?start=". ($start + $num_rows) ."&total_num_rows=$total_num_rows&post_limit=". $mx_request_vars->get('post_limit', MX_TYPE_INT) ."&time_limit=$time_limit&refresh_rate=". $mx_request_vars->get('refresh_rate', MX_TYPE_INT));
  		$next = $lang['Next'];
  		$template->assign_vars(array(
--- 146,150 ----
  	if (($start + $num_rows) != $total_num_rows)
  	{
! 		$form_action = mx_append_sid("admin_rebuild_mx_search.$phpEx?start=". ($start + $num_rows) ."&total_num_rows=$total_num_rows&post_limit=". $mx_request_vars->get('post_limit', MX_TYPE_INT) ."&time_limit=$time_limit&refresh_rate=". $mx_request_vars->get('refresh_rate', MX_TYPE_INT));
  		$next = $lang['Next'];
  		$template->assign_vars(array(
***************
*** 155,159 ****
  	{
  		$next = $lang['Finished'];
! 		$form_action = append_sid ("admin_rebuild_mx_search.$phpEx");
  	}
  
--- 155,159 ----
  	{
  		$next = $lang['Finished'];
! 		$form_action = mx_append_sid("admin_rebuild_mx_search.$phpEx");
  	}
  
***************
*** 184,188 ****
  		'SESSION_ID' => $userdata['session_id'],
  
! 		'S_REBUILD_SEARCH_ACTION' => append_sid ("admin_rebuild_mx_search.$phpEx"))
  	);
  
--- 184,188 ----
  		'SESSION_ID' => $userdata['session_id'],
  
! 		'S_REBUILD_SEARCH_ACTION' => mx_append_sid ("admin_rebuild_mx_search.$phpEx"))
  	);
  

Index: admin_rebuild_search.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/admin/admin_rebuild_search.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** admin_rebuild_search.php	15 Jul 2008 22:04:55 -0000	1.12
--- admin_rebuild_search.php	27 Aug 2008 22:26:49 -0000	1.13
***************
*** 17,31 ****
  }
  
  global $mx_request_vars;
  $start_time = time ();
  $time_limit = $mx_request_vars->get('time_limit', MX_TYPE_INT);
  
- define ('IN_PORTAL', 1);
- 
  $no_page_header = true;
! $module_root_path = '../';
! $mx_root_path = '../../../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! require( $mx_root_path . 'admin/pagestart.' . $phpEx );
  
  // **********************************************************************
--- 17,50 ----
  }
  
+ //
+ // Security and Page header
+ //
+ define('IN_PORTAL', 1);
+ $module_root_path = '../';
+ $mx_root_path = '../../../';
+ $phpEx = substr(strrchr(__FILE__, '.'), 1);
+ include_once($mx_root_path . 'common.' . $phpEx);
+ 
  global $mx_request_vars;
  $start_time = time ();
  $time_limit = $mx_request_vars->get('time_limit', MX_TYPE_INT);
  
  $no_page_header = true;
! require_once($mx_root_path . 'admin/pagestart.' . $phpEx);
! 
! switch (PORTAL_BACKEND)
! {
! 	case 'internal':
! 	case 'phpbb3':
! 		mx_message_die(GENERAL_MESSAGE, 'This feature is designed for MX-Publisher with phpBB2 backend, thus not compatible with current setup.');
! 	
! 	break;
! 
! 	case 'phpbb2':
! 
! 	break;
! }
! 
! 
  
  // **********************************************************************
***************
*** 111,115 ****
  	if (($start + $num_rows) != $total_num_rows)
  	{
! 		$form_action = append_sid ("admin_rebuild_search.$phpEx?start=". ($start + $num_rows) ."&total_num_rows=$total_num_rows&post_limit=". $mx_request_vars->get('post_limit',MX_TYPE_INT) ."&time_limit=$time_limit&refresh_rate=". $mx_request_vars->get('refresh_rate', MX_TYPE_INT));
  		$next = $lang['Next'];
  		$template->assign_vars(array(
--- 130,134 ----
  	if (($start + $num_rows) != $total_num_rows)
  	{
! 		$form_action = mx_append_sid("admin_rebuild_search.$phpEx?start=". ($start + $num_rows) ."&total_num_rows=$total_num_rows&post_limit=". $mx_request_vars->get('post_limit',MX_TYPE_INT) ."&time_limit=$time_limit&refresh_rate=". $mx_request_vars->get('refresh_rate', MX_TYPE_INT));
  		$next = $lang['Next'];
  		$template->assign_vars(array(
***************
*** 120,127 ****
  	{
  		$next = $lang['Finished'];
! 		$form_action = append_sid ("admin_rebuild_search.$phpEx");
  	}
  
! 	include( $mx_root_path . 'admin/page_header_admin.' . $phpEx );
  
  	$template->assign_vars (array (
--- 139,146 ----
  	{
  		$next = $lang['Finished'];
! 		$form_action = mx_append_sid("admin_rebuild_search.$phpEx");
  	}
  
! 	include_once($mx_root_path . 'admin/page_header_admin.' . $phpEx);
  
  	$template->assign_vars (array (
***************
*** 149,153 ****
  		'SESSION_ID' => $userdata['session_id'],
  
! 		'S_REBUILD_SEARCH_ACTION' => append_sid ("admin_rebuild_search.$phpEx"))
  	);
  
--- 168,172 ----
  		'SESSION_ID' => $userdata['session_id'],
  
! 		'S_REBUILD_SEARCH_ACTION' => mx_append_sid ("admin_rebuild_search.$phpEx"))
  	);