Fixed include file issue in sales order entry.

[fa-stable.git] / includes / main.inc

diff --git a/includes/main.inc b/includes/main.inc
index 8f2b3c33d56ea3912b97e3579d6b9488b45c9aa4..f5ecd4d6f491659c21229184443e957aba89341c 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -11,32 +11,34 @@
 ***********************************************************************/
 include_once($path_to_root . "/includes/db/connect_db.inc");
 
+include_once($path_to_root . "/admin/db/transactions_db.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");
 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");
-       
+
+$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>';
@@ -48,13 +50,15 @@ function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $scri
 
 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 ($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");
+       include_once($path_to_root . "/includes/page/footer.inc");
        page_footer($no_menu, $is_index);
 }
 
@@ -64,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;
@@ -256,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))));
 }
 
 /*
@@ -348,6 +373,7 @@ function find_custom_file($rep)
        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);
 }