diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 150b54e6..36804051 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -939,6 +939,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); /* This will handle error, success and notice messages */ hesk_handle_messages(); + $service_messages = mfh_get_service_messages('STAFF_VIEW_TICKET'); + foreach ($service_messages as $sm) { + hesk_service_message($sm); + } + // Prepare special custom fields foreach ($hesk_settings['custom_fields'] as $k=>$v) { if ($v['use'] && hesk_is_custom_field_in_category($k, $ticket['category']) ) { diff --git a/admin/index.php b/admin/index.php index aec1e374..f623d4a0 100644 --- a/admin/index.php +++ b/admin/index.php @@ -278,6 +278,12 @@ function print_login()
diff --git a/admin/knowledgebase_private.php b/admin/knowledgebase_private.php
index 041da9bd..e2cd0277 100644
--- a/admin/knowledgebase_private.php
+++ b/admin/knowledgebase_private.php
@@ -121,7 +121,9 @@ function hesk_kb_header($kb_link, $catid=1)
';
hesk_kbSearchLarge(1);
+ echo '
';
} // END hesk_kb_header()
@@ -214,7 +216,15 @@ function hesk_show_kb_article($artid)
?>
-
+ ';
+ $service_messages = mfh_get_service_messages('STAFF_VIEW_KB_ARTICLE');
+ foreach ($service_messages as $sm) {
+ hesk_service_message($sm);
+ }
+ echo '
';
+ ?>
@@ -397,6 +407,13 @@ function hesk_show_kb_category($catid, $is_search = 0) {
{
/* Print header */
hesk_kb_header($hesk_settings['kb_link'], $catid);
+
+ echo '
diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php
index b126a326..03e4ba6f 100644
--- a/admin/manage_knowledgebase.php
+++ b/admin/manage_knowledgebase.php
@@ -270,6 +270,12 @@ if (!isset($_SESSION['hide']['treemenu']))
';
+ $service_messages = mfh_get_service_messages('STAFF_KB_HOME');
+ foreach ($service_messages as $sm) {
+ hesk_service_message($sm);
+ }
+ echo '
';
} ?>
diff --git a/inc/common.inc.php b/inc/common.inc.php
index b510e92b..b6ce26f9 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -192,6 +192,27 @@ function hesk_service_message($sm)
-
@@ -322,6 +321,13 @@ function print_add_ticket()
+
@@ -1315,20 +1321,13 @@ function print_start()
0)
- {
+ $service_messages = mfh_get_service_messages('CUSTOMER_HOME');
+ if (count($service_messages) > 0) {
?>
diff --git a/knowledgebase.php b/knowledgebase.php
index fdb2a3a4..22e86586 100644
--- a/knowledgebase.php
+++ b/knowledgebase.php
@@ -254,6 +254,13 @@ if (!$show['show']) {
require_once(HESK_PATH . 'inc/header.inc.php');
hesk_kb_header($hesk_settings['kb_link']);
+
+ // Service messages
+ $service_messages = mfh_get_service_messages('CUSTOMER_VIEW_KB_ARTICLE');
+ foreach ($service_messages as $sm) {
+ hesk_service_message($sm);
+ }
+
// Update views by 1 - exclude known bots and reloads because of ratings
if (!isset($_GET['rated']) && !hesk_detect_bots()) {
hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "kb_articles` SET `views`=`views`+1 WHERE `id`={$artid}");
@@ -406,11 +413,11 @@ if (!$show['show']) {
hesk_kb_header($hesk_settings['kb_link']);
}
- // If we are in "Knowledgebase only" mode show system messages
- if ($catid == 1 && hesk_check_kb_only(false)) {
+ // Display service messages on the default category
+ if ($catid == 1) {
// Service messages
- $res = hesk_dbQuery('SELECT `title`, `message`, `style` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages` WHERE `type`='0' ORDER BY `order` ASC");
- while ($sm = hesk_dbFetchAssoc($res)) {
+ $service_messages = mfh_get_service_messages('CUSTOMER_KB_HOME');
+ foreach ($service_messages as $sm) {
hesk_service_message($sm);
}
}
diff --git a/ticket.php b/ticket.php
index cb7ef11b..316dac96 100644
--- a/ticket.php
+++ b/ticket.php
@@ -215,6 +215,13 @@ if (!$show['show']) {