kartero.org

commit ce0702bdba2d56702b3f441759fd2127d5c78ed1
tree ae049a7309bb168791763f9e2ba7b1a61b5e21ca
parent 8c3b31811412bf444b622dfe93eb3ccc9ba54834
author Engels Antonio <engels@majcms.org> 1297789847 +0800
committer Engels Antonio <engels@majcms.org> 1297789847 +0800

    Disable > in forward, retain > in reply

diff --git a/send.php b/send.php
index becdcca..e41af5d 100644
--- a/send.php
+++ b/send.php
@@ -109,21 +109,8 @@ if (isset($_POST['msg']) and !empty($_POST['msg']) and is_numeric($_POST['msg'])
        if ($_POST['rep'] == 2) {
 
                echo "---------------------------------------- Begin Forwarded Message ----------------------------------------\r\n";  
-       }
-       else {
-               $reply_personal = $header->fromaddress;
-               echo "On $header_date, $reply_personal wrote:\r\n";
-       }
-
-       foreach ($reply_quote_lines as $reply_quote_line) {
-              
-               $reply_quote_line = "> $reply_quote_line";
-               $reply_quote_line = preg_replace("/(^> >)/",">>",$reply_quote_line);
-
-               echo $reply_quote_line;
-       }
 
-       if ($_POST['rep'] == 2) {
+               echo $reply_quote;
 
                $filePath = "attachments/" . sha1($_SERVER['SERVER_NAME']) ."/" . sha1($header->subject);
 
@@ -142,6 +129,18 @@ if (isset($_POST['msg']) and !empty($_POST['msg']) and is_numeric($_POST['msg'])
 
                }
        }
+       else {
+               $reply_personal = $header->fromaddress;
+               echo "On $header_date, $reply_personal wrote:\r\n";
+
+               foreach ($reply_quote_lines as $reply_quote_line) {
+                      
+                       $reply_quote_line = "> $reply_quote_line";
+                       $reply_quote_line = preg_replace("/(^> >)/",">>",$reply_quote_line);
+
+                       echo $reply_quote_line;
+               }
+       }
 
        echo "</textarea></td></tr>";