[mxbb-commits] core/admin admin_mx_page_cp.php, 1.29, 1.30 admin_mx_styles.php, 1.4, 1.5 admin_mx_c

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

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

Modified Files:
	admin_mx_page_cp.php admin_mx_styles.php admin_mx_chkobjs.php 
	admin_mx_module_cp.php admin_mx_portal.php index_new.php 
	admin_mx_words.php admin_mx_module.php admin_mx_smilies.php 
Log Message:
code styling: replaced hard coded .php file extentions with $phpEx

Index: admin_mx_chkobjs.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** admin_mx_chkobjs.php	9 Feb 2008 12:44:32 -0000	1.26
--- admin_mx_chkobjs.php	11 Feb 2008 11:13:16 -0000	1.27
***************
*** 162,168 ****
  }

! include_once('./page_header_admin.php');
  check_relationship($check_mode);
! include('./page_footer_admin.php');
  exit;

--- 162,168 ----
  }

! include_once('./page_header_admin.' . $phpEx);
  check_relationship($check_mode);
! include('./page_footer_admin.' . $phpEx);
  exit;

Index: admin_mx_page_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** admin_mx_page_cp.php	9 Feb 2008 19:45:34 -0000	1.29
--- admin_mx_page_cp.php	11 Feb 2008 11:13:16 -0000	1.30
***************
*** 618,622 ****
  	$page_footer = $page_rows[$page_count]['page_footer'];
  	$page_main_layout = $page_rows[$page_count]['page_main_layout'];
! 	$navigation_block_list = get_list_formatted('block_list', $page_rows[$page_count]['navigation_block'], 'navigation_block', 'mx_menu_nav.php');

  	$style_select = mx_style_select($page_rows[$page_count]['default_style'], 'mx_default_style', 'templates', true);
--- 618,622 ----
  	$page_footer = $page_rows[$page_count]['page_footer'];
  	$page_main_layout = $page_rows[$page_count]['page_main_layout'];
! 	$navigation_block_list = get_list_formatted('block_list', $page_rows[$page_count]['navigation_block'], 'navigation_block', 'mx_menu_nav.' . $phpEx);

  	$style_select = mx_style_select($page_rows[$page_count]['default_style'], 'mx_default_style', 'templates', true);

Index: admin_mx_module.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** admin_mx_module.php	9 Feb 2008 19:45:34 -0000	1.50
--- admin_mx_module.php	11 Feb 2008 11:13:16 -0000	1.51
***************
*** 367,372 ****
  // Generate Module and Function Page
  //
! include_once('./page_header_admin.php');
  $template->pparse('body');
! include('./page_footer_admin.php');
  ?>
\ No newline at end of file
--- 367,372 ----
  // Generate Module and Function Page
  //
! include_once('./page_header_admin.' . $phpEx);
  $template->pparse('body');
! include('./page_footer_admin.' . $phpEx);
  ?>
\ No newline at end of file

Index: admin_mx_module_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** admin_mx_module_cp.php	9 Feb 2008 19:45:35 -0000	1.22
--- admin_mx_module_cp.php	11 Feb 2008 11:13:16 -0000	1.23
***************
*** 456,462 ****
  	$type_row = array();

