Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Author: ywarnier

main/inc/lib/TicketManager.php

@@ -774,6 +774,42 @@ public static function saveMessageAttachmentFile(
         }
     }
 
+    public static function deleteTicket($ticketId)
+    {
+        $ticketId = (int) $ticketId;
+        if ($ticketId <= 0) {
+            return false;
+        }
+        $table_support_tickets = Database::get_main_table(TABLE_TICKET_TICKET);
+        $table_ticket_message = Database::get_main_table('ticket_message');
+        $table_ticket_assigned_log = Database::get_main_table('ticket_assigned_log');
+        $table_ticket_message_attachments = Database::get_main_table('ticket_message_attachments');
+
+        $sql_get_message_ids = "SELECT id FROM $table_ticket_message WHERE ticket_id = $ticketId";
+        $sql_delete_attachments = "DELETE FROM $table_ticket_message_attachments WHERE message_id IN ($sql_get_message_ids)";
+        Database::query($sql_delete_attachments);
+        
+        $sql_assigned_log = "DELETE FROM $table_ticket_assigned_log WHERE ticket_id = $ticketId";
+        Database::query($sql_assigned_log);
+
+        $sql_messages = "DELETE FROM $table_ticket_message WHERE ticket_id = $ticketId";
+        Database::query($sql_messages);
+
+        $sql_get_category = "SELECT category_id FROM $table_support_tickets WHERE id = $ticketId";
+        $res = Database::query($sql_get_category);
+        if ($row = Database::fetch_array($res)) {
+            $category_id = (int)$row['category_id'];
+            $table_ticket_category = Database::get_main_table('ticket_category');
+            $sql_update_category = "UPDATE $table_ticket_category SET total_tickets = total_tickets - 1 WHERE id = $category_id AND total_tickets > 0";
+            Database::query($sql_update_category);
+        }
+
+        $sql_ticket = "DELETE FROM $table_support_tickets WHERE id = $ticketId";
+        Database::query($sql_ticket);
+
+        return true;
+    }
+
     /**
      * Get tickets by userId.
      *
@@ -1008,6 +1044,14 @@ public static function getTicketsByCurrentUser(
 					<div class="blackboard_hide" id="div_'.$row['ticket_id'].'">&nbsp;&nbsp;</div>
 					</a>&nbsp;&nbsp;';
             }
+            if ($isAdmin) {
+                $project_id = isset($row['project_id']) ? $row['project_id'] : (isset($_GET['project_id']) ? $_GET['project_id'] : 0);
+                $delete_link = '<a href="tickets.php?action=delete&ticket_id='.$row['ticket_id'].'&project_id='.$project_id.'" onclick="return confirm(\''.htmlentities(get_lang('AreYouSureYouWantToDeleteThisTicket')).'\')">'
+                . Display::return_icon('delete.png', get_lang('Delete')) .
+                '</a>';
+                $ticket[] = $delete_link;
+            }
+
             $tickets[] = $ticket;
         }
 

main/lang/english/trad4all.inc.php

@@ -9100,4 +9100,6 @@
 $BackToDateOrder = "Return to the chronological order";
 $SeeAlphabeticalOrder = "View in alphabetical order";
 $HideComment = "Hide comments";
+$AreYouSureYouWantToDeleteThisTicket = "Are you sure you want to delete this ticket ?";
+$TicketDeleted = "Ticket deleted";
 ?>

main/lang/french/trad4all.inc.php

@@ -9035,4 +9035,6 @@
 $BackToDateOrder = "Retour à l'ordre chronologique";
 $SeeAlphabeticalOrder = "Voir par ordre alphabétique";
 $HideComment = "Cacher les commentaires";
+$AreYouSureYouWantToDeleteThisTicket = "Êtes vous sûr de vouloir supprimer ce ticket ?";
+$TicketDeleted = "Ticket supprimé";
 ?>

main/lang/spanish/trad4all.inc.php

@@ -9125,4 +9125,6 @@
 $BackToDateOrder = "Retorno al orden cronológico";
 $SeeAlphabeticalOrder = "Ver en orden alfabético";
 $HideComment = "Ocultar comentarios";
+$AreYouSureYouWantToDeleteThisTicket = "¿Estás seguro de que quieres eliminar este ticket?";
+$TicketDeleted = "Ticket eliminado";
 ?>

main/ticket/tickets.php

@@ -72,6 +72,20 @@ function display_advanced_search_form () {
 }
 
 switch ($action) {
+    case 'delete':
+        if (isset($_GET['ticket_id'])) {
+            TicketManager::deleteTicket((int)$_GET['ticket_id']);
+            Display::addFlash(Display::return_message(
+                sprintf(
+                    get_lang('TicketDeleted'),
+                ),
+                null,
+                false
+            ));
+            header('Location: '.api_get_self().'?project_id='.$projectId);
+            exit;
+        }
+        break;
     case 'alert':
         if (!$isAdmin && isset($_GET['ticket_id'])) {
             TicketManager::send_alert($_GET['ticket_id'], $user_id);
@@ -409,6 +423,7 @@ function display_advanced_search_form () {
     $table->set_header(5, get_lang('CreatedBy'), true);
     $table->set_header(6, get_lang('AssignedTo'), true);
     $table->set_header(7, get_lang('Message'), true);
+    $table->set_header(8, get_lang('Delete'), true);
 } else {
     if ($isAllow == false) {
         echo Display::page_subheader(get_lang('MyTickets'));