Twitter integration - support for new foreign_link table and prefs now save/update

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

diff --git a/actions/avatar.php b/actions/avatar.php
index 2d8a9f81d2d491bc4ff3565d20ee6030a25b50db..9f397e93c3e0148248955ae8746308a489631f02 100644 (file)
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -23,25 +23,17 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 
 class AvatarAction extends SettingsAction {
 
+    function get_instructions() {
+               return _('Upload a new "avatar" (user image) here. You can\'t edit the picture after you upload it, so make sure it\'s more or less square. It must be under the site license, also. Use a picture that belongs to you and that you want to share.');
+       }
+
        function show_form($msg=NULL, $success=false) {
-               common_show_header(_t('Avatar'));
-               $this->settings_menu();
-               if ($msg) {
-                       $this->message($msg, $success);
-               } else {
-                       common_element('div', 'instructions', 
-                                                  _t('You can upload a new "avatar" (user picture) here. ' .
-                                                         'You can\'t edit the picture after you upload it, so you should ' .
-                                                         'edit it in your desktop image-manipulation software first. ' .
-                                                         'Everything works best if your picture is more or less square. ' . 
-                                                         'And remember: your image will be released under the site license, ' .
-                                                         'So don\'t upload images that don\'t belong to you or that you don\'t ' .
-                                                         'want to share.'));
-               }
+
+               $this->form_header(_('Avatar'), $msg, $success);
 
                $user = common_current_user();
                $profile = $user->getProfile();
-               $original = $profile->getOriginal();
+               $original = $profile->getOriginalAvatar();
 
                if ($original) {
                        common_element('img', array('src' => $original->url,
@@ -66,6 +58,7 @@ class AvatarAction extends SettingsAction {
                                                                                   'id' => 'avatar',
                                                                                   'action' =>
                                                                                   common_local_url('avatar')));
+               common_hidden('token', common_session_token());
                common_element('input', array('name' => 'MAX_FILE_SIZE',
                                                                          'type' => 'hidden',
                                                                          'id' => 'MAX_FILE_SIZE',
@@ -73,26 +66,34 @@ class AvatarAction extends SettingsAction {
                common_element('input', array('name' => 'avatarfile',
                                                                          'type' => 'file',
                                                                          'id' => 'avatarfile'));
-               common_submit('submit', _t('Upload'));
+               common_submit('submit', _('Upload'));
                common_element_end('form');
                common_show_footer();
        }
 
        function handle_post() {
 
+               # CSRF protection
+
+               $token = $this->trimmed('token');
+               if (!$token || $token != common_session_token()) {
+                       $this->show_form(_('There was a problem with your session token. Try again, please.'));
+                       return;
+               }
+
                switch ($_FILES['avatarfile']['error']) {
                 case UPLOAD_ERR_OK: # success, jump out
                        break;
                 case UPLOAD_ERR_INI_SIZE:
                 case UPLOAD_ERR_FORM_SIZE:
-                       $this->show_form(_t('That file is too big.'));
+                       $this->show_form(_('That file is too big.'));
                        return;
                 case UPLOAD_ERR_PARTIAL:
                        @unlink($_FILES['avatarfile']['tmp_name']);
-                       $this->show_form(_t('Partial upload.'));
+                       $this->show_form(_('Partial upload.'));
                        return;
                 default:
-                       $this->show_form(_t('System error uploading file.'));
+                       $this->show_form(_('System error uploading file.'));
                        return;
                }
 
@@ -100,7 +101,7 @@ class AvatarAction extends SettingsAction {
 
                if (!$info) {
                        @unlink($_FILES['avatarfile']['tmp_name']);
-                       $this->show_form(_t('Not an image or corrupt file.'));
+                       $this->show_form(_('Not an image or corrupt file.'));
                        return;
                }
 
@@ -110,17 +111,17 @@ class AvatarAction extends SettingsAction {
                 case IMAGETYPE_PNG:
                        break;
                 default:
-                       $this->show_form(_t('Unsupported image file format.'));
+                       $this->show_form(_('Unsupported image file format.'));
                        return;
                }
 
                $user = common_current_user();
                $profile = $user->getProfile();
-               
+
                if ($profile->setOriginal($_FILES['avatarfile']['tmp_name'])) {
-                       $this->show_form(_t('Avatar updated.'), true);
+                       $this->show_form(_('Avatar updated.'), true);
                } else {
-                       $this->show_form(_t('Failed updating avatar.'));
+                       $this->show_form(_('Failed updating avatar.'));
                }
 
                @unlink($_FILES['avatarfile']['tmp_name']);