From 2e6881c378896b8947fa9b58c69388a75bd9cfba Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Sun, 25 Apr 2010 14:46:45 +0000
Subject: [PATCH] Webadmin: Use a dedicated page for confirming user deletes

The old Javascript way didn't work when one had javascript disabled.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1937 726aef4b-f618-498e-8847-2d620e286838
---
 modules/webadmin.cpp                | 14 ++++++++++++++
 modules/www/webadmin/del_user.tmpl  | 18 ++++++++++++++++++
 modules/www/webadmin/listusers.tmpl |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 modules/www/webadmin/del_user.tmpl

diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index 9ce11ec1..e3cf44a3 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -293,6 +293,20 @@ public:
 				return false;
 			}
 
+			if (!WebSock.IsPost()) {
+				CString sUser = WebSock.GetParam("user", true);
+				CUser* pUser = CZNC::Get().FindUser(sUser);
+
+				if (!pUser) {
+					WebSock.PrintErrorPage("No such username");
+					return true;
+				}
+
+				Tmpl.SetFile("del_user.tmpl");
+				Tmpl["Username"] = sUser;
+				return true;
+			}
+
 			CString sUser = WebSock.GetParam("user");
 			CUser* pUser = CZNC::Get().FindUser(sUser);
 
diff --git a/modules/www/webadmin/del_user.tmpl b/modules/www/webadmin/del_user.tmpl
new file mode 100644
index 00000000..59a8dcfa
--- /dev/null
+++ b/modules/www/webadmin/del_user.tmpl
@@ -0,0 +1,18 @@
+<? INC Header.tmpl ?>
+
+<div class="section">
+	Are you sure you want to delete "<? VAR Username ?>"?
+
+	<form action="deluser" method="post">
+		<? INC _csrf_check.tmpl ?>
+		<input type="hidden" name="submitted" value="1" />
+		<input type="hidden" name="user" value="<? VAR Username ?>" />
+
+		<input type="submit" value="Yes" />
+	</form>
+	<form action="listusers" method="get">
+		<input type="submit" value="No" />
+	</form>
+</div>
+
+<? INC Footer.tmpl ?>
diff --git a/modules/www/webadmin/listusers.tmpl b/modules/www/webadmin/listusers.tmpl
index 6bf65bef..7bfd8d98 100644
--- a/modules/www/webadmin/listusers.tmpl
+++ b/modules/www/webadmin/listusers.tmpl
@@ -23,7 +23,7 @@
 						<td>
 							<span class="nowrap">
 								[<a href="edituser?user=<?VAR Username ESC=URL?>">Edit</a>]
-								<? IF !IsSelf ?>[<a href="deluser?user=<?VAR Username ESC=URL?>" onClick="return confirm('Do you really wish to remove this user?');">Delete</a>]<? ENDIF ?>
+								<? IF !IsSelf ?>[<a href="deluser?user=<?VAR Username ESC=URL?>">Delete</a>]<? ENDIF ?>
 							</span>
 						</td>
 						<td><? VAR Username ?></td>