X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=5dc425d63be4903da135422e1ddcaf82efa1cfed;hb=71257f8b1bbf95b87735f654487efbad21b138a0;hp=8c5fc0ac4459316adac529b5353cd5dc8bee979f;hpb=4d1d3c86a0c7a23b6589923058da3b2010a5f7fb;p=squirrelmail.git
diff --git a/src/compose.php b/src/compose.php
index 8c5fc0ac..5dc425d6 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -1,19 +1,20 @@
\n";
- echo "
\n";
- echo " "._("Attach:");
+ echo " | \n";
+ echo _("Attach:");
echo " | \n";
echo " \n";
echo " | \n | \n";
if ($use_javascript_addr_book) {
@@ -391,7 +394,17 @@
echo "\n \n";
if ($save_as_draft) {
- echo "\n";
+ echo '\n";
+ }
+ if ($default_use_priority) {
+ if(!isset($mailprio)) {
+ $mailprio = "3";
+ }
+ echo "\n\t". _("Priority") .":";
}
do_hook("compose_button_row");
@@ -419,7 +432,7 @@
// True if FAILURE
function saveAttachedFiles() {
global $HTTP_POST_FILES, $attachment_dir, $attachments;
-
+
$localfilename = GenerateRandomString(32, '', 7);
while (file_exists($attachment_dir . $localfilename))
$localfilename = GenerateRandomString(32, '', 7);
@@ -441,7 +454,7 @@
$attachments[] = $newAttachment;
}
- if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
+ if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None'))
$mailbox = "INBOX";
if (isset($draft)) {
@@ -500,7 +513,13 @@
do_hook("compose_send");
- if (! sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id)) {
+ if (! isset($mailprio))
+ $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc,
+ $subject, $body, $reply_id);
+ else
+ $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc,
+ $subject, $body, $reply_id, $mailprio);
+ if (! $Result) {
showInputForm();
exit();
}
|