X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fmain.inc;h=2477a6c0f38bfba618f915960618a827783928b8;hb=3faff3b471c0953bc1d11a6c00308779787a55f2;hp=fd4aa97759f8f26fd6e4c06cebccd6562034c38c;hpb=46adaa0c03e5bb3ec387cbd95483175be4f08dfb;p=fa-stable.git

diff --git a/includes/main.inc b/includes/main.inc
index fd4aa977..2477a6c0 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -11,9 +11,7 @@
 ***********************************************************************/
 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");
 include_once($path_to_root . "/includes/db/comments_db.inc");
 include_once($path_to_root . "/includes/db/sql_functions.inc");
@@ -23,21 +21,24 @@ include_once($path_to_root . "/includes/db/audit_trail_db.inc");
 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");
-	
+
+$page_nested = -1;
+
 function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false, $css='')
 {
 
-   	global $path_to_root, $page_security;
+   	global $path_to_root, $page_security, $page_nested;
 
+	if (++$page_nested) return;
 
    	$hide_menu = $no_menu;
 
-   	include($path_to_root . "/includes/page/header.inc");
+   	include_once($path_to_root . "/includes/page/header.inc");
 
    	page_header($title, $no_menu, $is_index, $onload, $js, $css);
 	check_page_security($page_security);
 //	error_box();
-	if($script_only) {		
+	if($script_only) {
 		echo '<noscript>';
 		echo display_heading(_('This page is usable only with javascript enabled browsers.'));
 		echo '</noscript>';
@@ -47,16 +48,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, $type_no=0, $trans_no=0)
+function end_page($no_menu=false, $is_index=false, $final_screen=false, $type_no=0, $trans_no=0)
 {
-	global $path_to_root;
+	global $path_to_root, $page_nested;
 
-	if (!$is_index && !$hide_back_link && function_exists('hyperlink_back'))
-		hyperlink_back(true, $no_menu, $type_no, $trans_no);
+	if ($page_nested-- > 0) return;
+
+	if (!$is_index && function_exists('hyperlink_back'))
+		hyperlink_back(true, $no_menu, $type_no, $trans_no, $final_screen);
 	div_end();	// end of _page_body section
 
-	include($path_to_root . "/includes/page/footer.inc");
-	page_footer($no_menu, $is_index, $hide_back_link);
+	include_once($path_to_root . "/includes/page/footer.inc");
+	page_footer($no_menu, $is_index);
 }
 
 function cache_js_file($fpath, $text) 
@@ -65,13 +68,34 @@ function cache_js_file($fpath, $text)
 
 	if(!$go_debug) $text = js_compress($text);
 
-        $file = fopen($fpath, 'w');
+    $file = force_open($fpath);
 	if (!$file) return false;
 	if (!fwrite($file, $text)) return false;
 	return fclose($file);
 
 }
 
+/*
+	Open file for writing with creration of subfolders if needed.
+*/
+function force_open($fname)
+{
+	$file = pathinfo($fname);
+
+	$path = $fname[0] == '/' ? '/' : '';
+	$tree = explode('/', $file['dirname']);
+	foreach($tree as $level) {
+		$path .= $level;
+		if (!file_exists($path)) {
+			if (!mkdir($path)) {
+				return null;
+			}
+		}
+		$path .= '/';
+	}
+	return fopen($fname, 'w');
+}
+
 function add_js_file($filename) 
 {
 	  global $js_static;
@@ -257,9 +281,9 @@ function check_write($path)
 {
 	if ($path == ''//|| $path == '.' || $path == '..'
 	) return 0;
-	
+
 	return is_writable($path) ? (is_dir($path) ? 1 : -1) 
-		: (is_file($path) ? 0 : ($path == '.' ? 0 : check_write(dirname($path))));
+		: (is_file($path) ? 0 : ($path == '.' || $path == '..' ? 0 : check_write(dirname($path))));
 }
 
 /*
@@ -270,11 +294,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;
 }
@@ -302,20 +327,22 @@ function copy_file($file, $from, $to)
 /*
 	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
@@ -328,6 +355,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;
 				}
 			}
@@ -339,6 +367,14 @@ function find_custom_file($rep)
 
 	return null;
 }
-
+/*
+	
+	Protect against directory traversal.
+	Changes all not POSIX compatible chars to underscore.
+*/
+function clean_file_name($filename) {
+    $filename = str_replace(chr(0), '', $filename);
+    return preg_replace('/[^a-zA-Z0-9.\-_]/', '_', $filename);
+}
 
 ?>
\ No newline at end of file