Removed bank payment print links (not implemented yet).

[fa-stable.git] / reporting / prn_redirect.php

diff --git a/reporting/prn_redirect.php b/reporting/prn_redirect.php
index 3f38f70889b36319a98925fd7acdb193c485322a..a9f4d336f45092d330976b771a7a938b58896d83 100644 (file)
--- a/reporting/prn_redirect.php
+++ b/reporting/prn_redirect.php
@@ -17,44 +17,11 @@ $path_to_root = "..";
 $page_security = 'SA_OPEN';    // this level is later overriden in rep file
 include_once($path_to_root . "/includes/session.inc");
 
-function find_report_file($rep) {
-       global $installed_extensions, $comp_path, $path_to_root;
-
-       // customized per company versions 
-       $path = $comp_path.'/'.user_company()."/reporting";
-       $rep_file = $path."/rep$rep.php";
-       if (file_exists($rep_file)) {
-               // add local include path for custom reports
-               set_include_path($path.PATH_SEPARATOR.get_include_path());
-               return $rep_file;
-       }
-       // reports added by active extension modules
-       if (count($installed_extensions) > 0)
-       {
-               $extensions = $installed_extensions;
-               foreach ($extensions as $ext)
-                       if (($ext['active'] && $ext['type'] == 'module')) {
-                               $path = $path_to_root.'/'.$ext['path']."/reporting";
-                               $rep_file = $path."/rep$rep.php";
-                               if (file_exists($rep_file)) {
-                                       set_include_path($path.PATH_SEPARATOR.get_include_path());
-                                       return $rep_file;
-                               }
-                       }
-       }
-       // standard reports
-       $rep_file = $path_to_root ."/reporting/rep$rep.php";
-       if (file_exists($rep_file))
-               return $rep_file;
-
-       return null;
-}
-
 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");
@@ -67,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");
@@ -85,10 +52,16 @@ if (!isset($_POST['REP_ID'])) {     // print link clicked
                        ? $_GET['PARAM_'.$i] : $def_pars[$i];
        }
 }
+
 $rep = $_POST['REP_ID'];
 
-$rep_file = find_report_file($rep);
-require($rep_file);
+$rep_file = find_custom_file("/reporting/rep$rep.php");
+
+if ($rep_file) {
+       chdir(dirname($rep_file));
+       require(basename($rep_file));
+} else
+       display_error("Cannot find report file '$rep'");
 exit();
 
 ?>
\ No newline at end of file