From 84f00a2519b4c1cd25fcc4216128f92469ea720c Mon Sep 17 00:00:00 2001 From: "Andreas Burchert (scarya)" Date: Mon, 19 Sep 2011 11:11:26 +0200 Subject: [PATCH] Fixes malformed priority in ticket archive search, fixes #714 Note: swedish could not be fixed and my swedish is way to bad to do it on my own Thanks to philnate --- actions/admin/settings/190.ticket.php | 4 ++-- admin_tickets.php | 24 ++++++++++++------- customer_tickets.php | 6 ++--- .../preconfig/0.9/preconfig_0.9.inc.php | 6 ++--- lng/czech.lng.php | 9 +++---- lng/dutch.lng.php | 9 +++---- lng/english.lng.php | 9 +++---- lng/french.lng.php | 9 +++---- lng/german.lng.php | 9 +++---- lng/italian.lng.php | 9 +++---- lng/polish.lng.php | 9 +++---- lng/portugues.lng.php | 9 +++---- .../admin/tickets/archived_tickets.tpl | 2 +- .../admin/tickets/archived_tickets.tpl | 2 +- 14 files changed, 50 insertions(+), 66 deletions(-) diff --git a/actions/admin/settings/190.ticket.php b/actions/admin/settings/190.ticket.php index bc07d192..a2d0cf08 100644 --- a/actions/admin/settings/190.ticket.php +++ b/actions/admin/settings/190.ticket.php @@ -133,7 +133,7 @@ return array( 'type' => 'option', 'default' => 2, 'option_mode' => 'one', - 'option_options' => array(1 => $lng['ticket']['unf_high'], 2 => $lng['ticket']['unf_normal'], 3 => $lng['ticket']['unf_low']), + 'option_options' => array(1 => $lng['ticket']['high'], 2 => $lng['ticket']['normal'], 3 => $lng['ticket']['low']), 'save_method' => 'storeSettingField', ), ), @@ -141,4 +141,4 @@ return array( ) ); -?> \ No newline at end of file +?> diff --git a/admin_tickets.php b/admin_tickets.php index 3ecd348c..88a83cb4 100644 --- a/admin_tickets.php +++ b/admin_tickets.php @@ -224,9 +224,9 @@ if($page == 'tickets' $customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']); } - $priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']); - $priorities.= makeoption($lng['ticket']['unf_normal'], '2', $settings['ticket']['default_priority']); - $priorities.= makeoption($lng['ticket']['unf_low'], '3', $settings['ticket']['default_priority']); + $priorities = makeoption($lng['ticket']['high'], '1', $settings['ticket']['default_priority']); + $priorities.= makeoption($lng['ticket']['normal'], '2', $settings['ticket']['default_priority']); + $priorities.= makeoption($lng['ticket']['low'], '3', $settings['ticket']['default_priority']); $ticket_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/formfield.ticket_new.php'; $ticket_new_form = htmlform::genHTMLForm($ticket_new_data); @@ -673,6 +673,16 @@ elseif($page == 'archive' } $tickets_count++; + switch ($ticket['priority']) + { + case 1: $ticket['display'] = 'high'; + break; + case 2: $ticket['display'] = 'normal'; + break; + case 3: $ticket['display'] = 'low'; + break; + default: $ticket['display'] = 'unknown'; + } $ticket['priority'] = ticket::getPriorityText($lng, $ticket['priority']); if($ticket['lastreplier'] == '1') @@ -688,9 +698,7 @@ elseif($page == 'archive' { $ticket['subject'] = substr($ticket['subject'], 0, 17) . '...'; } - $ticket = htmlentities_array($ticket); - eval("\$tickets.=\"" . getTemplate("tickets/archived_tickets") . "\";"); $count++; $_cid = $ticket['customerid']; @@ -733,9 +741,9 @@ elseif($page == 'archive' } } - $priorities_options = makecheckbox('priority1', $lng['ticket']['unf_high'], '1'); - $priorities_options.= makecheckbox('priority2', $lng['ticket']['unf_normal'], '2'); - $priorities_options.= makecheckbox('priority3', $lng['ticket']['unf_low'], '3'); + $priorities_options = makecheckbox('priority1', $lng['ticket']['high'], '1'); + $priorities_options.= makecheckbox('priority2', $lng['ticket']['normal'], '2'); + $priorities_options.= makecheckbox('priority3', $lng['ticket']['low'], '3'); $category_options = ''; $ccount = 0; $result = $db->query('SELECT * FROM `' . TABLE_PANEL_TICKET_CATS . '` ORDER BY `name` ASC'); diff --git a/customer_tickets.php b/customer_tickets.php index 56d74885..45e293eb 100644 --- a/customer_tickets.php +++ b/customer_tickets.php @@ -227,9 +227,9 @@ elseif($page == 'tickets') $categories = makeoption($lng['ticket']['no_cat'], '0'); } - $priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']); - $priorities.= makeoption($lng['ticket']['unf_normal'], '2', $settings['ticket']['default_priority']); - $priorities.= makeoption($lng['ticket']['unf_low'], '3', $settings['ticket']['default_priority']); + $priorities = makeoption($lng['ticket']['high'], '1', $settings['ticket']['default_priority']); + $priorities.= makeoption($lng['ticket']['normal'], '2', $settings['ticket']['default_priority']); + $priorities.= makeoption($lng['ticket']['low'], '3', $settings['ticket']['default_priority']); $ticketsopen = 0; $opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '` WHERE `customerid` = "' . $userinfo['customerid'] . '" diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index 3721274b..390e29eb 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -73,9 +73,9 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) $description = 'You can define a default support-ticket priority level which is pre-selected for new support-tickets.'; $question = 'Which should be the default ticket-priority?: '; $question .= ''; eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); } diff --git a/lng/czech.lng.php b/lng/czech.lng.php index 26288157..c4970a2e 100644 --- a/lng/czech.lng.php +++ b/lng/czech.lng.php @@ -606,12 +606,9 @@ $lng['ticket']['subject'] = 'Pøedmì t'; $lng['ticket']['status'] = 'Status'; $lng['ticket']['lastreplier'] = 'Poslední odpovídající'; $lng['ticket']['priority'] = 'Priorita'; -$lng['ticket']['low'] = 'Nízká'; -$lng['ticket']['normal'] = 'Normální'; -$lng['ticket']['high'] = 'Vysoká'; -$lng['ticket']['unf_low'] = 'Nízká'; -$lng['ticket']['unf_normal'] = 'Normální'; -$lng['ticket']['unf_high'] = 'Vysoká'; +$lng['ticket']['low'] = 'Nízká'; +$lng['ticket']['normal'] = 'Normální'; +$lng['ticket']['high'] = 'Vysoká'; $lng['ticket']['lastchange'] = 'Poslední zmì na'; $lng['ticket']['lastchange_from'] = 'Od data (dd.mm.yyyy)'; $lng['ticket']['lastchange_to'] = 'Do data (dd.mm.yyyy)'; diff --git a/lng/dutch.lng.php b/lng/dutch.lng.php index 6d0d4b6c..db6c3853 100644 --- a/lng/dutch.lng.php +++ b/lng/dutch.lng.php @@ -601,12 +601,9 @@ $lng['ticket']['subject'] = 'Onderwerp'; $lng['ticket']['status'] = 'Status'; $lng['ticket']['lastreplier'] = 'Laatste beantwoorder'; $lng['ticket']['priority'] = 'Prioriteit'; -$lng['ticket']['low'] = 'Laag'; -$lng['ticket']['normal'] = 'Normaal'; -$lng['ticket']['high'] = 'Hoog'; -$lng['ticket']['unf_low'] = 'Laag'; -$lng['ticket']['unf_normal'] = 'Normaal'; -$lng['ticket']['unf_high'] = 'Hoog'; +$lng['ticket']['low'] = 'Laag'; +$lng['ticket']['normal'] = 'Normaal'; +$lng['ticket']['high'] = 'Hoog'; $lng['ticket']['lastchange'] = 'Laatste wijziging'; $lng['ticket']['lastchange_from'] = 'Datum vanaf (dd.mm.yyyy)'; $lng['ticket']['lastchange_to'] = 'Datum tot (dd.mm.yyyy)'; diff --git a/lng/english.lng.php b/lng/english.lng.php index d3310dba..b68918f0 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -611,12 +611,9 @@ $lng['ticket']['subject'] = 'Subject'; $lng['ticket']['status'] = 'Status'; $lng['ticket']['lastreplier'] = 'Last replier'; $lng['ticket']['priority'] = 'Priority'; -$lng['ticket']['low'] = 'Low'; -$lng['ticket']['normal'] = 'Normal'; -$lng['ticket']['high'] = 'High'; -$lng['ticket']['unf_low'] = 'Low'; -$lng['ticket']['unf_normal'] = 'Normal'; -$lng['ticket']['unf_high'] = 'High'; +$lng['ticket']['low'] = 'Low'; +$lng['ticket']['normal'] = 'Normal'; +$lng['ticket']['high'] = 'High'; $lng['ticket']['lastchange'] = 'Last change'; $lng['ticket']['lastchange_from'] = 'From date (dd.mm.yyyy)'; $lng['ticket']['lastchange_to'] = 'To date (dd.mm.yyyy)'; diff --git a/lng/french.lng.php b/lng/french.lng.php index aadbef13..884e3717 100644 --- a/lng/french.lng.php +++ b/lng/french.lng.php @@ -618,12 +618,9 @@ $lng['ticket']['subject'] = 'Sujet'; $lng['ticket']['status'] = 'Etat'; $lng['ticket']['lastreplier'] = 'Dernière réponse de'; $lng['ticket']['priority'] = 'Priorité'; -$lng['ticket']['low'] = 'Basse'; -$lng['ticket']['normal'] = 'Normale'; -$lng['ticket']['high'] = 'Haute'; -$lng['ticket']['unf_low'] = 'Basse'; -$lng['ticket']['unf_normal'] = 'Normale'; -$lng['ticket']['unf_high'] = 'Haute'; +$lng['ticket']['low'] = 'Basse'; +$lng['ticket']['normal'] = 'Normale'; +$lng['ticket']['high'] = 'Haute'; $lng['ticket']['lastchange'] = 'Dernier changement'; $lng['ticket']['lastchange_from'] = 'Depuis (jj.mm.aaaa)'; $lng['ticket']['lastchange_to'] = 'Jusqu\'au (jj.mm.aaaa)'; diff --git a/lng/german.lng.php b/lng/german.lng.php index c85a8a3e..c3c79b26 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -614,12 +614,9 @@ $lng['ticket']['subject'] = 'Betreff'; $lng['ticket']['status'] = 'Status'; $lng['ticket']['lastreplier'] = 'Letzte Antwort'; $lng['ticket']['priority'] = 'Priorität'; -$lng['ticket']['low'] = 'Niedrig'; -$lng['ticket']['normal'] = 'Normal'; -$lng['ticket']['high'] = 'Hoch'; -$lng['ticket']['unf_low'] = 'Niedrig'; -$lng['ticket']['unf_normal'] = 'Normal'; -$lng['ticket']['unf_high'] = 'Hoch'; +$lng['ticket']['low'] = 'Niedrig'; +$lng['ticket']['normal'] = 'Normal'; +$lng['ticket']['high'] = 'Hoch'; $lng['ticket']['lastchange'] = 'Letzte Änderung'; $lng['ticket']['lastchange_from'] = 'Anfangsdatum (tt.mm.jjjj)'; $lng['ticket']['lastchange_to'] = 'Enddatum (tt.mm.jjjj)'; diff --git a/lng/italian.lng.php b/lng/italian.lng.php index 8478614f..13e1d980 100644 --- a/lng/italian.lng.php +++ b/lng/italian.lng.php @@ -614,12 +614,9 @@ $lng['ticket']['subject'] = 'Soggetto'; $lng['ticket']['status'] = 'Stato'; $lng['ticket']['lastreplier'] = 'Ultimo che ha risposto'; $lng['ticket']['priority'] = 'Priorità'; -$lng['ticket']['low'] = 'Bassa'; -$lng['ticket']['normal'] = 'Normale'; -$lng['ticket']['high'] = 'Alta'; -$lng['ticket']['unf_low'] = 'Bassa'; -$lng['ticket']['unf_normal'] = 'Normale'; -$lng['ticket']['unf_high'] = 'Alta'; +$lng['ticket']['low'] = 'Bassa'; +$lng['ticket']['normal'] = 'Normale'; +$lng['ticket']['high'] = 'Alta'; $lng['ticket']['lastchange'] = 'Ultima modifica'; $lng['ticket']['lastchange_from'] = 'Dalla data (dd.mm.yyyy)'; $lng['ticket']['lastchange_to'] = 'Alla data (dd.mm.yyyy)'; diff --git a/lng/polish.lng.php b/lng/polish.lng.php index 9e37c767..8c6ddf16 100644 --- a/lng/polish.lng.php +++ b/lng/polish.lng.php @@ -607,12 +607,9 @@ $lng['ticket']['subject'] = 'Temat'; $lng['ticket']['status'] = 'Status'; $lng['ticket']['lastreplier'] = 'Ostatnia odpowiedź'; $lng['ticket']['priority'] = 'Priorytet'; -$lng['ticket']['low'] = 'Niski'; -$lng['ticket']['normal'] = 'Normalny'; -$lng['ticket']['high'] = 'Wysoki'; -$lng['ticket']['unf_low'] = 'Niski'; -$lng['ticket']['unf_normal'] = 'Normalny'; -$lng['ticket']['unf_high'] = 'Wysoki'; +$lng['ticket']['low'] = 'Niski'; +$lng['ticket']['normal'] = 'Normalny'; +$lng['ticket']['high'] = 'Wysoki'; $lng['ticket']['lastchange'] = 'Ostatnia zmiana'; $lng['ticket']['lastchange_from'] = 'Od daty (dd.mm.yyyy)'; $lng['ticket']['lastchange_to'] = 'Do daty (dd.mm.yyyy)'; diff --git a/lng/portugues.lng.php b/lng/portugues.lng.php index 5ac9149a..0eb69e41 100644 --- a/lng/portugues.lng.php +++ b/lng/portugues.lng.php @@ -542,12 +542,9 @@ $lng['ticket']['subject'] = 'Assunto'; $lng['ticket']['status'] = 'Status'; $lng['ticket']['lastreplier'] = 'Último que respondeu'; $lng['ticket']['priority'] = 'Prioridade'; -$lng['ticket']['low'] = 'Baixa'; -$lng['ticket']['normal'] = 'Normal'; -$lng['ticket']['high'] = 'Alta'; -$lng['ticket']['unf_low'] = 'Baixa'; -$lng['ticket']['unf_normal'] = 'Normal'; -$lng['ticket']['unf_high'] = 'Alta'; +$lng['ticket']['low'] = 'Baixa'; +$lng['ticket']['normal'] = 'Normal'; +$lng['ticket']['high'] = 'Alta'; $lng['ticket']['lastchange_from'] = 'De data (dd.mm.aaaa)'; $lng['ticket']['lastchange_to'] = 'Até data (dd.mm.aaaa)'; $lng['ticket']['category'] = 'Categoria'; diff --git a/templates/Classic/admin/tickets/archived_tickets.tpl b/templates/Classic/admin/tickets/archived_tickets.tpl index 4e62cf0f..cb8336a4 100644 --- a/templates/Classic/admin/tickets/archived_tickets.tpl +++ b/templates/Classic/admin/tickets/archived_tickets.tpl @@ -3,7 +3,7 @@ {$ticket['ticket_answers']} {$ticket['subject']} {$ticket['lastreplier']} - {$ticket['priority']} + {$ticket['priority']} {$lng['ticket']['show']} diff --git a/templates/Froxlor/admin/tickets/archived_tickets.tpl b/templates/Froxlor/admin/tickets/archived_tickets.tpl index 806f0139..da41c39c 100644 --- a/templates/Froxlor/admin/tickets/archived_tickets.tpl +++ b/templates/Froxlor/admin/tickets/archived_tickets.tpl @@ -3,7 +3,7 @@ {$ticket['ticket_answers']} {$ticket['subject']} {$ticket['lastreplier']} - {$ticket['priority']} + {$ticket['priority']} {$lng['ticket']['show']}