Update array instantiation syntax to support PHP 5.3.X

merge-requests/22/head
Cody Mize 8 years ago committed by kingcody
parent e5e6f35e97
commit cd53a5812e

@ -141,7 +141,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
User Security User Security
</div> </div>
<?php <?php
$users = []; $users = array();
$userRs = hesk_dbQuery("SELECT `id`, `user`, `name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1'"); $userRs = hesk_dbQuery("SELECT `id`, `user`, `name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1'");
while ($row = hesk_dbFetchAssoc($userRs)) { while ($row = hesk_dbFetchAssoc($userRs)) {
$row['number_of_tokens'] = 0; $row['number_of_tokens'] = 0;

@ -59,7 +59,7 @@ if ($modsForHesk_settings['enable_calendar'] == '0') {
// Get categories for the dropdown // Get categories for the dropdown
$order_by = $modsForHesk_settings['category_order_column']; $order_by = $modsForHesk_settings['category_order_column'];
$rs = hesk_dbQuery("SELECT `id`, `name`, `color` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `usage` <> 1 ORDER BY `" . hesk_dbEscape($order_by) . "`"); $rs = hesk_dbQuery("SELECT `id`, `name`, `color` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `usage` <> 1 ORDER BY `" . hesk_dbEscape($order_by) . "`");
$categories = []; $categories = array();
while ($row = hesk_dbFetchAssoc($rs)) { while ($row = hesk_dbFetchAssoc($rs)) {
if (!$_SESSION['isadmin'] && !in_array($row['id'], $_SESSION['categories'])) { if (!$_SESSION['isadmin'] && !in_array($row['id'], $_SESSION['categories'])) {
continue; continue;

@ -10,7 +10,7 @@ function get_ticket_for_staff($hesk_settings, $user, $id = NULL) {
if ($id === NULL) { if ($id === NULL) {
$original_tickets = $tickets; $original_tickets = $tickets;
$tickets = []; $tickets = array();
foreach ($original_tickets as $ticket) { foreach ($original_tickets as $ticket) {
$ticket = remove_common_properties($ticket); $ticket = remove_common_properties($ticket);
$ticket = convert_to_camel_case($ticket); $ticket = convert_to_camel_case($ticket);

@ -6,7 +6,7 @@ function retrieve_user($hesk_settings, $id = NULL) {
if ($id === NULL) { if ($id === NULL) {
$original_users = $users; $original_users = $users;
$users = []; $users = array();
foreach ($original_users as $user) { foreach ($original_users as $user) {
$user = remove_unneeded_properties($user); $user = remove_unneeded_properties($user);
$user = convert_to_camel_case($user); $user = convert_to_camel_case($user);

@ -12,7 +12,7 @@ function get_canned_response($hesk_settings, $id = NULL) {
return NULL; return NULL;
} }
$results = []; $results = array();
while ($row = hesk_dbFetchAssoc($response)) { while ($row = hesk_dbFetchAssoc($response)) {
$row['id'] = intval($row['id']); $row['id'] = intval($row['id']);

@ -12,7 +12,7 @@ function get_category($hesk_settings, $id = NULL) {
return NULL; return NULL;
} }
$results = []; $results = array();
while ($row = hesk_dbFetchAssoc($response)) { while ($row = hesk_dbFetchAssoc($response)) {
$row['id'] = intval($row['id']); $row['id'] = intval($row['id']);
$row['displayOrder'] = intval($row['cat_order']); $row['displayOrder'] = intval($row['cat_order']);

@ -12,7 +12,7 @@ function get_status($hesk_settings, $id = NULL) {
return NULL; return NULL;
} }
$results = []; $results = array();
while ($row = hesk_dbFetchAssoc($response)) { while ($row = hesk_dbFetchAssoc($response)) {
$row['id'] = intval($row['ID']); $row['id'] = intval($row['ID']);
unset($row['ID']); unset($row['ID']);
@ -37,7 +37,7 @@ function get_status($hesk_settings, $id = NULL) {
$language_rs = hesk_dbQuery($language_sql); $language_rs = hesk_dbQuery($language_sql);
if (hesk_dbNumRows($language_rs) > 0) { if (hesk_dbNumRows($language_rs) > 0) {
$row['key'] = NULL; $row['key'] = NULL;
$row['keys'] = []; $row['keys'] = array();
} }
while ($language_row = hesk_dbFetchAssoc($language_rs)) { while ($language_row = hesk_dbFetchAssoc($language_rs)) {
unset($language_row['id']); unset($language_row['id']);

@ -31,7 +31,7 @@ function get_ticket_for_id($hesk_settings, $user, $id = NULL) {
} }
function build_results($response) { function build_results($response) {
$results = []; $results = array();
while ($row = hesk_dbFetchAssoc($response)) { while ($row = hesk_dbFetchAssoc($response)) {
$row['id'] = intval($row['id']); $row['id'] = intval($row['id']);
$row['category'] = intval($row['category']); $row['category'] = intval($row['category']);

@ -12,7 +12,7 @@ function get_ticket_template($hesk_settings, $id = NULL) {
return NULL; return NULL;
} }
$results = []; $results = array();
while ($row = hesk_dbFetchAssoc($response)) { while ($row = hesk_dbFetchAssoc($response)) {
$row['id'] = intval($row['id']); $row['id'] = intval($row['id']);
$row['displayOrder'] = intval($row['tpl_order']); $row['displayOrder'] = intval($row['tpl_order']);

@ -13,7 +13,7 @@ function get_user($hesk_settings, $id = NULL) {
return NULL; return NULL;
} }
$results = []; $results = array();
while ($row = hesk_dbFetchAssoc($response)) { while ($row = hesk_dbFetchAssoc($response)) {
$row['id'] = intval($row['id']); $row['id'] = intval($row['id']);
$row['isadmin'] = get_boolean($row['isadmin']); $row['isadmin'] = get_boolean($row['isadmin']);

@ -27,7 +27,7 @@ $request_method = $_SERVER['REQUEST_METHOD'];
* } * }
*/ */
if ($request_method == 'GET') { if ($request_method == 'GET') {
$results = []; $results = array();
$critical['id'] = 0; $critical['id'] = 0;
$critical['key'] = 'critical'; $critical['key'] = 'critical';
$results[] = $critical; $results[] = $critical;

@ -52,7 +52,7 @@ if ($modsForHesk_settings['enable_calendar'] != '1') {
hesk_error($hesklang['calendar_disabled']); hesk_error($hesklang['calendar_disabled']);
} }
$categories = []; $categories = array();
$orderBy = $modsForHesk_settings['category_order_column']; $orderBy = $modsForHesk_settings['category_order_column'];
$categorySql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `usage` <> 1 AND `type` = '0' ORDER BY '" . $orderBy . "'"; $categorySql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `usage` <> 1 AND `type` = '0' ORDER BY '" . $orderBy . "'";
$categoryRs = hesk_dbQuery($categorySql); $categoryRs = hesk_dbQuery($categorySql);

@ -67,8 +67,8 @@ $sql = "SELECT `reminder`.`id` AS `reminder_id`, `reminder`.`user_id` AS `user_i
AND `email_sent` = '0'"; AND `email_sent` = '0'";
$rs = hesk_dbQuery($sql); $rs = hesk_dbQuery($sql);
$reminders_to_flag = []; $reminders_to_flag = array();
$tickets_to_flag = []; $tickets_to_flag = array();
$included_email_functions = false; $included_email_functions = false;
if (hesk_dbNumRows($rs) > 0 && !$skip_events) { if (hesk_dbNumRows($rs) > 0 && !$skip_events) {
@ -150,12 +150,12 @@ $user_rs = hesk_dbQuery("SELECT `id`, `isadmin`, `categories`, `email`,
FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `notify_overdue_unassigned` = '1' FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `notify_overdue_unassigned` = '1'
AND (`heskprivileges` LIKE '%can_view_tickets%' OR `isadmin` = '1')"); AND (`heskprivileges` LIKE '%can_view_tickets%' OR `isadmin` = '1')");
$users = []; $users = array();
while ($row = hesk_dbFetchAssoc($user_rs)) { while ($row = hesk_dbFetchAssoc($user_rs)) {
$users[] = $row; $users[] = $row;
} }
$tickets_to_flag = []; $tickets_to_flag = array();
while ($row = hesk_dbFetchAssoc($rs)) { while ($row = hesk_dbFetchAssoc($rs)) {
if (mfh_sendOverdueTicketReminder($row, $users, $modsForHesk_settings)) { if (mfh_sendOverdueTicketReminder($row, $users, $modsForHesk_settings)) {
$tickets_to_flag[] = $row['id']; $tickets_to_flag[] = $row['id'];

@ -338,7 +338,7 @@ function mfh_sendOverdueTicketReminder($ticket, $users, $modsForHesk_settings) {
$htmlMessage = hesk_getHtmlMessage('overdue_ticket', NULL, $modsForHesk_settings, 1, 0, 1); $htmlMessage = hesk_getHtmlMessage('overdue_ticket', NULL, $modsForHesk_settings, 1, 0, 1);
$htmlMessage = hesk_processMessage($htmlMessage, $ticket, 1, 1, 0, $modsForHesk_settings, 1); $htmlMessage = hesk_processMessage($htmlMessage, $ticket, 1, 1, 0, $modsForHesk_settings, 1);
$emails = []; $emails = array();
if ($ticket['user_email'] != NULL) { if ($ticket['user_email'] != NULL) {
$emails[] = $ticket['user_email']; $emails[] = $ticket['user_email'];
} }

@ -26,7 +26,7 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
$rs = hesk_dbQuery($sql); $rs = hesk_dbQuery($sql);
$events = []; $events = array();
while ($row = hesk_dbFetchAssoc($rs)) { while ($row = hesk_dbFetchAssoc($rs)) {
// Skip the event if the user does not have access to it // Skip the event if the user does not have access to it
if ($staff && !$_SESSION['isadmin'] && !in_array($row['category'], $_SESSION['categories'])) { if ($staff && !$_SESSION['isadmin'] && !in_array($row['category'], $_SESSION['categories'])) {

@ -26,7 +26,7 @@ function search_log($hesk_settings, $location, $from_date, $to_date, $severity_i
$rs = hesk_dbQuery($sql); $rs = hesk_dbQuery($sql);
$results = []; $results = array();
while ($row = hesk_dbFetchAssoc($rs)) { while ($row = hesk_dbFetchAssoc($rs)) {
$row['timestamp'] = hesk_date($row['timestamp'], true); $row['timestamp'] = hesk_date($row['timestamp'], true);
$results[] = $row; $results[] = $row;

Loading…
Cancel
Save