X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fpage%2Fheader.inc;h=bf93e2d5e1bf15301a9c4bea8bc5a0bc3b1545a2;hb=deb258224a97804610393ef563d45b5af5c5243a;hp=12b99eba88621902e141fb4f04fc4a4d03641b55;hpb=e3f700d1e11788f176bf02c7b9969780e66dc167;p=fa-stable.git diff --git a/includes/page/header.inc b/includes/page/header.inc index 12b99eba..bf93e2d5 100644 --- a/includes/page/header.inc +++ b/includes/page/header.inc @@ -31,7 +31,11 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" { // titles and screen header global $db_connections, $path_to_root, $def_app, $applications, - $help_base_url, $help_page_url, $use_popup_windows; + $help_base_url, $help_page_url, $use_popup_windows, + $js_lib, $js_static, $js_path, $js_userlib, $comp_path; + + if (isset($_GET['ajax'])) return; + $theme = user_theme(); $local_path_to_root = $path_to_root; @@ -44,6 +48,21 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" $js = get_js_open_window(900, 500); } + add_js_user_num(); // add user native numeric input functions + // javascript includes collect + add_js_source($js); + $js =''; + foreach($js_static as $jsfile) { + $js .= ''; + } + foreach($js_userlib as $jsfile) { + $js .= ''; + } + foreach($js_lib as $text) { + $js .= $text; + } if (!isset($no_menu)) { $no_menu = false; @@ -58,10 +77,13 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" else $sel_app = $def_app; $_SESSION["sel_app"] = $sel_app; + $encoding = $_SESSION['language']->encoding; - echo "dir . "' >"; + if (!headers_sent()){ + header("Content-type: text/html; charset='$encoding'"); + } + echo "dir . "' >\n"; echo "$title"; - $encoding = $_SESSION['language']->encoding; $local_stylesheet = $_SESSION['language']->get_stylesheet(); echo ""; echo " \n"; @@ -74,6 +96,8 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" echo ""; else echo ""; + echo "\n"; echo "\n"; echo "\n"; echo "
\n";