Ticket #654: ticket.654.patch

expressoMail1_2/inc/hook_settings.inc.php

@@ -201 +201 @@
                 <textarea rows='5' cols='50' id='user_signature' name='user[signature]'>","</textarea></div>
                 <div style='display:none;' id='html_signature'>".$oFCKeditor->Create()."</div>
                 <script language='javascript'>
-document.getElementById('user_signature').value  = '".$vars['signature']."';
 function changeType(value){
         var html_signature = FCKeditorAPI.GetInstance(\"html_signature\");
         if(value == 'text'){
@@ -365 +364 @@
     return tmp_str;
 }
 
+function getTypeSignature() {
+   var elementoSelects  = document.getElementsByTagName('select');
+
+   if ( elementoSelects[18].name == \"user[type_signature]\" ) {
+        return elementoSelects[18];
+   }
+   
+   for(i=0;i<elementoSelects.length;i++){
+        if( elementoSelects[i].name == \"user[type_signature]\" ){
+                 return elementoSelects[i];
+        }
+    }
+    return null;
+}
+
 function config_form(pObj,pHandler)
 {
-        pObj.onclick=function () { if (document.getElementsByName(\"user[type_signature]\")[0].value == \"html\") return pHandler(\"text\") };
+        pObj.onclick=function () {
+                if (getTypeSignature().value == \"html\" || (getTypeSignature().value == \"\" && 'html' == '".$GLOBALS['phpgw']->preferences->default['expressoMail']['type_signature']."')) {
+                        return pHandler(\"text\");
+                }
+        };
+
 }
 document.getElementById('user_signature').value=html_entity_decode(document.getElementById('user_signature').innerHTML);
 
-setTimeout('config_form(document.getElementsByName(\'submit\')[0],changeType);changeType(document.getElementsByName(\'user[type_signature]\')[0].value==\'html\'?\'html\':\'\')',2000);
+setTimeout('config_form(document.getElementsByName(\'submit\')[0],changeType);changeType(getTypeSignature().value)',2000);
 </script>");
 }
 ?>