take out content rendering, seems to do something strange

[quix0rs-gnu-social.git] / lib / settingsaction.php

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 1795969f9082be38e000709d1386de5f8969683a..615a5cbae0e86116cc21b1bc73da2c5c85d9f881 100644 (file)
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -1,23 +1,23 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-  
-if (!defined('LACONICA')) { exit(1) }
+
+if (!defined('LACONICA')) { exit(1); }
 
 class SettingsAction extends Action {
 
@@ -26,8 +26,7 @@ class SettingsAction extends Action {
                if (!common_logged_in()) {
                        common_user_error(_t('Not logged in.'));
                        return;
-               }
-               if ($this->arg('METHOD') == 'POST') {
+               } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                        $this->handle_post();
                } else {
                        $this->show_form();
@@ -38,21 +37,21 @@ class SettingsAction extends Action {
        function handle_post() {
                return false;
        }
-       
+
        function show_form($msg=NULL, $success=false) {
                return false;
        }
 
-       function show_message($msg, $success) {
+       function message($msg, $success) {
                if ($msg) {
                        common_element('div', ($success) ? 'success' : 'error',
                                                   $msg);
                }
        }
-       
+
        function settings_menu() {
-               common_element_start('ul', 'headmenu');
-               common_menu_item(common_local_url('editprofile'),
+               common_element_start('ul', 'settingsmenu menuish');
+               common_menu_item(common_local_url('profilesettings'),
                                                 _t('Profile'));
                common_menu_item(common_local_url('avatar'),
                                                 _t('Avatar'));