From 605c9daa1b50e9e206f04b215d81e50c2ab677e6 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Wed, 13 Feb 2013 12:15:36 -0500
Subject: [PATCH] Consolidate SLAs selection/list.

---
 include/staff/department.inc.php       |  9 ++++-----
 include/staff/filter.inc.php           | 11 +++++------
 include/staff/helptopic.inc.php        |  9 ++++-----
 include/staff/settings-tickets.inc.php | 11 ++++++-----
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/include/staff/department.inc.php b/include/staff/department.inc.php
index b90008733..00a65ebc5 100644
--- a/include/staff/department.inc.php
+++ b/include/staff/department.inc.php
@@ -108,11 +108,10 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 <select name="sla_id">
                     <option value="0">&mdash; System default &mdash;</option>
                     <?php
-                    $sql='SELECT id,name FROM '.SLA_TABLE.' sla ORDER by name';
-                    if(($res=db_query($sql)) && db_num_rows($res)){
-                        while(list($id,$name)=db_fetch_row($res)){
-                            $selected=($info['sla_id'] && $id==$info['sla_id'])?'selected="selected"':'';
-                            echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
+                    if($slas=SLA::getSLAs()) {
+                        foreach($slas as $id =>$name) {
+                            echo sprintf('<option value="%d" %s>%s</option>',
+                                    $id, ($info['sla_id']==$id)?'selected="selected"':'',$name);
                         }
                     }
                     ?>
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index 36186838b..3743d5c9e 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -258,13 +258,12 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <select name="sla_id">
-                    <option value="0">&mdash; Default &mdash;</option>
+                    <option value="0">&mdash; System Default &mdash;</option>
                     <?php
-                    $sql='SELECT id,name FROM '.SLA_TABLE.' sla ORDER by name';
-                    if(($res=db_query($sql)) && db_num_rows($res)){
-                        while(list($id,$name)=db_fetch_row($res)){
-                            $selected=($info['sla_id'] && $id==$info['sla_id'])?'selected="selected"':'';
-                            echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
+                    if($slas=SLA::getSLAs()) {
+                        foreach($slas as $id =>$name) {
+                            echo sprintf('<option value="%d" %s>%s</option>',
+                                    $id, ($info['sla_id']==$id)?'selected="selected"':'',$name);
                         }
                     }
                     ?>
diff --git a/include/staff/helptopic.inc.php b/include/staff/helptopic.inc.php
index c222f745c..e5dac7602 100644
--- a/include/staff/helptopic.inc.php
+++ b/include/staff/helptopic.inc.php
@@ -137,11 +137,10 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 <select name="sla_id">
                     <option value="0">&mdash; Department's Default &mdash;</option>
                     <?php
-                    $sql='SELECT id,name FROM '.SLA_TABLE.' sla ORDER by name';
-                    if(($res=db_query($sql)) && db_num_rows($res)){
-                        while(list($id,$name)=db_fetch_row($res)){
-                            $selected=($info['sla_id'] && $id==$info['sla_id'])?'selected="selected"':'';
-                            echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
+                    if($slas=SLA::getSLAs()) {
+                        foreach($slas as $id =>$name) {
+                            echo sprintf('<option value="%d" %s>%s</option>',
+                                    $id, ($info['sla_id']==$id)?'selected="selected"':'',$name);
                         }
                     }
                     ?>
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index 992e99004..60d61257f 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -34,11 +34,12 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
                 <select name="default_sla_id">
                     <option value="0">&mdash; None &mdash;</option>
                     <?php
-                    $sql='SELECT id,name FROM '.SLA_TABLE.' sla ORDER by name';
-                    if(($res=db_query($sql)) && db_num_rows($res)){
-                        while(list($id,$name)=db_fetch_row($res)){
-                            $selected=($config['default_sla_id'] && $id==$config['default_sla_id'])?'selected="selected"':'';
-                            echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
+                    if($slas=SLA::getSLAs()) {
+                        foreach($slas as $id => $name) {
+                            echo sprintf('<option value="%d" %s>%s</option>',
+                                    $id,
+                                    ($config['default_sla_id'] && $id==$config['default_sla_id'])?'selected="selected"':'',
+                                    $name);
                         }
                     }
                     ?>
-- 
GitLab