Changeset 1002

Timestamp:

06/17/09 14:56:02 (15 years ago)

Author:

amuller

Message:

Ticket #485 - Correção de assinatura com texto rico

Location:

trunk

Files:

• expressoMail1_2/inc/hook_settings.inc.php (modified) (2 diffs)
• preferences/preferences.php (modified) (1 diff)

trunk/expressoMail1_2/inc/hook_settings.inc.php

@@ -82 +82 @@
         $vars = $GLOBALS['phpgw']->preferences->user[$appname];
 
-        create_html_code("<div id='text_signature'>
-                <textarea rows='5' cols='50' id='user[signature]' name='user[signature]'></textarea></div>
+        create_html_code("signature","<div id='text_signature'>
+                <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'>
@@ -93 +93 @@
                 document.getElementById(\"text_signature\").style.display = '';
                 document.getElementById(\"html_signature\").style.display = 'none';
+        }
+        else if(value == 'html'){       
+                html_signature.SetHTML(document.getElementById('user[signature]').value);
+                document.getElementById(\"text_signature\").style.display = 'none';
+                document.getElementById(\"html_signature\").style.display  = '';
+        }
 }
-else if(value == 'html'){
-        html_signature.SetHTML(document.getElementById('user[signature]').value);
-        document.getElementById(\"text_signature\").style.display = 'none';
-        document.getElementById(\"html_signature\").style.display  = '';                                                             }
-}
-setTimeout('changeType(document.getElementsByName(\'user[type_signature]\')[0].value)',1500);
+setTimeout('changeType(document.getElementsByName(\'user[type_signature]\')[0].value==\'html\'?\'html\':\'\')',2500);
+document.getElementById('user[signature]').value=document.getElementById('user[signature]').innerHTML;
 </script>");
 }

trunk/preferences/preferences.php

@@ -193 +193 @@
                         $t->fp('rows',process_help($help) ? 'help_row' : 'row',True);
         }
-        function create_html_code($code)
-        {
-                global $t;
-                $t->set_var('row_value',$code);
+        function create_html_code($name,$code,$appendcode)
+        {
+                global $t,$prefs;
+                $t->set_var('row_value',$code.$prefs[$name].$appendcode);
                 $t->set_var('row_name',lang("signature"));
                 $GLOBALS['phpgw']->nextmatchs->template_alternate_row_color($t);