mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 12:20:44 +02:00
Code Issues Releases Wiki Activity

Fixes #2115 User avatar and picture upload.

Browse Source
This commit is contained in:
Cameron
2016-12-17 09:45:48 -08:00
parent 6ff2667898
commit 52f867d415
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/file_class.php
View File

@@ -1191,11 +1191,11 @@ class e_file
* ['error'] - error code. 0 = 'good'. 1..4 main others, although up to 8 defined for later PHP versions * ['error'] - error code. 0 = 'good'. 1..4 main others, although up to 8 defined for later PHP versions
* Files stored in server's temporary directory, unless another set * Files stored in server's temporary directory, unless another set
*/ */
public function getUploaded($uploaddir, $fileinfo = false, $options = null) public function getUploaded($uploaddir, $fileinfo = false, $options = array())
{ {
require_once(e_HANDLER."upload_handler.php"); require_once(e_HANDLER."upload_handler.php");
if($uploaddir == e_UPLOAD || $uploaddir == e_TEMP) if($uploaddir == e_UPLOAD || $uploaddir == e_TEMP || $uploaddir = e_AVATAR_UPLOAD)
{ {
$path = $uploaddir; $path = $uploaddir;
} }
@@ -1208,7 +1208,6 @@ class e_file
return false; return false;
} }
return process_uploaded_files($path, $fileinfo, $options); return process_uploaded_files($path, $fileinfo, $options);
} }

6
usersettings.php
View File

@@ -230,15 +230,19 @@ class usersettings_front // Begin Usersettings rewrite.
$_POST['password2'] = ''; $_POST['password2'] = '';
} }
e107::getMessage()->addDebug("_FILES".print_a($_FILES,true));
// Uploaded avatar and/or photo // Uploaded avatar and/or photo
if (varset($_FILES['file_userfile']['error']) != UPLOAD_ERR_NO_FILE) if (varset($_FILES['file_userfile']['error']['avatar'], false) === UPLOAD_ERR_OK || varset($_FILES['file_userfile']['error']['photo'], false) == UPLOAD_ERR_OK)
{ {
e107::getMessage()->addDebug("Uploaded File Detected");
require_once (e_HANDLER.'resize_handler.php'); require_once (e_HANDLER.'resize_handler.php');
$opts = array('overwrite' => TRUE, 'file_mask'=>'jpg,png,gif,jpeg', 'max_file_count' => 2); $opts = array('overwrite' => TRUE, 'file_mask'=>'jpg,png,gif,jpeg', 'max_file_count' => 2);
if ($uploaded = e107::getFile()->getUploaded(e_AVATAR_UPLOAD, 'prefix+ap_'.$tp->leadingZeros($udata['user_id'],7).'_', $opts)) if ($uploaded = e107::getFile()->getUploaded(e_AVATAR_UPLOAD, 'prefix+ap_'.$tp->leadingZeros($udata['user_id'],7).'_', $opts))
{ {
e107::getMessage()->addDebug("Uploaded: ".print_a($uploaded,true));
foreach ($uploaded as $upload) foreach ($uploaded as $upload)
{ {
if ($upload['name'] && ($upload['index'] == 'avatar') && $pref['avatar_upload']) if ($upload['name'] && ($upload['index'] == 'avatar') && $pref['avatar_upload'])