X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fpage%2Fheader.inc;h=8b1b36e2f4c338a62221994767ebd562ed1ff14a;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=2ab707cc55e9d14419c6dcfd6d4312e8d56db0ed;hpb=b1c79afd0a78ec37ff813f1305e9e0804be78ef3;p=fa-stable.git diff --git a/includes/page/header.inc b/includes/page/header.inc index 2ab707cc..8b1b36e2 100644 --- a/includes/page/header.inc +++ b/includes/page/header.inc @@ -1,5 +1,14 @@ . +***********************************************************************/ function help_url($title, $app) { @@ -17,7 +26,7 @@ function help_url($title, $app) } elseif ($title==_("Main Menu")) { - $help_page_url = access_string($applications[$app], true); + $help_page_url = access_string($_SESSION['App']->applications[$app]->name, true); } else { @@ -32,8 +41,6 @@ function send_scripts() global $js_lib, $js_static, $js_path, $js_userlib, $comp_path, $path_to_root, $go_debug; - add_user_js_data(); - $js =''; foreach($js_static as $jsfile) { @@ -51,10 +58,6 @@ function send_scripts() $jsfile . '">'; } - foreach($js_lib as $text) - { - $js .= $text; - } echo $js; } @@ -66,6 +69,11 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" if (in_ajax()) return; // just for speed up +// $jsext = substr_replace($_SERVER['PHP_SELF'], '.js', -4); + +// if (file_exists($_SERVER['DOCUMENT_ROOT'].$jsext)) +// add_js_ufile($jsext); + $theme = user_theme(); $local_path_to_root = $path_to_root; @@ -92,7 +100,7 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" elseif (isset($_SESSION["sel_app"]) && $_SESSION["sel_app"] != "") $sel_app = $_SESSION["sel_app"]; else - $sel_app = $def_app; + $sel_app = user_startup_tab(); $_SESSION["sel_app"] = $sel_app; if (isset($_SESSION["App"]) && is_object($_SESSION["App"])) $_SESSION["App"]->selected_application = $sel_app; @@ -104,11 +112,8 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" echo "\n"; echo "dir . "' >\n"; echo "