From ae77dbf0ea9c8e4ea0da870ad8b1fa92dfbd6470 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 23 Feb 2017 10:55:39 +0100
Subject: [PATCH] Add toolbar see BT#11081

---
 main/inc/lib/TicketManager.php |  4 ++++
 main/ticket/new_ticket.php     |  5 ++---
 main/ticket/ticket_details.php | 15 ++++++++++++---
 main/ticket/tickets.php        |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/main/inc/lib/TicketManager.php b/main/inc/lib/TicketManager.php
index f997dfd514..20a5d4ab99 100644
--- a/main/inc/lib/TicketManager.php
+++ b/main/inc/lib/TicketManager.php
@@ -289,6 +289,10 @@ class TicketManager
             TABLE_TICKET_CATEGORY
         );
 
+        if (empty($category_id)) {
+            return false;
+        }
+
         $now = api_get_utc_datetime();
         $course_id = intval($course_id);
         $category_id = intval($category_id);
diff --git a/main/ticket/new_ticket.php b/main/ticket/new_ticket.php
index 0567aa2568..860974c09a 100644
--- a/main/ticket/new_ticket.php
+++ b/main/ticket/new_ticket.php
@@ -288,8 +288,7 @@ function show_form_send_ticket()
         )
     );
 
-    $form->addElement(
-        'select',
+    $form->addSelect(
         'category_id',
         get_lang('Category'),
         $categoryList,
@@ -450,13 +449,13 @@ function show_form_send_ticket()
  */
 function save_ticket()
 {
-    $category_id = $_POST['category_id'];
     $content = $_POST['content'];
     if ($_POST['phone'] != '') {
         $content .= '<p style="color:red">&nbsp;' . get_lang('Phone') . ': ' . Security::remove_XSS($_POST['phone']). '</p>';
     }
     $course_id = isset($_POST['course_id']) ? $_POST['course_id'] : '';
     $sessionId = isset($_POST['session_id']) ? $_POST['session_id'] : '';
+    $category_id = isset($_POST['category_id']) ? $_POST['category_id'] : '';
 
     $project_id = $_POST['project_id'];
     $subject = $_POST['subject'];
diff --git a/main/ticket/ticket_details.php b/main/ticket/ticket_details.php
index ee7c97909b..8ce5950d61 100644
--- a/main/ticket/ticket_details.php
+++ b/main/ticket/ticket_details.php
@@ -238,6 +238,15 @@ if (!isset($_POST['compose'])) {
     }
 
     Display::display_header();
+    $projectId = $ticket['ticket']['project_id'];
+    echo '<div class="actions" >';
+    echo Display::url(
+        Display::return_icon('back.png', get_lang('Categories'), [], ICON_SIZE_MEDIUM),
+        api_get_path(WEB_CODE_PATH) . 'ticket/tickets.php?project_id='.$projectId
+    );
+    echo '</span>';
+    echo '</div>';
+
     $form_close_ticket = '';
         if ($ticket['ticket']['status_id'] != TicketManager::STATUS_FORWARDED &&
             $ticket['ticket']['status_id'] != TicketManager::STATUS_CLOSE &&
@@ -264,7 +273,6 @@ if (!isset($_POST['compose'])) {
         }
     }
     $bold = '';
-
     if ($ticket['ticket']['status_id'] == TicketManager::STATUS_CLOSE) {
         $bold = 'style = "font-weight: bold;"';
         echo "<style>
@@ -483,7 +491,8 @@ function show_form_send_message($ticket)
         );
 
         $admins = UserManager::get_user_list_like(
-            array('status' => COURSEMANAGER), array('username'),
+            array('status' => COURSEMANAGER),
+            array('username'),
             true
         );
 
@@ -541,7 +550,7 @@ function show_form_send_message($ticket)
         $form->addElement(
             'checkbox',
             'confirmation',
-             null,
+            null,
             get_lang('RequestConfirmation')
         );
     }
diff --git a/main/ticket/tickets.php b/main/ticket/tickets.php
index f374bce680..2a93d6292a 100644
--- a/main/ticket/tickets.php
+++ b/main/ticket/tickets.php
@@ -231,7 +231,7 @@ if ($isAdmin) {
                     Display::return_icon('export_excel.png', get_lang('Export'), '', ICON_SIZE_MEDIUM) . '</a>';
 
         echo Display::url(
-            Display::return_icon('settings.png', get_lang('Categories')),
+            Display::return_icon('settings.png', get_lang('Categories'), [], ICON_SIZE_MEDIUM),
             api_get_path(WEB_CODE_PATH) . 'ticket/settings.php'
         );
         echo '</span>';