From 6c707b9e051733ea56f8bcc66b09d957180e51e4 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 22 May 2009 10:06:25 +0000
Subject: [PATCH] improving active/inactive control for editAccountData, second
 tab

---
 felamimail/inc/class.uipreferences.inc.php | 12 ++++++------
 felamimail/js/jscode/editAccountData.js    | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/felamimail/inc/class.uipreferences.inc.php b/felamimail/inc/class.uipreferences.inc.php
index 4fba29c112..38f84ec65a 100644
--- a/felamimail/inc/class.uipreferences.inc.php
+++ b/felamimail/inc/class.uipreferences.inc.php
@@ -381,12 +381,12 @@
 			$folderList = array_merge( array('' => lang('default').' '.lang("folder settings")),(is_array($tomerge)?$tomerge:array()));
 
 			$this->t->set_var('allowAccounts',($preferences->userDefinedAccounts ? 1 : 0));
-			$this->t->set_var('identity_selectbox', html::select('identity[signature]',$sigvalue,$allSignatures, true, "style='width: 250px;'"));
-			$this->t->set_var('folder_selectbox', html::select('ic[folderstoshowinhome]',$icServer->folderstoshowinhome,$folderList, true, "style='width: 250px;'",6));
-			$this->t->set_var('trash_selectbox', html::select('ic[trashfolder]',$icServer->trashfolder,$trashOptions, true, "style='width: 250px;'"));
-			$this->t->set_var('sent_selectbox', html::select('ic[sentfolder]',$icServer->sentfolder,$sentOptions, true, "style='width: 250px;'"));
-			$this->t->set_var('draft_selectbox', html::select('ic[draftfolder]',$icServer->draftfolder,$draftOptions, true, "style='width: 250px;'"));
-			$this->t->set_var('template_selectbox', html::select('ic[templatefolder]',$icServer->templatefolder,$templateOptions, true, "style='width: 250px;'"));
+			$this->t->set_var('identity_selectbox', html::select('identity[signature]',$sigvalue,$allSignatures, true, " id=\"identity[signature]\" style='width: 250px;'"));
+			$this->t->set_var('folder_selectbox', html::select('ic[folderstoshowinhome]',$icServer->folderstoshowinhome,$folderList, true, "id=\"ic[folderstoshowinhome]\" style='width: 250px;'",6));
+			$this->t->set_var('trash_selectbox', html::select('ic[trashfolder]',$icServer->trashfolder,$trashOptions, true, "id=\"ic[trashfolder]\" style='width: 250px;'"));
+			$this->t->set_var('sent_selectbox', html::select('ic[sentfolder]',$icServer->sentfolder,$sentOptions, true, "id=\"ic[sentfolder]\" style='width: 250px;'"));
+			$this->t->set_var('draft_selectbox', html::select('ic[draftfolder]',$icServer->draftfolder,$draftOptions, true, "id=\"ic[draftfolder]\" style='width: 250px;'"));
+			$this->t->set_var('template_selectbox', html::select('ic[templatefolder]',$icServer->templatefolder,$templateOptions, true, "id=\"ic[templatefolder]\" style='width: 250px;'"));
 			$linkData = array
 			(
 				'menuaction'    => 'felamimail.uipreferences.editAccountData'
diff --git a/felamimail/js/jscode/editAccountData.js b/felamimail/js/jscode/editAccountData.js
index bfa19bf610..5657d4fbc8 100644
--- a/felamimail/js/jscode/editAccountData.js
+++ b/felamimail/js/jscode/editAccountData.js
@@ -24,6 +24,11 @@ function onchange_active(_checkbox)
 			for(i=0; i<outgoingInputs.length; i++) {
 				outgoingInputs[i].disabled = false;
 			}
+			document.getElementById('ic[folderstoshowinhome]').disabled =false;
+			document.getElementById('ic[trashfolder]').disabled =false;
+			document.getElementById('ic[sentfolder]').disabled =false;
+			document.getElementById('ic[draftfolder]').disabled =false;
+			document.getElementById('ic[templatefolder]').disabled =false;
 		} else {
 			for(i=0; i<incomingInputs.length; i++) {
 				incomingInputs[i].disabled = true;
@@ -31,6 +36,11 @@ function onchange_active(_checkbox)
 			for(i=0; i<outgoingInputs.length; i++) {
 				outgoingInputs[i].disabled = true;
 			}
+			document.getElementById('ic[folderstoshowinhome]').disabled =true;
+			document.getElementById('ic[trashfolder]').disabled =true;
+			document.getElementById('ic[sentfolder]').disabled =true;
+			document.getElementById('ic[draftfolder]').disabled =true;
+			document.getElementById('ic[templatefolder]').disabled =true;
 		}
 
 		onchange_og_smtpauth(document.getElementById('og[smtpauth]'));
@@ -43,6 +53,11 @@ function onchange_active(_checkbox)
 		for(i=0; i<outgoingInputs.length; i++) {
 			outgoingInputs[i].disabled = true;
 		}
+		document.getElementById('ic[folderstoshowinhome]').disabled =true;
+		document.getElementById('ic[trashfolder]').disabled =true;
+		document.getElementById('ic[sentfolder]').disabled =true;
+		document.getElementById('ic[draftfolder]').disabled =true;
+		document.getElementById('ic[templatefolder]').disabled =true;
 	}
 }