Fixed for better extension modules support.

diff --git a/reporting/includes/tcpdf.php b/reporting/includes/tcpdf.php
index e30155a4fac3dc9f9020ae120475946341f9903b..8f21785532568bc0abfa6c377eac59ae98cf8210 100644 (file)
--- 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 3e362a23b3a027961dfcc1df7f6bd1247daef042..a9f4d336f45092d330976b771a7a938b58896d83 100644 (file)
--- 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();