Merged changes from master branch up to current state.

[fa-stable.git] / includes / page / header.inc

diff --git a/includes/page/header.inc b/includes/page/header.inc
index 147b3293fd49662ac4fb7820f7373bf725bb7ac8..3661c7cf7b1240de475bead083d6fcbfb1bcd170 100644 (file)
--- 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,28 @@ 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 htmlspecialchars($SysPrefs->help_base_url
                .urlencode(strtr(ucwords($help_page_url), array(' '=>'', '/'=>'', '&'=>'And')))
-               .'&ctxhelp=1&lang='.$country);
+               .'&ctxhelp=1&lang='.$country, ENT_QUOTES);
 }
 
 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 .= '<script language="javascript" type="text/javascript" src="'.
@@ -72,7 +73,7 @@ function send_scripts()
 function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="", $css='')
 {
        // titles and screen header
-       global $path_to_root, $def_app, $use_popup_windows, $help_base_url, $db_connections;
+       global $path_to_root, $SysPrefs, $db_connections;
 
        if (in_ajax())
                return; // just for speed up
@@ -84,7 +85,7 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
 
        $theme = user_theme();
 
-       if ($help_base_url != null && $use_popup_windows && $js == '')
+       if ($SysPrefs->help_base_url != null && $SysPrefs->use_popup_windows && $js == '')
        {
                if (!function_exists('get_js_open_window'))
                {
@@ -148,4 +149,3 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
        error_box();
 }
 
-?>
\ No newline at end of file