From 2ea23a78652f3dcf8740419677dc1415f1b75256 Mon Sep 17 00:00:00 2001
From: Eike Foken <kontakt@eikefoken.de>
Date: Wed, 10 Aug 2011 21:02:08 +0200
Subject: [PATCH] Add delete confirmation

---
 application/controllers/users.php       | 14 ++++++++------
 application/views/admin/users/index.php |  2 +-
 assets/js/scattport.js                  | 15 ++++++++++++++-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/application/controllers/users.php b/application/controllers/users.php
index 70b735b..c710934 100644
--- a/application/controllers/users.php
+++ b/application/controllers/users.php
@@ -156,12 +156,14 @@ class Users extends MY_Controller {
 	 * @param integer $id
 	 */
 	public function delete($id = '') {
-		if (!is_array($this->user->getUserByID())) {
-			show_404();
-		}
+		$user = $this->user->getUserByID($id);
 
-		$this->user->delete($id);
-		$this->messages->add('The selected user was deleted', 'success');
-		redirect('users', 200);
+		if (!isset($user) || !is_array($user) || !isset($user['id'])) {
+			show_404();
+		} else {
+			$this->user->delete($user['id']);
+			$this->messages->add('The selected user was deleted', 'success');
+			redirect('users', 200);
+		}
 	}
 }
\ No newline at end of file
diff --git a/application/views/admin/users/index.php b/application/views/admin/users/index.php
index 50ee331..2ff968b 100644
--- a/application/views/admin/users/index.php
+++ b/application/views/admin/users/index.php
@@ -22,7 +22,7 @@ foreach ($users as $user):
 				<tr>
 					<td><?=$user['username'];?></td>
 					<td><?=$user['firstname'];?> <?=$user['lastname'];?></td>
-					<td><?=anchor('users/edit/' . $user['id'], lang('user_edit'));?> | <?=anchor('users/delete/' . $user['id'], lang('user_delete'));?></td>
+					<td><?=anchor('users/edit/' . $user['id'], lang('user_edit'));?> | <a href="javascript:deleteConfirm('<?=site_url('users/delete/' . $user['id']);?>');" title="User"><?=lang('user_delete');?></a></td>
 				</tr>
 <?php
 endforeach;
diff --git a/assets/js/scattport.js b/assets/js/scattport.js
index 04f7cff..9b09d82 100644
--- a/assets/js/scattport.js
+++ b/assets/js/scattport.js
@@ -1,5 +1,5 @@
 /**
- *
+ * Gets the queued notifications.
  */
 function getNotifications() {
 	$.get(SITE_URL + 'ajax/get_notifications', function(data) {
@@ -9,6 +9,19 @@ function getNotifications() {
 	});
 }
 
+/**
+ * Asks the user if he is sure to delete an item.
+ *
+ * @param url
+ */
+function deleteConfirm(url) {
+	var answer = confirm('Are you sure?');
+
+	if (answer) {
+		window.location = url;
+	}
+}
+
 /**
  * Saves the changes done by in-place edit.
  *