[mxbb-commits] core/includes mx_functions_admincp.php, 1.34, 1.35 mx_functions_core.php, 1.41, 1.42 page_tail.php, 1.28, 1.29

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

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16:/tmp/cvs-serv24103/includes

Modified Files:
	mx_functions_admincp.php mx_functions_core.php page_tail.php 
Log Message:
New db field, page_footer

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** mx_functions_core.php	7 May 2007 19:25:11 -0000	1.41
--- mx_functions_core.php	13 May 2007 20:33:04 -0000	1.42
***************
*** 367,370 ****
--- 367,371 ----
  						pag.page_icon,
  						pag.page_header,
+ 						pag.page_footer,
  						pag.navigation_block,
  						pag.auth_view AS pag_auth_view,
***************
*** 410,413 ****
--- 411,415 ----
  				"page_icon" => $row['page_icon'],
  				"page_header" => $row['page_header'],
+ 				"page_footer" => $row['page_footer'],
  				"page_navigation_block" => $row['navigation_block'],
  				"page_auth_view" => $row['pag_auth_view'],
***************
*** 2482,2485 ****
--- 2484,2488 ----
  	var $page_icon = '';
  	var $page_ov_header = '';
+ 	var $page_ov_footer = '';
  	var $page_main_layout = '';
  	var $page_navigation_block = '0';
***************
*** 2533,2536 ****
--- 2536,2540 ----
  
  		$this->page_ov_header = !empty($this->info['page_header']) && file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $this->info['page_header']) ? $this->info['page_header'] : $portal_config['overall_header'];
+ 		$this->page_ov_footer = !empty($this->info['page_footer']) && file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $this->info['page_footer']) ? $this->info['page_footer'] : $portal_config['overall_footer'];
  		$this->page_main_layout = !empty($this->info['page_main_layout']) && file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $this->info['page_main_layout']) ? $this->info['page_main_layout'] : $portal_config['main_layout'];
  		$this->phpbb_stats = $this->info['phpbb_stats'] == -1 ? ($portal_config['top_phpbb_links'] == 1 ? true : false ) : ( $this->info['phpbb_stats'] == 1 ? true : false );

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** mx_functions_admincp.php	7 May 2007 19:25:10 -0000	1.34
--- mx_functions_admincp.php	13 May 2007 20:33:04 -0000	1.35
***************
*** 335,338 ****
--- 335,339 ----
  					$page_icon = $mx_request_vars->post('menuicons', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '');
  					$page_header = $mx_request_vars->post('page_header', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '');
+ 					$page_footer = $mx_request_vars->post('page_footer', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '');
  					$page_main_layout = $mx_request_vars->post('page_main_layout', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '');
  					$navigation_block = $mx_request_vars->post('navigation_block', MX_TYPE_INT, '0');
***************
*** 367,371 ****
  					}
  
! 					$sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, auth_view, page_header, page_main_layout, navigation_block, ip_filter, phpbb_stats )
  						VALUES ( 	'" . $page_id_new . "',
  									'" . $page_name . "',
--- 368,372 ----
  					}
  
! 					$sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, auth_view, page_header, page_footer, page_main_layout, navigation_block, ip_filter, phpbb_stats )
  						VALUES ( 	'" . $page_id_new . "',
  									'" . $page_name . "',
***************
*** 374,377 ****
--- 375,379 ----
  									'" . $auth_view . "',
  									'" . $page_header . "',
+ 									'" . $page_footer . "',
  									'" . $page_main_layout . "',
  									'" . $navigation_block . "',
***************
*** 921,924 ****
--- 923,927 ----
  					$page_icon = $mx_request_vars->post('menuicons', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '');
  					$page_header = $mx_request_vars->post('page_header', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '');
+ 					$page_footer = $mx_request_vars->post('page_footer', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '');
  					$page_main_layout = $mx_request_vars->post('page_main_layout', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '');
  					$navigation_block = $mx_request_vars->post('navigation_block', MX_TYPE_INT, '0');
***************
*** 943,946 ****
--- 946,950 ----
  							page_icon         = '$page_icon',
  							page_header       = '$page_header',
+ 							page_footer       = '$page_footer',
  							page_main_layout  = '$page_main_layout',
  							navigation_block  = '$navigation_block',

Index: page_tail.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** page_tail.php	5 May 2007 20:12:58 -0000	1.28
--- page_tail.php	13 May 2007 20:33:04 -0000	1.29
***************
*** 24,29 ****
  
  $template->set_filenames(array(
! 	'overall_footer' => ( empty($gen_simple_header) ) ? 'overall_footer.tpl' : 'simple_footer.tpl' )
! );
  
  //
--- 24,30 ----
  
  $template->set_filenames(array(
! 	//'overall_footer' => ( empty($gen_simple_header) ) ? 'overall_footer.tpl' : 'simple_footer.tpl'
! 	'overall_footer' => empty($mx_page->page_ov_footer) || !file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $mx_page->page_ov_footer) ? ( empty($gen_simple_header) ? 'overall_footer.tpl' : 'simple_footer.tpl' ) : $mx_page->page_ov_footer
! ));
  
  //