X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fmain.inc;h=ef86d4383903f587fda2eda5ab7e5f6b2eac000c;hb=3613e32ad573d5faccb974a421702bdd87583878;hp=cffb8ee67c9871bc519b0df6851d368cdb20e472;hpb=1c67490b878ae789ad0f27d8777e520a3d914c89;p=fa-stable.git

diff --git a/includes/main.inc b/includes/main.inc
index cffb8ee6..ef86d438 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -47,12 +47,12 @@ function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $scri
 	}
 }
 
-function end_page($no_menu=false, $is_index=false, $hide_back_link=false)
+function end_page($no_menu=false, $is_index=false, $hide_back_link=false, $type_no=0, $trans_no=0)
 {
 	global $path_to_root;
 
 	if (!$is_index && !$hide_back_link && function_exists('hyperlink_back'))
-		hyperlink_back(true, $no_menu);
+		hyperlink_back(true, $no_menu, $type_no, $trans_no);
 	div_end();	// end of _page_body section
 
 	include($path_to_root . "/includes/page/footer.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());