Fixes #3233 useradd form is now sticky

git-svn-id: http://code.elgg.org/elgg/trunk@8901 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/actions/useradd.php b/actions/useradd.php
index f20b9d0703ebcd4a8c3082c088a2cc529413eea1..8e588d073e261c9b403c82601cdc786836ff04bb 100644 (file)
--- a/actions/useradd.php
+++ b/actions/useradd.php
@@ -6,6 +6,8 @@
  * @subpackage Core
  */
 
+elgg_make_sticky_form('useradd');
+
 // Get variables
 $username = get_input('username');
 $password = get_input('password');
@@ -28,7 +30,10 @@ try {
                        $new_user->makeAdmin();
                }
 
+               elgg_clear_sticky_form('useradd');
+
                $new_user->admin_created = TRUE;
+               // @todo ugh, saving a guid as metadata!
                $new_user->created_by_guid = elgg_get_logged_in_user_guid();
 
                $subject = elgg_echo('useradd:subject');

diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php
index e2152e65481effe09c364259f536af816a4acdf3..fcb93a6c63bbc7a20b1168655a47dfd6525a05f9 100644 (file)
--- a/views/default/forms/useradd.php
+++ b/views/default/forms/useradd.php
@@ -7,6 +7,16 @@
  * 
  */
 
+$name = $username = $email = $password = $password2 = $admin = '';
+
+if (elgg_is_sticky_form('useradd')) {
+       extract(elgg_get_sticky_values('useradd'));
+       elgg_clear_sticky_form('useradd');
+       if (is_array($admin)) {
+               $admin = $admin[0];
+       }
+}
+
 $admin_option = false;
 if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) {
        $admin_option = true;
@@ -14,33 +24,62 @@ if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) {
 ?>
 <div>
        <label><?php echo elgg_echo('name');?></label><br />
-       <?php echo elgg_view('input/text' , array('name' => 'name')); ?>
+       <?php
+       echo elgg_view('input/text', array(
+               'name' => 'name',
+               'value' => $name,
+       ));
+       ?>
 </div>
 <div>
        <label><?php echo elgg_echo('username'); ?></label><br />
-       <?php echo elgg_view('input/text' , array('name' => 'username')); ?>
+       <?php
+       echo elgg_view('input/text', array(
+               'name' => 'username',
+               'value' => $username,
+       ));
+       ?>
 </div>
 <div>
        <label><?php echo elgg_echo('email'); ?></label><br />
-       <?php echo elgg_view('input/text' , array('name' => 'email')); ?>
+       <?php
+       echo elgg_view('input/text', array(
+               'name' => 'email',
+               'value' => $email,
+       ));
+       ?>
 </div>
 <div>
        <label><?php echo elgg_echo('password'); ?></label><br />
-       <?php echo elgg_view('input/password' , array('name' => 'password')); ?>
+       <?php
+       echo elgg_view('input/password', array(
+               'name' => 'password',
+               'value' => $password,
+       ));
+       ?>
 </div>
 <div>
        <label><?php echo elgg_echo('passwordagain'); ?></label><br />
-       <?php echo elgg_view('input/password' , array('name' => 'password2')); ?>
+       <?php
+       echo elgg_view('input/password', array(
+               'name' => 'password2',
+               'value' => $password2,
+       ));
+       ?>
 </div>
 
 <?php 
 if ($admin_option) {
        echo "<div>";
-       echo elgg_view('input/checkboxes', array('name' => "admin", 'options' => array(elgg_echo('admin_option'))));
+       echo elgg_view('input/checkboxes', array(
+               'name' => "admin",
+               'options' => array(elgg_echo('admin_option') => 1),
+               'value' => $admin,
+       ));
        echo "</div>";
 }
 ?>
 
 <div>
-       <?php echo elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('register'))); ?>
+       <?php echo elgg_view('input/submit', array('value' => elgg_echo('register'))); ?>
 </div>
\ No newline at end of file