! 	if ( file_exists( $mx_root_path . $module_rows[$module_count]['module_path'] . 'admin/mx_module_defs.php' ) )
  	{
! 		include_once( $mx_root_path . $module_rows[$module_count]['module_path'] . 'admin/mx_module_defs.php' );

  		if (class_exists('mx_module_defs'))
--- 456,462 ----
  	$type_row = array();

! 	if ( file_exists( $mx_root_path . $module_rows[$module_count]['module_path'] . 'admin/mx_module_defs.' . $phpEx ) )
  	{
! 		include_once( $mx_root_path . $module_rows[$module_count]['module_path'] . 'admin/mx_module_defs.' . $phpEx );

  		if (class_exists('mx_module_defs'))

Index: admin_mx_smilies.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** admin_mx_smilies.php	9 Feb 2008 12:44:32 -0000	1.3
--- admin_mx_smilies.php	11 Feb 2008 11:13:16 -0000	1.4
***************
*** 71,75 ****
  // Load default header
  //
! include_once('./page_header_admin.php');

  if ($cancel)
--- 71,75 ----
  // Load default header
  //
! include_once('./page_header_admin.' . $phpEx);

  if ($cancel)

Index: index_new.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index_new.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** index_new.php	9 Feb 2008 12:44:32 -0000	1.8
--- index_new.php	11 Feb 2008 11:13:16 -0000	1.9
***************
*** 105,113 ****
  	include_once( $phpbb_root_path . 'includes/functions_selects.' . $phpEx ); // LOAD phpbb2 file functions_select for 2.8.0
  	include_once( $phpbb_root_path . 'includes/functions.php' );
! 	include_once( $phpbb_root_path . 'includes/functions_validate.php' );
  }
  if ( PORTAL_BACKEND == OLYMPUS_BACKEND )
  {
! 	include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.php' );
  	mx_page::load_file( 'acp/auth', 'phpbb3' );
  	// mx_page::load_file( 'auth', 'phpbb3');
--- 105,113 ----
  	include_once( $phpbb_root_path . 'includes/functions_selects.' . $phpEx ); // LOAD phpbb2 file functions_select for 2.8.0
  	include_once( $phpbb_root_path . 'includes/functions.php' );
! 	include_once( $phpbb_root_path . 'includes/functions_validate.' . $phpEx );
  }
  if ( PORTAL_BACKEND == OLYMPUS_BACKEND )
  {
! 	include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx );
  	mx_page::load_file( 'acp/auth', 'phpbb3' );
  	// mx_page::load_file( 'auth', 'phpbb3');
***************
*** 590,594 ****
  						continue;
  					}
! 					if ( eregi( 'index.php', $match_links['LINK'][$i] ) )
  					{
  						$text = str_replace( $match_links['LINK'][$i], PORTAL_URL . $admin_path . $match_links['LINK'][$i], $text );
--- 590,594 ----
  						continue;
  					}
! 					if ( eregi( 'index.' . $phpEx, $match_links['LINK'][$i] ) )
  					{
  						$text = str_replace( $match_links['LINK'][$i], PORTAL_URL . $admin_path . $match_links['LINK'][$i], $text );

Index: admin_mx_words.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_words.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** admin_mx_words.php	9 Feb 2008 12:44:32 -0000	1.2
--- admin_mx_words.php	11 Feb 2008 11:13:16 -0000	1.3
***************
*** 42,46 ****
  // Load default header
  //
! include_once('./page_header_admin.php');

  if ($cancel)
--- 42,46 ----
  // Load default header
  //
! include_once('./page_header_admin.' . $phpEx);

  if ($cancel)

Index: admin_mx_styles.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_styles.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_mx_styles.php	10 Feb 2008 22:09:34 -0000	1.4
--- admin_mx_styles.php	11 Feb 2008 11:13:16 -0000	1.5
***************
*** 44,48 ****
  // Load default header
  //
! include_once('./page_header_admin.php');

  $confirm = $mx_request_vars->is_post('confirm');
--- 44,48 ----
  // Load default header
  //
! include_once('./page_header_admin.' . $phpEx);

  $confirm = $mx_request_vars->is_post('confirm');
***************
*** 264,268 ****
  if ($mx_request_vars->is_empty_post('send_file'))
  {
! 	include('./page_footer_admin.php');
  }

--- 264,268 ----
  if ($mx_request_vars->is_empty_post('send_file'))
  {
! 	include('./page_footer_admin.' . $phpEx);
  }

Index: admin_mx_portal.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** admin_mx_portal.php	10 Feb 2008 21:23:20 -0000	1.40
--- admin_mx_portal.php	11 Feb 2008 11:13:16 -0000	1.41
***************
*** 112,116 ****
  $template->set_filenames(array( 'admin_portal' => 'admin/admin_mx_portal.tpl') );

! $navigation_block_list = get_list_formatted('block_list', $portal_config['navigation_block'], 'navigation_block', 'mx_menu_nav.php', false, 'mx_site_nav.php');

  $portal_config['default_lang'] = $portal_config['default_lang'] == -1 ? $board_config['default_lang'] : $portal_config['default_lang'];
--- 112,116 ----
  $template->set_filenames(array( 'admin_portal' => 'admin/admin_mx_portal.tpl') );

! $navigation_block_list = get_list_formatted('block_list', $portal_config['navigation_block'], 'navigation_block', 'mx_menu_nav.' . $phpEx, false, 'mx_site_nav.' . $phpEx);

  $portal_config['default_lang'] = $portal_config['default_lang'] == -1 ? $board_config['default_lang'] : $portal_config['default_lang'];