X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fmain.inc;h=fcb8b99ac5ac4c7ce4ac4fbb3fe073e64bba5a01;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=4d6e9130c8165329aa8ccf46e98b6fd281504c3d;hpb=daa7cc26dcbcca57248925405fd7a71a7a66a969;p=fa-stable.git
diff --git a/includes/main.inc b/includes/main.inc
index 4d6e9130..fcb8b99a 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -1,67 +1,77 @@
.
+***********************************************************************/
+include_once($path_to_root . "/includes/db/connect_db.inc");
- 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/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 . "/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 . "/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 . "/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)
+{
- global $path_to_root;
+ global $path_to_root, $page_security;
- $hide_menu = $no_menu;
- include($path_to_root . "/includes/page/header.inc");
+ $hide_menu = $no_menu;
- page_header($title, $no_menu, $is_index, $onload, $js);
- error_box();
- if($script_only) {
- echo '';
- div_start('_page_body', null, true);
- } else {
- div_start('_page_body'); // whole page content for ajax reloading
- }
- }
+ include($path_to_root . "/includes/page/header.inc");
- function end_page($no_menu=false, $is_index=false)
- {
- global $path_to_root, $Ajax;
+ page_header($title, $no_menu, $is_index, $onload, $js);
+ check_page_security($page_security);
+// error_box();
+ if($script_only) {
+ echo '';
+ div_start('_page_body', null, true);
+ } else {
+ div_start('_page_body'); // whole page content for ajax reloading
+ }
+}
+function end_page($no_menu=false, $is_index=false)
+{
+ global $path_to_root, $Ajax;
$hide_menu = $no_menu;
-
div_end(); // _page_body section
- include($path_to_root . "/includes/page/footer.inc");
-
+ include($path_to_root . "/includes/page/footer.inc");
page_footer($no_menu, $is_index);
- }
+}
- function flush_dir($path) {
+function flush_dir($path, $wipe = false)
+{
$dir = opendir($path);
while(false !== ($fname = readdir($dir))) {
- if($fname=='.' || $fname=='..' || $fname=='index.php') continue;
+ if($fname=='.' || $fname=='..' || $fname=='CVS' || (!$wipe && $fname=='index.php')) continue;
if(is_dir($path.'/'.$fname)) {
- flush_dir($path.'/'.$fname);
- @rmdir($path.'/'.$fname);
+ flush_dir($path.'/'.$fname, $wipe);
+ if ($wipe) @rmdir($path.'/'.$fname);
} else
@unlink($path.'/'.$fname);
- }
- }
+ }
+}
- function cache_js_file($fpath, $text)
- {
+function cache_js_file($fpath, $text)
+{
global $go_debug;
if(!$go_debug) $text = js_compress($text);
@@ -71,34 +81,34 @@
if (!fwrite($file, $text)) return false;
return fclose($file);
- }
+}
- function add_js_file($filename)
- {
+function add_js_file($filename)
+{
global $js_static;
$search = array_search($filename, $js_static);
if ($search === false || $search === null) // php>4.2.0 returns null
$js_static[] = $filename;
- }
+}
- function add_js_ufile($filename)
- {
+function add_js_ufile($filename)
+{
global $js_userlib;
$search = array_search($filename, $js_userlib);
if ($search === false || $search === null) // php>4.2.0 returns null
$js_userlib[] = $filename;
- }
+}
- function add_js_source($text)
- {
+function add_js_source($text)
+{
global $js_lib;
$search = array_search($text, $js_lib);
if ($search === false || $search === null) // php>4.2.0 returns null
$js_lib[] = $text;
- }
+}
/**
* Compresses the Javascript code for more efficient delivery.
@@ -131,10 +141,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