From d860dd5ecd11caa5e88da6b302f916efb09ab18c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 28 Aug 2014 09:05:58 +0000
Subject: [PATCH] * EMailAdmin/Mail: folders on personal accounts where not
 stored, automatic unsetting "use default" when changing/adding folders

---
 emailadmin/inc/class.emailadmin_wizard.inc.php |  1 +
 emailadmin/js/app.js                           | 12 ++++++++++++
 emailadmin/templates/default/account.xet       |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/emailadmin/inc/class.emailadmin_wizard.inc.php b/emailadmin/inc/class.emailadmin_wizard.inc.php
index 13a9a03bac..aa4642fa56 100644
--- a/emailadmin/inc/class.emailadmin_wizard.inc.php
+++ b/emailadmin/inc/class.emailadmin_wizard.inc.php
@@ -930,6 +930,7 @@ class emailadmin_wizard
 			unset($content['acc_imap_login_type']);
 			$content['acc_smtp_type'] = 'emailadmin_smtp';
 			unset($content['acc_smtp_auth_session']);
+			unset($content['notify_use_default']);
 		}
 		$edit_access = emailadmin_account::check_access(EGW_ACL_EDIT, $content);
 
diff --git a/emailadmin/js/app.js b/emailadmin/js/app.js
index d5a1fdada5..4919e1654b 100644
--- a/emailadmin/js/app.js
+++ b/emailadmin/js/app.js
@@ -240,6 +240,18 @@ app.classes.emailadmin = AppJS.extend(
 	{
 		// todo check dirty and query user to a) save changes, b) discard changes, c) cancel selection
 		_widget.getInstanceManager().submit();
+	},
+
+	/**
+	 * Callback if user changes notification folders: unset use-default checkbox
+	 *
+	 * @param {object} _event
+	 * @param {et2_widget} _widget
+	 */
+	change_folders: function(_event, _widget)
+	{
+		var use_default = this.et2.getWidgetById('notify_use_default');
+		if (use_default) use_default.set_value(false);
 	}
 });
 
diff --git a/emailadmin/templates/default/account.xet b/emailadmin/templates/default/account.xet
index b9c00e0e68..e4102481cc 100644
--- a/emailadmin/templates/default/account.xet
+++ b/emailadmin/templates/default/account.xet
@@ -147,7 +147,7 @@
 				<row>
 					<description for="acc_folder_junk" value="Notify about new mail in this folders"/>
 					<vbox>
-						<taglist id="notify_folders" empty_label="Select one ..." autocomplete_url=""/>
+						<taglist id="notify_folders" empty_label="Select one ..." autocomplete_url="" onchange="app.emailadmin.change_folders"/>
 						<checkbox id="notify_save_default" label="save as default"/>
 						<checkbox id="notify_use_default" label="use default"/>
 					</vbox>