From 086631fe74c3f3c38c96230774052288d2919d2b Mon Sep 17 00:00:00 2001
From: Eike Foken <kontakt@eikefoken.de>
Date: Mon, 15 Aug 2011 00:58:12 +0200
Subject: [PATCH] Clean-up user administration

---
 application/controllers/admin/users.php             |  9 ++++-----
 application/models/user.php                         |  1 -
 application/views/admin/users/create.php            | 13 ++++++-------
 application/views/admin/users/edit.php              | 10 +++-------
 .../views/admin/users/{index.php => list.php}       |  2 +-
 5 files changed, 14 insertions(+), 21 deletions(-)
 rename application/views/admin/users/{index.php => list.php} (100%)

diff --git a/application/controllers/admin/users.php b/application/controllers/admin/users.php
index 65d12ee..43e568e 100644
--- a/application/controllers/admin/users.php
+++ b/application/controllers/admin/users.php
@@ -15,7 +15,6 @@ class Users extends CI_Controller {
 		parent::__construct();
 		$this->load->library('form_validation');
 		$this->load->model('user');
-		$this->load->config('form_validation');
 	}
 
 	/**
@@ -23,7 +22,7 @@ class Users extends CI_Controller {
 	 */
 	public function index() {
 		$data['users'] = $this->user->getAll();
-		$this->load->view('admin/users/index', $data);
+		$this->load->view('admin/users/list', $data);
 	}
 
 	/**
@@ -41,7 +40,7 @@ class Users extends CI_Controller {
 			);
 
 			if ($this->user->register($username, $this->input->post('password'), $this->input->post('email'), $data)) {
-				$this->messages->add(sprintf(_("The user '%s' was created"), $username), 'success');
+				$this->messages->add(sprintf(_("The user '%s' has been created successfully"), $username), 'success');
 				redirect('admin/users', 303);
 			}
 		}
@@ -71,7 +70,7 @@ class Users extends CI_Controller {
 			);
 
 			if ($this->user->update($user['id'], $data)) {
-				$this->messages->add(sprintf(_("The user '%s' was updated"), $user['username']), 'success');
+				$this->messages->add(sprintf(_("The user '%s' has been updated successfully"), $user['username']), 'success');
 				redirect('admin/users', 303);
 			}
 		}
@@ -91,7 +90,7 @@ class Users extends CI_Controller {
 			show_404();
 		} else {
 			$this->user->delete($user['id']);
-			$this->messages->add(_("The selected user was deleted"), 'success');
+			$this->messages->add(_("The selected user has been deleted successfully"), 'success');
 			redirect('admin/users', 303);
 		}
 	}
diff --git a/application/models/user.php b/application/models/user.php
index c8bea8f..2942dc6 100644
--- a/application/models/user.php
+++ b/application/models/user.php
@@ -251,7 +251,6 @@ class User extends CI_Model {
 		if ($this->storeSalt) {
 			$data['salt'] = $salt;
 		}
-		print_r($data);
 
 		$this->db->insert('users', array_merge($data, $additionalData));
 
diff --git a/application/views/admin/users/create.php b/application/views/admin/users/create.php
index 9b88113..24bf724 100644
--- a/application/views/admin/users/create.php
+++ b/application/views/admin/users/create.php
@@ -12,6 +12,7 @@
 			<ul>
 				<li>
 					<?=form_label(_('Username'), 'username');?>
+					<span class="req">*</span>
 					<div>
 						<input type="text" name="username" id="username" class="short text" value="<?=set_value('username');?>" />
 						<?=form_error('username')?>
@@ -20,6 +21,7 @@
 				</li>
 				<li>
 					<?=form_label(_('Email address'), 'email');?>
+					<span class="req">*</span>
 					<div>
 						<input type="text" name="email" id="email" class="medium text" value="<?=set_value('email');?>" />
 						<?=form_error('email')?>
@@ -27,6 +29,7 @@
 				</li>
 				<li>
 					<?=form_label(_('Password'), 'password');?>
+					<span class="req">*</span>
 					<div>
 						<input type="password" name="password" id="password" class="short text" />
 						<?=form_error('password')?>
@@ -34,6 +37,7 @@
 				</li>
 				<li>
 					<?=form_label(_('Confirm password'), 'password_confirm');?>
+					<span class="req">*</span>
 					<div>
 						<input type="password" name="password_confirm" id="password_confirm" class="short text" />
 						<?=form_error('password_confirm')?>
@@ -41,6 +45,7 @@
 				</li>
 				<li>
 					<?=form_label(_('First name'), 'firstname');?>
+					<span class="req">*</span>
 					<div>
 						<input type="text" name="firstname" id="firstname" class="short text" value="<?=set_value('firstname');?>" />
 						<?=form_error('firstname')?>
@@ -48,6 +53,7 @@
 				</li>
 				<li>
 					<?=form_label(_('Last name'), 'lastname');?>
+					<span class="req">*</span>
 					<div>
 						<input type="text" name="lastname" id="lastname" class="short text" value="<?=set_value('lastname');?>" />
 						<?=form_error('lastname')?>
@@ -71,13 +77,6 @@
 					</div>
 					<label class="note"><?=('Example');?>: +49 123 456789</label>
 				</li>
-				<li>
-					<?=form_label(_('Language'), 'language');?>
-					<div>
-						<?=form_dropdown('language', array('English'), null, 'id="language" class="drop"');?>
-						<?=form_error('language')?>
-					</div>
-				</li>
 			</ul>
 			<p>
 				<a class="button save" href="javascript:void(0);" onclick="$('form[name=createUser]').submit();"><?=_('Save');?></a>
diff --git a/application/views/admin/users/edit.php b/application/views/admin/users/edit.php
index 5e02f10..9e4ed0b 100644
--- a/application/views/admin/users/edit.php
+++ b/application/views/admin/users/edit.php
@@ -12,6 +12,7 @@
 			<ul>
 				<li>
 					<?=form_label(_('Email address'), 'email');?>
+					<span class="req">*</span>
 					<div>
 						<input type="text" name="email" id="email" class="medium text" value="<?=set_value('email', $user['email']);?>" />
 						<?=form_error('email')?>
@@ -19,6 +20,7 @@
 				</li>
 				<li>
 					<?=form_label(_('First name'), 'firstname');?>
+					<span class="req">*</span>
 					<div>
 						<input type="text" name="firstname" id="firstname" class="short text" value="<?=set_value('firstname', $user['firstname']);?>" />
 						<?=form_error('firstname')?>
@@ -26,6 +28,7 @@
 				</li>
 				<li>
 					<?=form_label(_('Last name'), 'lastname');?>
+					<span class="req">*</span>
 					<div>
 						<input type="text" name="lastname" id="lastname" class="short text" value="<?=set_value('lastname', $user['lastname']);?>" />
 						<?=form_error('lastname')?>
@@ -49,13 +52,6 @@
 					</div>
 					<label class="note"><?=_('Example');?>: +49 123 456789</label>
 				</li>
-				<li>
-					<?=form_label(_('Language'), 'language');?>
-					<div>
-						<?=form_dropdown('language', array('English'), null, 'id="language" class="drop"');?>
-						<?=form_error('language')?>
-					</div>
-				</li>
 			</ul>
 			<p>
 				<a class="button save" href="javascript:void(0);" onclick="$('form[name=createUser]').submit();"><?=_('Save');?></a>
diff --git a/application/views/admin/users/index.php b/application/views/admin/users/list.php
similarity index 100%
rename from application/views/admin/users/index.php
rename to application/views/admin/users/list.php
index 814dd39..3b73738 100644
--- a/application/views/admin/users/index.php
+++ b/application/views/admin/users/list.php
@@ -16,6 +16,7 @@
 					<th scope="col"><?=_('Actions');?></th>
 				</tr>
 			</thead>
+			<tbody>
 <?php
 	foreach ($users as $user):
 ?>
@@ -27,7 +28,6 @@
 <?php
 	endforeach;
 ?>
-			<tbody>
 			</tbody>
 		</table>