[ #414604 ] Help files for Czech language in iso-x-2

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index af429d431346cbd6100ea63c072717ccfa739f7f..5c8c2cf3b6c321d2a3c1ed4fca4d6f9db86e93f3 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -15,13 +15,13 @@
     ** $Id$
     **/
 
-   include('../src/validate.php');
-   include("../functions/imap.php");
-   include("../functions/date.php");
-   include("../functions/mime.php");
-   include("../functions/smtp.php");
-   include("../functions/display_messages.php");
-   include ("../functions/plugin.php");
+   require_once('../src/validate.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/date.php');
+   require_once('../functions/mime.php');
+   require_once('../functions/smtp.php');
+   require_once('../functions/display_messages.php');
+   require_once('../functions/plugin.php');
 
    if (!isset($attachments))
    {
@@ -102,11 +102,11 @@
              $bodyTop .= "\n";
              $body = $bodyTop . $body;
          } else if ($reply_id) {
-             $orig_from = $orig_header->from;
+             $orig_from = decodeHeader($orig_header->from);
              $orig_from = trim(substr($orig_from,0,strpos($orig_from,'<')));
              $orig_from = str_replace('"','',$orig_from);
              $orig_from = str_replace("'",'',$orig_from);
-             $body = "<quote who=\"$orig_from\">\n\n$body";
+            $body = getReplyCitation($orig_from) . $body;
          }
          
          return;
@@ -368,11 +368,6 @@
          echo "      <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
       }   
       echo "\n    <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
-      echo "\n    ". _("Priority") .":<select name=\"mailprio\">".
-           "\n                        <option value=1>". _("High") ."</option>".
-           "\n                        <option value=3 selected>". _("Normal") ."</option>".
-           "\n                        <option value=5>". _("Low") ."</option>".
-           "\n                      </select>";
       
       do_hook("compose_button_row");
 
@@ -449,7 +444,8 @@
         $body = explode("\n", $body);
         $newBody = '';
         foreach ($body as $line) {
-           $line = rtrim($line);
+           if( $line <> '-- ' )
+              $line = rtrim($line);
            if (strlen($line) <= $editor_size + 1)
               $newBody .= $line . "\n";
            else {
@@ -461,7 +457,7 @@
         
          do_hook("compose_send");
 
-         if (! sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id, $mailprio)) {
+         if (! sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id)) {
            showInputForm(); 
            exit();
         }
@@ -512,7 +508,7 @@
       }
       // I am using an include so as to elminiate an extra unnecessary click.  If you
       // can think of a better way, please implement it.
-      include ("./addrbook_search_html.php");
+      include_once('./addrbook_search_html.php');
    } else if (isset($attach)) {
       if (saveAttachedFiles())
             plain_error_message(_("Could not move/copy file. File not attached"), $color);
@@ -550,9 +546,6 @@
       sqimap_logout($imapConnection);
    }
    
-   
-   
-   
    function ClearAttachments() {
        global $attachments, $attachment_dir;
        
@@ -564,5 +557,33 @@
        
        $attachments = array();
    }
-   
+
+   function getReplyCitation($orig_from) {
+      global $reply_citation_style, $reply_citation_start, $reply_citation_end;
+
+      /* First, return an empty string when no citation style selected. */
+      if (($reply_citation_style == '') || ($reply_citation_style == 'none')) {
+         return ('');
+      }
+
+      /* Otherwise, try to select the desired citation style. */
+      switch ($reply_citation_style) {
+         case 'author_said':
+            $start = '';
+            $end   = ' ' . _("said") . ':';
+            break;
+         case 'quote_who':
+            $start = '<' . _("quote") . ' ' . _("who") . '="';
+            $end   = '">';
+            break;
+         case 'user-defined':
+            $start = $reply_citation_start;
+            $end   = $reply_citation_end;
+            break;
+         default: return ('');
+      }
+
+      /* Build and return the citation string. */
+      return ($start . $orig_from . $end . "\n");
+   }   
 ?>