X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fpage%2Fheader.inc;h=7777dae422e66241483f09f5f2800e6160442949;hb=67100a2b9c55e5ed9126bbf28aafb54d829066df;hp=7dd84b6525b66089b3fdbe1a91bbc99a86e0644d;hpb=fc24ee893402902fc58632dabb5d7c2594e191d0;p=fa-stable.git
diff --git a/includes/page/header.inc b/includes/page/header.inc
index 7dd84b65..7777dae4 100644
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -15,7 +15,7 @@
function help_url($context=null)
{
- global $help_base_url, $help_context, $old_style_help;
+ global $SysPrefs, $help_context;
$country = $_SESSION['language']->code;
$clean = 0;
@@ -34,27 +34,45 @@ function help_url($context=null)
$clean = 1;
}
- if (@$old_style_help)
+ if (@$SysPrefs->old_style_help)
$help_page_url = _($help_page_url);
if ($clean)
$help_page_url = access_string($help_page_url, true);
- return htmlspecialchars($help_base_url
+ return html_specials_encode(
+ $SysPrefs->help_base_url
.urlencode(strtr(ucwords($help_page_url), array(' '=>'', '/'=>'', '&'=>'And')))
.'&ctxhelp=1&lang='.$country);
}
+function send_css($css = '')
+{
+ global $css_files;
+
+ css_files_ensure_init();
+
+ foreach ($css_files as $css_file)
+ {
+ echo " \n";
+ }
+ if ($css)
+ {
+ echo " \n";
+ }
+}
+
function send_scripts()
{
- global $js_static, $js_path, $js_userlib, $path_to_root, $go_debug;
+ global $SysPrefs, $path_to_root, $js_static, $js_path, $js_userlib;
$js ='';
foreach($js_static as $jsfile)
{
- $fpath = company_path().'/js_cache/'.$jsfile;
+ $cached_name = basename($jsfile);
+ $fpath = user_js_cache().'/'.$cached_name;
// compress also static files
- if (!file_exists($fpath) || $go_debug)
+ if (!file_exists($fpath) || $SysPrefs->go_debug)
cache_js_file($fpath, file_get_contents($js_path.$jsfile));
$js .= '