add stub email canonicalizer

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

diff --git a/actions/login.php b/actions/login.php
index c37f92b79c90b73fd52c4d60286a5ee57397d16e..4795dfdbd64939a5a1ca800e322ebde224c66122 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1) }
+if (!defined('LACONICA')) { exit(1); }
 
 class LoginAction extends Action {
        
@@ -25,7 +25,7 @@ class LoginAction extends Action {
                parent::handle($args);
                if (common_logged_in()) {
                        common_user_error(_t('Already logged in.'));
-               } else if ($this->arg('METHOD') == 'POST') {
+               } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                        $this->check_login();
                } else {
                        $this->show_form();
@@ -53,7 +53,7 @@ class LoginAction extends Action {
                if (!is_null($error)) {
                        common_element('div', array('class' => 'error'), $msg);
                }
-               common_start_element('form', array('method' => 'POST',
+               common_element_start('form', array('method' => 'POST',
                                                                                   'id' => 'login',
                                                                                   'action' => common_local_url('login')));
                common_element('label', array('for' => 'username'),
@@ -74,5 +74,6 @@ class LoginAction extends Action {
                                                                          'type' => 'button',
                                                                          'id' => 'cancel'),
                                           _t('Cancel'));
+               common_element_end('form');
        }
 }