GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

add timestamp to avatar filenames to prevent overlap

Browse Source 
darcs-hash:20080528140321-84dde-2dbeb6032e845a23bb1adde1cbc1788333b55156.gz
This commit is contained in:
Evan Prodromou 2008-05-28 10:03:21 -04:00
parent 4f37f4b764
commit de56ccca07
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/avatar.php
View File

@ -108,7 +108,7 @@ class AvatarAction extends SettingsAction {
$user = common_current_user(); $user = common_current_user();
$filename = common_avatar_filename($user, image_type_to_extension($info[2])); $filename = common_avatar_filename($user, image_type_to_extension($info[2]), NULL, common_timestamp());
$filepath = common_avatar_path($filename); $filepath = common_avatar_path($filename);
if (!move_uploaded_file($_FILES['avatarfile']['tmp_name'], $filepath)) { if (!move_uploaded_file($_FILES['avatarfile']['tmp_name'], $filepath)) {
@ -166,9 +166,9 @@ class AvatarAction extends SettingsAction {
imagecopyresampled($image_s, $image_a, 0, 0, 0, 0, imagecopyresampled($image_s, $image_a, 0, 0, 0, 0,
$size, $size, $square, $square); $size, $size, $square, $square);
$ext = ($avatar->mediattype == 'image/jpeg') ? ".jpg" : ".png"; $ext = ($avatar->mediattype == 'image/jpeg') ? ".jpeg" : ".png";
$filename = common_avatar_filename($user, $ext, $size); $filename = common_avatar_filename($user, $ext, $size, common_timestamp());
if ($avatar->mediatype == 'image/jpeg') { if ($avatar->mediatype == 'image/jpeg') {
imagejpeg($image_s, common_avatar_path($filename)); imagejpeg($image_s, common_avatar_path($filename));

10
lib/util.php
View File

@ -349,13 +349,13 @@ function common_render_content($text) {
// where should the avatar go for this user? // where should the avatar go for this user?
function common_avatar_filename($user, $extension, $size=NULL) { function common_avatar_filename($user, $extension, $size=NULL, $extra=NULL) {
global $config; global $config;
if ($size) { if ($size) {
return $user->id . '-' . $size . $extension; return $user->id . '-' . $size . (($extra) ? $extra : '') . $extension;
} else { } else {
return $user->id . '-original' . $extension; return $user->id . '-original' . (($extra) ? $extra : '') . $extension;
} }
} }
@ -479,6 +479,10 @@ function common_mtrand($bytes) {
return $enc; return $enc;
} }
function common_timestamp() {
return date('YmdHisu');
}
// XXX: set up gettext // XXX: set up gettext
function _t($str) { function _t($str) {