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

Get inline attachment viewing for doc/xls/ppt working

Browse Source
This commit is contained in:
Mike Koch 2017-05-25 12:55:04 -04:00
parent e3bb11f27d
commit 67fad4c6ce
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/common.inc.php
View File

@ -262,13 +262,13 @@ function hesk_load_database_functions()
function hesk_load_api_database_functions() function hesk_load_api_database_functions()
{ {
require(__DIR__ . '/../api/core/json_error.php'); require(__DIR__ . '/../api/Core/json_error.php');
// Preferrably use the MySQLi functions // Preferrably use the MySQLi functions
if (function_exists('mysqli_connect')) { if (function_exists('mysqli_connect')) {
require(__DIR__ . '/../api/core/database_mysqli.inc.php'); require(__DIR__ . '/../api/Core/database_mysqli.inc.php');
} // Default to MySQL } // Default to MySQL
else { else {
require(__DIR__ . '/../api/core/database.inc.php'); require(__DIR__ . '/../api/Core/database.inc.php');
} }
} // END hesk_load_database_functions() } // END hesk_load_database_functions()

3
inc/view_attachment_functions.inc.php
View File

@ -51,11 +51,12 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
} elseif (in_array($fontAwesomeIcon, array('fa fa-file-word-o', 'fa fa-file-excel-o', 'fa fa-file-powerpoint-o'))) { } elseif (in_array($fontAwesomeIcon, array('fa fa-file-word-o', 'fa fa-file-excel-o', 'fa fa-file-powerpoint-o'))) {
//-- Get the actual image location and display a thumbnail. It will be linked to a modal to view a larger size. //-- Get the actual image location and display a thumbnail. It will be linked to a modal to view a larger size.
$path = mfh_getSavedNameUrlForAttachment($att_id, $is_staff); $path = mfh_getSavedNameUrlForAttachment($att_id, $is_staff);
$apiPath = preg_replace('/https?:\/\//i', '', $hesk_settings['hesk_url'] . '/api/index.php/v1/tickets/' . $trackingID . '/attachments/' . $att_id);
if ($path == '') { if ($path == '') {
echo '<i class="fa fa-ban fa-4x" data-toggle="tooltip" title="' . $hesklang['attachment_removed'] . '"></i>'; echo '<i class="fa fa-ban fa-4x" data-toggle="tooltip" title="' . $hesklang['attachment_removed'] . '"></i>';
} else { } else {
echo '<a class="mfp-iframe" data-toggle="lightbox-item" href="https://view.officeapps.live.com/op/embed.aspx?src=' . $path . '"> echo '<a class="mfp-iframe" data-toggle="lightbox-item" href="https://view.officeapps.live.com/op/embed.aspx?src=' . $apiPath . '">
<i class="' . $fontAwesomeIcon . ' fa-4x"></i> <i class="' . $fontAwesomeIcon . ' fa-4x"></i>
</a>'; </a>';
} }