X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fmain.inc;h=19279f04d74a68c5b85524907024de65f9ad8af8;hb=3e2a432dd72688dbac39a07716201b2b00c16c8b;hp=fdad9cb7999f691e858a4cea0ecfb0193f614fe0;hpb=be2f084444559f98377583ea35807a4c672122c6;p=fa-stable.git
diff --git a/includes/main.inc b/includes/main.inc
index fdad9cb7..19279f04 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -13,25 +13,36 @@
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="")
+ function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false)
{
- global $path_to_root, $js_lib;
+ global $path_to_root;
$hide_menu = $no_menu;
include($path_to_root . "/includes/page/header.inc");
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
+ }
}
function end_page($no_menu=false, $is_index=false)
{
- global $path_to_root;
+ 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);
@@ -43,21 +54,22 @@
if($fname=='.' || $fname=='..') continue;
if(is_dir($path.'/'.$fname)) {
flush_dir($path.'/'.$fname);
- rmdir($path.'/'.$fname);
+ @rmdir($path.'/'.$fname);
} else
- unlink($path.'/'.$fname);
+ @unlink($path.'/'.$fname);
}
}
function cache_js_file($fpath, $text)
{
+ global $go_debug;
- // FIX compress text ...
+ if(!$go_debug) $text = js_compress($text);
- $file = fopen($fpath, 'w');
- if (!$file) return false;
- if (!fwrite($file, $text)) return false;
- return fclose($file);
+ $file = fopen($fpath, 'w');
+ if (!$file) return false;
+ if (!fwrite($file, $text)) return false;
+ return fclose($file);
}
@@ -88,4 +100,152 @@
$js_lib[] = $text;
}
+/**
+ * Compresses the Javascript code for more efficient delivery.
+ * copyright (c) 2005 by Jared White & J. Max Wilson
+ * http://www.xajaxproject.org
+ * Added removing comments from output.
+ * Warning: Fails on RegExp with quotes - use new RegExp() in this case.
+ */
+function js_compress($sJS)
+{
+ //remove windows cariage returns
+ $sJS = str_replace("\r","",$sJS);
+
+ //array to store replaced literal strings
+ $literal_strings = array();
+
+ //explode the string into lines
+ $lines = explode("\n",$sJS);
+ //loop through all the lines, building a new string at the same time as removing literal strings
+ $clean = "";
+ $inComment = false;
+ $literal = "";
+ $inQuote = false;
+ $escaped = false;
+ $quoteChar = "";
+
+ for($i=0;$i
\ No newline at end of file