Ticket #2174: ticket_system.patch

gui/admin/ticket_closed.php

@@ -59 +59 @@
         if (isset($_GET['psi'])) {
                 $start_index = $_GET['psi'];
         }
+
         $count_query = "
                 SELECT
                         COUNT(`ticket_id`) AS cnt
                 FROM
                         `tickets`
                 WHERE
+                        (`ticket_from` = ? OR `ticket_to` = ?)
+                AND
                         `ticket_status` = 0
                 AND
                         `ticket_reply` = 0
         ";
 
-        $rs = exec_query($sql, $count_query);
+        $rs = exec_query($sql, $count_query, array($user_id,$user_id));
         $records_count = $rs->fields['cnt'];
 
         $query = <<<SQL_QUERY
@@ -84 +87 @@
                 FROM
                         `tickets`
                 WHERE
+                        (`ticket_from` = ? OR `ticket_to` = ?)
+                AND
                         `ticket_status` = 0
                 AND
                         `ticket_reply` = 0
@@ -93 +98 @@
                         $start_index, $rows_per_page
 SQL_QUERY;
 
-        $rs = exec_query($sql, $query);
+        $rs = exec_query($sql, $query, array($user_id,$user_id));
 
         if ($rs->recordCount() == 0) {
                 $tpl->assign(

gui/admin/ticket_delete.php

@@ -35 +35 @@
 if (isset($_GET['ticket_id']) && $_GET['ticket_id'] !== '') {
 
         $ticket_id = $_GET['ticket_id'];
+        $user_id = $_SESSION['user_id'];
 
         $query = "
                 SELECT
@@ -43 +44 @@
                         `tickets`
                 WHERE
                         `ticket_id` = ?
+                AND
+                        (`ticket_from` = ? OR `ticket_to` = ?)
                 ORDER BY
                         `ticket_date` ASC
         ";
 
-        $rs = exec_query($sql, $query, $ticket_id);
+        $rs = exec_query($sql, $query, array($ticket_id,$user_id,$user_id));
         $ticket_status = $rs->fields['ticket_status'];
 
         $back_url = ($ticket_status == 0) ? 'ticket_closed.php' : 'ticket_system.php';

gui/admin/ticket_system.php

@@ -66 +66 @@
                 FROM
                         `tickets`
                 WHERE
+                        (`ticket_from` = ? OR `ticket_to` = ?)
+                AND
                         `ticket_status` != 0
                 AND
                         `ticket_reply` = 0
         ";
 
-        $rs = exec_query($sql, $count_query);
+        $rs = exec_query($sql, $count_query, array($user_id,$user_id));
         $records_count = $rs->fields['cnt'];
 
         $query = "
@@ -85 +87 @@
                 FROM
                         `tickets`
                 WHERE
+                        (`ticket_from` = ? OR `ticket_to` = ?)
+                AND
                         `ticket_status` != 0
                 AND
                         `ticket_reply` = 0
@@ -94 +98 @@
                         $start_index, $rows_per_page
         ";
 
-        $rs = exec_query($sql, $query);
+        $rs = exec_query($sql, $query, array($user_id,$user_id));
 
         if ($rs->recordCount() == 0) {
                 $tpl->assign(

gui/admin/ticket_view.php

@@ -46 +46 @@
 
 // page functions.
 function gen_tickets_list(&$tpl, &$sql, &$ticket_id, $screenwidth) {
+        
+        $user_id = $_SESSION['user_id'];
 
         $cfg = ispCP_Registry::get('Config');
 
@@ -62 +64 @@
                         `tickets`
                 WHERE
                         `ticket_id` = ?
+                AND
+                        (`ticket_from` = ? OR `ticket_to` = ?)
         ";
 
-        $rs = exec_query($sql, $query, $ticket_id);
+        $rs = exec_query($sql, $query, array($ticket_id,$user_id,$user_id));
 
         if ($rs->recordCount() == 0) {
                 $tpl->assign('TICKETS_LIST', '');

gui/include/functions.ticket_system.php

@@ -50 +50 @@
                 FROM
                         `tickets`
                 WHERE
-                        `ticket_id` = ?
-                OR
                         `ticket_reply` = ?
                 ORDER BY
                         `ticket_date` DESC
         ";
 
-        $rs = exec_query($sql, $query, array($ticket_id, $ticket_id));
+        $rs = exec_query($sql, $query, array($ticket_id));
+        
+        if($rs->fields['ticket_date'] == NULL) {
+                return tr('Never');
+        }
 
         $date_formt = $cfg->DATE_FORMAT;
         return date($date_formt, $rs->fields['ticket_date']); // last date

gui/reseller/ticket_view.php

@@ -313 +313 @@
         }
 
         send_tickets_msg($ticket_from, $ticket_to, $subject, $user_message, $ticket_reply, $urgency);
+        
+        user_goto('ticket_system.php');
 }
 
-// NXW: Not used !
-/*
-function get_send_to_who(&$sql, &$ticket_reply) {
-
-        $query = "
-                SELECT
-                        `ticket_from`
-                FROM
-                        `tickets`
-                WHERE
-                        `ticket_id` = ?
-        ";
-
-        $rs = exec_query($sql, $query, $ticket_reply);
-        $ticket_from = $rs->fields['ticket_from'];
-
-        $query = "
-                SELECT
-                        `admin_type`
-                FROM
-                        `admin`
-                WHERE
-                        `admin_id` = ?
-        ";
-
-        $rs = exec_query($sql, $query, $ticket_from);
-        //$admin_type = $rs->fields['admin_type'];
-}
-*/
-
 function close_ticket($sql, $ticket_id) {
 
         $query = "