From 838f6e1743eee1919c7f03cb0b4b3c0fad9c34ec Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 21 Mar 2011 19:40:14 +0000
Subject: [PATCH] * eMail: ask confirmation before deleting a folder in manage
 folders

---
 felamimail/inc/class.uipreferences.inc.php             |  1 +
 felamimail/lang/egw_de.lang                            |  1 +
 felamimail/lang/egw_en.lang                            |  1 +
 .../templates/default/preferences_manage_folder.tpl    | 10 +++++-----
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/felamimail/inc/class.uipreferences.inc.php b/felamimail/inc/class.uipreferences.inc.php
index ac792ceb54..7da6d8868d 100644
--- a/felamimail/inc/class.uipreferences.inc.php
+++ b/felamimail/inc/class.uipreferences.inc.php
@@ -789,6 +789,7 @@ require_once(EGW_INCLUDE_ROOT.'/felamimail/inc/class.felamimail_bosignatures.inc
 			$this->t->set_var('lang_draft_folder', lang('draft folder'));
 			$this->t->set_var('lang_template_folder', lang('template folder'));
 			$this->t->set_var('lang_folder_to_appear_on_main_screen', lang('if shown, which folders should appear on main screen'));
+			$this->t->set_var('lang_confirm_delete_folder', lang('Delete this folder irreversible? '));
 			$this->t->set_var("th_bg",$GLOBALS['egw_info']["theme"]["th_bg"]);
 			$this->t->set_var("bg01",$GLOBALS['egw_info']["theme"]["bg01"]);
 			$this->t->set_var("bg02",$GLOBALS['egw_info']["theme"]["bg02"]);
diff --git a/felamimail/lang/egw_de.lang b/felamimail/lang/egw_de.lang
index 699af9ae22..ed86fa4ac0 100644
--- a/felamimail/lang/egw_de.lang
+++ b/felamimail/lang/egw_de.lang
@@ -100,6 +100,7 @@ delete folder	felamimail	de	Ordner löschen
 delete script	felamimail	de	Skript löschen
 delete selected	felamimail	de	ausgewählte Nachrichten löschen
 delete selected messages	felamimail	de	ausgewählte Nachrichten löschen
+delete this folder irreversible?	felamimail	de	Ordner unwiderruflich löschen?
 deleted	felamimail	de	gelöscht
 deleted folder successfully!	felamimail	de	Ordner erfolgreich gelöscht
 deleting messages	felamimail	de	lösche Nachrichten
diff --git a/felamimail/lang/egw_en.lang b/felamimail/lang/egw_en.lang
index 1e8b9b389d..cca23ce049 100644
--- a/felamimail/lang/egw_en.lang
+++ b/felamimail/lang/egw_en.lang
@@ -100,6 +100,7 @@ delete folder	felamimail	en	Delete Folder
 delete script	felamimail	en	delete script
 delete selected	felamimail	en	Delete selected
 delete selected messages	felamimail	en	delete selected messages
+delete this folder irreversible?	felamimail	en	Delete this folder irreversible?
 deleted	felamimail	en	deleted
 deleted folder successfully!	felamimail	en	Deleted folder successfully!
 deleting messages	felamimail	en	deleting messages
diff --git a/felamimail/templates/default/preferences_manage_folder.tpl b/felamimail/templates/default/preferences_manage_folder.tpl
index 9107766701..371aa7697d 100644
--- a/felamimail/templates/default/preferences_manage_folder.tpl
+++ b/felamimail/templates/default/preferences_manage_folder.tpl
@@ -52,7 +52,7 @@
 						<span id="folderName">{folderName}</span>
 					</td>
 					<td align="center">
-						<div id="divDeleteButton" style="visibility:hidden;"><button type='button' id="mailboxDeleteButton" onclick='xajax_doXMLHTTP("felamimail.ajaxfelamimail.deleteFolder",tree.getSelectedItemId())'>{lang_delete}</button></div>
+						<div id="divDeleteButton" style="visibility:hidden;"><button type='button' id="mailboxDeleteButton" onclick='if (confirm("{lang_confirm_delete_folder}")) xajax_doXMLHTTP("felamimail.ajaxfelamimail.deleteFolder",tree.getSelectedItemId())'>{lang_delete}</button></div>
 					</td>
 				</tr>
 				<tr>
@@ -123,7 +123,7 @@
 </style>
 <TABLE border=1 style="border: 1px solid black; border-collapse: collapse;">
 <CAPTION>
-<B class="TableTitle">Mailbox Access Rights </b> 
+<B class="TableTitle">Mailbox Access Rights </b>
 </caption>
 <TR>
 <TH ROWSPAN="1" COLSPAN="1">
@@ -236,7 +236,7 @@
 <p>
 <TABLE border=1 style="border: 1px solid black; border-collapse: collapse;">
 <CAPTION>
-<B class="TableTitle">Abbreviations for Common Access Rights </b> 
+<B class="TableTitle">Abbreviations for Common Access Rights </b>
 </caption>
 <TR>
 <TH ROWSPAN="1" COLSPAN="1">
@@ -440,10 +440,10 @@
 					<input type="checkbox" name="acl[]" value="a" id="acl_a">
 				</td>
 			</tr>
-			
+
 			<tr>
 				<td colspan="4">
-					<button onClick="javascript:window.close();"> 
+					<button onClick="javascript:window.close();">
 						{lang_cancel}
 					</button>
 				</td>