X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fpage%2Fheader.inc;h=8db8fe9ba5ae8f3b42cbea08022b42b6e48bd558;hb=c061e1b478cb41d22c23627ddff39a4ea7d849ed;hp=721ba242d258ad3a6cc495054b40a2b170ef3f41;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git diff --git a/includes/page/header.inc b/includes/page/header.inc index 721ba242..8db8fe9b 100644 --- a/includes/page/header.inc +++ b/includes/page/header.inc @@ -40,9 +40,26 @@ function help_url($context=null) if ($clean) $help_page_url = access_string($help_page_url, true); - return htmlspecialchars($SysPrefs->help_base_url + return html_specials_encode( + $SysPrefs->help_base_url .urlencode(strtr(ucwords($help_page_url), array(' '=>'', '/'=>'', '&'=>'And'))) - .'&ctxhelp=1&lang='.$country, ENT_QUOTES); + .'&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() @@ -75,17 +92,12 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" // titles and screen header global $path_to_root, $SysPrefs, $db_connections; - if (in_ajax()) + if (in_ajax() || isset($_POST['REP_ID'])) 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(); - if ($SysPrefs->help_base_url != null && $SysPrefs->SysPrefs->use_popup_windows && $js == '') + if ($SysPrefs->help_base_url != null && $SysPrefs->use_popup_windows && $js == '') { if (!function_exists('get_js_open_window')) { @@ -94,7 +106,7 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" add_js_source(get_js_open_window(900, 500)); } if ($js!='') - add_js_source($js); + add_js_source($js); if (!isset($no_menu)) { @@ -127,11 +139,12 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" echo "\n"; echo "dir . "' >\n"; echo "