X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fmain.inc;h=11746a288b386bc254d0ea2b6ab4fdd6b436480e;hb=5ac9ea61baac0cf298b07317051da51e781645b7;hp=f5bb4139c4d11c9eece88358bd075b305ed2f64d;hpb=6e7684f82b40489bd1d7d8236439a147e723f8ba;p=fa-stable.git
diff --git a/includes/main.inc b/includes/main.inc
index f5bb4139..11746a28 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -1,104 +1,133 @@
.
+***********************************************************************/
+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 . "/admin/db/transactions_db.inc");
+include_once($path_to_root . "/includes/types.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/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)
- {
+$page_nested = -1;
+// static js files path
+$js_path = $path_to_root.'/js/';
+// standard external js scripts included in all files
+$js_static = array('JsHttpRequest.js', 'behaviour.js', 'utils.js', 'inserts.js');
+// additional js source included in header
+$js_lib = $js_userlib = array();
- global $path_to_root;
+function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false, $css='')
+{
- $hide_menu = $no_menu;
+ global $path_to_root, $page_security, $page_nested;
- include($path_to_root . "/includes/page/header.inc");
+ if (++$page_nested) return;
- 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
- }
- }
+ $hide_menu = $no_menu;
- function end_page($no_menu=false, $is_index=false)
- {
- global $path_to_root, $Ajax;
+ 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) {
+ echo '';
+ div_start('_page_body', null, true);
+ } else {
+ div_start('_page_body'); // whole page content for ajax reloading
+ }
+}
- $hide_menu = $no_menu;
+function end_page($no_menu=false, $is_index=false, $final_screen=false, $type_no=0, $trans_no=0)
+{
+ global $path_to_root, $page_nested;
- div_end(); // _page_body section
- include($path_to_root . "/includes/page/footer.inc");
+ if ($page_nested-- > 0) return;
- page_footer($no_menu, $is_index);
- }
+ 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
- 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);
- }
- }
+ include_once($path_to_root . "/includes/page/footer.inc");
+ page_footer($no_menu, $is_index);
+}
- function cache_js_file($fpath, $text)
- {
- global $go_debug;
+function cache_js_file($fpath, $text)
+{
+ global $SysPrefs;
- if(!$go_debug) $text = js_compress($text);
+ if (!$SysPrefs->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);
- function add_js_file($filename)
- {
+ $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;
$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 +160,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 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