From: Janusz Dobrowolski Date: Sun, 4 Apr 2010 12:02:16 +0000 (+0000) Subject: Fixed for better extension modules support. X-Git-Tag: v2.4.2~19^2~923 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=f38bbd4604a673b34a05c91b0a1502c577fd8800;p=fa-stable.git Fixed for better extension modules support. --- diff --git a/reporting/includes/tcpdf.php b/reporting/includes/tcpdf.php index e30155a4..8f217855 100644 --- a/reporting/includes/tcpdf.php +++ b/reporting/includes/tcpdf.php @@ -148,8 +148,8 @@ * ------------------------------------------------------------------------------- */ if (!defined("K_PATH_FONTS")) - define ("K_PATH_FONTS", '../reporting/fonts/'); -define ("K_PATH_CACHE", '../reporting/fonts/'); + define ("K_PATH_FONTS", dirname(__FILE__)."/../fonts/"); +define ("K_PATH_CACHE", dirname(__FILE__)."/../fonts/"); define("K_CELL_HEIGHT_RATIO", 1.25); //require_once(dirname(__FILE__).'/config/tcpdf_config.php'); diff --git a/reporting/prn_redirect.php b/reporting/prn_redirect.php index 3e362a23..a9f4d336 100644 --- a/reporting/prn_redirect.php +++ b/reporting/prn_redirect.php @@ -21,7 +21,7 @@ if (isset($_GET['xls'])) { $filename = $_GET['filename']; $unique_name = $_GET['unique']; - $path = $comp_path.'/'.user_company(). '/pdf_files/'; + $path = company_path(). '/pdf_files/'; header("Content-type: application/vnd.ms-excel"); header("Content-Disposition: attachment; filename=$filename" ); header("Expires: 0"); @@ -34,7 +34,7 @@ elseif (isset($_GET['xml'])) { $filename = $_GET['filename']; $unique_name = $_GET['unique']; - $path = $comp_path.'/'.user_company(). '/pdf_files/'; + $path = company_path(). '/pdf_files/'; header("content-type: text/xml"); header("Content-Disposition: attachment; filename=$filename"); header("Expires: 0"); @@ -57,9 +57,10 @@ $rep = $_POST['REP_ID']; $rep_file = find_custom_file("/reporting/rep$rep.php"); -if ($rep_file) - require($rep_file); -else +if ($rep_file) { + chdir(dirname($rep_file)); + require(basename($rep_file)); +} else display_error("Cannot find report file '$rep'"); exit();