From 8e7bbb2e62f4c9d48d2a0c43b31e9ef35d907552 Mon Sep 17 00:00:00 2001
From: Quitta <none@none>
Date: Sat, 3 Aug 2013 04:00:41 +0200
Subject: [PATCH] fixed assigning/unassigning and sending empty messages

--HG--
branch : quitta-gsoc-2013
---
 .../tools/server/ryzom_ams/ams_lib/autoload/ticket.php    | 4 +++-
 .../ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl    | 8 ++++----
 .../server/ryzom_ams/www/html/func/reply_on_ticket.php    | 3 ++-
 .../server/ryzom_ams/www/html/templates/show_ticket.tpl   | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

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 0db211738..c9703d232 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
@@ -147,7 +147,9 @@ class Ticket{
     }
     
     public static function createReply($content, $author, $ticket_id, $hidden){
-        if($content != ""){
+        //if not empty
+        if(! ( Trim ( $content ) === '' )){
+            $content = filter_var($content, FILTER_SANITIZE_STRING);
             $ticket = new Ticket();
             $ticket->load_With_TId($ticket_id);
             //if status is not closed
diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl
index 253131d90..841b47bb1 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl
@@ -79,7 +79,7 @@
 								    </td>                  
 								</tr>
 								<tr>
-								    <td><font color="#00CED1">Assigned To:  </font>{if $ticket_assignedTo neq ""} <a href="index.php?page=show_user&id={$ticket_assignedTo}">{$ticket_assignedToText} {else} {$not_assigned} {/if}</td>
+								    <td><font color="#00CED1">Assigned To:  </font>{if $ticket_assignedTo neq ""} <a href="index.php?page=show_user&id={$ticket_assignedTo}">{$ticket_assignedToText}</a>{else} {$not_assigned} {/if}</td>
 								    <td></td>
 								    <td></td> 
 							      </tr>
@@ -178,13 +178,13 @@
 									 <p>
 									    Ticket Assigning: 
 									    {if $ticket_assignedTo eq 0}
-									       <form id="assign_ticket" method="post" action="">
+									       <form id="assign_ticket" method="post" action="index.php?page=show_ticket&id={$ticket_tId}">
 										   <input type="hidden" name="ticket_id" value="{$ticket_tId}">
 										   <input type="hidden" name="action" value="assignTicket">
 										   <input type="submit" value="Assign Ticket"/>
 									       </form>
 									   {else if $ticket_assignedTo eq $user_id}
-									       <form id="assign_ticket" method="post" action="">
+									       <form id="assign_ticket" method="post" action="index.php?page=show_ticket&id={$ticket_tId}">
 										   <input type="hidden" name="ticket_id" value="{$ticket_tId}">
 										   <input type="hidden" name="action" value="unAssignTicket">
 										   <input type="submit"value="Remove Assign"/>
@@ -218,7 +218,7 @@
 								    <td>
 									<p>
 									    Forward to Group:		    
-									    <form id="forward" method="post" action="" >
+									    <form id="forward" method="post" action="index.php?page=show_ticket&id={$ticket_tId}" >
 										<select name="group">
 											    <option></option>
 										    {foreach from=$sGroups key=k item=v}
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/func/reply_on_ticket.php b/code/ryzom/tools/server/ryzom_ams/www/html/func/reply_on_ticket.php
index f79ffabf9..6ba5d665b 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/func/reply_on_ticket.php
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/func/reply_on_ticket.php
@@ -13,7 +13,8 @@ function reply_on_ticket(){
             
             try{
                 $author = $_SESSION['ticket_user']->getTUserId();
-                $content = filter_var($_POST['Content'], FILTER_SANITIZE_STRING);
+               
+                $content = $_POST['Content'];
                 $hidden = 0;
                 if(isset($_POST['hidden']) &&  Ticket_User::isMod($_SESSION['ticket_user'])){
                     $hidden = 1;
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket.tpl
index b09f6fd4d..1867ec86a 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket.tpl
@@ -34,7 +34,7 @@
 			    </td>                  
 			</tr>
 			<tr>
-			    <td><strong>Assigned To: </strong>{if $ticket_assignedTo neq ""} <a href="index.php?page=show_user&id={$ticket_assignedTo}">{$ticket_assignedToText} {else}<i> {$not_assigned}</i> {/if}</td>
+			    <td><strong>Assigned To: </strong>{if $ticket_assignedTo neq ""} <a href="index.php?page=show_user&id={$ticket_assignedTo}">{$ticket_assignedToText}</a> {else}<i> {$not_assigned}</i> {/if}</td>
 			    <td></td>
 			    <td></td> 
 		      </tr>