From f8d19762fe212b9db5434529b36000051e1bc383 Mon Sep 17 00:00:00 2001
From: Quitta <none@none>
Date: Sun, 18 Aug 2013 02:49:58 +0200
Subject: [PATCH] fixed some nasty errors + made it show the entire replied
 message

--HG--
branch : quitta-gsoc-2013
---
 .../server/ryzom_ams/ams_lib/autoload/mail_handler.php      | 4 ++--
 .../tools/server/ryzom_ams/ams_lib/autoload/ticket.php      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/mail_handler.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/mail_handler.php
index b65e04c70..cb101bfec 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/mail_handler.php
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/mail_handler.php
@@ -231,7 +231,7 @@ class Mail_Handler{
         if($ticket_id){
             
             //use the line ---------- Ticket # to make a distincton between the old message and the reply
-            $endpos = strpos($txt, ">---------- Ticket #");
+            /*$endpos = strpos($txt, ">---------- Ticket #");
             if($endpos){
                 $txt = substr($txt, 0, $endpos);
             }else{
@@ -239,7 +239,7 @@ class Mail_Handler{
                 if($endpos){
                     $txt = substr($txt, 0, $endpos);
                 }
-            }
+            }*/
             
             //if email is sent from an existing email address in the db (else it will give an error while loading the user object)
             if($from != "FALSE"){
diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket.php
index db03aab97..1d57ae8b2 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket.php
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket.php
@@ -84,7 +84,7 @@ class Ticket{
      * for_support_group defines to which support group the ticket has to  be forwarded
      */
     public static function create_Ticket( $title, $content, $category, $author, $real_author, $for_support_group = 0) {
-        
+
         $ticket = new Ticket();
         $values = array("Title" => $title, "Status"=> 1, "Queue"=> 0, "Ticket_Category" => $category, "Author" => $author, "Priority" => 0);
         $ticket->set($values);
@@ -102,8 +102,8 @@ class Ticket{
         if($for_support_group){
             Ticket::forwardTicket(0, $ticket_id, $for_support_group);
         }
-        
-        Mail_Handler::send_ticketing_mail($ticket, $content, "NEW", $real_author, $ticket->getForwardedGroupId());
+
+        Mail_Handler::send_ticketing_mail($ticket, $content, "NEW", $ticket->getForwardedGroupId());
         return $ticket_id;
         
     }