From 16841d9d5a00fb115a7e10b8044f692bf3e7a415 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 12 Oct 2016 13:29:50 -0400 Subject: [PATCH] Update canned and categories --- admin/manage_canned.php | 11 +++++++---- admin/manage_categories.php | 14 +++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/admin/manage_canned.php b/admin/manage_canned.php index dd7b4b56..02f22506 100644 --- a/admin/manage_canned.php +++ b/admin/manage_canned.php @@ -48,6 +48,9 @@ define('WYSIWYG', 1); /* Check permissions for this feature */ hesk_checkPermission('can_man_canned'); +// Load custom fields +require_once(HESK_PATH . 'inc/custom_fields.inc.php'); + /* What should we do? */ if ($action = hesk_REQUEST('a')) { if (defined('HESK_DEMO')) { @@ -442,7 +445,7 @@ function edit_saved() hesk_process_messages($hesk_error_buffer, 'manage_canned.php?saved_replies=' . $id); } - $result = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` SET `title`='" . hesk_dbEscape($savename) . "',`message`='" . hesk_dbEscape($msg) . "' WHERE `id`='" . intval($id) . "' LIMIT 1"); + $result = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` SET `title`='" . hesk_dbEscape($savename) . "',`message`='" . hesk_dbEscape($msg) . "' WHERE `id`='" . intval($id) . "'"); unset($_SESSION['canned']['what']); unset($_SESSION['canned']['id']); @@ -501,7 +504,7 @@ function remove() $mysaved = intval(hesk_GET('id')) or hesk_error($hesklang['id_not_valid']); - hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` WHERE `id`='" . intval($mysaved) . "' LIMIT 1"); + hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` WHERE `id`='" . intval($mysaved) . "'"); if (hesk_dbAffectedRows() != 1) { hesk_error("$hesklang[int_error]: $hesklang[reply_not_found]."); } @@ -522,7 +525,7 @@ function order_saved() $reply_move = intval(hesk_GET('move')); - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` SET `reply_order`=`reply_order`+" . intval($reply_move) . " WHERE `id`='" . intval($replyid) . "' LIMIT 1"); + hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` SET `reply_order`=`reply_order`+" . intval($reply_move) . " WHERE `id`='" . intval($replyid) . "'"); if (hesk_dbAffectedRows() != 1) { hesk_error("$hesklang[int_error]: $hesklang[reply_not_found]."); } @@ -532,7 +535,7 @@ function order_saved() $i = 10; while ($myreply = hesk_dbFetchAssoc($result)) { - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` SET `reply_order`=" . intval($i) . " WHERE `id`='" . intval($myreply['id']) . "' LIMIT 1"); + hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` SET `reply_order`=" . intval($i) . " WHERE `id`='" . intval($myreply['id']) . "'"); $i += 10; } diff --git a/admin/manage_categories.php b/admin/manage_categories.php index aaf9df54..2ffa9248 100644 --- a/admin/manage_categories.php +++ b/admin/manage_categories.php @@ -549,7 +549,7 @@ function change_priority() $priority = 3; } - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `priority`='{$priority}' WHERE `id`='" . intval($catid) . "' LIMIT 1"); + hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `priority`='{$priority}' WHERE `id`='" . intval($catid) . "'"); hesk_cleanSessionVars('cat_ch_priority'); @@ -703,7 +703,7 @@ function update_category() `manager` = " . intval($manager) . ", `color` = " . $color . ", `usage` = " . intval($usage) . " - WHERE `id`='" . intval($catid) . "' LIMIT 1"); + WHERE `id`='" . intval($catid) . "'"); unset($_SESSION['selcat']); unset($_SESSION['catname2']); @@ -726,7 +726,7 @@ function remove() hesk_process_messages($hesklang['cant_del_default_cat'], $_SERVER['PHP_SELF']); } - hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `id`='" . intval($mycat) . "' LIMIT 1"); + hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `id`='" . intval($mycat) . "'"); if (hesk_dbAffectedRows() != 1) { hesk_error("$hesklang[int_error]: $hesklang[cat_not_found]."); } @@ -749,7 +749,7 @@ function order_cat() $cat_move = intval(hesk_GET('move')); - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `cat_order`=`cat_order`+" . intval($cat_move) . " WHERE `id`='" . intval($catid) . "' LIMIT 1"); + hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `cat_order`=`cat_order`+" . intval($cat_move) . " WHERE `id`='" . intval($catid) . "'"); if (hesk_dbAffectedRows() != 1) { hesk_error("$hesklang[int_error]: $hesklang[cat_not_found]."); } @@ -759,7 +759,7 @@ function order_cat() $i = 10; while ($mycat = hesk_dbFetchAssoc($res)) { - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `cat_order`=" . intval($i) . " WHERE `id`='" . intval($mycat['id']) . "' LIMIT 1"); + hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `cat_order`=" . intval($i) . " WHERE `id`='" . intval($mycat['id']) . "'"); $i += 10; } @@ -787,7 +787,7 @@ function toggle_autoassign() } /* Update auto-assign settings */ - $res = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `autoassign`='" . intval($autoassign) . "' WHERE `id`='" . intval($catid) . "' LIMIT 1"); + $res = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `autoassign`='" . intval($autoassign) . "' WHERE `id`='" . intval($catid) . "'"); if (hesk_dbAffectedRows() != 1) { hesk_process_messages($hesklang['int_error'] . ': ' . $hesklang['cat_not_found'], './manage_categories.php'); } @@ -816,7 +816,7 @@ function toggle_type() } /* Update auto-assign settings */ - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `type`='{$type}' WHERE `id`='" . intval($catid) . "' LIMIT 1"); + hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `type`='{$type}' WHERE `id`='" . intval($catid) . "'"); if (hesk_dbAffectedRows() != 1) { hesk_process_messages($hesklang['int_error'] . ': ' . $hesklang['cat_not_found'], './manage_categories.php'); }