diff --git a/admin/admin_main.php b/admin/admin_main.php index bad21451..111ed08a 100644 --- a/admin/admin_main.php +++ b/admin/admin_main.php @@ -40,8 +40,10 @@ if (is_dir(HESK_PATH . 'install')) {die('Please delete the install folder /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); +require(HESK_PATH . 'modsForHesk_settings.inc.php'); require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php'); +require(HESK_PATH . 'inc/status_functions.inc.php'); hesk_load_database_functions(); hesk_session_start(); diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index a677176b..1a7604d2 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -40,6 +40,7 @@ require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'modsForHesk_settings.inc.php'); require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php'); +require(HESK_PATH . 'inc/status_functions.inc.php'); hesk_load_database_functions(); hesk_session_start(); @@ -1079,8 +1080,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); echo '

'.$hesklang['status'].'

'; $status_options = array(); - $results = hesk_dbQuery("SELECT `ID`FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses`"); - while ($row = hesk_dbFetchAssoc($results)) + $results = mfh_getAllStatuses(); + foreach ($results as $row) { $selected = $ticket['status'] == $row['ID'] ? 'selected' : ''; $status_options[$row['ID']] = ''; @@ -1991,11 +1992,6 @@ function hesk_printReplyForm() { } } - $statusSql = 'SELECT `ID` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsStaffClosedOption` = 1'; - $statusRow = hesk_dbQuery($statusSql)->fetch_assoc(); - $staffClosedOptionStatus = array(); - $staffClosedOptionStatus['ID'] = $statusRow['ID']; - ?>