[mxbb-commits] mx_kb/admin admin_kb_cat.php,1.12,1.13 admin_kb_custom.php,1.5,1.6 admin_kb_rebuild_search.php,1.5,1.6

[Jon O. <jon...@us...>]

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

Modified Files:
	admin_kb_cat.php admin_kb_custom.php 
	admin_kb_rebuild_search.php 
Log Message:
fixing up

Index: admin_kb_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_cat.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** admin_kb_cat.php	9 Apr 2005 21:41:27 -0000	1.12
--- admin_kb_cat.php	11 Apr 2005 20:07:55 -0000	1.13
***************
*** 679,683 ****
  
  $template->pparse( 'body' );
- // include('./page_footer_admin.'.$phpEx);
  include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx );
  
--- 679,682 ----

Index: admin_kb_rebuild_search.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_rebuild_search.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin_kb_rebuild_search.php	9 Apr 2005 21:41:27 -0000	1.5
--- admin_kb_rebuild_search.php	11 Apr 2005 20:07:56 -0000	1.6
***************
*** 146,152 ****
  	}
  	
- //	include ('./page_header_admin.'.$phpEx);
- include( $mx_root_path . 'admin/page_header_admin.' . $phpEx );
- 	
  	$template->assign_vars (array (
  		'PERCENT' => round ((($start + $num_rows) / $total_num_rows) * 100),
--- 146,149 ----
***************
*** 160,167 ****
  	    "body" => "admin/kb_rebuild_search_progress.tpl")
  	);
! } else {
! //	include('./page_header_admin.'.$phpEx);
! include( $mx_root_path . 'admin/page_header_admin.' . $phpEx );
! 	
  	$template->assign_vars (array (
  		'L_REBUILD_SEARCH' => $lang['Rebuild_search'],
--- 157,163 ----
  	    "body" => "admin/kb_rebuild_search_progress.tpl")
  	);
! } 
! else 
! {
  	$template->assign_vars (array (
  		'L_REBUILD_SEARCH' => $lang['Rebuild_search'],

Index: admin_kb_custom.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_custom.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin_kb_custom.php	9 Apr 2005 21:41:27 -0000	1.5
--- admin_kb_custom.php	11 Apr 2005 20:07:56 -0000	1.6
***************
*** 235,241 ****
  			'L_FIELD_ORDER' => $lang['Field_order'],
  
! 			'DATA' => ( $field_type != INPUT && $field_type != TEXTAREA ) ? true : false,
! 			'REGEX' => ( $field_type == INPUT || $field_type == TEXTAREA ) ? true : false,
! 			'ORDER' => ( $field_id ) ? true : false,
  
  			'FIELD_NAME' => $data['custom_name'],
--- 235,241 ----
  			'L_FIELD_ORDER' => $lang['Field_order'],
  
! 			//'DATA' => ( $field_type != INPUT && $field_type != TEXTAREA ) ? true : false,
! 			//'REGEX' => ( $field_type == INPUT || $field_type == TEXTAREA ) ? true : false,
! 			//'ORDER' => ( $field_id ) ? true : false,
  
  			'FIELD_NAME' => $data['custom_name'],
***************
*** 245,248 ****
--- 245,261 ----
  			'FIELD_ORDER' => $data['field_order'] ) 
  		);
+ 		
+ 		if ( $field_type != INPUT && $field_type != TEXTAREA )
+ 		{
+ 			$template->assign_block_vars( 'data', array() );
+ 		}
+ 		if ( $field_type == INPUT || $field_type == TEXTAREA )
+ 		{
+ 			$template->assign_block_vars( 'regex', array() );
+ 		}
+ 		if ( $field_id )
+ 		{
+ 			$template->assign_block_vars( 'order', array() );
+ 		}
  }
  elseif ( $mode == 'add' )
***************
*** 274,283 ****
  $template->pparse( 'admin' );
  
- //$pafiledb->_pafiledb();
- //$cache->unload();
- 
- /* Original
- include('./page_footer_admin.'.$phpEx);
- */
  // MX Module
  include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx );
--- 287,290 ----