X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fmain.inc;h=db1576bf50d748ad38b2b0bdd7b1b160dfcba57d;hb=a3b394e516743dba27de10a7aa1f31aa5596e117;hp=5d4371ba68d6c0efbfa1e2fdb52e7271db0f84be;hpb=0beb325a748bb32dbf312c55e0afea57e7380972;p=fa-stable.git

diff --git a/includes/main.inc b/includes/main.inc
index 5d4371ba..db1576bf 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -11,31 +11,31 @@
 ***********************************************************************/
 include_once($path_to_root . "/includes/db/connect_db.inc");
 
-include_once($path_to_root . "/includes/reserved.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/prefs/sysprefs.inc");
 include_once($path_to_root . "/includes/db/comments_db.inc");
 include_once($path_to_root . "/includes/db/sql_functions.inc");
+include_once($path_to_root . "/includes/db/audit_trail_db.inc");
+//include_once($path_to_root . "/includes/validation.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");
-include_once($path_to_root . "/installed_extensions.php");
 	
-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;
+   	global $path_to_root, $page_security;
+
 
    	$hide_menu = $no_menu;
 
    	include($path_to_root . "/includes/page/header.inc");
 
-   	page_header($title, $no_menu, $is_index, $onload, $js);
-	error_box();
+   	page_header($title, $no_menu, $is_index, $onload, $js, $css);
+	check_page_security($page_security);
+//	error_box();
 	if($script_only) {		
 		echo '<noscript>';
 		echo display_heading(_('This page is usable only with javascript enabled browsers.'));
@@ -46,26 +46,16 @@ function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $scri
 	}
 }
 
-function end_page($no_menu=false, $is_index=false)
+function end_page($no_menu=false, $is_index=false, $final_screen=false, $type_no=0, $trans_no=0)
 {
-   	global $path_to_root, $Ajax;
-    	$hide_menu = $no_menu;
-		div_end();	// _page_body section
-   	include($path_to_root . "/includes/page/footer.inc");
-    	page_footer($no_menu, $is_index);
-}
+	global $path_to_root;
 
-function flush_dir($path) 
-{
-	$dir = opendir($path);
-	while(false !== ($fname = readdir($dir))) {
-		if($fname=='.' || $fname=='..' || $fname=='index.php') continue;
-  		if(is_dir($path.'/'.$fname)) {
-		    flush_dir($path.'/'.$fname);
-		    @rmdir($path.'/'.$fname);
-		} else
-		    @unlink($path.'/'.$fname);
-  	}
+	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);
 }
 
 function cache_js_file($fpath, $text) 
@@ -139,10 +129,11 @@ function js_compress($sJS)
 		$inNormalComment = false;
 	
 		//loop through line's characters and take out any literal strings, replace them with ___i___ where i is the index of this string
-		for($j=0;$j<strlen($line);$j++)
+		$len = strlen($line);
+		for($j=0;$j<$len;$j++)
 		{
-			$c = substr($line,$j,1);
-			$d = substr($line,$j,2);
+			$c = $line[$j];		// this is _really_ faster than subst
+			$d = $c.$line[$j+1];
 	
 			//look for start of quote
 			if(!$inQuote && !$inComment)
@@ -256,37 +247,109 @@ function js_compress($sJS)
 	}
 	return $sJS;
 }
-//-----------------------------------------------------------------------------
-//	Inserts $elements into $array at position $index.
-//	$elements is list of any objects
-//
-function array_insert(&$array, $index, $elements)
+
+/*
+	Check if file can be updated, restoring subdirectories 
+	if needed. Returns 1 when no confilcts, -1 when file exists and is writable
+*/
+function check_write($path)
 {
-	if (!is_array($elements)) $elements = array($elements);
+	if ($path == ''//|| $path == '.' || $path == '..'
+	) return 0;
 
-	$head  = array_splice($array, 0, $index);
-	$array = array_merge($head, $elements, $array);
+	return is_writable($path) ? (is_dir($path) ? 1 : -1) 
+		: (is_file($path) ? 0 : ($path == '.' || $path == '..' ? 0 : check_write(dirname($path))));
 }
 
-function array_remove(&$array, $index, $len=1)
+/*
+	Copies set of files. When $strict is set
+	also removes files from the $to which 
+	does not exists in $from directory but arelisted in $flist.
+*/
+function copy_files($flist, $from, $to, $strict=false)
 {
-	array_splice($array, $index, $len);
+	foreach ($flist as $file) {
+		if (file_exists($from.'/'.$file)) {
+			if (!copy_file($file, $from, $to))
+				return false;
+		} else if ($strict) {
+				unlink($to.'/'.$file);
+		}
+	}
+	return true;
 }
 
-function array_replace(&$array, $index, $len, $elements)
+/*
+	Copies file from base to target directory, restoring subdirectories 
+	if needed.
+*/
+function copy_file($file, $from, $to)
 {
-	array_splice($array, $index, $len);
-	array_insert($array, $index, $elements);
-}
 
-function array_append(&$array, $elements)
+	if (!is_dir(dirname($file=='.' ? $to : ($to.'/'.$file)))) {
+		if (!copy_file(dirname($file), null, $to))
+			return false;
+	}
+	if (!$from) {
+	//		error_log( 'dodanie katalogu '.$to.'/'.$file);
+		return @mkdir($file=='.' ? $to : ($to.'/'.$file));
+	}
+	else {
+	//		error_log( 'skopiowanie '.$to.'/'.$file);
+		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.
+	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)
 {
-	foreach($elements as $key => $el) {
-		if(is_int($key))
-			$array[] = $el;
-		else
-			$array[$key] = $el;
+	global $installed_extensions, $path_to_root, $local_path_to_root;
+
+	// customized per company version
+	$path = company_path();
+	$file = $path.$rep;
+	if (file_exists($file)) {
+		// add local 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
+	if (count($installed_extensions) > 0)
+	{
+		$extensions = $installed_extensions;
+		foreach ($extensions as $ext)
+			if (($ext['active'] && $ext['type'] == 'extension')) {
+				$path = $path_to_root.'/'.$ext['path'];
+				$file = $path.$rep;
+				if (file_exists($file)) {
+					set_include_path($path.PATH_SEPARATOR.get_include_path());
+					$local_path_to_root = $path;
+					return $file;
+				}
+			}
 	}
+	// standard location
+	$file = $path_to_root.$rep;
+	if (file_exists($file))
+		return $file;
+
+	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