makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10939] Modified functions_user.php to not use $_FILES

Browse source 
PHPBB3-10939
This commit is contained in:
Fyorl 2012-08-15 15:07:42 +01:00
parent 3eb88b0267
commit a3b87f1e95
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/functions_user.php
View file

@ -2059,13 +2059,14 @@ function avatar_remote($data, &$error)
*/ */
function avatar_upload($data, &$error) function avatar_upload($data, &$error)
{ {
global $phpbb_root_path, $config, $db, $user, $phpEx; global $phpbb_root_path, $config, $db, $user, $phpEx, $request;
// Init upload class // Init upload class
include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx); include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx);
$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $config['avatar_filesize'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], (isset($config['mime_triggers']) ? explode('|', $config['mime_triggers']) : false)); $upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $config['avatar_filesize'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], (isset($config['mime_triggers']) ? explode('|', $config['mime_triggers']) : false));
if (!empty($_FILES['uploadfile']['name'])) $uploadfile = $request->file('uploadfile');
if (!empty($uploadfile['name']))
{ {
$file = $upload->form_upload('uploadfile'); $file = $upload->form_upload('uploadfile');
} }
@ -2288,7 +2289,7 @@ function avatar_get_dimensions($avatar, $avatar_type, &$error, $current_x = 0, $
*/ */
function avatar_process_user(&$error, $custom_userdata = false, $can_upload = null) function avatar_process_user(&$error, $custom_userdata = false, $can_upload = null)
{ {
global $config, $phpbb_root_path, $auth, $user, $db; global $config, $phpbb_root_path, $auth, $user, $db, $request;
$data = array( $data = array(
'uploadurl' => request_var('uploadurl', ''), 'uploadurl' => request_var('uploadurl', ''),
@ -2330,7 +2331,8 @@ function avatar_process_user(&$error, $custom_userdata = false, $can_upload = nu
$can_upload = ($config['allow_avatar_upload'] && file_exists($phpbb_root_path . $config['avatar_path']) && phpbb_is_writable($phpbb_root_path . $config['avatar_path']) && $change_avatar && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false; $can_upload = ($config['allow_avatar_upload'] && file_exists($phpbb_root_path . $config['avatar_path']) && phpbb_is_writable($phpbb_root_path . $config['avatar_path']) && $change_avatar && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
} }
if ((!empty($_FILES['uploadfile']['name']) || $data['uploadurl']) && $can_upload) $uploadfile = $request->file('uploadfile');
if ((!empty($uploadfile['name']) || $data['uploadurl']) && $can_upload)
{ {
list($sql_ary['user_avatar_type'], $sql_ary['user_avatar'], $sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = avatar_upload($data, $error); list($sql_ary['user_avatar_type'], $sql_ary['user_avatar'], $sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = avatar_upload($data, $error);
} }