remove tag URI stuff; unused and confusing

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

diff --git a/actions/avatar.php b/actions/avatar.php
index a22512750ebe6148da563bc8baa5c1a3066af67a..ebfbd72952e9d1bec9ec315d3c958c948de38e4b 100644 (file)
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -23,25 +23,13 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 
 class AvatarAction extends SettingsAction {
 
-       function show_top($arr) {
-               $msg = $arr[0];
-               $success = $arr[1];
-               if ($msg) {
-                       $this->message($msg, $success);
-               } else {
-                       common_element('div', 'instructions', 
-                                                  _t('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.'));
-               }
-               $this->settings_menu();
+    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'), NULL, array($msg, $success), array($this, 'show_top'));
+
+               $this->form_header(_('Avatar'), $msg, $success);
 
                $user = common_current_user();
                $profile = $user->getProfile();
@@ -77,7 +65,7 @@ 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();
        }
@@ -89,14 +77,14 @@ class AvatarAction extends SettingsAction {
                        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;
                }
 
@@ -104,7 +92,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;
                }
 
@@ -114,17 +102,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']);