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

diff --git a/includes/main.inc b/includes/main.inc
index cffb8ee6..55a97b2b 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -24,7 +24,7 @@ include_once($path_to_root . "/admin/db/users_db.inc");
 include_once($path_to_root . "/includes/ui/ui_view.inc");
 include_once($path_to_root . "/includes/ui/ui_controls.inc");
 	
-function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false)
+function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false, $css='')
 {
 
    	global $path_to_root, $page_security;
@@ -34,7 +34,7 @@ function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $scri
 
    	include($path_to_root . "/includes/page/header.inc");
 
-   	page_header($title, $no_menu, $is_index, $onload, $js);
+   	page_header($title, $no_menu, $is_index, $onload, $js, $css);
 	check_page_security($page_security);
 //	error_box();
 	if($script_only) {		
@@ -47,31 +47,18 @@ 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");
 	page_footer($no_menu, $is_index, $hide_back_link);
 }
 
-function flush_dir($path, $wipe = false) 
-{
-	$dir = opendir($path);
-	while(false !== ($fname = readdir($dir))) {
-		if($fname=='.' || $fname=='..' || $fname=='CVS' || (!$wipe && $fname=='index.php')) continue;
-  		if(is_dir($path.'/'.$fname)) {
-		    flush_dir($path.'/'.$fname, $wipe);
-		    if ($wipe) @rmdir($path.'/'.$fname);
-		} else
-		    @unlink($path.'/'.$fname);
-	}
-}
-
 function cache_js_file($fpath, $text) 
 {
 	global $go_debug;
@@ -272,7 +259,7 @@ function check_write($path)
 	) return 0;
 	
 	return is_writable($path) ? (is_dir($path) ? 1 : -1) 
-		: ($path =='.' ? 0 : check_write(dirname($path)));
+		: (is_file($path) ? 0 : ($path == '.' ? 0 : check_write(dirname($path))));
 }
 
 /*
@@ -312,7 +299,6 @@ function copy_file($file, $from, $to)
 		return @copy($from.'/'.$file, $to.'/'.$file);
 	}
 }
-
 /*
 	Search for file, looking first for company specific version, then for 
 	version provided by any extension module, finally in main FA directory.
@@ -325,11 +311,11 @@ function find_custom_file($rep)
 	global $installed_extensions, $comp_path, $path_to_root;
 
 	// customized per company version
-	$path = $comp_path.'/'.user_company();
+	$path = company_path();
 	$file = $path.$rep;
 	if (file_exists($file)) {
 		// add local include path
-		set_include_path($path.PATH_SEPARATOR.get_include_path());
+		set_include_path(dirname($file).PATH_SEPARATOR.get_include_path());
 		return $file;
 	}
 	// file added by active extension modules
@@ -354,5 +340,4 @@ function find_custom_file($rep)
 	return null;
 }
 
-
 ?>
\ No newline at end of file