mirror of
https://github.com/phpbb/phpbb.git
synced 2025-03-19 07:00:14 +01:00
[ticket/15738] Remove code related with safe_mode
PHPBB3-15738
This commit is contained in:
parent
a9e0d91cc1
commit
aaa98248d6
@ -49,7 +49,6 @@ if (!$auth->acl_get('a_'))
|
||||
define('IN_ADMIN', true);
|
||||
|
||||
// Some oft used variables
|
||||
$safe_mode = (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) === 'on') ? true : false;
|
||||
$file_uploads = (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_uploads')) === 'on') ? true : false;
|
||||
$module_id = $request->variable('i', '');
|
||||
$mode = $request->variable('mode', '');
|
||||
|
@ -605,12 +605,6 @@ function create_thumbnail($source, $destination, $mimetype)
|
||||
imagecopyresampled($new_image, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
|
||||
}
|
||||
|
||||
// If we are in safe mode create the destination file prior to using the gd functions to circumvent a PHP bug
|
||||
if (@ini_get('safe_mode') || @strtolower(ini_get('safe_mode')) == 'on')
|
||||
{
|
||||
@touch($destination);
|
||||
}
|
||||
|
||||
switch ($type['format'])
|
||||
{
|
||||
case IMG_GIF:
|
||||
|
@ -437,7 +437,7 @@ $lang = array_merge($lang, array(
|
||||
'AUTH_PROVIDER_OAUTH_TITLE' => 'OAuth',
|
||||
'AUTH_PROVIDER_OAUTH_SECRET' => 'Secret',
|
||||
|
||||
'APACHE_SETUP_BEFORE_USE' => 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version) and safe_mode disabled.',
|
||||
'APACHE_SETUP_BEFORE_USE' => 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version).',
|
||||
|
||||
'LDAP' => 'LDAP',
|
||||
'LDAP_DN' => 'LDAP base <var>dn</var>',
|
||||
|
@ -420,7 +420,7 @@ class filespec
|
||||
return false;
|
||||
}
|
||||
|
||||
$upload_mode = ($this->php_ini->getBool('open_basedir') || $this->php_ini->getBool('safe_mode')) ? 'move' : 'copy';
|
||||
$upload_mode = ($this->php_ini->getBool('open_basedir')) ? 'move' : 'copy';
|
||||
$upload_mode = ($this->local) ? 'local' : $upload_mode;
|
||||
$this->destination_file = $this->destination_path . '/' . utf8_basename($this->realname);
|
||||
|
||||
|
@ -420,7 +420,7 @@ class phpbb_filespec_test extends phpbb_test_case
|
||||
/**
|
||||
* @dataProvider data_move_file_copy
|
||||
*/
|
||||
public function test_move_file_copy($tmp_name, $move_success, $safe_mode_on, $expected_error)
|
||||
public function test_move_file_copy($tmp_name, $move_success, $open_basedir_on, $expected_error)
|
||||
{
|
||||
// Initialise a blank filespec object for use with trivial methods
|
||||
$upload_ary = array(
|
||||
@ -436,7 +436,7 @@ class phpbb_filespec_test extends phpbb_test_case
|
||||
$php_ini->expects($this->any())
|
||||
->method('getBool')
|
||||
->with($this->anything())
|
||||
->willReturn($safe_mode_on);
|
||||
->willReturn($open_basedir_on);
|
||||
$upload = new phpbb_mock_fileupload();
|
||||
$upload->max_filesize = self::UPLOAD_MAX_FILESIZE;
|
||||
$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $php_ini, new \FastImageSize\FastImagesize, '', $this->mimetype_guesser);
|
||||
|
Loading…
x
Reference in New Issue
Block a user