');
- $form->addElement('html', '
');
- $form->addElement('html', '' . get_lang('AddOneMoreFile') . '');
- $form->addElement('html', '');
- $form->addElement('html', '(' . sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize'))) . ')');
+ $form->addLabel('',
+ '
+ ' . get_lang('AddOneMoreFile') . '
+
+ ('.sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize'))).')
+ ');
$form->addElement('html', '
');
$form->addElement(
@@ -415,7 +411,7 @@ function show_form_send_ticket()
null,
null,
null,
- 'save',
+ 'btn btn-primary',
array(
'id' => 'btnsubmit'
)
diff --git a/plugin/ticket/src/ticket.class.php b/plugin/ticket/src/ticket.class.php
index 69e79fe2d6..4e61b6ad69 100755
--- a/plugin/ticket/src/ticket.class.php
+++ b/plugin/ticket/src/ticket.class.php
@@ -152,6 +152,8 @@ class TicketManager
/**
* @param int $userId
* @param int $categoryId
+ *
+ * @return bool
*/
public static function userIsAssignedToCategory($userId, $categoryId)
{
@@ -166,6 +168,8 @@ class TicketManager
/**
* @param int $categoryId
+ *
+ * @return array
*/
public static function getUsersInCategory($categoryId)
{
@@ -272,7 +276,8 @@ class TicketManager
if ($request_user == '' && $source == 'VRT') {
$request_user = $user_id;
}
- $sql_insert_ticket = "INSERT INTO $table_support_tickets
+ // insert_ticket
+ $sql = "INSERT INTO $table_support_tickets
(
project_id,
category_id,
@@ -302,7 +307,7 @@ class TicketManager
'$now',
'$source'
)";
- Database::query($sql_insert_ticket);
+ Database::query($sql);
$ticket_id = Database::insert_id();
if ($assigned_user != 0) {
@@ -313,41 +318,54 @@ class TicketManager
$ticket_code = "A" . str_pad(
(int) $ticket_id, 11, "0", STR_PAD_LEFT
);
- $sql_update_code = "UPDATE $table_support_tickets
- SET ticket_code = '$ticket_code'
- WHERE ticket_id = '$ticket_id'";
- Database::query($sql_update_code);
+ // Update code
+ $sql = "UPDATE $table_support_tickets
+ SET ticket_code = '$ticket_code'
+ WHERE ticket_id = '$ticket_id'";
+ Database::query($sql);
$data_files = array();
- $sql_update_total = "UPDATE $table_support_category
- SET total_tickets = total_tickets +1
- WHERE category_id = '$category_id';";
- Database::query($sql_update_total);
+ // Update total
+ $sql = "UPDATE $table_support_category
+ SET total_tickets = total_tickets +1
+ WHERE category_id = '$category_id';";
+ Database::query($sql);
if (self::insert_message($ticket_id, $subject, $content, $file_attachments, $request_user)) {
+
+ $user = api_get_user_info($request_user);
+ $helpDeskMessage =
+ '
+
+ | ' . get_lang('User') . ' |
+ ' . $user['firstname']. ' ' . $user['lastname'] . ' |
+
+
+ | ' . get_lang('Username') . ' |
+ ' . $user['username'] . ' |
+
+
+ | ' . get_lang('Email') . ' |
+ ' . $user['email'] . ' |
+
+
+ | ' . get_lang('Phone') . ' |
+ ' . $user['phone'] . ' |
+
+
+ | ' . get_lang('Date') . ' |
+ ' . api_convert_and_format_date($now, DATE_TIME_FORMAT_LONG) . ' |
+
+
+ | ' . get_lang('Topic') . ' |
+ ' . $subject . ' |
+
+
+ | ' . get_lang('Description') . ' |
+ ' . $content . ' |
+
+
';
+
global $data_files;
if ($other_area) {
- $user = api_get_user_info($request_user);
- $helpDeskMessage = '
-
- | ' . get_lang('User') . ' |
- ' . $user['firstname']. ' ' . $user['lastname'] . ' |
-
-
- | ' . get_lang('Username') . ' |
- ' . $user['username'] . ' |
-
-
- | ' . get_lang('Date') . ' |
- ' . api_convert_and_format_date($now, DATE_TIME_FORMAT_LONG) . ' |
-
-
- | ' . get_lang('Topic') . ' |
- ' . $subject . ' |
-
-
- | ' . get_lang('Description') . ' |
- ' . $content . ' |
-
-
';
// Send email to "other area" email
api_mail_html(
@@ -380,6 +398,44 @@ class TicketManager
);
}
+ if (!empty($category_id)) {
+ $categoryInfo = TicketManager::getCategory($category_id);
+ if ($plugin->get('warn_admin_no_user_in_category')) {
+
+ $usersInCategory = TicketManager::getUsersInCategory($category_id);
+
+ if (empty($usersInCategory)) {
+
+ $subject = sprintf(
+ $plugin->get_lang('WarningCategoryXDoesntHaveUsers'),
+ $categoryInfo['name']
+ );
+
+ $message = '
'.$plugin->get_lang('TicketInformation').'
'.$helpDeskMessage;
+
+ if ($plugin->get('send_warning_to_all_admins')) {
+ $admins = UserManager::get_all_administrators();
+ foreach ($admins as $userId => $data) {
+ if ($data['active']) {
+ MessageManager::send_message_simple(
+ $userId,
+ $subject,
+ $message
+ );
+ }
+ }
+ } else {
+ MessageManager::send_message_simple(
+ api_get_user_id(),
+ $subject,
+ $message
+ );
+ }
+ }
+ }
+ }
+
+
return true;
} else {
diff --git a/plugin/ticket/src/ticket_plugin.class.php b/plugin/ticket/src/ticket_plugin.class.php
index ae4b06e0e8..e50b3ed3d7 100755
--- a/plugin/ticket/src/ticket_plugin.class.php
+++ b/plugin/ticket/src/ticket_plugin.class.php
@@ -28,11 +28,13 @@ class TicketPlugin extends Plugin
$settings = array(
'tool_enable' => 'boolean',
'allow_student_add' => 'boolean',
- 'allow_category_edition' => 'boolean'
+ 'allow_category_edition' => 'boolean',
+ 'warn_admin_no_user_in_category' => 'boolean',
+ 'send_warning_to_all_admins' => 'boolean'
);
parent::__construct(
- '1.0',
+ '2.0',
'Kenny Rodas Chavez, Genesis Lopez, Francis Gonzales, Yannick Warnier, Julio Montoya',
$settings
);