projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tax Inquiry: fixed refrences to non-existing database fields.
[fa-stable.git]
/
includes
/
page
/
header.inc
diff --git
a/includes/page/header.inc
b/includes/page/header.inc
index 61c155855b3f21953b69108df06ebe09ff5ef490..3661c7cf7b1240de475bead083d6fcbfb1bcd170 100644
(file)
--- a/
includes/page/header.inc
+++ b/
includes/page/header.inc
@@
-15,7
+15,7
@@
function help_url($context=null)
{
function help_url($context=null)
{
- global $
help_base_url, $help_context, $old_style_help
;
+ global $
SysPrefs, $help_context
;
$country = $_SESSION['language']->code;
$clean = 0;
$country = $_SESSION['language']->code;
$clean = 0;
@@
-34,20
+34,20
@@
function help_url($context=null)
$clean = 1;
}
$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);
$help_page_url = _($help_page_url);
if ($clean)
$help_page_url = access_string($help_page_url, true);
- return
$
help_base_url
+ return
htmlspecialchars($SysPrefs->
help_base_url
.urlencode(strtr(ucwords($help_page_url), array(' '=>'', '/'=>'', '&'=>'And')))
.urlencode(strtr(ucwords($help_page_url), array(' '=>'', '/'=>'', '&'=>'And')))
- .'&ctxhelp=1&lang='.$country;
+ .'&ctxhelp=1&lang='.$country
, ENT_QUOTES)
;
}
function send_scripts()
{
}
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)
$js ='';
foreach($js_static as $jsfile)
@@
-55,7
+55,7
@@
function send_scripts()
$cached_name = basename($jsfile);
$fpath = user_js_cache().'/'.$cached_name;
// compress also static files
$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="'.
cache_js_file($fpath, file_get_contents($js_path.$jsfile));
$js .= '<script language="javascript" type="text/javascript" src="'.
@@
-73,7
+73,7
@@
function send_scripts()
function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="", $css='')
{
// titles and screen header
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
if (in_ajax())
return; // just for speed up
@@
-85,7
+85,7
@@
function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
$theme = user_theme();
$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'))
{
{
if (!function_exists('get_js_open_window'))
{
@@
-122,11
+122,13
@@
function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
$encoding = $_SESSION['language']->encoding;
if (!headers_sent()){
$encoding = $_SESSION['language']->encoding;
if (!headers_sent()){
- header("Content-type: text/html; charset=
'$encoding'
");
+ header("Content-type: text/html; charset=
$encoding
");
}
echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n";
echo "<html dir='" . $_SESSION['language']->dir . "' >\n";
echo "<head profile=\"http://www.w3.org/2005/10/profile\"><title>$title</title>";
}
echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n";
echo "<html dir='" . $_SESSION['language']->dir . "' >\n";
echo "<head profile=\"http://www.w3.org/2005/10/profile\"><title>$title</title>";
+ if (strpos($_SERVER['HTTP_USER_AGENT'], 'Trident/7.0; rv:11.0') != -1) // IE 11 doesn't work with input file type in form.
+ echo "<meta http-equiv='X-UA-Compatible' content='IE=10'>\n";
echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding'>";
echo "<link href='$path_to_root/themes/$theme/default.css' rel='stylesheet' type='text/css'> \n";
echo "<link href='$path_to_root/themes/default/images/favicon.ico' rel='icon' type='image/x-icon'> \n";
echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding'>";
echo "<link href='$path_to_root/themes/$theme/default.css' rel='stylesheet' type='text/css'> \n";
echo "<link href='$path_to_root/themes/default/images/favicon.ico' rel='icon' type='image/x-icon'> \n";
@@
-147,4
+149,3
@@
function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
error_box();
}
error_box();
}
-?>
\ No newline at end of file