X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fmain.inc;h=161911c608b512b87559d7e7ff2569b21ae8427d;hb=4e4ce8577f8582967995919860c66aa94d633afd;hp=ca434c27b2e5ae5e43c1e95f876d17675736958a;hpb=5725ec31293c82da0aa1f182bfe4755ee7e0f11a;p=fa-stable.git

diff --git a/includes/main.inc b/includes/main.inc
index ca434c27..161911c6 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -11,7 +11,6 @@
 ***********************************************************************/
 include_once($path_to_root . "/includes/db/connect_db.inc");
 
-include_once($path_to_root . "/includes/errors.inc");
 include_once($path_to_root . "/includes/types.inc");
 include_once($path_to_root . "/includes/systypes.inc");
 include_once($path_to_root . "/includes/references.inc");
@@ -24,7 +23,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 +33,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 +46,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 +258,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))));
 }
 
 /*
@@ -283,11 +269,12 @@ function check_write($path)
 function copy_files($flist, $from, $to, $strict=false)
 {
 	foreach ($flist as $file) {
-		if (file_exists($from.'/'.$file))
+		if (file_exists($from.'/'.$file)) {
 			if (!copy_file($file, $from, $to))
 				return false;
-		if ($strict && !is_file($from.'/'.$file)) // if 
+		} else if ($strict) {
 				unlink($to.'/'.$file);
+		}
 	}
 	return true;
 }
@@ -312,38 +299,25 @@ 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.
-	Also adds include path for any related files.
+	Also adds include path for any related files, and sets $local_path_to_root 
+	to enable local translation domains.
 	
 	Returns found file path or null.
 */
 function find_custom_file($rep)
 {
-	global $installed_extensions, $comp_path, $path_to_root;
+	global $installed_extensions, $path_to_root, $local_path_to_root;
 
 	// customized per company version
 	$path = company_path();
-	$file = $path.'/'.$rep;
+	$file = $path.$rep;
 	if (file_exists($file)) {
 		// add local include path
-		set_include_path($path.PATH_SEPARATOR.get_include_path());
+		$local_path_to_root = $path;
+		set_include_path(dirname($file).PATH_SEPARATOR.get_include_path());
 		return $file;
 	}
 	// file added by active extension modules
@@ -356,6 +330,7 @@ function find_custom_file($rep)
 				$file = $path.$rep;
 				if (file_exists($file)) {
 					set_include_path($path.PATH_SEPARATOR.get_include_path());
+					$local_path_to_root = $path;
 					return $file;
 				}
 			}
@@ -367,6 +342,13 @@ function find_custom_file($rep)
 
 	return null;
 }
-
+/*
+	
+	Protect against directory traversal.
+	Changes all not POSIX compatible chars to underscore.
+*/
+function clean_file_name($filename) {
+    return preg_replace('/[^a-zA-Z0-9.\-_]/', '_', $filename);
+}
 
 ?>
\ No newline at end of file