diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/account/forgotten_password.php | 6 | ||||
| -rw-r--r-- | pages/account/register.php | 7 | ||||
| -rw-r--r-- | pages/account/reset_password.php | 35 | ||||
| -rw-r--r-- | pages/dashboard.php | 29 |
4 files changed, 44 insertions, 33 deletions
diff --git a/pages/account/forgotten_password.php b/pages/account/forgotten_password.php index 93d786e22..bf6ef87e0 100644 --- a/pages/account/forgotten_password.php +++ b/pages/account/forgotten_password.php @@ -6,8 +6,6 @@ * @subpackage Registration */ -require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - if (elgg_is_logged_in()) { forward(); } @@ -15,7 +13,9 @@ if (elgg_is_logged_in()) { $title = elgg_echo("user:password:lost"); $content = elgg_view_title($title); -$content .= elgg_view_form('user/requestnewpassword'); +$content .= elgg_view_form('user/requestnewpassword', array( + 'class' => 'elgg-form-account', +)); $body = elgg_view_layout("one_column", array('content' => $content)); diff --git a/pages/account/register.php b/pages/account/register.php index 58544ef49..5eb2b4001 100644 --- a/pages/account/register.php +++ b/pages/account/register.php @@ -35,7 +35,10 @@ $register_url = elgg_get_site_url() . 'action/register'; if (elgg_get_config('https_login')) { $register_url = str_replace("http:", "https:", $register_url); } -$form_params = array('action' => $register_url); +$form_params = array( + 'action' => $register_url, + 'class' => 'elgg-form-account float', +); $body_params = array( 'friend_guid' => $friend_guid, @@ -43,6 +46,8 @@ $body_params = array( ); $content .= elgg_view_form('register', $form_params, $body_params); +$content .= elgg_view('help/register'); + $body = elgg_view_layout("one_column", array('content' => $content)); echo elgg_view_page($title, $body); diff --git a/pages/account/reset_password.php b/pages/account/reset_password.php new file mode 100644 index 000000000..6515bfc5d --- /dev/null +++ b/pages/account/reset_password.php @@ -0,0 +1,35 @@ +<?php +/** + * Page for resetting a forgotten password + * + * @package Elgg.Core + * @subpackage Registration + */ + +if (elgg_is_logged_in()) { + forward(); +} + +$user_guid = get_input('u'); +$code = get_input('c'); + +$user = get_entity($user_guid); + +// don't check code here to avoid automated attacks +if (!$user instanceof ElggUser) { + register_error(elgg_echo('user:passwordreset:unknown_user')); + forward(); +} + +$params = array( + 'guid' => $user_guid, + 'code' => $code, +); +$form = elgg_view_form('user/passwordreset', array('class' => 'elgg-form-account'), $params); + +$title = elgg_echo('resetpassword'); +$content = elgg_view_title(elgg_echo('resetpassword')) . $form; + +$body = elgg_view_layout('one_column', array('content' => $content)); + +echo elgg_view_page($title, $body); diff --git a/pages/dashboard.php b/pages/dashboard.php deleted file mode 100644 index 31cc9087d..000000000 --- a/pages/dashboard.php +++ /dev/null @@ -1,29 +0,0 @@ -<?php -/** - * Elgg dashboard - * - * @package Elgg - * @subpackage Core - */ - -// Ensure that only logged-in users can see this page -gatekeeper(); - -// Set context and title -elgg_set_context('dashboard'); -elgg_set_page_owner_guid(elgg_get_logged_in_user_guid()); -$title = elgg_echo('dashboard'); - -// wrap intro message in a div -$intro_message = elgg_view('core/dashboard/blurb'); - -$params = array( - 'content' => $intro_message, - 'num_columns' => 3, - 'show_access' => false, -); -$widgets = elgg_view_layout('widgets', $params); - -$body = elgg_view_layout('one_column', array('content' => $widgets)); - -echo elgg_view_page($title, $body);
\ No newline at end of file |