[mxbb-commits] core/admin index_new.php,1.4,1.5

[OryNider <ory...@us...>]

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

Modified Files:
	index_new.php 
Log Message:
new acp releated

Index: index_new.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index_new.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index_new.php	6 Feb 2008 11:37:53 -0000	1.4
--- index_new.php	6 Feb 2008 15:13:21 -0000	1.5
***************
*** 156,160 ****
  		{
  			include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions_hook.' . $phpEx );
! 			$this->phpbb3_hook = new mx_phpbb3_admin();
  			$this->phpbb3_hook->hook( 'admin' );
  		}
--- 156,160 ----
  		{
  			include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions_hook.' . $phpEx );
! 			$this->phpbb3_hook = new mx_phpbb3_admin( $this);
  			$this->phpbb3_hook->hook( 'admin' );
  		}
***************
*** 514,545 ****
  
  				$preg_array = array(
! 				'#^<\?(php)?#'				=> '',
! 				'#\?>$#'				=> '',
! 				"#define\('IN_PORTAL', 1\);#si"				=> '',
! 				'#\$mx_root_path = [^;]*;#si'				=> '',
! 				'#([^_]{1})append_sid#si'				=> '\1mx_append_sid',
! 				'#([^_]{1})mx_message_die#si'				=> '\1$mx_acp->mx_message_die_acp',
! 				'#([^_]{1})message_die#si'				=> '\1$mx_acp->mx_message_die_acp',
! 				'#\$phpEx = [^;]*;#'				=> '',
! 				 '#(include|require)(_once)?.*(pagestart|footer|header)(_admin)?[^;]*;#'				=> '',
! 				 "#\\\$module_root_path = ['\\\"]([^']*)['\\\"];#"				=> '$module_root_path = "' . $mx_root_path . $module_root_path . '";',
! 				 '#.*(\$HTTP_GET_VARS\[\'pane\'\] == \'right\')#si'				=> 'if ( 1==1',
! 				 '#\$db->sql_close\(\);#si'				=> '',
! 				'#->assign_vars\([^(]*\(#si'				=> '\0 ' . "'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,'U_PORTAL_ROOT_PATH' => PORTAL_URL,",
! 				// '#if.*setmodules.*return[^\}]*\}#' => '',
! 				'#\$phpbb_root_path =[^;]*;#si'				=> '// \0 //<= has been allready defined $phpbb_root_path',
! 				'#require[^;]*;#si' => '// \0',
  				);
  				$preg_array = array_merge( $preg_array, array( // #
  					"#([\n\t ](@?(include|require)\\(\\\$phpbb_root_path[^;]*;))#si" => '// \2 // <<== PHPBB2 INCLUDE',
! 					 "#([\n\t ](@?(include|require)[^(lang)]*;))#si" => "\n" . '// \2 //<= has been allready defined INCLUDE',
! 				//$preg_replace[] = "\n" . '\1';
  				));
  				// PHPBB2 FUNCTIONS REPLACE
  				$functions_ary = array( //#
! 						'get_userdata', 'phpbb_clean_username', phpbb_realpath
  				);
  				$preg_array = array_merge( $preg_array, array( // #
! 						'#(' . implode( '|', $functions_ary) . ')\(#si'					=> 'phpBB2::\1(',
  				));
  
--- 514,543 ----
  
  				$preg_array = array(
! 					'#^<\?(php)?#'				=> '',
! 					'#\?>$#'				=> '',
! 					"#define\('IN_PORTAL', 1\);#si"				=> '',
! 					'#\$mx_root_path = [^;]*;#si'				=> '',
! 					'#([^_]{1})append_sid#si'				=> '\1mx_append_sid',
! 					'#([^_]{1})mx_message_die#si'				=> '\1$mx_acp->mx_message_die_acp',
! 					'#([^_]{1})message_die#si'				=> '\1$mx_acp->mx_message_die_acp',
! 					'#\$phpEx = [^;]*;#'				=> '',
! 					 '#(include|require)(_once)?.*(pagestart|footer|header)(_admin)?[^;]*;#'				=> '',
! 					 "#\\\$module_root_path = ['\\\"]([^']*)['\\\"];#"				=> '$module_root_path = "' . $mx_root_path . $module_root_path . '";',
! 					 '#.*(\$HTTP_GET_VARS\[\'pane\'\] == \'right\')#si'				=> 'if ( 1==1',
! 					 '#\$db->sql_close\(\);#si'				=> '',
! 					'#->assign_vars\([^(]*\(#si'				=> '\0 ' . "'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,'U_PORTAL_ROOT_PATH' => PORTAL_URL,",
! 					'#\$phpbb_root_path =[^;]*;#si'				=> '// \0 //<= has been allready defined $phpbb_root_path',
! 					'#require[^;]*;#si' => '// \0',
  				);
  				$preg_array = array_merge( $preg_array, array( // #
  					"#([\n\t ](@?(include|require)\\(\\\$phpbb_root_path[^;]*;))#si" => '// \2 // <<== PHPBB2 INCLUDE',
! 					"#([\n\t ](@?(include|require)[^(lang)]*;))#si" => "\n" . '// \2 //<= has been allready defined INCLUDE',
  				));
  				// PHPBB2 FUNCTIONS REPLACE
  				$functions_ary = array( //#
! 					'get_userdata', 'phpbb_clean_username', phpbb_realpath
  				);
  				$preg_array = array_merge( $preg_array, array( // #
! 					'#(' . implode( '|', $functions_ary) . ')\(#si'					=> 'phpBB2::\1(',
  				));
  
***************
*** 646,650 ****
  			case OLYMPUS_CATEGORY:
  				$acp_html = $this->phpbb3_hook->assign_content_acp( $acp_html);
! 				$acp_html = '<h1>' . $this->panel_title . '</h1><p>Panel: ' . $this->panel . '</p>' . $acp_html;
  				break;
  		} // switch
--- 644,648 ----
  			case OLYMPUS_CATEGORY:
  				$acp_html = $this->phpbb3_hook->assign_content_acp( $acp_html);
! 				//$acp_html = '<h1>' . $this->panel_title . '</h1><p>Panel: ' . $this->panel . '</p>' . $acp_html;
  				break;
  		} // switch
***************
*** 770,774 ****
  			'S_JUMPBOX_ACTION' => mx_append_sid('../viewforum.'.$phpEx),
  			'S_CURRENT_TIME' => sprintf($lang['Current_time'], phpBB2::create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
! 			//'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
  
  			'S_CONTENT_DIRECTION' => $lang['DIRECTION'],
--- 768,772 ----
  			'S_JUMPBOX_ACTION' => mx_append_sid('../viewforum.'.$phpEx),
  			'S_CURRENT_TIME' => sprintf($lang['Current_time'], phpBB2::create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
! 		//'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
  
  			'S_CONTENT_DIRECTION' => $lang['DIRECTION'],