diff options
| -rw-r--r-- | account/forgotten_password.php | 20 | ||||
| -rw-r--r-- | account/register.php | 27 | ||||
| -rw-r--r-- | actions/systemsettings/install.php | 2 | ||||
| -rw-r--r-- | languages/en.php | 8 | ||||
| -rw-r--r-- | views/default/account/forms/forgotten_password.php | 19 | ||||
| -rw-r--r-- | views/default/account/forms/login.php | 2 |
6 files changed, 74 insertions, 4 deletions
diff --git a/account/forgotten_password.php b/account/forgotten_password.php new file mode 100644 index 000000000..dd76cd8fe --- /dev/null +++ b/account/forgotten_password.php @@ -0,0 +1,20 @@ +<?php + /** + * Forgotten password function. + * + * @package Elgg + * @subpackage Core + * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 + * @author Marcus Povey + * @copyright Curverider Ltd 2008 + * @link http://elgg.org/ + */ + + require_once(dirname(dirname(__FILE__)) . "/engine/start.php"); + + if (!isloggedin()) { + echo page_draw(elgg_echo('user:password:lost'), elgg_view_title(elgg_echo('user:password:lost')) . elgg_view("account/forms/forgotten_password")); + } else { + forward(); + } +?>
\ No newline at end of file diff --git a/account/register.php b/account/register.php new file mode 100644 index 000000000..c86c67f62 --- /dev/null +++ b/account/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(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/actions/systemsettings/install.php b/actions/systemsettings/install.php index bf2011a19..061a2404e 100644 --- a/actions/systemsettings/install.php +++ b/actions/systemsettings/install.php @@ -64,7 +64,7 @@ system_message(elgg_echo("installation:configuration:success"));
- header("Location: ../../register.php");
+ header("Location: ../../account/register.php");
exit;
}
diff --git a/languages/en.php b/languages/en.php index 1811cdb8c..8ead8eb40 100644 --- a/languages/en.php +++ b/languages/en.php @@ -309,8 +309,11 @@ 'user:username:notfound' => 'Username %s not found.', + 'user:password:lost' => 'Lost password', 'user:password:resetreq:success' => 'Successfully requested a new password, email sent', - 'user:password:resetreq:fail' => 'Could not request a new password.',
+ 'user:password:resetreq:fail' => 'Could not request a new password.', + + 'user:password:text' => 'To generate a new password, enter your username below. We will send the address of a unique verification page to you via email click on the link in the body of the message and a new password will be sent to you.',
/**
* Administration
@@ -416,7 +419,8 @@ 'upload' => "Upload",
'ban' => "Ban",
'enable' => "Enable",
- 'disable' => "Disable",
+ 'disable' => "Disable", + 'request' => "Request",
'invite' => "Invite",
diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php new file mode 100644 index 000000000..18a9888fd --- /dev/null +++ b/views/default/account/forms/forgotten_password.php @@ -0,0 +1,19 @@ +<?php + /** + * Elgg forgotten password. + * + * @package Elgg + * @subpackage Core + * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 + * @author Marcus Povey + * @copyright Curverider Ltd 2008 + * @link http://elgg.org/ + */ +?> +<div id="forgotten_box"> + <form action="<?php echo $vars['url']; ?>actions/user/requestnewpassword" method="post"> + <p><?php echo elgg_echo('user:password:text'); ?></p> + <p><b><?php echo elgg_echo('username'); ?></b> <?php echo elgg_view('input/text', array('internalname' => 'username')); ?></p> + <p><input type="submit" name="submit" class="submit_button" value="<?php echo elgg_echo('request'); ?>" /></p> + </form> +</div>
\ No newline at end of file diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php index 105c4499d..1723cf81a 100644 --- a/views/default/account/forms/login.php +++ b/views/default/account/forms/login.php @@ -20,6 +20,6 @@ <br />
<label><?php echo elgg_echo('password'); ?><br /><input name="password" type="password" class="general-textarea" /></label><br />
<input type="submit" name="submit" class="submit_button" value="<?php echo elgg_echo('login'); ?>" /></p>
- <?php if (!$CONFIG->disable_registration) { ?><p><a href="<?php echo $vars['url']; ?>register.php"><?php echo elgg_echo('register'); ?></a></p><?php } ?>
+ <p><?php if (!$CONFIG->disable_registration) { ?><a href="<?php echo $vars['url']; ?>account/register.php"><?php echo elgg_echo('register'); ?></a> : <?php } ?> <a href="<?php echo $vars['url']; ?>account/forgotten_password.php"><?php echo elgg_echo('user:password:lost'); ?></a></p>
</form>
</div>
\ No newline at end of file |