X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fpage%2Fheader.inc;h=fc850b953b950172d173c2299d351463d3bd177a;hb=66a62190f99d83f958bb98195b5756b8b307e378;hp=bb8fbd3102c07f94789ec95fae215d906f3be766;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git
diff --git a/includes/page/header.inc b/includes/page/header.inc
index bb8fbd31..fc850b95 100644
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -40,18 +40,19 @@ function help_url($context=null)
if ($clean)
$help_page_url = access_string($help_page_url, true);
- return $help_base_url.urlencode(str_replace(' ', '', ucwords($help_page_url))).'&lang='.$country;
+ return $help_base_url
+ .urlencode(strtr(ucwords($help_page_url), array(' '=>'', '/'=>'', '&'=>'And')))
+ .'&ctxhelp=1&lang='.$country;
}
function send_scripts()
{
- global $js_lib, $js_static, $js_path, $js_userlib, $comp_path,
- $path_to_root, $go_debug;
+ global $js_static, $js_path, $js_userlib, $path_to_root, $go_debug;
$js ='';
foreach($js_static as $jsfile)
{
- $fpath = $comp_path.'/'.user_company().'/js_cache/'.$jsfile;
+ $fpath = company_path().'/js_cache/'.$jsfile;
// compress also static files
if (!file_exists($fpath) || $go_debug)
cache_js_file($fpath, file_get_contents($js_path.$jsfile));
@@ -68,7 +69,7 @@ function send_scripts()
echo $js;
}
-function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="")
+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;
@@ -82,7 +83,6 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
// add_js_ufile($jsext);
$theme = user_theme();
- $local_path_to_root = $path_to_root;
if ($help_base_url != null && $use_popup_windows && $js == '')
{
@@ -99,8 +99,8 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
{
$no_menu = false;
}
- if (!isset($_SESSION["sel_app"]))
- session_register("sel_app");
+ //if (!isset($_SESSION["sel_app"]))
+ // session_register("sel_app");
if (isset($_SESSION["App"]) && is_object($_SESSION["App"]) && isset($_SESSION["App"]->selected_application) &&
$_SESSION["App"]->selected_application != "")
$sel_app = $_SESSION["App"]->selected_application;
@@ -125,15 +125,19 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
echo "dir . "' >\n";
echo "$title";
echo "";
- echo " \n";
- send_scripts($js);
+ echo " \n";
+ if ($css)
+ echo '';
+
+ send_scripts();
echo " \n";
if ($onload == "")
echo "";
else
echo "";
- include_once($local_path_to_root."/themes/".user_theme()."/renderer.php");
+
+ include_once($path_to_root . "/themes/".user_theme()."/renderer.php");
$rend = new renderer();
$rend->menu_header($title, $no_menu, $is_index);
error_box();