diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 478709e3..c84443f4 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -500,6 +500,35 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); } ?> +
  • + +

    fetch_assoc(); + echo ''.$parent['trackid'].''; + } else { + echo $hesklang['none']; + } + ?>

    +
  • +
  • + +

    fetch_assoc()) { + $hasRows = true; + echo ''.$row['trackid'].'
    '; + } + if (!$hasRows) { + echo $hesklang['none']; + } + ?>

    +
  • diff --git a/install/updateTo1-4-0.php b/install/updateTo1-4-0.php index e2d4dddd..c8ff8bd5 100644 --- a/install/updateTo1-4-0.php +++ b/install/updateTo1-4-0.php @@ -4,11 +4,12 @@ define('HESK_PATH','../'); require(HESK_PATH . 'install/install_functions.inc.php'); require(HESK_PATH . 'hesk_settings.inc.php'); hesk_dbConnect(); -hesk_dbQuery("CREATE TABLE `".$hesk_settings['db_pfix']."denied_ips` ( +hesk_dbQuery("CREATE TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."denied_ips` ( `ID` INT NOT NULL PRIMARY KEY AUTO_INCREMENT, `RangeStart` VARCHAR(100) NOT NULL, `RangeEnd` VARCHAR(100) NOT NULL)"); -hesk_dbQuery("CREATE TABLE `".$hesk_settings['db_pfix']."denied_emails` (ID INT NOT NULL PRIMARY KEY AUTO_INCREMENT, Email VARCHAR(100) NOT NULL PRIMARY KEY);"); +hesk_dbQuery("CREATE TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."denied_emails` (ID INT NOT NULL PRIMARY KEY AUTO_INCREMENT, Email VARCHAR(100) NOT NULL PRIMARY KEY);"); +hesk_dbQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` ADD COLUMN `parent` MEDIUMINT(8) NULL AFTER `custom20`;"); ?>

    Update complete!

    diff --git a/language/en/text.php b/language/en/text.php index 52378770..e659d01b 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -59,6 +59,9 @@ $hesklang['email_bans'] = 'Email Bans'; $hesklang['ip_email_bans'] = 'IP / Email Bans'; $hesklang['ip_banned'] = 'Your IP has been banned by the help desk. You will be unable to submit a ticket until your IP ban has been removed.'; $hesklang['email_banned'] = 'The email address you have entered has been banned by the help desk. You will be unable to submit a ticket until your email ban has been removed.'; +$hesklang['none'] = 'None'; +$hesklang['parent'] = 'Parent'; +$hesklang['children'] = 'Children'; // ADDED OR MODIFIED IN NuMods 1.3.1 $hesklang['autorefresh'] = 'Autorefresh:';