From 5b646495af90ec0041d5922e643efd2265406b5a Mon Sep 17 00:00:00 2001
From: pichalite <pichalite.com@gmail.com>
Date: Thu, 29 Dec 2016 01:01:35 +0000
Subject: [PATCH] Confirm before removing user and group cover picture

---
 public/language/en-GB/groups.json   |  3 ++-
 public/language/en-GB/user.json     |  1 +
 public/src/client/account/header.js | 24 ++++++++++++++++--------
 public/src/client/groups/details.js | 27 ++++++++++++++++++---------
 4 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/public/language/en-GB/groups.json b/public/language/en-GB/groups.json
index 2efc9a69fc..a55cc8603f 100644
--- a/public/language/en-GB/groups.json
+++ b/public/language/en-GB/groups.json
@@ -61,5 +61,6 @@
 	"new-group.group_name": "Group Name:",
 	"upload-group-cover": "Upload group cover",
 	"bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
-	"bulk-invite": "Bulk Invite"
+	"bulk-invite": "Bulk Invite",
+	"remove_group_cover_confirm": "Are you sure you want to remove the cover picture?"
 }
\ No newline at end of file
diff --git a/public/language/en-GB/user.json b/public/language/en-GB/user.json
index f0cb35f615..6215486cb3 100644
--- a/public/language/en-GB/user.json
+++ b/public/language/en-GB/user.json
@@ -67,6 +67,7 @@
 	"upload_a_picture": "Upload a picture",
 	"remove_uploaded_picture" : "Remove Uploaded Picture",
 	"upload_cover_picture": "Upload cover picture",
+	"remove_cover_picture_confirm": "Are you sure you want to remove the cover picture?",
 
 	"settings": "Settings",
 	"show_email": "Show My Email",
diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js
index d225e2cae1..e99b7ee0a8 100644
--- a/public/src/client/account/header.js
+++ b/public/src/client/account/header.js
@@ -168,14 +168,22 @@ define('forum/account/header', [
 	}
 
 	function removeCover() {
-		socket.emit('user.removeCover', {
-			uid: ajaxify.data.uid
-		}, function (err) {
-			if (!err) {
-				ajaxify.refresh();
-			} else {
-				app.alertError(err.message);
-			}
+		translator.translate('[[user:remove_cover_picture_confirm]]', function (translated) {
+			bootbox.confirm(translated, function (confirm) {
+				if (!confirm) {
+					return;
+				}
+						
+				socket.emit('user.removeCover', {
+					uid: ajaxify.data.uid
+				}, function (err) {
+					if (!err) {
+						ajaxify.refresh();
+					} else {
+						app.alertError(err.message);
+					}
+				});
+			});
 		});
 	}
 
diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js
index e8c449f5f6..96610baf38 100644
--- a/public/src/client/groups/details.js
+++ b/public/src/client/groups/details.js
@@ -7,8 +7,9 @@ define('forum/groups/details', [
 	'components',
 	'coverPhoto',
 	'uploader',
+	'translator',
 	'vendor/colorpicker/colorpicker'
-], function (memberList, iconSelect, components, coverPhoto, uploader) {
+], function (memberList, iconSelect, components, coverPhoto, uploader, translator) {
 
 	var Details = {};
 	var groupName;
@@ -265,14 +266,22 @@ define('forum/groups/details', [
 	}
 
 	function removeCover() {
-		socket.emit('groups.cover.remove', {
-			groupName: ajaxify.data.group.name
-		}, function (err) {
-			if (!err) {
-				ajaxify.refresh();
-			} else {
-				app.alertError(err.message);
-			}
+		translator.translate('[[groups:remove_group_cover_confirm]]', function (translated) {
+			bootbox.confirm(translated, function (confirm) {
+				if (!confirm) {
+					return;
+				}
+						
+				socket.emit('groups.cover.remove', {
+					groupName: ajaxify.data.group.name
+				}, function (err) {
+					if (!err) {
+						ajaxify.refresh();
+					} else {
+						app.alertError(err.message);
+					}
+				});
+			});
 		});
 	}