diff --git a/admin/admin_submit_ticket.php b/admin/admin_submit_ticket.php
index 23ab2af2..56cce5d4 100644
--- a/admin/admin_submit_ticket.php
+++ b/admin/admin_submit_ticket.php
@@ -364,9 +364,7 @@ hesk_cleanSessionVars('as_owner');
hesk_cleanSessionVars('as_notify');
hesk_cleanSessionVars('as_show');
foreach ($hesk_settings['custom_fields'] as $k => $v) {
- if ($v['use']) {
- hesk_cleanSessionVars("as_$k");
- }
+ hesk_cleanSessionVars("as_$k");
}
// If ticket has been assigned to the person submitting it lets show a message saying so
diff --git a/admin/banned_emails.php b/admin/banned_emails.php
index dd1e8a6c..37107fb5 100644
--- a/admin/banned_emails.php
+++ b/admin/banned_emails.php
@@ -155,8 +155,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
- john@email.com
- @domain.com
+ john@example.com
+ @example.com
diff --git a/admin/edit_post.php b/admin/edit_post.php
index 9385c09c..1b15e20e 100644
--- a/admin/edit_post.php
+++ b/admin/edit_post.php
@@ -347,7 +347,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
$cls = in_array($k,$_SESSION['iserror']) ? ' class="isError" ' : '';
foreach ($v['value']['radio_options'] as $option) {
- if (strlen($k_value) == 0 || $k_value == $option) {
+ if (strlen($k_value) == 0) {
+ $k_value = $option;
+ $checked = empty($v['value']['no_default']) ? 'checked="checked"' : '';
+ } elseif ($k_value == $option) {
$k_value = $option;
$checked = 'checked="checked"';
} else {
@@ -460,20 +463,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
';
break;
- // Hidden
+ // Hidden (same as text for staff)
case 'hidden':
- if (strlen($k_value) != 0) {
- $v['value']['hidden_default_value'] = $k_value;
- }
- echo '
-
- '.$v['name:'].' '.$v['req'].' |
- ('.$hesklang['sch'].') |
-
- ';
- break;
-
- /* Default text input */
default:
if (strlen($k_value) != 0) {
$v['value']['default_value'] = $k_value;
diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php
index 412af5c6..38dc3a38 100644
--- a/admin/manage_knowledgebase.php
+++ b/admin/manage_knowledgebase.php
@@ -473,18 +473,33 @@ if (!isset($_SESSION['hide']['new_article']))
@@ -670,8 +685,8 @@ function list_draft() {
|
-
- |
+
+
-
- |
+
+
2) ? 0 : $old_type;
+ $from = hesk_POST('from');
$subject = hesk_input( hesk_POST('subject') ) or $hesk_error_buffer[] = $hesklang['kb_e_subj'];
@@ -1209,7 +1225,7 @@ function save_article()
$hesk_error_buffer = $tmp;
$hesk_error_buffer = $hesklang['rfm'].'
';
- hesk_process_messages($hesk_error_buffer,'./manage_knowledgebase.php?a=edit_article&id='.$id);
+ hesk_process_messages($hesk_error_buffer,'./manage_knowledgebase.php?a=edit_article&id='.$id.'&from='.$from);
}
/* Add to database */
@@ -1247,7 +1263,20 @@ function save_article()
// Update article order
update_article_order($catid);
- hesk_process_messages($hesklang['your_kb_mod'],'./manage_knowledgebase.php?a=manage_cat&catid='.$catid,'SUCCESS');
+ // Redirect to the correct page
+ switch ($from) {
+ case 'draft':
+ $redirect_action = 'a=list_draft';
+ break;
+ case 'private':
+ $redirect_action = 'a=list_private';
+ break;
+ default:
+ $redirect_action = 'a=manage_cat&catid='.$catid;
+ break;
+ }
+
+ hesk_process_messages($hesklang['your_kb_mod'],'./manage_knowledgebase.php?'.$redirect_action,'SUCCESS');
} // END save_article()
@@ -1278,6 +1307,8 @@ function edit_article()
$catid = $article['catid'];
+ $from = hesk_GET('from');
+
if (isset($_SESSION['edit_article']))
{
$_SESSION['edit_article'] = hesk_stripArray($_SESSION['edit_article']);
@@ -2136,6 +2167,7 @@ function remove_article()
$article = hesk_dbFetchAssoc($result);
$catid = intval($article['catid']);
+ $from = hesk_GET('from');
$result = hesk_dbQuery("DELETE FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `id`='".intval($id)."'");
@@ -2156,7 +2188,20 @@ function remove_article()
hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_categories` SET `articles_draft`=`articles_draft`-1 WHERE `id`='{$catid}'");
}
- hesk_process_messages($hesklang['your_kb_deleted'],'./manage_knowledgebase.php?a=manage_cat&catid='.$catid,'SUCCESS');
+ // Redirect to the correct page
+ switch ($from) {
+ case 'draft':
+ $redirect_action = 'a=list_draft';
+ break;
+ case 'private':
+ $redirect_action = 'a=list_private';
+ break;
+ default:
+ $redirect_action = 'a=manage_cat&catid='.$catid;
+ break;
+ }
+
+ hesk_process_messages($hesklang['your_kb_deleted'],'./manage_knowledgebase.php?'.$redirect_action,'SUCCESS');
} // End remove_article()