From 5725ec31293c82da0aa1f182bfe4755ee7e0f11a Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Sun, 4 Apr 2010 12:09:27 +0000
Subject: [PATCH] Added company_path() helper.

---
 includes/main.inc | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/includes/main.inc b/includes/main.inc
index cffb8ee6..ca434c27 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -312,7 +312,21 @@ function copy_file($file, $from, $to)
 		return @copy($from.'/'.$file, $to.'/'.$file);
 	}
 }
+/*
+	Returns current path to company private folder.
+	(Current path can change after chdir).
+*/
+function company_path($comp=null)
+{
+	global $path_to_root, $comp_path;
 
+	if (!isset($comp))
+		$comp = user_company();
+
+	// if path is relative, set current path_to_root
+	return ($comp_path[0]=='.' ? $path_to_root.'/'.basename($comp_path) : $comp_path)
+			. '/'.$comp;
+}
 /*
 	Search for file, looking first for company specific version, then for 
 	version provided by any extension module, finally in main FA directory.
@@ -325,8 +339,8 @@ function find_custom_file($rep)
 	global $installed_extensions, $comp_path, $path_to_root;
 
 	// customized per company version
-	$path = $comp_path.'/'.user_company();
-	$file = $path.$rep;
+	$path = company_path();
+	$file = $path.'/'.$rep;
 	if (file_exists($file)) {
 		// add local include path
 		set_include_path($path.PATH_SEPARATOR.get_include_path());
-- 
2.30.2