[mxbb-commits] core/admin admin_mx_page_cp.php, 1.21, 1.22 admin_mx_portal.php, 1.30, 1.31

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

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

Modified Files:
	admin_mx_page_cp.php admin_mx_portal.php 
Log Message:
New db field, page_footer

Index: admin_mx_portal.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** admin_mx_portal.php	7 May 2007 19:25:10 -0000	1.30
--- admin_mx_portal.php	13 May 2007 20:33:03 -0000	1.31
***************
*** 40,43 ****
--- 40,44 ----
  	$new['portal_phpbb_url'] 		= $mx_request_vars->post('portal_phpbb_url', MX_TYPE_NO_TAGS, '');
  	$new['overall_header'] 			= $mx_request_vars->post('overall_header', MX_TYPE_NO_TAGS, 'overall_header.tpl');
+ 	$new['overall_footer'] 			= $mx_request_vars->post('overall_footer', MX_TYPE_NO_TAGS, 'overall_footer.tpl');
  	$new['main_layout'] 			= $mx_request_vars->post('main_layout', MX_TYPE_NO_TAGS, 'mx_main_layout.tpl');
  	$new['navigation_block'] 		= $mx_request_vars->post('navigation_block', MX_TYPE_INT, '0');
***************
*** 51,54 ****
--- 52,56 ----
  			portal_phpbb_url	= '" . str_replace("\'", "''", $new['portal_phpbb_url']) . "',
  			overall_header		= '" . str_replace("\'", "''", $new['overall_header']) . "',
+ 			overall_footer		= '" . str_replace("\'", "''", $new['overall_footer']) . "',
  			main_layout			= '" . str_replace("\'", "''", $new['main_layout']) . "',
  			navigation_block	= '" . str_replace("\'", "''", $new['navigation_block']) . "',
***************
*** 103,106 ****
--- 105,109 ----
  	"L_PORTAL_PHPBB_URL" => $lang['Portal_PHPBB_Url'] . "<br />" . $lang['Phpbb_url_explain'],
  	"L_OVERALL_HEADER" => $lang['Portal_Overall_header'] . "<br />" . $lang['Portal_Overall_header_explain'],
+ 	"L_OVERALL_FOOTER" => $lang['Portal_Overall_footer'] . "<br />" . $lang['Portal_Overall_footer_explain'],
  	"L_MAIN_LAYOUT" => $lang['Portal_Main_layout'] . "<br />" . $lang['Portal_Main_layout_explain'],
  	"L_NAVIGATION_BLOCK" => $lang['Portal_Navigation_block'] . "<br />" . $lang['Portal_Navigation_block_explain'],
***************
*** 112,115 ****
--- 115,119 ----
  	"PORTAL_PHPBB_URL" => $portal_config['portal_phpbb_url'],
  	"OVERALL_HEADER" => $portal_config['overall_header'],
+ 	"OVERALL_FOOTER" => $portal_config['overall_footer'],
  	"MAIN_LAYOUT" => $portal_config['main_layout'],
  	"NAVIGATION_BLOCK" => $navigation_block_list,

Index: admin_mx_page_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** admin_mx_page_cp.php	5 May 2007 20:12:55 -0000	1.21
--- admin_mx_page_cp.php	13 May 2007 20:33:03 -0000	1.22
***************
*** 249,256 ****
  	'L_PAGE_TITLE'				=> $lang['Page'],
  	'L_PAGE_DESC'				=> $lang['Page_desc'],
! 	'L_PAGE_ID'					=> empty($lang['Page_Id']) ? "Page Id" : $lang['Page_Id'] ,
! 	'L_PAGE_ICON'				=> empty($lang['Page_icon']) ? "Page Icon" : $lang['Page_icon'] ,
! 	'L_PAGE_HEADER'				=> empty($lang['Page_header']) ? "Page header file" : $lang['Page_header'] ,
! 	'L_PAGE_MAIN_LAYOUT'		=> empty($lang['Page_main_layout']) ? "Page main_layout file" : $lang['Page_main_layout'] ,
  	"L_NAVIGATION_BLOCK" 		=> $lang['Page_Navigation_block'],
  	"L_NAVIGATION_BLOCK_EXPLAIN" => $lang['Page_Navigation_block_explain'],
--- 249,257 ----
  	'L_PAGE_TITLE'				=> $lang['Page'],
  	'L_PAGE_DESC'				=> $lang['Page_desc'],
! 	'L_PAGE_ID'					=> empty($lang['Page_Id']) ? "Page Id" : $lang['Page_Id'],
! 	'L_PAGE_ICON'				=> empty($lang['Page_icon']) ? "Page Icon" : $lang['Page_icon'],
! 	'L_PAGE_HEADER'				=> empty($lang['Page_header']) ? "Page header file" : $lang['Page_header'],
! 	'L_PAGE_FOOTER'				=> empty($lang['Page_footer']) ? "Page footer file" : $lang['Page_footer'],
! 	'L_PAGE_MAIN_LAYOUT'		=> empty($lang['Page_main_layout']) ? "Page main_layout file" : $lang['Page_main_layout'],
  	"L_NAVIGATION_BLOCK" 		=> $lang['Page_Navigation_block'],
  	"L_NAVIGATION_BLOCK_EXPLAIN" => $lang['Page_Navigation_block_explain'],
***************
*** 665,668 ****
--- 666,670 ----
  	$page_icon = !$new_page ? $page_rows[$page_count]['page_icon'] : '';
  	$page_header = $page_rows[$page_count]['page_header'];
+ 	$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');
***************
*** 745,748 ****
--- 747,751 ----
  		'S_PAGE_ICON'				=> $page_icon,
  		'E_PAGE_HEADER'				=> $page_header,
+ 		'E_PAGE_FOOTER'				=> $page_footer,
  		'E_PAGE_MAIN_LAYOUT'		=> $page_main_layout,
  		"E_NAVIGATION_BLOCK" 		=> $navigation_block_list,