add stub email canonicalizer

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

diff --git a/actions/register.php b/actions/register.php
index 5972d583883c0b8240f9390d66ef1e2ce7f0b88b..d3358cb9244086f5d0dd4281ef86b6c79cb616c1 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -1,4 +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); }
 
 class RegisterAction extends Action {
        
@@ -7,7 +26,7 @@ class RegisterAction extends Action {
                
                if (common_logged_in()) {
                        common_user_error(_t('Already logged in.'));
-               } else if ($this->arg('METHOD') == 'POST') {
+               } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                        $this->try_register();
                } else {
                        $this->show_form();
@@ -79,10 +98,10 @@ class RegisterAction extends Action {
        
        function show_form($error=NULL) {
                
-               common_show_header(_t('Login'));
-               common_start_element('form', array('method' => 'POST',
+               common_show_header(_t('Register'));
+               common_element_start('form', array('method' => 'POST',
                                                                                   'id' => 'login',
-                                                                                  'action' => common_local_url('login')));
+                                                                                  'action' => common_local_url('register')));
                common_element('label', array('for' => 'username'),
                                           _t('Name'));
                common_element('input', array('name' => 'username',
@@ -105,11 +124,12 @@ class RegisterAction extends Action {
                                                                          'id' => 'email'));
                common_element('input', array('name' => 'submit',
                                                                          'type' => 'submit',
-                                                                         'id' => 'submit'),
-                                          _t('Login'));
+                                                                         'id' => 'submit',
+                                                                         'value' => _t('Login')));
                common_element('input', array('name' => 'cancel',
                                                                          'type' => 'button',
-                                                                         'id' => 'cancel'),
-                                          _t('Cancel'));
+                                                                         'id' => 'cancel',
+                                                                         'value' => _t('Cancel')));
+               common_element_end('form');
        }
 }