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

PHPBB3-10939
This commit is contained in:
Fyorl 2012-08-15 15:14:52 +01:00
parent 83a53eb985
commit 94ed66c777

View file

@ -26,6 +26,7 @@ class acp_groups
{ {
global $config, $db, $user, $auth, $template, $cache; global $config, $db, $user, $auth, $template, $cache;
global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads; global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads;
global $request;
$user->add_lang('acp/groups'); $user->add_lang('acp/groups');
$this->tpl_name = 'acp_groups'; $this->tpl_name = 'acp_groups';
@ -323,7 +324,8 @@ class acp_groups
$submit_ary['founder_manage'] = isset($_REQUEST['group_founder_manage']) ? 1 : 0; $submit_ary['founder_manage'] = isset($_REQUEST['group_founder_manage']) ? 1 : 0;
} }
if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink']) $uploadfile = $request->file('uploadfile');
if (!empty($uploadfile['tmp_name']) || $data['uploadurl'] || $data['remotelink'])
{ {
// Avatar stuff // Avatar stuff
$var_ary = array( $var_ary = array(
@ -337,7 +339,7 @@ class acp_groups
{ {
$data['user_id'] = "g$group_id"; $data['user_id'] = "g$group_id";
if ((!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl']) && $can_upload) if ((!empty($uploadfile['tmp_name']) || $data['uploadurl']) && $can_upload)
{ {
list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_upload($data, $error); list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_upload($data, $error);
} }