diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/account/forms/forgotten_password.php | 24 | ||||
| -rw-r--r-- | views/default/account/forms/register.php | 55 | ||||
| -rw-r--r-- | views/default/admin/users/add.php | 2 | ||||
| -rw-r--r-- | views/default/core/account/login_box.php | 2 | ||||
| -rw-r--r-- | views/default/core/account/login_dropdown.php | 2 | ||||
| -rw-r--r-- | views/default/core/account/login_walled_garden.php | 2 | ||||
| -rw-r--r-- | views/default/forms/login.php (renamed from views/default/account/forms/login.php) | 0 | ||||
| -rw-r--r-- | views/default/forms/register.php | 65 | ||||
| -rw-r--r-- | views/default/forms/user/requestnewpassword.php | 26 | ||||
| -rw-r--r-- | views/default/forms/useradd.php (renamed from views/default/account/forms/useradd.php) | 0 |
10 files changed, 95 insertions, 83 deletions
diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php deleted file mode 100644 index 48fafe4d8..000000000 --- a/views/default/account/forms/forgotten_password.php +++ /dev/null @@ -1,24 +0,0 @@ -<?php -/** - * Elgg forgotten password. - * - * @package Elgg - * @subpackage Core - */ - -$form_body = "<p>" . elgg_echo('user:password:text') . "</p>"; -$form_body .= "<p><label>". elgg_echo('username') . " " - . elgg_view('input/text', array('internalname' => 'username')) . "</label></p>"; -$form_body .= elgg_view('input/captcha'); -$form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "</p>"; - -echo elgg_view('input/form', array( - 'action' => "action/user/requestnewpassword", - 'body' => $form_body, - 'class' => "margin-top" -)); -?> - -<script type="text/javascript"> - $(document).ready(function() { $('input[name=username]').focus(); }); -</script>
\ No newline at end of file diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php deleted file mode 100644 index bf629b589..000000000 --- a/views/default/account/forms/register.php +++ /dev/null @@ -1,55 +0,0 @@ -<?php -/** - * Elgg register form - * - * @package Elgg - * @subpackage Core - */ - -$register_url = elgg_get_site_url(); -if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) { - $register_url = str_replace("http:", "https:", $register_url); -} - -$username = get_input('u'); -$email = get_input('e'); -$name = get_input('n'); - -$admin_option = false; -$loggedin_user = get_loggedin_user(); - -if ($loggedin_user && $loggedin_user->isAdmin() && isset($vars['show_admin'])) { - $admin_option = true; -} - -$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "input-text name", 'value' => $name)) . "</label></p>"; -$form_body .= "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "input-text", 'value' => $email)) . "</label></p>"; -$form_body .= "<p><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "input-text", 'value' => $username)) . "</label></p>"; -$form_body .= "<p><label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "input-password")) . "</label></p>"; -$form_body .= "<p><label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "input-password")) . "</label></p>"; - -// view to extend to add more fields to the registration form -$form_body .= elgg_view('register/extend'); - -// Add captcha hook -$form_body .= elgg_view('input/captcha'); - -if ($admin_option) { - $form_body .= elgg_view('input/checkboxes', array('internalname' => "admin", 'options' => array(elgg_echo('admin_option')))); -} - -$form_body .= elgg_view('input/hidden', array('internalname' => 'friend_guid', 'value' => $vars['friend_guid'])); -$form_body .= elgg_view('input/hidden', array('internalname' => 'invitecode', 'value' => $vars['invitecode'])); -$form_body .= elgg_view('input/hidden', array('internalname' => 'action', 'value' => 'register')); -$form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>"; - -echo elgg_view('input/form', array( - 'action' => "{$login_url}action/register", - 'body' => $form_body, - 'class' => "margin-top" -)); -?> - -<script type="text/javascript"> - $(document).ready(function() { $('input[name=name]').focus(); }); -</script> diff --git a/views/default/admin/users/add.php b/views/default/admin/users/add.php index cc2da61db..9caeedd89 100644 --- a/views/default/admin/users/add.php +++ b/views/default/admin/users/add.php @@ -4,4 +4,4 @@ */ echo elgg_view_title(elgg_echo('admin:users')); -echo elgg_view('account/forms/useradd', array('show_admin'=>true));
\ No newline at end of file +echo elgg_view('forms/useradd', array('show_admin'=>true));
\ No newline at end of file diff --git a/views/default/core/account/login_box.php b/views/default/core/account/login_box.php index eb37d7554..0dee72328 100644 --- a/views/default/core/account/login_box.php +++ b/views/default/core/account/login_box.php @@ -6,7 +6,7 @@ * @subpackage Core */ -$form_body = elgg_view('account/forms/login'); +$form_body = elgg_view('forms/login'); $login_url = elgg_get_site_url(); if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) { diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php index dc124f4e8..386a52a6c 100644 --- a/views/default/core/account/login_dropdown.php +++ b/views/default/core/account/login_dropdown.php @@ -8,7 +8,7 @@ if (isloggedin()) { return true; } -$form_body = elgg_view('account/forms/login'); +$form_body = elgg_view('forms/login'); $form_body .= "<input type='hidden' name='returntoreferer' value='true' />"; $login_url = elgg_get_site_url(); diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php index 9f407bdff..bdd4cb016 100644 --- a/views/default/core/account/login_walled_garden.php +++ b/views/default/core/account/login_walled_garden.php @@ -21,7 +21,7 @@ $form_body .= "<a class='forgotten_password_link' href=\"{$login_url}pages/accou $form_body .= '</p>'; */ -$form_body = elgg_view('account/forms/login'); +$form_body = elgg_view('forms/login'); $form_body .= elgg_view('input/hidden', array('internalname' => 'returntoreferer', 'value' => 'true')); $login_url = elgg_get_site_url(); diff --git a/views/default/account/forms/login.php b/views/default/forms/login.php index 87dd6d5ad..87dd6d5ad 100644 --- a/views/default/account/forms/login.php +++ b/views/default/forms/login.php diff --git a/views/default/forms/register.php b/views/default/forms/register.php new file mode 100644 index 000000000..93e2585d8 --- /dev/null +++ b/views/default/forms/register.php @@ -0,0 +1,65 @@ +<?php +/** + * Elgg register form + * + * @package Elgg + * @subpackage Core + */ + +$username = get_input('u'); +$email = get_input('e'); +$name = get_input('n'); + +$admin_option = false; +if (isadminloggedin() && isset($vars['show_admin'])) { + $admin_option = true; +} + +?> +<p class="mtm"> + <label><?php echo elgg_echo('name'); ?></label> + <br /> + <?php echo elgg_view('input/text', array('internalname' => 'name', 'value' => $name)); ?> +</p> +<p> + <label><?php echo elgg_echo('email'); ?></label> + <br /> + <?php echo elgg_view('input/text', array('internalname' => 'email', 'value' => $email)); ?> +</p> +<p> + <label><?php echo elgg_echo('username'); ?></label> + <br /> + <?php echo elgg_view('input/text', array('internalname' => 'username', 'value' => $username)); ?> +</p> +<p> + <label><?php echo elgg_echo('password'); ?></label> + <br /> + <?php echo elgg_view('input/password', array('internalname' => 'password')); ?> +</p> +<p> + <label><?php echo elgg_echo('passwordagain'); ?></label> + <br /> + <?php echo elgg_view('input/password', array('internalname' => 'password2')); ?> +</p> + +<?php +// view to extend to add more fields to the registration form +echo elgg_view('register/extend'); + +// Add captcha hook +echo elgg_view('input/captcha'); + +if ($admin_option) { + echo elgg_view('input/checkboxes', array('internalname' => "admin", 'options' => array(elgg_echo('admin_option')))); +} + +echo elgg_view('input/hidden', array('internalname' => 'friend_guid', 'value' => $vars['friend_guid'])); +echo elgg_view('input/hidden', array('internalname' => 'invitecode', 'value' => $vars['invitecode'])); +echo elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))); +?> + +<script type="text/javascript"> + $(document).ready(function() { + $('input[name=name]').focus(); + }); +</script>
\ No newline at end of file diff --git a/views/default/forms/user/requestnewpassword.php b/views/default/forms/user/requestnewpassword.php new file mode 100644 index 000000000..a235f2cc6 --- /dev/null +++ b/views/default/forms/user/requestnewpassword.php @@ -0,0 +1,26 @@ +<?php +/** + * Elgg forgotten password. + * + * @package Elgg + * @subpackage Core + */ +?> + +<p class="mtm"> + <?php echo elgg_echo('user:password:text'); ?> +</p> +<p> + <label><?php echo elgg_echo('username'); ?></label> + <?php echo elgg_view('input/text', array('internalname' => 'username')); ?> +</p> +<?php echo elgg_view('input/captcha'); ?> +<p> + <?php echo elgg_view('input/submit', array('value' => elgg_echo('request'))); ?> +</p> + +<script type="text/javascript"> + $(document).ready(function() { + $('input[name=username]').focus(); + }); +</script>
\ No newline at end of file diff --git a/views/default/account/forms/useradd.php b/views/default/forms/useradd.php index 7c1969f1b..7c1969f1b 100644 --- a/views/default/account/forms/useradd.php +++ b/views/default/forms/useradd.php |