1 files changed, 63 insertions, 28 deletions
diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php
index 1119d180f..4f337e4e4 100644
--- a/views/default/forms/useradd.php
+++ b/views/default/forms/useradd.php
@@ -5,39 +5,74 @@
  * @package Elgg
  * @subpackage Core
  * 
- * @todo FIXME Forms 1.8: views in the forms/ directory should not be generating the <form> wrapper itself
  */
 
-$admin_option = false;
-if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) {
-	$admin_option = true;
-}
-
-$form_body  = "<div><label>" . elgg_echo('name') . "</label><br />" . elgg_view('input/text' , array('name' => 'name')) . "</div>";
-$form_body .= "<div><label>" . elgg_echo('username') . "</label><br />" . elgg_view('input/text' , array('name' => 'username')) . "</div>";
-$form_body .= "<div><label>" . elgg_echo('email') . "</label><br />" . elgg_view('input/text' , array('name' => 'email')) . "</div>";
-$form_body .= "<div><label>" . elgg_echo('password') . "</label><br />" . elgg_view('input/password' , array('name' => 'password')) . "</div>";
-$form_body .= "<div><label>" . elgg_echo('passwordagain') . "</label><br />" . elgg_view('input/password' , array('name' => 'password2')) . "</div>";
-$form_body .= "<div>";
+$name = $username = $email = $password = $password2 = $admin = '';
 
-if ($admin_option) {
-	$form_body .= elgg_view('input/checkboxes', array('name' => "admin", 'options' => array(elgg_echo('admin_option'))));
-	$form_body .= '</div><div>';
+if (elgg_is_sticky_form('useradd')) {
+	extract(elgg_get_sticky_values('useradd'));
+	elgg_clear_sticky_form('useradd');
+	if (is_array($admin)) {
+		$admin = $admin[0];
+	}
 }
 
-$form_body .= elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('register'))) . "</div>";
 ?>
+<div>
+	<label><?php echo elgg_echo('name');?></label><br />
+	<?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',
+		'value' => $username,
+	));
+	?>
+</div>
+<div>
+	<label><?php echo elgg_echo('email'); ?></label><br />
+	<?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',
+		'value' => $password,
+	));
+	?>
+</div>
+<div>
+	<label><?php echo elgg_echo('passwordagain'); ?></label><br />
+	<?php
+	echo elgg_view('input/password', array(
+		'name' => 'password2',
+		'value' => $password2,
+	));
+	?>
+</div>
+<div>
+<?php 
+	echo elgg_view('input/checkboxes', array(
+		'name' => "admin",
+		'options' => array(elgg_echo('admin_option') => 1),
+		'value' => $admin,
+	));
+?>
+</div>
 
-<div class="elgg-module elgg-module-inline">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('adduser'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<?php
-			echo elgg_view('input/form', array(
-				'action' => "action/useradd",
-				'body' => $form_body,
-			));
-		?>
-	</div>
+<div class="elgg-foot">
+	<?php echo elgg_view('input/submit', array('value' => elgg_echo('register'))); ?>
 </div>
 \ No newline at end of file