fixed several warnings about Undefined vars

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

diff --git a/functions/page_header.php b/functions/page_header.php
index cbda75358c0e7de738d1d350579c858881e178d9..5ce415148927dc0f8630d1dc0dc4f353a24438b1 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -204,21 +204,6 @@ function compose_Header($color, $mailbox) {
                     "document.forms[i-1].elements[pos].focus();\n".
                 "}\n".
             "}\n";
-            if ($compose_new_win == '1') {
-                $width= getPref($username, $datadir, 'editor_size', 76);
-                if ($width < 65) {
-                    $pix_width = 560;
-                }
-                else {
-                    $width = (.9*$width);
-                    $pix_width = intval($width).'0';
-                }
-                echo "function comp_in_new() {\n".
-                     "    var newwin = window.open(\"".$base_uri."src/compose.php\"".
-                     ", \"compose_window\", \"width=".$pix_width.",height=650".
-                     ",scrollbars=yes,resizable=yes\");\n".
-                     "}\n";
-            }
         echo "// -->\n".
                 "</script>\n";
         $onload = "onLoad=\"checkForm();\"";

diff --git a/src/compose.php b/src/compose.php
index 78d16906bd936b01d2e6c0db7b00eb477d46f116..e0b50bbd3e4bcc60129a0ec16693c9734722dc15 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -36,6 +36,12 @@ if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) {
 
 if (isset($draft)) {
     include_once ('../src/draft_actions.php');
+    if (! isset($reply_id)) {
+         $reply_id = 0;
+    }
+       if (! isset($MDN)) {
+            $MDN = 'False';
+    }
     if (!saveMessageAsDraft($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id, $MDN)) {
         showInputForm();
         exit();
@@ -494,7 +500,7 @@ function showInputForm () {
     }
     echo '<TABLE WIDTH="100%" ALIGN=center CELLSPACING=0 BORDER=0>' . "\n";
     if ($compose_new_win == '1') {
-        echo '   <TR><TD></TD><TD ALIGN="RIGHT"><INPUT TYPE="BUTTON" NAME="Close" onClick="return self.close()" VALUE="Close"></TD></TR>'."\n";
+        echo '   <TR><TD></TD><TD ALIGN="RIGHT"><INPUT TYPE="BUTTON" NAME="Close" onClick="return self.close()" VALUE='._("Close").'></TD></TR>'."\n";
     }
     if ($location_of_buttons == 'top') {
         showComposeButtonRow();