add w3dtf date to rss 1.0 items

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

diff --git a/actions/avatar.php b/actions/avatar.php
index 00b7ea6c0f1e1baebdd11200d4b558255ccd6078..33b5452d0b3b68802784f00aa8d43f546151033a 100644 (file)
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -36,7 +36,8 @@ class AvatarAction extends SettingsAction {
                        common_element('img', array('src' => $original->url,
                                                                                'class' => 'avatar original',
                                                                                'width' => $original->width,
-                                                                               'height' => $original->height));
+                                                                               'height' => $original->height,
+                                                                               'alt' => $user->nickname));
                }
 
                $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
@@ -45,7 +46,8 @@ class AvatarAction extends SettingsAction {
                        common_element('img', array('src' => $avatar->url,
                                                                                'class' => 'avatar profile',
                                                                                'width' => AVATAR_PROFILE_SIZE,
-                                                                               'height' => AVATAR_PROFILE_SIZE));
+                                                                               'height' => AVATAR_PROFILE_SIZE,
+                                                                               'alt' => $user->nickname));
                }
 
                common_element_start('form', array('enctype' => 'multipart/form-data',
@@ -65,6 +67,7 @@ class AvatarAction extends SettingsAction {
                                                                          'id' => 'submit',
                                                                          'value' =>_t('Upload')));
                common_element_end('form');
+               common_show_footer();
        }
 
        function handle_post() {
@@ -125,6 +128,17 @@ 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);
                }
@@ -136,7 +150,6 @@ class AvatarAction extends SettingsAction {
                        common_server_error(_t('Error deleting old avatars.'));
                        return;
                }
-
                if (!$avatar->insert()) {
                        @unlink($filepath);
                        common_server_error(_t('Error inserting avatar.'));