diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 287249d5..047a6c6c 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -552,7 +552,7 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
/* List of categories */
$orderBy = $modsForHesk_settings['category_order_column'];
-$result = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ORDER BY `" . $orderBy . "` ASC");
+$result = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `usage` <> 2 ORDER BY `" . $orderBy . "` ASC");
$categories_options = '';
while ($row = hesk_dbFetchAssoc($result)) {
$selected = '';
diff --git a/admin/calendar.php b/admin/calendar.php
index 48f86006..ab22f04e 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -50,7 +50,7 @@ hesk_isLoggedIn();
define('MFH_CALENDAR', 1);
// Get categories for the dropdown
-$rs = hesk_dbQuery("SELECT `id`, `name`, `color` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ORDER BY `cat_order`");
+$rs = hesk_dbQuery("SELECT `id`, `name`, `color` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `usage` <> 1 ORDER BY `cat_order`");
$categories = [];
while ($row = hesk_dbFetchAssoc($rs)) {
$row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000' : 'background: ' . $row['color'];
diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index af766cf6..1d976d70 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -234,6 +234,7 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
|
|
|
+ |
|
|
@@ -261,6 +262,13 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
$j = 0;
$num = hesk_dbNumRows($res);
+ $usage = array(
+ 0 => '
+ ',
+ 1 => '',
+ 2 => ' '
+ );
+
while ($mycat = hesk_dbFetchAssoc($res)) {
$j++;
@@ -327,6 +335,7 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
+ ' . $usage[$mycat['usage']] . ' |
' . get_manager($mycat['manager'], $users) . ' |
diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index d3351af9..ddedc474 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -263,7 +263,7 @@ if (!$show['show']) {
// List categories
$orderByColumn = $modsForHesk_settings['category_order_column'];
- $result = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'categories` ORDER BY `' . $orderByColumn . '` ASC');
+ $result = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'categories` WHERE `usage` <> 2 ORDER BY `' . $orderByColumn . '` ASC');
while ($row = hesk_dbFetchAssoc($result)) {
if (isset($_SESSION['as_category']) && $_SESSION['as_category'] == $row['id']) {
$selected = ' selected="selected"';
diff --git a/index.php b/index.php
index 8bea070f..709c5b97 100644
--- a/index.php
+++ b/index.php
@@ -262,7 +262,7 @@ function print_add_ticket()
// Get categories
hesk_dbConnect();
$orderBy = $modsForHesk_settings['category_order_column'];
- $res = hesk_dbQuery("SELECT `id`, `name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `type`='0' ORDER BY `" . $orderBy . "` ASC");
+ $res = hesk_dbQuery("SELECT `id`, `name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `type`='0' AND `usage` <> 2 ORDER BY `" . $orderBy . "` ASC");
if (hesk_dbNumRows($res) == 1) {
// Only 1 public category, no need for a select box
|