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

Issue #257 , Issue #64, Issue #236 - usersettings and avatar upload issues.

Browse Source
This commit is contained in:
Cameron
2013-05-07 20:30:20 -07:00
parent a47cadb9b9
commit b8362372df
6 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
usersettings.php
View File

@@ -213,7 +213,7 @@ if (isset($_POST['updatesettings']))
require_once (e_HANDLER.'upload_handler.php');
require_once (e_HANDLER.'resize_handler.php');
if ($uploaded = process_uploaded_files(e_AVATAR_UPLOAD, 'prefix+ap_'.$udata['user_id'].'_', array('overwrite' => TRUE, 'file_mask'=>'jpg,png,gif', 'max_file_count' => 2)))
if ($uploaded = process_uploaded_files(e_AVATAR_UPLOAD, 'prefix+ap_'.$tp->leadingZeros($udata['user_id'],7).'_', array('overwrite' => TRUE, 'file_mask'=>'jpg,png,gif', 'max_file_count' => 2)))
{
foreach ($uploaded as $upload)
{
@@ -232,8 +232,11 @@ if (isset($_POST['updatesettings']))
{
$extraErrors[] = $upload['message'];
}
}
}
}
@@ -291,14 +294,13 @@ if (isset($_POST['updatesettings']))
}
if ($udata['user_image'] && !isset($changedUserData['user_image']))
{
$changedUserData['user_image'] = '';
// $changedUserData['user_image'] = ''; // FIXME Deletes the user's image when no changes made.
$avatar_to_delete = str_replace('-upload-', '', $udata['user_image']);
}
// Validate Extended User Fields.
$changedEUFData = array();
if (isset($_POST['ue']))
@@ -367,6 +369,9 @@ if (isset($_POST['updatesettings']))
$error = TRUE;
}
}
} // End - update setttings
elseif (isset($_POST['SaveValidatedInfo']))
{ // Next bit only valid if user editing their own data
@@ -632,7 +637,7 @@ if ($dataToSave && !$promptPassword)
{
$message = str_replace("{MESSAGE}",$message,$USERSETTINGS_MESSAGE);
}
else // backwards compatible
elseif(!deftrue('e_BOOTSTRAP')) // backwards compatible
{
$message = "<div style='text-align:center'>".$message.'</div>';
@@ -681,9 +686,17 @@ if ($error)
// --- User data has been updated here if appropriate ---
$testSessionMessage = e107::getMessage()->get(E_MESSAGE_SUCCESS, 'default', true); // only success in the session
if($testSessionMessage) $message = implode('<br />', $testSessionMessage); // we got raw message - array
if (isset($message))
{
$ns->tablerender($caption, $message);
if(deftrue('e_BOOTSTRAP'))
{
echo e107::getMessage()->addInfo($message)->render();
}
else
{
$ns->tablerender($caption, $message);
}
}