[gentoo-commits] gentoo-projects commit in forums/htdocs: common.php

[Tom Knight (tomk)]

tomk        13/02/25 10:39:07

  Modified:             common.php
  Log:
  ensure code is compatible with php 5.4

Revision  Changes    Path
1.11                 forums/htdocs/common.php

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/common.php?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/common.php?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/common.php?r1=1.10&r2=1.11

Index: common.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/common.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- common.php	25 Jun 2011 08:41:20 -0000	1.10
+++ common.php	25 Feb 2013 10:39:07 -0000	1.11
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: common.php,v 1.10 2011/06/25 08:41:20 desultory Exp $
+ *   $Id: common.php,v 1.11 2013/02/25 10:39:07 tomk Exp $
  *
  ***************************************************************************/
 
@@ -26,14 +26,16 @@
 
 //
 error_reporting  (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
-set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
+// 2013-02-25 tomk - set_magic_quotes_runtime() raises an E_CORE_ERROR in php 5.4
+//set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
 
 // The following code (unsetting globals)
 // Thanks to Matt Kavanagh and Stefan Esser for providing feedback as well as patch files
 
 // PHP5 with register_long_arrays off?
-if (@phpversion() >= '5.0.0' && (!@ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off'))
-{
+// 2013-02-25 tomk - register_globals and register_long_arrays php.ini directives have been removed in php 5.4
+//if (@phpversion() >= '5.0.0' && (!@ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off'))
+//{
 	$HTTP_POST_VARS = $_POST;
 	$HTTP_GET_VARS = $_GET;
 	$HTTP_SERVER_VARS = $_SERVER;
@@ -46,7 +48,7 @@
 	{
 		$HTTP_SESSION_VARS = $_SESSION;
 	}
-}
+//}
 
 // Protect against GLOBALS tricks
 if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS']))
@@ -60,6 +62,8 @@
 	die("Hacking attempt");
 }
 
+// 2013-02-25 tomk - register_globals and register_long_arrays php.ini directives have been removed in php 5.4
+/*
 if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
 {
 	// PHP4+ path
@@ -95,14 +99,17 @@
 
 	unset($input);
 }
+*/
 
 //
 // addslashes to vars if magic_quotes_gpc is off
 // this is a security precaution to prevent someone
 // trying to break out of a SQL statement.
 //
-if( !get_magic_quotes_gpc() )
-{
+// 2013-02-25 tomk - get_magic_quotes_gpc always returns FALSE as of php 5.4
+// so lets get rid of this call now as I guess they'll deprecate it at some point
+//if( !get_magic_quotes_gpc() )
+//{
 	if( is_array($HTTP_GET_VARS) )
 	{
 		while( list($k, $v) = each($HTTP_GET_VARS) )
@@ -162,7 +169,7 @@
 		}
 		@reset($HTTP_COOKIE_VARS);
 	}
-}
+//}
 
 //
 // Define some basic configuration arrays this also prevents