diff --git a/include/staff/department.inc.php b/include/staff/department.inc.php index b900087331721347ee1b1c57dd37f43e274ed2d2..00a65ebc54cfc1345d55ea365e00f5ff9aaa12ca 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">— System default —</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 36186838bd93cdba6977add500645becba4d673e..3743d5c9e062f112489d229c8f9e3cfb71a68adc 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">— Default —</option> + <option value="0">— System Default —</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 c222f745c9419eca924b1a975781791b7142e418..e5dac76027006cdbbd6631a66c3df119c758d292 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">— Department's Default —</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 992e9900425c19d708f7cb35d75a59f7b18c36bf..60d61257fe3ba781a4e98ae3bfd6ebab280f4259 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">— None —</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); } } ?>