diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php index 81e485f1..96ab9f9f 100644 --- a/admin/admin_reply_ticket.php +++ b/admin/admin_reply_ticket.php @@ -234,7 +234,7 @@ if ($ticket['locked']) { if ($ticket['status'] != $new_status) { // Does this status close the ticket? - $newStatusRs = hesk_dbQuery('SELECT `IsClosed`, `Key` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses` WHERE `ID` = ' . hesk_dbEscape($new_status)); + $newStatusRs = hesk_dbQuery('SELECT `IsClosed`, `Key` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses` WHERE `ID` = ' . intval($new_status)); $newStatus = hesk_dbFetchAssoc($newStatusRs); if ($newStatus['IsClosed'] && hesk_checkPermission('can_resolve', 0)) { diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 58014f08..b7fcfcb2 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -470,12 +470,12 @@ if (($can_reply || $can_edit) && isset($_POST['childTrackingId'])) { } //-- Check if the ticket is already a child. - $childRs = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` WHERE `parent` = ' . $ticket['id'] . ' AND `trackid` = \'' . $_POST['childTrackingId'] . '\''); + $childRs = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` WHERE `parent` = ' . intval($ticket['id']) . ' AND `trackid` = \'' . hesk_dbEscape(hesk_POST(['childTrackingId'])) . '\''); if (hesk_dbNumRows($childRs) > 0) { hesk_process_messages(sprintf($hesklang['is_already_linked'], $_POST['childTrackingId']), 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999), 'NOTICE'); } - hesk_dbQuery('UPDATE `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` SET `parent` = ' . $ticket['id'] . ' WHERE `trackid` = \'' . $_POST['childTrackingId'] . '\''); + hesk_dbQuery('UPDATE `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` SET `parent` = ' . intval($ticket['id']) . ' WHERE `trackid` = \'' . hesk_dbEscape(hesk_POST['childTrackingId']) . '\''); hesk_process_messages(sprintf($hesklang['link_added'], $_POST['childTrackingId']), 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999), 'SUCCESS'); } @@ -746,7 +746,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); if ($ticket['parent'] != null) { //-- Get the tracking ID of the parent $parentRs = hesk_dbQuery('SELECT `trackid` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` - WHERE `ID` = ' . hesk_dbEscape($ticket['parent'])); + WHERE `ID` = ' . intval($ticket['parent'])); $parent = hesk_dbFetchAssoc($parentRs); echo ' '; @@ -755,7 +755,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); //-- Check if any tickets have a parent set to this tracking ID $hasRows = false; $childrenRS = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` - WHERE `parent` = ' . hesk_dbEscape($ticket['id'])); + WHERE `parent` = ' . intval($ticket['id'])); while ($row = hesk_dbFetchAssoc($childrenRS)) { $hasRows = true; echo ' @@ -916,7 +916,24 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ?>
- + + +
@@ -1014,13 +1031,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); { echo ''; } - echo '
'; + echo ''; } else { echo '

'; echo isset($admins[$ticket['owner']]) ? $admins[$ticket['owner']] : ($can_assign_self ? $hesklang['unas'] . ' [' . $hesklang['asss'] . ']' : $hesklang['unas']); echo '

'; } + echo ''; echo '

' . $hesklang['category'] . '

'; if (strlen($categories_options) && ($can_change_cat || $can_change_own_cat)) { echo ' @@ -1280,7 +1298,7 @@ function hesk_getAdminButtons($category_id) } } - $isTicketClosedSql = 'SELECT `IsClosed`, `Closable` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses` WHERE `ID` = ' . $ticket['status']; + $isTicketClosedSql = 'SELECT `IsClosed`, `Closable` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses` WHERE `ID` = ' . intval($ticket['status']); $isTicketClosedRs = hesk_dbQuery($isTicketClosedSql); $isTicketClosedRow = hesk_dbFetchAssoc($isTicketClosedRs); $isTicketClosed = $isTicketClosedRow['IsClosed']; @@ -1297,15 +1315,22 @@ function hesk_getAdminButtons($category_id) } $dropdown = ' -
- -
'; + $dropdown .= '
'; $options .= $dropdown; /* Return generated HTML */ @@ -1609,15 +1644,22 @@ function mfh_print_message() { ?>
- +
+
+ +
+
+ +
+

- +
+
+ +
+
+ +
+
-
-
-
- -

' . $hesklang['device_information'] . '

-
-
- - - - - - - - - - - - - - - - - - - -
' . $hesklang['operating_system'] . ' -  
' . $hesklang['browser'] . ' 
' . $hesklang['screen_resolution'] . ' -  
-
-
-
- '; + return ' + + + + + + + + + + + + + + + + + + + +
' . $hesklang['operating_system'] . ' +  
' . $hesklang['browser'] . ' 
' . $hesklang['screen_resolution'] . ' +  
'; } ?> diff --git a/admin/assign_owner.php b/admin/assign_owner.php index 92d2f7c2..64a6426d 100755 --- a/admin/assign_owner.php +++ b/admin/assign_owner.php @@ -92,8 +92,9 @@ if (!$row['isadmin']) { // Make sure two people don't assign a ticket to a different user at the same time if ($ticket['owner'] && $ticket['owner'] != $owner && hesk_REQUEST('unassigned') && hesk_GET('confirm') != 'Y') { $new_owner = ($owner == $_SESSION['id']) ? $hesklang['scoy'] : sprintf($hesklang['scot'], $row['name']); + $originalOwner = intval($ticket['owner']); - $res = hesk_dbQuery("SELECT `name` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` WHERE `id`='{$ticket['owner']}' LIMIT 1"); + $res = hesk_dbQuery("SELECT `name` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` WHERE `id`='{$originalOwner}' LIMIT 1"); if (hesk_dbNumRows($res) == 1) { $row = hesk_dbFetchAssoc($res); diff --git a/admin/calendar.php b/admin/calendar.php index 96c98361..b2fbef33 100644 --- a/admin/calendar.php +++ b/admin/calendar.php @@ -68,7 +68,7 @@ while ($row = hesk_dbFetchAssoc($rs)) { continue; } - $row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000;' : 'border: solid 1px ' . $row['color'] . '; background: ' . $row['color']; + $row['css_style'] = $row['color'] == null ? 'background: white; color: black; border: solid 1px #000;' : 'border: solid 1px ' . $row['color'] . '; background: ' . $row['color']; $categories[] = $row; } @@ -83,7 +83,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');