Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '3-2-3' into 'master'

Browse Source 
3.2.3

See merge request mike-koch/Mods-for-HESK!80
This commit is contained in:
Mike Koch 2017-11-20 17:38:11 +00:00
commit 15b971412b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/admin_ticket.php
View File

@ -1561,7 +1561,7 @@ function hesk_getAdminButtons($category_id)
function hesk_getAdminButtonsInTicket($reply = 0, $white = 1) function hesk_getAdminButtonsInTicket($reply = 0, $white = 1)
{ {
global $hesk_settings, $hesklang, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete, $isManager; global $hesk_settings, $hesklang, $ticket, $trackingID, $can_edit, $can_archive, $can_delete, $isManager;
$options = $reply ? '' : '<div class="pull-right">'; $options = $reply ? '' : '<div class="pull-right">';
@ -1934,7 +1934,7 @@ function mfh_print_reply($reply) {
?> ?>
</div> </div>
<div class="col-md-6 text-right"> <div class="col-md-6 text-right">
<?php echo hesk_getAdminButtonsInTicket(); ?> <?php echo hesk_getAdminButtonsInTicket($reply); ?>
</div> </div>
</div> </div>
</div> </div>

4
inc/email_functions.inc.php
View File

@ -512,10 +512,10 @@ function hesk_mail($to, $subject, $message, $htmlMessage, $modsForHesk_settings,
$headers .= "MIME-Version: 1.0\n"; $headers .= "MIME-Version: 1.0\n";
$headers .= "From: $hesk_settings[from_header]\n"; $headers .= "From: $hesk_settings[from_header]\n";
if (count($cc) > 0) { if (count($cc) > 0) {
$headers .= "Cc: " . implode(',', $cc); $headers .= "Cc: " . implode(',', $cc) . "\n";
} }
if (count($bcc) > 0) { if (count($bcc) > 0) {
$headers .= "Bcc: " . implode(',', $bcc); $headers .= "Bcc: " . implode(',', $bcc) . "\n";
} }
$headers .= "Reply-To: $hesk_settings[from_header]\n"; $headers .= "Reply-To: $hesk_settings[from_header]\n";
$headers .= "Return-Path: $hesk_settings[webmaster_mail]\n"; $headers .= "Return-Path: $hesk_settings[webmaster_mail]\n";