From 330ca9228857560164c963172fc8f5c289f16b42 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 30 Sep 2010 22:52:15 +0000
Subject: Refs #2344 - move account pages into pages directory

git-svn-id: http://code.elgg.org/elgg/trunk@6984 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 account/forgotten_password.php                     | 17 ---------
 account/register.php                               | 44 ----------------------
 engine/classes/ElggSite.php                        |  2 +-
 engine/lib/users.php                               |  2 +-
 pages/account/forgotten_password.php               | 17 +++++++++
 pages/account/register.php                         | 44 ++++++++++++++++++++++
 views/default/account/forms/login.php              |  2 +-
 views/default/account/forms/login_dropdown.php     |  2 +-
 .../default/account/forms/login_walled_garden.php  |  2 +-
 9 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100644 account/forgotten_password.php
 delete mode 100644 account/register.php
 create mode 100644 pages/account/forgotten_password.php
 create mode 100644 pages/account/register.php

diff --git a/account/forgotten_password.php b/account/forgotten_password.php
deleted file mode 100644
index 827b254c9..000000000
--- a/account/forgotten_password.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Assembles and outputs the forgotten password page.
- *
- * @package Elgg.Core
- * @subpackage Registration
- */
-
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-if (!isloggedin()) {
-	$area1 = elgg_view_title(elgg_echo("user:password:lost"));
-	$area2 = elgg_view("account/forms/forgotten_password");
-	page_draw(elgg_echo('user:password:lost'), elgg_view_layout("one_column_with_sidebar", $area1 . $area2));
-} else {
-	forward();
-}
\ No newline at end of file
diff --git a/account/register.php b/account/register.php
deleted file mode 100644
index 5709ee6d8..000000000
--- a/account/register.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Assembles and outputs the registration page.
- *
- * Since 1.8 registration can be disabled via administration.  If this is
- * the case, calls to this page will forward to the network front page.
- *
- * If the user is logged in, this page will forward to the network
- * front page.
- *
- * @package Elgg.Core
- * @subpackage Registration
- */
-
-/**
- * Start the Elgg engine
- *
- * Why? In the case this file is called thru a page handler: $CONFIG
- * is not within the global scope (the page handler function does not include it).
- * BUT, there _might_ exist direct calls to this file, requiring the engine
- * to be started. Logic for both cases follow.
- */
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-global $CONFIG;
-
-// check new registration allowed
-if (!$CONFIG->allow_registration) {
-	register_error(elgg_echo('registerdisabled'));
-	forward();
-}
-
-$friend_guid = (int) get_input('friend_guid',0);
-$invitecode = get_input('invitecode');
-
-// If we're not logged in, display the registration page
-if (!isloggedin()) {
-	$area1 = elgg_view_title(elgg_echo("register"));
-	$area2 = elgg_view("account/forms/register", array('friend_guid' => $friend_guid, 'invitecode' => $invitecode));
-	page_draw(elgg_echo("register"), elgg_view_layout("one_column_with_sidebar", $area1 . $area2));
-
-// Otherwise, forward to the index page
-} else {
-	forward();
-}
diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php
index 08d47ade5..e71f3ca25 100644
--- a/engine/classes/ElggSite.php
+++ b/engine/classes/ElggSite.php
@@ -332,7 +332,7 @@ class ElggSite extends ElggEntity {
 			'action/login',
 			'pg/register',
 			'action/register',
-			'account/forgotten_password\.php',
+			'pages/account/forgotten_password\.php',
 			'action/user/requestnewpassword',
 			'pg/resetpassword',
 			'upgrade\.php',
diff --git a/engine/lib/users.php b/engine/lib/users.php
index c82db2046..5c2ac7731 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1184,7 +1184,7 @@ function dashboard_page_handler($page_elements) {
  * Page handler for registration
  */
 function registration_page_handler($page_elements) {
-	require_once(dirname(dirname(dirname(__FILE__))) . "/account/register.php");
+	require_once(dirname(dirname(dirname(__FILE__))) . "/pages/account/register.php");
 }
 
 /**
diff --git a/pages/account/forgotten_password.php b/pages/account/forgotten_password.php
new file mode 100644
index 000000000..2285e7299
--- /dev/null
+++ b/pages/account/forgotten_password.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Assembles and outputs the forgotten password page.
+ *
+ * @package Elgg.Core
+ * @subpackage Registration
+ */
+
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+if (!isloggedin()) {
+	$area1 = elgg_view_title(elgg_echo("user:password:lost"));
+	$area2 = elgg_view("account/forms/forgotten_password");
+	page_draw(elgg_echo('user:password:lost'), elgg_view_layout("one_column_with_sidebar", $area1 . $area2));
+} else {
+	forward();
+}
\ No newline at end of file
diff --git a/pages/account/register.php b/pages/account/register.php
new file mode 100644
index 000000000..cbbc40060
--- /dev/null
+++ b/pages/account/register.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Assembles and outputs the registration page.
+ *
+ * Since 1.8 registration can be disabled via administration.  If this is
+ * the case, calls to this page will forward to the network front page.
+ *
+ * If the user is logged in, this page will forward to the network
+ * front page.
+ *
+ * @package Elgg.Core
+ * @subpackage Registration
+ */
+
+/**
+ * Start the Elgg engine
+ *
+ * Why? In the case this file is called thru a page handler: $CONFIG
+ * is not within the global scope (the page handler function does not include it).
+ * BUT, there _might_ exist direct calls to this file, requiring the engine
+ * to be started. Logic for both cases follow.
+ */
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+global $CONFIG;
+
+// check new registration allowed
+if (!$CONFIG->allow_registration) {
+	register_error(elgg_echo('registerdisabled'));
+	forward();
+}
+
+$friend_guid = (int) get_input('friend_guid',0);
+$invitecode = get_input('invitecode');
+
+// If we're not logged in, display the registration page
+if (!isloggedin()) {
+	$area1 = elgg_view_title(elgg_echo("register"));
+	$area2 = elgg_view("account/forms/register", array('friend_guid' => $friend_guid, 'invitecode' => $invitecode));
+	page_draw(elgg_echo("register"), elgg_view_layout("one_column_with_sidebar", $area1 . $area2));
+
+// Otherwise, forward to the index page
+} else {
+	forward();
+}
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index 594c645de..5e6b5c8fe 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -20,7 +20,7 @@ $form_body .= elgg_view('login/extend');
 
 $form_body .= "<p class='loginbox'>";
 $form_body .= $CONFIG->allow_registration ? "<a href=\"{$vars['url']}pg/register/\">" . elgg_echo('register') . '</a> | ' : '';
-$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
+$form_body .= "<a href=\"{$vars['url']}pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
 
 $login_url = $vars['url'];
 if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
diff --git a/views/default/account/forms/login_dropdown.php b/views/default/account/forms/login_dropdown.php
index 5e5afd520..43cb248fa 100644
--- a/views/default/account/forms/login_dropdown.php
+++ b/views/default/account/forms/login_dropdown.php
@@ -13,7 +13,7 @@ if (!isloggedin()) {
 
 	$form_body .= "<p class='loginbox'>";
 	$form_body .= $CONFIG->allow_registration ? "<a href=\"{$vars['url']}account/register.php\">" . elgg_echo('register') . '</a> | ' : '';
-	$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
+	$form_body .= "<a href=\"{$vars['url']}pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
 	$form_body .= "<input type='hidden' name='returntoreferer' value='true' />";
 
 	$login_url = $vars['url'];
diff --git a/views/default/account/forms/login_walled_garden.php b/views/default/account/forms/login_walled_garden.php
index 56ea365bb..72af49359 100644
--- a/views/default/account/forms/login_walled_garden.php
+++ b/views/default/account/forms/login_walled_garden.php
@@ -16,7 +16,7 @@ $register = elgg_echo('register');
 $lost_password = elgg_echo('user:password:lost');
 $form_body .= '<p class="lost_password">';
 $form_body .= $CONFIG->allow_registration ? "<a class=\"registration_link\" href=\"{$vars['url']}pg/register/\">$register</a> | " : '';
-$form_body .= "<a class='forgotten_password_link' href=\"{$login_url}account/forgotten_password.php\">$lost_password</a>";
+$form_body .= "<a class='forgotten_password_link' href=\"{$login_url}pages/account/forgotten_password.php\">$lost_password</a>";
 $form_body .= '</p>';
 
 $login_url = $vars['url'];
-- 
cgit v1.2.3