Make useless hook useful (and rename to eliminate confusion)

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index e774fd82b54e72ae4c661bcc3dd78e521f5ab62b..8b2f6e50a41b0dacbb398c6b445a400472ebead0 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -492,10 +492,15 @@ if ($send) {
 
         $Result = deliverMessage($composeMessage);
 
+        if ($Result)
+            $mail_sent = 'yes';
+        else
+            $mail_sent = 'no';
+
         // NOTE: this hook changed in 1.5.2 from sending $Result and
         //       $composeMessage as args #2 and #3 to being in an array
         //       under arg #2
-        do_hook('compose_send_after', $temp=array(&$Result, &$composeMessage));
+        do_hook('compose_send_after', $temp=array(&$Result, &$composeMessage, &$mail_sent));
         if (! $Result) {
             showInputForm($session);
             exit();
@@ -523,21 +528,21 @@ if ($send) {
 
         if ($compose_new_win == '1') {
             if ( !isset($pageheader_sent) || !$pageheader_sent ) {
-                Header("Location: $location/compose.php?mail_sent=yes");
+                Header("Location: $location/compose.php?mail_sent=$mail_sent");
             } else {
                 echo '   <br><br><div style="text-align: center;"><a href="' . $location
-                    . '/compose.php?mail_sent=yes">'
+                    . '/compose.php?mail_sent=$mail_sent">'
                     . _("Return") . '</a></div>';
             }
             exit();
         } else {
             if ( !isset($pageheader_sent) || !$pageheader_sent ) {
                 Header("Location: $location/right_main.php?mailbox=$urlMailbox".
-                    "&startMessage=$startMessage&mail_sent=yes");
+                    "&startMessage=$startMessage&mail_sent=$mail_sent");
             } else {
                 echo '   <br><br><div style="text-align: center;"><a href="' . $location
                     . "/right_main.php?mailbox=$urlMailbox"
-                    . "&amp;startMessage=$startMessage&amp;mail_sent=yes\">"
+                    . "&amp;startMessage=$startMessage&amp;mail_sent=$mail_sent\">"
                     . _("Return") . '</a></div>';
             }
             exit();
@@ -1328,18 +1333,10 @@ function showComposeButtonRow() {
 
     $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 {
-        $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);