diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index ee2ecd65..fb6f0698 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -1133,7 +1133,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); - + + +
@@ -1189,152 +1194,40 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); if ($can_reply && $hesk_settings['reply_top'] == 1) { hesk_printReplyForm(); } + + /* Do we need or have any canned responses? */ + $can_options = hesk_printCanned(); + + hesk_printTicketReplies(); + + echo '
'; + + /* Reply form on bottom? */ + if ($can_reply && !$hesk_settings['reply_top']) { + hesk_printReplyForm(); + } + + /* Display ticket history */ + if (strlen($ticket['history'])) { + ?> +
+
+

+ +

+
+ +
+
+
+ +
+
+ -
-
-

- -

-
- -
-
-
- -
-
- -
-
- -
-
- $v) { - if ($v['use'] && $v['place'] == 0) { - if ($modsForHesk_settings['custom_field_setting']) { - $v['name'] = $hesklang[$v['name']]; - } - echo '
'; - echo '
' . $v['name'] . ':
'; - if ($v['type'] == 'date' && !empty($ticket[$k])) { - $dt = date('Y-m-d h:i:s', $ticket[$k]); - echo '
' . hesk_dateToString($dt, 0) . '
'; - } else { - echo '
' . $ticket[$k] . '
'; - } - echo '
'; - } - } - ?> -
-
- -
-
- -
-
- $v) { - if ($v['use'] && $v['place']) { - if ($modsForHesk_settings['custom_field_setting']) { - $v['name'] = $hesklang[$v['name']]; - } - echo '
'; - echo '
' . $v['name'] . ':
'; - if ($v['type'] == 'date' && !empty($ticket[$k])) { - $dt = date('Y-m-d h:i:s', $ticket[$k]); - echo '
' . hesk_dateToString($dt, 0) . '
'; - } else { - echo '
' . $ticket[$k] . '
'; - } - echo '
'; - } - } - ?> -
- -
- ' . $article['subject'] . '
'; - } - - // Loop through the IDs to preserve the order they were suggested in - $articles = explode(',', $ticket['articles']); - foreach ($articles as $article) { - if (isset($suggested[$article])) { - $suggested_list .= $suggested[$article]; - } - } - - // Finally print suggested articles - if (strlen($suggested_list)) { - $suggested_list = '
' . $hesklang['taws'] . '
' . $suggested_list . ' '; - echo $_SESSION['show_suggested'] ? $suggested_list : '' . $hesklang['sska'] . ''; - } - } - ?> -
- -
- -
-
-
-
- - - - - -

-
-
- -
-

@@ -1660,24 +1553,137 @@ function print_form() exit(); } // End print_form() +function mfh_print_message() { + global $ticket, $hesklang, $hesk_settings, $modsForHesk_settings; + ?> +
  • +
    + +

    +
    +
    +
    + +
    +
    + +
    +
    + $v) { + if ($v['use'] && $v['place'] == 0) { + if ($modsForHesk_settings['custom_field_setting']) { + $v['name'] = $hesklang[$v['name']]; + } + echo '
    '; + echo '
    ' . $v['name'] . ':
    '; + if ($v['type'] == 'date' && !empty($ticket[$k])) { + $dt = hesk_date($ticket[$k], false, false); + echo '
    ' . hesk_dateToString($dt, 0) . '
    '; + } else { + echo '
    ' . $ticket[$k] . '
    '; + } + echo '
    '; + } + } + ?> +
    +
    + +
    +
    + +
    +
    + $v) { + if ($v['use'] && $v['place']) { + if ($modsForHesk_settings['custom_field_setting']) { + $v['name'] = $hesklang[$v['name']]; + } + echo '
    '; + echo '
    ' . $v['name'] . ':
    '; + if ($v['type'] == 'date' && !empty($ticket[$k])) { + $dt = hesk_date($ticket[$k], false, false); + echo '
    ' . hesk_dateToString($dt, 0) . '
    '; + } else { + echo '
    ' . $ticket[$k] . '
    '; + } + echo '
    '; + } + } + ?> +
    + +
    + ' . $article['subject'] . '
    '; + } + + // Loop through the IDs to preserve the order they were suggested in + $articles = explode(',', $ticket['articles']); + foreach ($articles as $article) { + if (isset($suggested[$article])) { + $suggested_list .= $suggested[$article]; + } + } + + // Finally print suggested articles + if (strlen($suggested_list)) { + $suggested_list = '
    ' . $hesklang['taws'] . '
    ' . $suggested_list . ' '; + echo $_SESSION['show_suggested'] ? $suggested_list : '' . $hesklang['sska'] . ''; + } + } + ?> +
    + +
    +
    +
    + +
    +
    +
    +
    +
    • +'; + if (!$hesk_settings['new_top']) { + mfh_print_message(); + } else { + echo '
    • '; + } + while ($reply = hesk_dbFetchAssoc($result)) { $reply['dt'] = hesk_date($reply['dt'], true); ?>
  • - + - +
    @@ -1724,7 +1730,12 @@ function hesk_printTicketReplies()
    • '; + + if ($hesk_settings['new_top']) { + mfh_print_message(); + } else { + echo '
    • '; + } echo ''; return; diff --git a/admin/edit_post.php b/admin/edit_post.php index 6171c4a9..0effba60 100644 --- a/admin/edit_post.php +++ b/admin/edit_post.php @@ -36,6 +36,7 @@ define('WYSIWYG', 1); require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php'); +require(HESK_PATH . 'inc/mail_functions.inc.php'); hesk_load_database_functions(); hesk_session_start(); @@ -207,176 +208,183 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    • -
    -
    -

    +
    +
    +
    +

    + +

    +
    + +
    +
    +
    +
    + +
    + -
    - - - +
    + +
    +
    + '; + } ?>
    - +
    - +
    - '; - } ?> -
    - +
    + -
    - +
    + +
    -
    -
    - +
    + -
    - +
    + +
    -
    -
    - + $v) { + if ($v['use']) { + if ($modsForHesk_settings['custom_field_setting']) { + $v['name'] = $hesklang[$v['name']]; + } -
    - -
    -
    - $v) { - if ($v['use']) { - if ($modsForHesk_settings['custom_field_setting']) { - $v['name'] = $hesklang[$v['name']]; - } + $k_value = $ticket[$k]; - $k_value = $ticket[$k]; + if ($v['type'] == 'checkbox') { + $k_value = explode('
    ', $k_value); + } - if ($v['type'] == 'checkbox') { - $k_value = explode('
    ', $k_value); - } - - switch ($v['type']) { - /* Radio box */ - case 'radio': - echo ' + switch ($v['type']) { + /* Radio box */ + case 'radio': + echo '
    '; - $options = explode('#HESK#', $v['value']); + $options = explode('#HESK#', $v['value']); - foreach ($options as $option) { + foreach ($options as $option) { - if (strlen($k_value) == 0 || $k_value == $option) { - $k_value = $option; - $checked = 'checked="checked"'; - } else { - $checked = ''; + if (strlen($k_value) == 0 || $k_value == $option) { + $k_value = $option; + $checked = 'checked="checked"'; + } else { + $checked = ''; + } + + echo '
    '; } - echo '
    '; - } - - echo '
    + echo '
    '; - break; + break; - /* Select drop-down box */ - case 'select': - echo ' + /* Select drop-down box */ + case 'select': + echo '
    + foreach ($options as $option) { + + if (strlen($k_value) == 0 || $k_value == $option) { + $k_value = $option; + $selected = 'selected="selected"'; + } else { + $selected = ''; + } + + echo ''; + } + + echo '
    '; - break; + break; - /* Checkbox */ - case 'checkbox': - echo ' + /* Checkbox */ + case 'checkbox': + echo '
    '; - $options = explode('#HESK#', $v['value']); + $options = explode('#HESK#', $v['value']); - foreach ($options as $option) { + foreach ($options as $option) { - if (in_array($option, $k_value)) { - $checked = 'checked="checked"'; - } else { - $checked = ''; + if (in_array($option, $k_value)) { + $checked = 'checked="checked"'; + } else { + $checked = ''; + } + + echo '
    '; } - echo '
    '; - } - - echo '
    + echo '
    '; - break; + break; - /* Large text box */ - case 'textarea': - $size = explode('#', $v['value']); - $size[0] = empty($size[0]) ? 5 : intval($size[0]); - $size[1] = empty($size[1]) ? 30 : intval($size[1]); - $k_value = hesk_msgToPlain($k_value, 0, 0); + /* Large text box */ + case 'textarea': + $size = explode('#', $v['value']); + $size[0] = empty($size[0]) ? 5 : intval($size[0]); + $size[1] = empty($size[1]) ? 30 : intval($size[1]); + $k_value = hesk_msgToPlain($k_value, 0, 0); - echo ' + echo '
    '; - break; + break; - case 'date': - if (strlen($k_value) != 0) { - $v['value'] = $k_value; - } - echo ' + case 'date': + if (strlen($k_value) != 0) { + $v['value'] = $k_value; + } + echo '
    @@ -384,63 +392,63 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); maxlength="' . $v['maxlen'] . '" value="' . date('Y-m-d', $v['value']) . '" readonly/>
    '; - break; - case 'multiselect': - echo '
    + break; + case 'multiselect': + echo '
    + echo '
    '; - break; + break; - case 'hidden': - //Clean up multiple dashes or whitespaces - $formattedId = preg_replace("/[\s-]+/", " ", $v['name']); - $formattedId = preg_replace("/[\s_]/", "-", $formattedId); + case 'hidden': + //Clean up multiple dashes or whitespaces + $formattedId = preg_replace("/[\s-]+/", " ", $v['name']); + $formattedId = preg_replace("/[\s_]/", "-", $formattedId); - if (strlen($k_value) != 0) { - $v['value'] = $k_value; - } + if (strlen($k_value) != 0) { + $v['value'] = $k_value; + } - echo ''; + echo ''; - break; + break; - case 'readonly': - //Clean up multiple dashes or whitespaces - $formattedId = preg_replace("/[\s-]+/", " ", $v['name']); - $formattedId = preg_replace("/[\s_]/", "-", $formattedId); + case 'readonly': + //Clean up multiple dashes or whitespaces + $formattedId = preg_replace("/[\s-]+/", " ", $v['name']); + $formattedId = preg_replace("/[\s_]/", "-", $formattedId); - if (strlen($k_value) != 0) { - $v['value'] = $k_value; - } + if (strlen($k_value) != 0) { + $v['value'] = $k_value; + } - echo '
    + echo '
    '; - break; + break; - /* Default text input */ - default: - if (strlen($k_value) != 0) { - $k_value = hesk_msgToPlain($k_value, 0, 0); - $v['value'] = $k_value; - } - echo ' + /* Default text input */ + default: + if (strlen($k_value) != 0) { + $k_value = hesk_msgToPlain($k_value, 0, 0); + $v['value'] = $k_value; + } + echo '
    @@ -448,50 +456,55 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    '; + } } } - } - ?> - - -
    - - -
    - - + + +
    + + +
    + + +
    -
    -
    - - - - +
    + + -
    -
    - - - - - - - -
    - + if ($is_reply) { + ?> + + +
    +
    +
    + + + + + +
    + + +
    +
    +
    + +
    -
    +