typo in LocalID generation in xrds

[quix0rs-gnu-social.git] / actions / avatar.php

diff --git a/actions/avatar.php b/actions/avatar.php
index 33b5452d0b3b68802784f00aa8d43f546151033a..9c736cd3b6fd65001372f013f45e7ab9479818c9 100644 (file)
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -62,10 +62,7 @@ class AvatarAction extends SettingsAction {
                common_element('input', array('name' => 'avatarfile',
                                                                          'type' => 'file',
                                                                          'id' => 'avatarfile'));
-               common_element('input', array('name' => 'submit',
-                                                                         'type' => 'submit',
-                                                                         'id' => 'submit',
-                                                                         'value' =>_t('Upload')));
+               common_submit('submit', _t('Upload'));
                common_element_end('form');
                common_show_footer();
        }
@@ -108,7 +105,7 @@ class AvatarAction extends SettingsAction {
 
                $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);
 
                if (!move_uploaded_file($_FILES['avatarfile']['tmp_name'], $filepath)) {
@@ -128,19 +125,11 @@ class AvatarAction extends SettingsAction {
                $avatar->url = common_avatar_url($filename);
                $avatar->created = DB_DataObject_Cast::dateTime(); # current time
 
-               $val = $avatar->validate();
-
-               if ($val !== TRUE) {
-                       $err = '';
-                       foreach ($val as $k=>$v) {
-                               $err .= _t('Something wrong with ') . $k;
-                               $this->show_form($err);
-                               return;
-                       }
-               }
-
                foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
-                       $scaled[] = $this->scale_avatar($user, $avatar, $size);
+                       # We don't need a scaled one if the original is already of that size!
+                       if ($avatar->width != $size && $avatar->height != $size) {
+                               $scaled[] = $this->scale_avatar($user, $avatar, $size);
+                       }
                }
 
                # XXX: start a transaction here
@@ -177,9 +166,9 @@ class AvatarAction extends SettingsAction {
                imagecopyresampled($image_s, $image_a, 0, 0, 0, 0,
                                                   $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') {
                        imagejpeg($image_s, common_avatar_path($filename));