From c9360fd538b4e9317ce8a868d3488c8ffb5900e7 Mon Sep 17 00:00:00 2001
From: Mike Koch <Mike.Koch@emerson.com>
Date: Tue, 28 Jul 2015 13:00:26 -0400
Subject: [PATCH] #209 Update search and export pages to show new status table

Still need to fix searching and need to test exporting
---
 admin/export.php             | 10 ++++------
 inc/show_search_form.inc.php |  8 ++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/admin/export.php b/admin/export.php
index c9a2db84..946c094a 100644
--- a/admin/export.php
+++ b/admin/export.php
@@ -243,12 +243,12 @@ $fid = 1;
 require(HESK_PATH . 'inc/assignment_search.inc.php');
 
 // --> TICKET STATUS
-$possibleStatusSql = 'SELECT `ID`, `Key` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`';
+$possibleStatusSql = 'SELECT `ID` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`';
 $possibleStatusRS = hesk_dbQuery($possibleStatusSql);
 $possible_status = array();
 while ($row = $possibleStatusRS->fetch_assoc())
 {
-    $possible_status[$row['ID']] = $hesklang[$row['Key']];
+    $possible_status[$row['ID']] = mfh_getDisplayTextForStatusId($row['ID']);
 }
 
 $status = $possible_status;
@@ -507,9 +507,7 @@ if (isset($_GET['w']))
     $result = hesk_dbQuery($sql);
 	while ($ticket=hesk_dbFetchAssoc($result))
 	{
-        $statusContentKeySql = 'SELECT `Key` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `ID` = '.$ticket['status'];
-        $statusContentKeyRow = hesk_dbQuery($statusContentKeySql)->fetch_assoc();
-        $ticket['status'] = $hesklang[$statusContentKeyRow['Key']];
+        $ticket['status'] = mfh_getDisplayTextForStatusId($ticket['status']);
 
 		switch ($ticket['priority'])
 		{
@@ -788,7 +786,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             ?>
                             <div class="col-xs-4">
                                 <div class="checkbox">
-                                    <label><input type="checkbox" name="s<?php echo $row['ID']; ?>" value="1" <?php if (isset($status[$row['ID']])) {echo 'checked="checked"';} ?> /> <span style="color: <?php echo $row['TextColor']; ?>"><?php echo $hesklang[$row['Key']]; ?></span></label>
+                                    <label><input type="checkbox" name="s<?php echo $row['ID']; ?>" value="1" <?php if (isset($status[$row['ID']])) {echo 'checked="checked"';} ?> /> <span style="color: <?php echo $row['TextColor']; ?>"><?php echo mfh_getDisplayTextForStatusId($row['ID']); ?></span></label>
                                 </div>
                             </div>
                             <?php
diff --git a/inc/show_search_form.inc.php b/inc/show_search_form.inc.php
index 413e3a71..f4a944cf 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`, `Key` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsClosed` = 0');
+    $statusRS = hesk_dbQuery('SELECT `ID` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsClosed` = 0');
     while ($row = $statusRS->fetch_assoc())
     {
-        $status[$row['ID']] = $row['Key'];
+        $status[$row['ID']] = mfh_getDisplayTextForStatusId($row['ID']);
     }
 }
 
@@ -131,7 +131,7 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
                                 <tr>
                                     <?php
                                     $rowCounter = 1;
-                                    $statusRS = hesk_dbQuery('SELECT `ID`, `Key`, `TextColor` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`');
+                                    $statusRS = hesk_dbQuery('SELECT `ID`, `TextColor` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`');
                                     while ($row = $statusRS->fetch_assoc())
                                     {
                                         if ($rowCounter > 3)
@@ -149,7 +149,7 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
                                         }
                                         echo '<label><input type="checkbox" name="s'.$row['ID'].'" value="1"';
                                         if (isset($status[$row['ID']])) {echo 'checked="checked"';}
-                                        echo '/> <span style="font-weight: bold;color: '.$row['TextColor'].';">'.$hesklang[$row['Key']].'</span></label></td>';
+                                        echo '/> <span style="font-weight: bold;color: '.$row['TextColor'].';">'.mfh_getDisplayTextForStatusId($row['ID']).'</span></label></td>';
 
                                         $rowCounter++;
                                     }