Menu
▾
▴
[mxbb-commits] core/includes mx_functions.php, 1.100, 1.101 mx_functions_tools.php, 1.62, 1.63
|
From: Florin C B. <ory...@us...> - 2011-02-27 00:50:01
|
Update of /cvsroot/mxbb/core/includes
In directory vz-cvs-4.sog:/tmp/cvs-serv3649
Modified Files:
mx_functions.php mx_functions_tools.php
Log Message:
phpbb 2.3.0 fix
Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** mx_functions_tools.php 26 Feb 2011 02:58:46 -0000 1.62
--- mx_functions_tools.php 27 Feb 2011 00:49:59 -0000 1.63
***************
*** 1319,1323 ****
return $mytext;
}
!
/**
* Enter description here...
--- 1319,1323 ----
return $mytext;
}
!
/**
* Enter description here...
***************
*** 1331,1335 ****
* @return unknown
*/
! function _magic_url( $url )
{
global $board_config;
--- 1331,1335 ----
* @return unknown
*/
! function _magic_url($url)
{
global $board_config;
***************
*** 1713,1717 ****
// Includes
//
! if( !function_exists('prepare_message') )
{
//include_once($mx_root_path . 'includes/shared/phpbb2/includes/functions_post.' . $phpEx);
--- 1713,1717 ----
// Includes
//
! if(!function_exists('prepare_message'))
{
//include_once($mx_root_path . 'includes/shared/phpbb2/includes/functions_post.' . $phpEx);
***************
*** 2013,2017 ****
if ( !$result = $db->sql_query($sql) )
{
! mx_message_die(GENERAL_ERROR, 'Could not find oldest privmsgs (inbox)', '', __LINE__, __FILE__, $sql);
}
--- 2013,2017 ----
if ( !$result = $db->sql_query($sql) )
{
! //mx_message_die(GENERAL_ERROR, 'Could not find oldest privmsgs (inbox)', '', __LINE__, __FILE__, $sql);
}
***************
*** 2024,2028 ****
if ( !$db->sql_query($sql) )
{
! mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)'.$sql, '', __LINE__, __FILE__, $sql);
}
--- 2024,2028 ----
if ( !$db->sql_query($sql) )
{
! //mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)'.$sql, '', __LINE__, __FILE__, $sql);
}
***************
*** 2032,2036 ****
if ( !$db->sql_query($sql) )
{
! mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql);
}
}
--- 2032,2036 ----
if ( !$db->sql_query($sql) )
{
! //mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql);
}
}
Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** mx_functions.php 26 Feb 2011 03:10:30 -0000 1.100
--- mx_functions.php 27 Feb 2011 00:49:59 -0000 1.101
***************
*** 386,390 ****
--- 386,406 ----
else
{
+ if (file_exists($mx_root_path . TEMPLATE_ROOT_PATH . 'msgdie_header.tpl'))
+ {
+ $layouttemplate->set_filenames(array(
+ 'overall_header' => 'msgdie_header.tpl',
+ ));
+ $layouttemplate->pparse('overall_header');
+ }
+
echo "<html>\n<body>\n" . $msg_title . "\n<br /><br />\n" . $msg_text . "</body>\n</html>";
+
+ if (file_exists($mx_root_path . TEMPLATE_ROOT_PATH . 'msgdie_footer.tpl'))
+ {
+ $layouttemplate->set_filenames(array(
+ 'overall_footer' => 'msgdie_footer.tpl',
+ ));
+ $layouttemplate->pparse('overall_footer');
+ }
}
***************
*** 1755,1759 ****
// $do_gzip_compress = FALSE;
! if ( $board_config['gzip_compress'] && !defined('MX_GZIP_DISABLED') )
{
$phpver = phpversion();
--- 1771,1775 ----
// $do_gzip_compress = FALSE;
! if ($board_config['gzip_compress'] && !defined('MX_GZIP_DISABLED'))
{
$phpver = phpversion();
***************
*** 1761,1767 ****
$useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');
! if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) )
{
! if ( extension_loaded('zlib') )
{
ob_end_clean();
--- 1777,1783 ----
$useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');
! if ($phpver >= '4.0.4pl1' && (strstr($useragent,'compatible') || strstr($useragent,'Gecko')))
{
! if (extension_loaded('zlib'))
{
ob_end_clean();
***************
*** 1769,1777 ****
}
}
! else if ( $phpver > '4.0' )
{
! if ( strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') )
{
! if ( extension_loaded('zlib') )
{
$do_gzip_compress = TRUE;
--- 1785,1793 ----
}
}
! else if ($phpver > '4.0')
{
! if (strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip'))
{
! if (extension_loaded('zlib') )
{
$do_gzip_compress = TRUE;
***************
*** 1788,1792 ****
--- 1804,1810 ----
// Initialize PHP session
//
+ //phpinfo();
session_start();
+ //
}
***************
*** 2406,2409 ****
--- 2424,2438 ----
/**
+ * Borrowed from phpBB
+ *
+ */
+ function mx_phpbb_realpath($path)
+ {
+ global $mx_root_path, $phpEx;
+
+ return (!@function_exists('realpath') || !@realpath($mx_root_path . 'includes/mx_functions.'.$phpEx)) ? $path : @realpath($path);
+ }
+
+ /**
* Get langcode.
*
***************
*** 2515,2517 ****
--- 2544,2561 ----
return $message;
}
+
+ /**
+ * function eregi
+ *
+ * temp replacement for eregi()
+ *
+ *
+ */
+ if (!@function_exists('eregi'))
+ {
+ function eregi($find, $str)
+ {
+ return stristr($str, $find);
+ }
+ }
?>
\ No newline at end of file
|
