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

#275 Utilize the separated folders option

Browse Source
This commit is contained in:
Mike Koch 2015-08-06 12:56:44 -04:00
parent 698e0b678a
commit 194c4a0dad
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/manage_knowledgebase.php
View File

@ -37,6 +37,7 @@ define('HESK_PATH','../');
/* Get all the required files and functions */ /* Get all the required files and functions */
require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'hesk_settings.inc.php');
require(HESK_PATH . 'modsForHesk_settings.inc.php');
require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/common.inc.php');
require(HESK_PATH . 'inc/admin_functions.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php');
hesk_load_database_functions(); hesk_load_database_functions();
@ -1113,7 +1114,7 @@ function save_article()
$attachments = array(); $attachments = array();
for ($i=1;$i<=3;$i++) for ($i=1;$i<=3;$i++)
{ {
$att = hesk_uploadFile($i); $att = hesk_uploadFile($i, false);
if ( ! empty($att)) if ( ! empty($att))
{ {
$attachments[$i] = $att; $attachments[$i] = $att;
@ -1922,7 +1923,7 @@ function new_article()
$attachments = array(); $attachments = array();
for ($i=1;$i<=3;$i++) for ($i=1;$i<=3;$i++)
{ {
$att = hesk_uploadFile($i); $att = hesk_uploadFile($i, false);
if ( ! empty($att)) if ( ! empty($att))
{ {
$attachments[$i] = $att; $attachments[$i] = $att;

4
download_attachment.php
View File

@ -37,6 +37,7 @@ define('HESK_PATH','./');
// Get all the required files and functions // Get all the required files and functions
require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'hesk_settings.inc.php');
require(HESK_PATH . 'modsForHesk_settings.inc.php');
require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/common.inc.php');
hesk_load_database_functions(); hesk_load_database_functions();
@ -139,6 +140,9 @@ else
// Path of the file on the server // Path of the file on the server
$realpath = $hesk_settings['attach_dir'] . '/' . $file['saved_name']; $realpath = $hesk_settings['attach_dir'] . '/' . $file['saved_name'];
if (isset($_GET['kb_att'])) {
$realpath = $modsForHesk_settings['kb_attach_dir'] . '/' . $file['saved_name'];
}
// Perhaps the file has been deleted? // Perhaps the file has been deleted?
if ( ! file_exists($realpath)) if ( ! file_exists($realpath))

21
inc/attachments.inc.php
View File

@ -38,9 +38,9 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
/*************************** /***************************
Function hesk_uploadFiles() Function hesk_uploadFiles()
***************************/ ***************************/
function hesk_uploadFile($i) function hesk_uploadFile($i, $isTicket = true)
{ {
global $hesk_settings, $hesklang, $trackingID, $hesk_error_buffer; global $hesk_settings, $hesklang, $trackingID, $hesk_error_buffer, $modsForHesk_settings;
/* Return if name is empty */ /* Return if name is empty */
if (empty($_FILES['attachment']['name'][$i])) {return '';} if (empty($_FILES['attachment']['name'][$i])) {return '';}
@ -92,7 +92,11 @@ function hesk_uploadFile($i)
*/ */
/* If upload was successful let's create the headers */ /* If upload was successful let's create the headers */
if ( ! move_uploaded_file($_FILES['attachment']['tmp_name'][$i], dirname(dirname(__FILE__)).'/'.$hesk_settings['attach_dir'].'/'.$file_name)) $directory = $hesk_settings['attach_dir'];
if (!$isTicket) {
$directory = $modsForHesk_settings['kb_attach_dir'];
}
if ( ! move_uploaded_file($_FILES['attachment']['tmp_name'][$i], dirname(dirname(__FILE__)).'/'.$directory.'/'.$file_name))
{ {
return hesk_fileError($hesklang['cannot_move_tmp']); return hesk_fileError($hesklang['cannot_move_tmp']);
} }
@ -118,11 +122,16 @@ function hesk_fileError($error)
} // End hesk_fileError() } // End hesk_fileError()
function hesk_removeAttachments($attachments) function hesk_removeAttachments($attachments, $isTicket)
{ {
global $hesk_settings, $hesklang; global $hesk_settings, $hesklang, $modsForHesk_settings;
$hesk_settings['server_path'] = dirname(dirname(__FILE__)).'/'.$hesk_settings['attach_dir'].'/'; $directory = $hesk_settings['attach_dir'];
if (!$isTicket) {
$directory = $modsForHesk_settings['kb_attach_dir'];
}
$hesk_settings['server_path'] = dirname(dirname(__FILE__)).'/'.$directory.'/';
foreach ($attachments as $myatt) foreach ($attachments as $myatt)
{ {