[mxbb-commits] core/includes/shared/phpbb3/includes functions_hook.php, 1.15, 1.16 functions_module

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	functions_hook.php functions_module.php functions.php 
Log Message:
new acp update

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** functions.php	15 Jun 2008 21:01:41 -0000	1.17
--- functions.php	18 Jun 2008 12:14:15 -0000	1.18
***************
*** 2172,2180 ****
  function redirect($url, $return = false)
  {
! 	global $db, $mx_cache, $board_config, $user, $phpbb_root_path;

  	if (empty($user->lang))
  	{
! 		$user->add_lang('common');
  	}

--- 2172,2180 ----
  function redirect($url, $return = false)
  {
! 	global $db, $mx_cache, $board_config, $mx_user, $phpbb_root_path;

  	if (empty($user->lang))
  	{
! 		$mx_user->add_lang('common');
  	}

***************
*** 2193,2197 ****
  	{
  		// Malformed url, redirect to current page...
! 		$url = self::generate_board_url() . '/' . $user->page['page'];
  	}
  	else if (!empty($url_parts['scheme']) && !empty($url_parts['host']))
--- 2193,2197 ----
  	{
  		// Malformed url, redirect to current page...
! 		$url = self::generate_board_url() . '/' . $mx_user->page['page'];
  	}
  	else if (!empty($url_parts['scheme']) && !empty($url_parts['host']))
***************
*** 2332,2336 ****
  	}

! 	return append_sid($url);
  }

--- 2332,2336 ----
  	}

! 	return mx_append_sid($url);
  }

***************
*** 2474,2478 ****

  	// generate activation key
! 	$confirm_key = gen_rand_string(10);

  	if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin'])
--- 2474,2478 ----

  	// generate activation key
! 	$confirm_key = phpBB3::gen_rand_string(10);

  	if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin'])
***************
*** 2482,2486 ****
  	else
  	{
! 		page_header((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]);
  	}

--- 2482,2486 ----
  	else
  	{
! 		//page_header((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]);
  	}

***************
*** 2498,2502 ****
  	// re-add sid / transform & to &amp; for user->page (user->page is always using &)
  	$use_page = ($u_action) ? $phpbb_root_path . $u_action : $phpbb_root_path . str_replace('&', '&amp;', $user->page['page']);
! 	$u_action = reapply_sid($use_page);
  	$u_action .= ((strpos($u_action, '?') === false) ? '?' : '&amp;') . 'confirm_key=' . $confirm_key;

--- 2498,2502 ----
  	// re-add sid / transform & to &amp; for user->page (user->page is always using &)
  	$use_page = ($u_action) ? $phpbb_root_path . $u_action : $phpbb_root_path . str_replace('&', '&amp;', $user->page['page']);
! 	$u_action = self::reapply_sid($use_page);
  	$u_action .= ((strpos($u_action, '?') === false) ? '?' : '&amp;') . 'confirm_key=' . $confirm_key;

***************
*** 2520,2524 ****
  	else
  	{
! 		page_footer();
  	}
  }
--- 2520,2524 ----
  	else
  	{
! 		//page_footer();
  	}
  }
