X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fprn_redirect.php;h=ce525ea1ff788253acabaf994fdb5f8a644013f1;hb=20c9b5846824f0489c6791d74a6c78e2bfb0b2fc;hp=9018e0fd424be98585075561fb44a8f02b3d4fea;hpb=877aa741346d3ac9c0bfffa90cbe10ed16f7c8f3;p=fa-stable.git

diff --git a/reporting/prn_redirect.php b/reporting/prn_redirect.php
index 9018e0fd..ce525ea1 100644
--- a/reporting/prn_redirect.php
+++ b/reporting/prn_redirect.php
@@ -17,42 +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");
 
-/*
-	Find report definition file.
-	Standard reports can be superseded by report with the same id
-	included in active extension, or company customized report.
-*/
-function find_report_file($rep) {
-	global $installed_extensions, $comp_path, $path_to_root;
-
-	// customized per company versions 
-	$rep_file = $comp_path.'/'.user_company()."/reporting/rep$rep.php";
-	if (file_exists($rep_file)) 
-		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')) {
-				$rep_file = $path_to_root.'/'.$ext['path']."/reporting/rep$rep.php";
-				if (file_exists($rep_file))
-					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");
@@ -65,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");
@@ -83,10 +52,15 @@ 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) {
+	require($rep_file);
+} else
+	display_error("Cannot find report file '$rep'");
 exit();
 
 ?>
\ No newline at end of file