SF Patch #3054517 - Suppress PHP 5.3 E_DEPRECATED exceptions
This commit is contained in:
parent
f9c56bc4ff
commit
ab0717e0e3
@ -193,7 +193,7 @@ if (isset($_SERVER['SERVER_SOFTWARE']) && ! isset($_SESSION[APPCONFIG])) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Check for safe mode.
|
# Check for safe mode.
|
||||||
if (ini_get('safe_mode') && ! get_request('cmd','GET'))
|
if (@ini_get('safe_mode') && ! get_request('cmd','GET'))
|
||||||
system_message(array(
|
system_message(array(
|
||||||
'title'=>_('PHP Safe Mode'),
|
'title'=>_('PHP Safe Mode'),
|
||||||
'body'=>_('You have PHP Safe Mode enabled. This application may work unexpectedly in Safe Mode.'),
|
'body'=>_('You have PHP Safe Mode enabled. This application may work unexpectedly in Safe Mode.'),
|
||||||
@ -215,11 +215,11 @@ if (DEBUG_ENABLED)
|
|||||||
app_version(),$_REQUEST);
|
app_version(),$_REQUEST);
|
||||||
|
|
||||||
# Set our PHP timelimit.
|
# Set our PHP timelimit.
|
||||||
if ($_SESSION[APPCONFIG]->getValue('session','timelimit') && ! ini_get('safe_mode'))
|
if ($_SESSION[APPCONFIG]->getValue('session','timelimit') && ! @ini_get('safe_mode'))
|
||||||
set_time_limit($_SESSION[APPCONFIG]->getValue('session','timelimit'));
|
set_time_limit($_SESSION[APPCONFIG]->getValue('session','timelimit'));
|
||||||
|
|
||||||
# If debug mode is set, increase the time_limit, since we probably need it.
|
# If debug mode is set, increase the time_limit, since we probably need it.
|
||||||
if (DEBUG_ENABLED && $_SESSION[APPCONFIG]->getValue('session','timelimit') && ! ini_get('safe_mode'))
|
if (DEBUG_ENABLED && $_SESSION[APPCONFIG]->getValue('session','timelimit') && ! @ini_get('safe_mode'))
|
||||||
set_time_limit($_SESSION[APPCONFIG]->getValue('session','timelimit') * 5);
|
set_time_limit($_SESSION[APPCONFIG]->getValue('session','timelimit') * 5);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -227,7 +227,7 @@ if (DEBUG_ENABLED && $_SESSION[APPCONFIG]->getValue('session','timelimit') && !
|
|||||||
* Shall we attempt to auto-determine the language?
|
* Shall we attempt to auto-determine the language?
|
||||||
*/
|
*/
|
||||||
# If we are in safe mode, and LANG is not in the allowed vars, display an error.
|
# If we are in safe mode, and LANG is not in the allowed vars, display an error.
|
||||||
if (ini_get('safe_mode') && ! in_array('LANG',explode(',',ini_get('safe_mode_allowed_env_vars'))))
|
if (@ini_get('safe_mode') && ! in_array('LANG',explode(',',@ini_get('safe_mode_allowed_env_vars'))))
|
||||||
error('You are running in SAFE_MODE, but LANG is not in the safe_mode_allowed_env_vars. Please add LANG to safe_mode_allowed_env_vars','error',true,false);
|
error('You are running in SAFE_MODE, but LANG is not in the safe_mode_allowed_env_vars. Please add LANG to safe_mode_allowed_env_vars','error',true,false);
|
||||||
|
|
||||||
$app['language'] = $_SESSION[APPCONFIG]->getValue('appearance','language');
|
$app['language'] = $_SESSION[APPCONFIG]->getValue('appearance','language');
|
||||||
@ -296,7 +296,7 @@ if ($app['language'] == 'auto') {
|
|||||||
* Strip slashes from GET, POST, and COOKIE variables if this
|
* Strip slashes from GET, POST, and COOKIE variables if this
|
||||||
* PHP install is configured to automatically addslashes()
|
* PHP install is configured to automatically addslashes()
|
||||||
*/
|
*/
|
||||||
if (get_magic_quotes_gpc() && (! isset($slashes_stripped) || ! $slashes_stripped)) {
|
if (@get_magic_quotes_gpc() && (! isset($slashes_stripped) || ! $slashes_stripped)) {
|
||||||
array_stripslashes($_REQUEST);
|
array_stripslashes($_REQUEST);
|
||||||
array_stripslashes($_GET);
|
array_stripslashes($_GET);
|
||||||
array_stripslashes($_POST);
|
array_stripslashes($_POST);
|
||||||
|
@ -58,8 +58,11 @@ if (! function_exists('mhash') && ! function_exists('mhash_keygen_s2k')) {
|
|||||||
function openssl_hash($openssl_hash_id,$password_clear) {
|
function openssl_hash($openssl_hash_id,$password_clear) {
|
||||||
global $emuhash_emu;
|
global $emuhash_emu;
|
||||||
|
|
||||||
$current_magic_quotes = get_magic_quotes_runtime();
|
if (PHP_VERSION < 6) {
|
||||||
set_magic_quotes_runtime(0);
|
$current_magic_quotes = @get_magic_quotes_runtime();
|
||||||
|
@set_magic_quotes_runtime(0);
|
||||||
|
}
|
||||||
|
|
||||||
$tmpfile = tempnam($emuhash_emu['tmpdir'],'emuhash');
|
$tmpfile = tempnam($emuhash_emu['tmpdir'],'emuhash');
|
||||||
$pwhandle = fopen($tmpfile,'w');
|
$pwhandle = fopen($tmpfile,'w');
|
||||||
|
|
||||||
@ -73,7 +76,9 @@ if (! function_exists('mhash') && ! function_exists('mhash_keygen_s2k')) {
|
|||||||
$pass = fread($prog,1024);
|
$pass = fread($prog,1024);
|
||||||
pclose($prog);
|
pclose($prog);
|
||||||
unlink($tmpfile);
|
unlink($tmpfile);
|
||||||
set_magic_quotes_runtime($current_magic_quotes);
|
|
||||||
|
if (PHP_VERSION < 6)
|
||||||
|
@set_magic_quotes_runtime($current_magic_quotes);
|
||||||
|
|
||||||
return $pass;
|
return $pass;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user