***************
*** 3282,3288 ****
  function smiley_text($text, $force_option = false)
  {
! 	global $board_config, $user, $phpbb_root_path;

! 	if ($force_option || !$board_config['allow_smilies'] || !$user->optionget('viewsmilies'))
  	{
  		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $text);
--- 3282,3288 ----
  function smiley_text($text, $force_option = false)
  {
! 	global $board_config, $mx_user, $phpbb_root_path;

! 	if ($force_option || !$board_config['allow_smilies'] || !$mx_user->optionget('viewsmilies'))
  	{
  		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $text);
***************
*** 4307,4310 ****
--- 4307,4311 ----
  /**
  * Generate page header
+ 
  function page_header($page_title = '', $display_online_list = true)
  {
***************
*** 4648,4656 ****

  	// application/xhtml+xml not used because of IE
! 	header('Content-type: text/html; charset=UTF-8');

! 	header('Cache-Control: private, no-cache="set-cookie"');
! 	header('Expires: 0');
! 	header('Pragma: no-cache');

  	return;
--- 4649,4657 ----

  	// application/xhtml+xml not used because of IE
! 	//header('Content-type: text/html; charset=UTF-8');

! 	//header('Cache-Control: private, no-cache="set-cookie"');
! 	//header('Expires: 0');
! 	//header('Pragma: no-cache');

  	return;
***************
*** 4660,4666 ****
  /**
  * Generate page footer
  function page_footer($run_cron = true)
  {
! 	global $db, $board_config, $template, $user, $auth, $mx_cache, $starttime, $phpbb_root_path, $phpEx;

  	// Output page creation time
--- 4661,4668 ----
  /**
  * Generate page footer
+ 
  function page_footer($run_cron = true)
  {
! 	global $db, $board_config, $template, $mx_user, $auth, $mx_cache, $starttime, $phpbb_root_path, $phpEx;

  	// Output page creation time
***************
*** 4699,4703 ****
  		'TRANSLATION_INFO'		=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',

! 		'U_ACP' => ($auth->acl_get('a_') && $user->data['is_registered']) ? append_sid("{$phpbb_root_path}adm/index.$phpEx", false, true, $user->session_id) : '')
  	);

--- 4701,4706 ----
  		'TRANSLATION_INFO'		=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',

! 		'U_ACP' => ( $mx_user->data['is_registered']) ? mx_append_sid("{$phpbb_root_path}adm/index.$phpEx", false, true, $mx_user->session_id) : ''
! 		)
  	);

***************
*** 4738,4742 ****
  		if ($cron_type)
  		{
! 			$template->assign_var('RUN_CRON_TASK', '<img src="' . append_sid($phpbb_root_path . 'cron.' . $phpEx, 'cron_type=' . $cron_type) . '" width="1" height="1" alt="cron" />');
  		}
  	}
--- 4741,4745 ----
  		if ($cron_type)
  		{
! 			$template->assign_var('RUN_CRON_TASK', '<img src="' . mx_append_sid($phpbb_root_path . 'cron.' . $phpEx, 'cron_type=' . $cron_type) . '" width="1" height="1" alt="cron" />');
  		}
  	}
***************
*** 4744,4748 ****
  	$template->display('body');

! 	garbage_collection();

  	exit;
--- 4747,4751 ----
  	$template->display('body');

! 	self::garbage_collection();

  	exit;

Index: functions_hook.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** functions_hook.php	18 Jun 2008 08:11:20 -0000	1.15
--- functions_hook.php	18 Jun 2008 12:14:14 -0000	1.16
***************
*** 17,20 ****
--- 17,21 ----
  }

+ 
  class mx_phpbb3_admin
  {
***************
*** 235,238 ****
--- 236,241 ----
  		}
  				$preg_array = array( '##si' => '');
+ 		$do_not_convert_ary = array( "{$phpbb_root_path}memberlist");
+ 		$do_not_convert = "(" . implode( "|", $do_not_convert_ary) . ")";
  		for( $i=0; $i<$match_link_cnt; $i++)
  		{
***************
*** 259,263 ****
  			$link_orig = preg_replace( '#([./\[\]\(\)?\\\\])#si', "\\\\\\1", $match_link[2][$i]);
  			$link_orig = str_replace( '#', '\#', $link_orig);
! 			if ( !empty($link_orig) )
  			{
  				$preg_array = array_merge( $preg_array, array( '#' . $link_orig .'#si' => @$mx_admin_path . $link));
--- 262,266 ----
  			$link_orig = preg_replace( '#([./\[\]\(\)?\\\\])#si', "\\\\\\1", $match_link[2][$i]);
  			$link_orig = str_replace( '#', '\#', $link_orig);
! 			if ( !empty($link_orig) && !( eregi($do_not_convert, $link_orig)) )
  			{
  				$preg_array = array_merge( $preg_array, array( '#' . $link_orig .'#si' => @$mx_admin_path . $link));
***************
*** 278,281 ****
--- 281,286 ----
  		return preg_replace( array_keys( $preg_array), $preg_array, $html);
  	}
+ 
+ 	
  }

Index: functions_module.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_module.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** functions_module.php	15 Jun 2008 21:01:42 -0000	1.12
--- functions_module.php	18 Jun 2008 12:14:14 -0000	1.13
***************
*** 51,55 ****
  	'request_var', 'add_form_key', 'generate_text_for_display', 'check_form_key', 'gen_sort_selects',
  	'on_page', 'generate_pagination', 'generate_text_for_edit', 'generate_text_for_storage', 'group_create',
! 	'unique_id', 'set_config', 'style_select', 'language_select'
  	);
  	/**
--- 51,55 ----
  	'request_var', 'add_form_key', 'generate_text_for_display', 'check_form_key', 'gen_sort_selects',
  	'on_page', 'generate_pagination', 'generate_text_for_edit', 'generate_text_for_storage', 'group_create',
! 	'unique_id', 'set_config', 'style_select', 'language_select', 'meta_refresh', 'get_formatted_filesize'
  	);
  	/**

[mxbb-commits] core/includes/shared/phpbb3/includes functions_hook.php, 1.15, 1.16 functions_module

[mxbb-commits] core/includes/shared/phpbb3/includes functions_hook.php, 1.15, 1.16 functions_module.php, 1.12, 1.13 functions.php, 1.17, 1.18