';
diff --git a/inc/show_search_form.inc.php b/inc/show_search_form.inc.php
index d775550a..16499df6 100644
--- a/inc/show_search_form.inc.php
+++ b/inc/show_search_form.inc.php
@@ -38,10 +38,10 @@ if ( ! isset($status) )
{
$status = array();
//-- We don't want to check statuses that are considered "closed"
- $statusRS = hesk_dbQuery('SELECT `ID`, `ShortNameContentKey` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsClosed` = 0');
+ $statusRS = hesk_dbQuery('SELECT `ID`, `Key` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsClosed` = 0');
while ($row = $statusRS->fetch_assoc())
{
- $status[$row['ID']] = $row['ShortNameContentKey'];
+ $status[$row['ID']] = $row['Key'];
}
}
@@ -131,7 +131,7 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
fetch_assoc())
{
if ($rowCounter > 3)
@@ -149,7 +149,7 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
}
echo '';
+ echo '/> '.$hesklang[$row['Key']].'';
$rowCounter++;
}
diff --git a/inc/ticket_list.inc.php b/inc/ticket_list.inc.php
index d24cea03..04f4030e 100644
--- a/inc/ticket_list.inc.php
+++ b/inc/ticket_list.inc.php
@@ -386,8 +386,8 @@ if ($total > 0)
// Print ticket status
if ( hesk_show_column('status') )
{
- $statusName = hesk_dbFetchAssoc(hesk_dbQuery("SELECT `ShortNameContentKey`, `TextColor` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE ID = ".$ticket['status']));
- $ticket['status']=''.$hesklang[$statusName['ShortNameContentKey']].'';
+ $statusName = hesk_dbFetchAssoc(hesk_dbQuery("SELECT `Key`, `TextColor` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE ID = ".$ticket['status']));
+ $ticket['status']=''.$hesklang[$statusName['Key']].'';
echo '
'.$ticket['status'].'
';
}
diff --git a/index.php b/index.php
index f36dc325..7e91e765 100644
--- a/index.php
+++ b/index.php
@@ -1089,11 +1089,20 @@ function print_start()
?>
+
%s was NOT saved due to an error. Enable debug mode to see if an error message appears, and ensure that your file has CHMOD 0666'; // %s: Template file name
+$hesklang['language_key'] = 'Language Key';
+$hesklang['language_key_description'] = 'This is the language file \'key\' that contains the text you want to display';
+$hesklang['can_man_ticket_statuses'] = 'Can manage ticket statuses';
// ADDED OR MODIFIED IN Mods for HESK 2.2.1
$hesklang['popart_no_colon']='Top Knowledgebase Articles'; // same as $hesklang['popart'] but without a colon (:)
@@ -224,10 +232,6 @@ $hesklang['changeLanguage'] = 'Change language to';
// ADDED OR MODIFIED IN Mods For HESK 1.2
$hesklang['statuses'] = 'Statuses';
$hesklang['basicProperties'] = 'Basic Properties';
-$hesklang['shortNameKey'] = 'Short Name Key';
-$hesklang['shortNameKeyDescr'] = "This is the language file 'key' that contains the text you want to display on all pages that have statuses, except for the ticket view pages (ticket.php, admin_ticket.php, and print.php)";
-$hesklang['longNameKey'] = 'Long Name Key';
-$hesklang['longNameKeyDescr'] = "This is the language file 'key' that contains the text you want to display on ticket.php, print.php, and admin_ticket.php";
$hesklang['textColor'] = 'Text Color';
$hesklang['textColorDescr'] = 'This is the hex color code for the status that will be used on the ticket search page and export search page';
$hesklang['closedQuestionMark'] = 'Closed?';
diff --git a/print.php b/print.php
index d4d26795..05ee7bcc 100644
--- a/print.php
+++ b/print.php
@@ -60,7 +60,7 @@ if ( empty($_SESSION['id']) )
}
/* Get ticket info */
-$res = hesk_dbQuery("SELECT `t1`.* , `ticketStatus`.`IsClosed` AS `isClosed`, `ticketStatus`.`TicketViewContentKey` AS `statusKey`, `t2`.name AS `repliername`
+$res = hesk_dbQuery("SELECT `t1`.* , `ticketStatus`.`IsClosed` AS `isClosed`, `ticketStatus`.`Key` AS `statusKey`, `t2`.name AS `repliername`
FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` AS `t1` LEFT JOIN `".hesk_dbEscape($hesk_settings['db_pfix'])."users` AS `t2` ON `t1`.`replierid` = `t2`.`id`
INNER JOIN `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` AS `ticketStatus` ON `t1`.`status` = `ticketStatus`.`ID`
WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
diff --git a/ticket.php b/ticket.php
index 8c0668ae..24c94315 100644
--- a/ticket.php
+++ b/ticket.php
@@ -106,7 +106,7 @@ hesk_dbConnect();
hesk_limitBfAttempts();
/* Get ticket info */
-$res = hesk_dbQuery( "SELECT `t1`.* , `t2`.name AS `repliername`, `ticketStatus`.`IsClosed` AS `isClosed`, `ticketStatus`.`TicketViewContentKey` AS `statusKey` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` AS `t1` INNER JOIN `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` AS `ticketStatus` ON `t1`.`status` = `ticketStatus`.`ID` LEFT JOIN `".hesk_dbEscape($hesk_settings['db_pfix'])."users` AS `t2` ON `t1`.`replierid` = `t2`.`id` WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
+$res = hesk_dbQuery( "SELECT `t1`.* , `t2`.name AS `repliername`, `ticketStatus`.`IsClosed` AS `isClosed`, `ticketStatus`.`Key` AS `statusKey` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` AS `t1` INNER JOIN `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` AS `ticketStatus` ON `t1`.`status` = `ticketStatus`.`ID` LEFT JOIN `".hesk_dbEscape($hesk_settings['db_pfix'])."users` AS `t2` ON `t1`.`replierid` = `t2`.`id` WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
/* Ticket found? */
if (hesk_dbNumRows($res) != 1)
@@ -299,7 +299,7 @@ require_once(HESK_PATH . 'inc/header.inc.php');
$repliesColumnWidth = 3;
}
echo '