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

Merge pull request #374 from mkoch227/bug-fix-download-attachment-email

Browse Source 
#370 Fix download attachment with email required
This commit is contained in:
Mike Koch 2015-10-18 11:13:04 -04:00
commit ed092c1bbd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inc/view_attachment_functions.inc.php
View File

@ -3,6 +3,11 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
{ {
global $hesk_settings, $hesklang, $trackingID, $can_edit, $can_delete; global $hesk_settings, $hesklang, $trackingID, $can_edit, $can_delete;
$email = '';
if (!$is_staff) {
$email = $hesk_settings['e_query'];
}
/* Attachments disabled or not available */ /* Attachments disabled or not available */
if (!$hesk_settings['attachments']['use'] || !strlen($attachments)) { if (!$hesk_settings['attachments']['use'] || !strlen($attachments)) {
return false; return false;
@ -59,7 +64,7 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">' . $hesklang['close_modal'] . '</button> <button type="button" class="btn btn-default" data-dismiss="modal">' . $hesklang['close_modal'] . '</button>
<a href="' . $download_path . 'download_attachment.php?att_id=' . $att_id . '&amp;track=' . $trackingID . '" class="btn btn-success">' . $hesklang['dnl'] . '</a> <a href="' . $download_path . 'download_attachment.php?att_id=' . $att_id . '&amp;track=' . $trackingID . $email . '" class="btn btn-success">' . $hesklang['dnl'] . '</a>
</div> </div>
</div> </div>
</div> </div>
@ -87,7 +92,7 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
echo '<a class="btn btn-danger" href="admin_ticket.php?delatt=' . $att_id . '&amp;reply=' . $reply . '&amp;track=' . $trackingID . '&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '" onclick="return hesk_confirmExecute(\'' . hesk_makeJsString($hesklang['pda']) . '\');" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['delete'] . '"><i class="fa fa-times"></i></a> '; echo '<a class="btn btn-danger" href="admin_ticket.php?delatt=' . $att_id . '&amp;reply=' . $reply . '&amp;track=' . $trackingID . '&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '" onclick="return hesk_confirmExecute(\'' . hesk_makeJsString($hesklang['pda']) . '\');" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['delete'] . '"><i class="fa fa-times"></i></a> ';
} }
} }
echo '<a class="btn btn-success" href="' . $download_path . 'download_attachment.php?att_id=' . $att_id . '&amp;track=' . $trackingID . '" echo '<a class="btn btn-success" href="' . $download_path . 'download_attachment.php?att_id=' . $att_id . '&amp;track=' . $trackingID . $email . '"
data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['dnl'] . '"> data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['dnl'] . '">
<i class="fa fa-arrow-down"></i> <i class="fa fa-arrow-down"></i>
</a>'; </a>';