[mxbb-commits] core/admin admin_mx_page_cp.php,1.6,1.7 admin_mx_portal.php,1.18,1.19

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

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

Modified Files:
	admin_mx_page_cp.php admin_mx_portal.php 
Log Message:
Adding IP filter for pages
Merged module_def panels and parameters, now usable at the same time
Menu navigation fixes for highlights

Index: admin_mx_portal.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** admin_mx_portal.php	1 Oct 2005 14:10:44 -0000	1.18
--- admin_mx_portal.php	12 Oct 2005 15:37:32 -0000	1.19
***************
*** 46,54 ****
  if( !empty($mode) )
  {
! 	$new['portal_name'] = $HTTP_POST_VARS['portal_name'];
! 	$new['portal_url'] = $HTTP_POST_VARS['portal_url'];
! 	$new['portal_phpbb_url'] = $HTTP_POST_VARS['portal_phpbb_url'];
! 	$new['top_phpbb_links'] = $HTTP_POST_VARS['top_phpbb_links'];
! 	$new['mx_use_cache'] = $HTTP_POST_VARS['mx_use_cache'];
  
  	$sql = "UPDATE " . PORTAL_TABLE . "
--- 46,54 ----
  if( !empty($mode) )
  {
! 	$new['portal_name'] = $mx_request_vars->post('portal_name', MX_TYPE_NO_TAGS, 'mxBB Portal and CMS');
! 	$new['portal_url'] = $mx_request_vars->post('portal_url', MX_TYPE_NO_TAGS, '');
! 	$new['portal_phpbb_url'] = $mx_request_vars->post('portal_phpbb_url', MX_TYPE_NO_TAGS, '');
! 	$new['top_phpbb_links'] = $mx_request_vars->post('top_phpbb_links', MX_TYPE_INT, '0');
! 	$new['mx_use_cache'] = $mx_request_vars->post('mx_use_cache', MX_TYPE_INT, '1');
  
  	$sql = "UPDATE " . PORTAL_TABLE . "
***************
*** 80,83 ****
--- 80,84 ----
  
  $phpbb_rel_path = substr( "$phpbb_root_path", 3 );
+ 
  $portal_version = $portal_config['portal_version'];
  
***************
*** 106,109 ****
--- 107,111 ----
  	"PORTAL_URL" => $portal_config['portal_url'],
  	"PORTAL_PHPBB_URL" => $portal_config['portal_phpbb_url'],
+ 	
  	// Added in v 2.706
  	"L_PHPBB_RELATIVE_PATH" => $lang['Phpbb_path'],

Index: admin_mx_page_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** admin_mx_page_cp.php	1 Oct 2005 14:10:44 -0000	1.6
--- admin_mx_page_cp.php	12 Oct 2005 15:37:32 -0000	1.7
***************
*** 260,264 ****
  	'L_PRIVATE_AUTH_EXPLAIN' 	=> $lang['Mx_Page_Auth_Explain'],
  	'L_GROUPS' 					=> $lang['Usergroups'],
! 	'L_IS_MODERATOR' 			=> $lang['Is_Moderator'],		
  	//
  	// Graphics
--- 260,267 ----
  	'L_PRIVATE_AUTH_EXPLAIN' 	=> $lang['Mx_Page_Auth_Explain'],
  	'L_GROUPS' 					=> $lang['Usergroups'],
! 	'L_IS_MODERATOR' 			=> $lang['Is_Moderator'],	
! 	"L_IP_FILTER" => $lang['Mx_IP_filter'],
! 	"L_IP_FILTER_EXPLAIN" => $lang['Mx_IP_filter_explain'],		
! 	
  	//
  	// Graphics
***************
*** 651,654 ****
--- 654,659 ----
  	$icon_tmp = ( !empty($page_icon) && $page_icon != 'none' && file_exists($mx_root_path . TEMPLATE_ROOT_PATH . "images/page_icons/" . $page_icon)) ? '<img align="absmiddle" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . "images/page_icons/" . $page_icon . '" />' : '';
  
+ 	$ip_filter = !empty($page_rows[$page_count]['ip_filter']) ? implode( "\n", unserialize( stripslashes( $page_rows[$page_count]['ip_filter'] ))) : '' ;
+ 
  	//
  	// Page subpanel - edit
***************
*** 720,723 ****
--- 725,733 ----
  		'E_PAGE_GRAPH_BORDER'		=> $page_graph_border,
  		'S_TEMPLATE_LIST'			=> $template_list,
+ 
+ 		//
+ 		// IP filter
+ 		//
+ 		"IP_FILTER" => $ip_filter,		
  		
  		// Main