Use templates to build buttons. Remove all this document.write crap - that's what...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12230 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index 389ccd8337e99116b8e14640fff01ad515a748df..8b2f6e50a41b0dacbb398c6b445a400472ebead0 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1333,18 +1333,10 @@ function showComposeButtonRow() {
 
     $mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
 
 
     $mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn);
 

-    if ($use_javascript_addr_book) {
-//FIXME: do not construct HTML in core!
-        $addr_book = "         <script type=\"text/javascript\"><!--\n document.write(\"".
-            "            <input type=button value=\\\""._("Addresses").
-            "\\\" onclick=\\\"javascript:open_abook();\\\" />\");".
-            "            // --></script><noscript>\n".
-            '            <input type="submit" name="html_addr_search" value="'.
-            _("Addresses").'" />'.
-            "         </noscript>\n";
+    if ($use_javascript_addr_book && checkForJavascript()) {
+        $addr_book = addButton(_("Addresses"), null, array('onclick' => 'javascript:open_abook();'));

     } else {
     } else {

-        $addr_book = '         <input type="submit" name="html_addr_search" value="'.
-            _("Addresses").'" />' . "\n";
+        $addr_book = addSubmit(_("Addresses"), 'html_addr_search');

     }
 
     $oTemplate->assign('allow_priority', $default_use_priority==1);
     }
 
     $oTemplate->assign('allow_priority', $default_use_priority==1);