[mxbb-commits] core/includes/shared/phpbb3/includes functions.php, 1.8, 1.9 functions_module.php, 1.8, 1.9

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

Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13727

Modified Files:
	functions.php functions_module.php 
Log Message:
phpBB3 backend stuff, culpit I need a working blockCP with nav menu


Index: functions_module.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_module.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** functions_module.php	6 Feb 2008 15:13:40 -0000	1.8
--- functions_module.php	6 Feb 2008 23:43:43 -0000	1.9
***************
*** 19,23 ****
  //
  // Common global functions
! // Fixes for mxBB:
  // $config -> $board_config
  // $cache -> $mx_cache
--- 19,23 ----
  //
  // Common global functions
! // Fixes for MX-Publisher:
  // $config -> $board_config
  // $cache -> $mx_cache
***************
*** 71,75 ****
  				ORDER BY left_id ASC";
  			$result = $db->sql_query($sql);
! 
  			$rows = array();
  			while ($row = $db->sql_fetchrow($result))
--- 71,75 ----
  				ORDER BY left_id ASC";
  			$result = $db->sql_query($sql);
! 				
  			$rows = array();
  			while ($row = $db->sql_fetchrow($result))
***************
*** 206,210 ****
  
  			$names[$row['module_basename'] . '_' . $row['module_mode']][] = true;
! 
  			$module_row = array(
  				'depth'		=> $depth,
--- 206,210 ----
  
  			$names[$row['module_basename'] . '_' . $row['module_mode']][] = true;
! 				
  			$module_row = array(
  				'depth'		=> $depth,
***************
*** 426,432 ****
  
  			$func_array = array(
! 				'request_var', 'add_form_key', 'generate_text_for_display', 'censor_text'
  				);
- 
  			$preg_array = array(
  				'#^<\?(php)?|\?>$#si' => '',
--- 426,431 ----
  
  			$func_array = array(
! 				'request_var', 'add_form_key', 'generate_text_for_display'
  				);
  			$preg_array = array(
  				'#^<\?(php)?|\?>$#si' => '',
***************
*** 437,448 ****
  				'#append_sid\(#si' => 'mx3_append_sid(',
  				'#get_username_string\(#si' => 'mx_get_username_string(',
! 				'#global#si' => 'global $mx_acp,',
  				'#\$template-#si' => '$mx_acp->template-',
  				'#(' . implode( '|', $func_array) . ')\(#si' => 'phpBB3::\1(',
  				);
  
! 			$modulecode = preg_replace( array_keys( $preg_array), array_values( $preg_array), $modulecode);
! 
! 			$mx_user = new mx_user();
  			eval($modulecode);
  
--- 436,457 ----
  				'#append_sid\(#si' => 'mx3_append_sid(',
  				'#get_username_string\(#si' => 'mx_get_username_string(',
! 				'#global#si' => 'global $mx_acp,', 
  				'#\$template-#si' => '$mx_acp->template-',
+ 				'#\$mx_acp->template->assign_vars#si' => 'foreach( $mx_user->lang as $key => $value)
+ 			{
+ 				$mx_acp->template->assign_var( \'L_\' . $key, $value); 
+ 			}
+ 				$mx_acp->template->assign_vars',
  				'#(' . implode( '|', $func_array) . ')\(#si' => 'phpBB3::\1(',
  				);
+ 			
+ 			$modulecode = preg_replace( array_keys( $preg_array), $preg_array, $modulecode);				
  
! 			//print_r( $mx_user);
! 			//$mx_user = new mx_user();
! 			//$mx_user->add_lang('acp/groups');
! 			//print_r( $mx_user->lang);
! 			//print '<pre style="font:10pt normal;font-family:Courier New">' .preg_replace( array("#\n#esi", "#\t#si"), array("'\n' . sprintf('%4d ', \$i++)", '&nbsp;&nbsp;&nbsp;'), htmlentities( $modulecode ) );
! 			//die();
  			eval($modulecode);
  
***************
*** 506,510 ****
  				$this->module->main($this->p_name, $this->p_mode);
  			}
! 
  			return;
  		}
--- 515,519 ----
  				$this->module->main($this->p_name, $this->p_mode);
  			}
! 			
  			return;
  		}
***************
*** 807,811 ****
  	function display($page_title, $display_online_list = true)
  	{
! 		global $template, $mx_user;
  
  		// Generate the page
--- 816,820 ----
  	function display($page_title, $display_online_list = true)
  	{
! 		global $template, $mx_acp; $mx_user;
  
  		// Generate the page
***************
*** 819,823 ****
  		}
  
! 		$template->set_filenames(array(
  			'body' => $this->get_tpl_name())
  		);
--- 828,832 ----
  		}
  
! 		$mx_acp->template->set_filenames(array(
  			'body' => $this->get_tpl_name())
  		);