From b47a737618bca590aafe29ee51d98490ad4003e9 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 1 Apr 2008 14:32:58 +0000
Subject: Further adventures in registration

git-svn-id: https://code.elgg.org/elgg/trunk@310 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php                         |  3 +++
 register.php                             | 27 +++++++++++++++++++++++++++
 views/default/account/forms/login.php    | 24 ++++++++++++++++++++++++
 views/default/account/forms/register.php | 26 ++++++++++++++++++++++++++
 views/default/login.php                  | 24 ------------------------
 views/default/welcome/logged_out.php     |  2 +-
 6 files changed, 81 insertions(+), 25 deletions(-)
 create mode 100644 register.php
 create mode 100644 views/default/account/forms/login.php
 create mode 100644 views/default/account/forms/register.php
 delete mode 100644 views/default/login.php

diff --git a/languages/en.php b/languages/en.php
index 49ac9c647..e956d78fc 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -25,8 +25,11 @@
 		 * User details
 		 */
 
+			'name' => "Display name",
+			'email' => "Email address",
 			'username' => "Username",
 			'password' => "Password",
+			'passwordagain' => "Password (again for verification)",
 	
 		/**
 		 * Dashboard
diff --git a/register.php b/register.php
new file mode 100644
index 000000000..442a798a9
--- /dev/null
+++ b/register.php
@@ -0,0 +1,27 @@
+<?php
+
+	/**
+	 * Elgg registration page
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	/**
+	 * Start the Elgg engine
+	 */
+		require_once(dirname(__FILE__) . "/engine/start.php");
+
+	// If we're not logged in, display the registration page
+		if (!isloggedin()) {
+			echo page_draw(elgg_echo('register'), elgg_view("account/forms/register"));
+	// Otherwise, forward to the index page
+		} else {
+			forward();
+		}
+		
+?>
\ No newline at end of file
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
new file mode 100644
index 000000000..c17f87b33
--- /dev/null
+++ b/views/default/account/forms/login.php
@@ -0,0 +1,24 @@
+<?php
+
+     /**
+	 * Elgg login form
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+	 
+?>
+
+	<div id="login-box">
+		<form action="<?php echo $vars['url']; ?>action/login" method="POST">
+			<p><label><?php echo elgg_echo('username'); ?><br /><input name="username" type="text" class="general-textarea" /></label>
+			<br />
+			<label><?php echo elgg_echo('password'); ?><br /><input name="password" type="password" class="general-textarea" /></label><br />
+			<input type="submit" name="submit" value="<?php echo elgg_echo('login'); ?>" /></p>
+			<p><a href="<?php echo $vars['url']; ?>register.php"><?php echo elgg_echo('register'); ?></a></p>
+	    </form>
+	</div>
\ No newline at end of file
diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
new file mode 100644
index 000000000..aec0556c0
--- /dev/null
+++ b/views/default/account/forms/register.php
@@ -0,0 +1,26 @@
+<?php
+
+     /**
+	 * Elgg register form
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+	 
+?>
+
+	<h2><?php echo elgg_echo('register'); ?></h2>
+	<div id="register-box">
+		<form action="<?php echo $vars['url']; ?>action/register" method="POST">
+			<p><label><?php echo elgg_echo('name'); ?><br /><input name="name" type="text" class="general-textarea" /></label><br />
+			<label><?php echo elgg_echo('email'); ?><br /><input name="email" type="text" class="general-textarea" /></label><br />
+			<label><?php echo elgg_echo('username'); ?><br /><input name="username" type="text" class="general-textarea" /></label><br />
+			<label><?php echo elgg_echo('password'); ?><br /><input name="password" type="password" class="general-textarea" /></label><br />
+			<label><?php echo elgg_echo('passwordagain'); ?><br /><input name="password" type="password" class="general-textarea" /></label><br />
+			<input type="submit" name="submit" value="<?php echo elgg_echo('register'); ?>" /></p>
+	    </form>
+	</div>
\ No newline at end of file
diff --git a/views/default/login.php b/views/default/login.php
deleted file mode 100644
index c17f87b33..000000000
--- a/views/default/login.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-     /**
-	 * Elgg login form
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-	 
-?>
-
-	<div id="login-box">
-		<form action="<?php echo $vars['url']; ?>action/login" method="POST">
-			<p><label><?php echo elgg_echo('username'); ?><br /><input name="username" type="text" class="general-textarea" /></label>
-			<br />
-			<label><?php echo elgg_echo('password'); ?><br /><input name="password" type="password" class="general-textarea" /></label><br />
-			<input type="submit" name="submit" value="<?php echo elgg_echo('login'); ?>" /></p>
-			<p><a href="<?php echo $vars['url']; ?>register.php"><?php echo elgg_echo('register'); ?></a></p>
-	    </form>
-	</div>
\ No newline at end of file
diff --git a/views/default/welcome/logged_out.php b/views/default/welcome/logged_out.php
index 47e9ac19f..8d7146e16 100644
--- a/views/default/welcome/logged_out.php
+++ b/views/default/welcome/logged_out.php
@@ -18,6 +18,6 @@
 	</p>
 	<?php
 
-		echo elgg_view("login");
+		echo elgg_view("account/forms/login");
 	
 	?>
\ No newline at end of file
-- 
cgit v1.2.3