projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from stable branch up to 2.3.23.
[fa-stable.git]
/
includes
/
page
/
header.inc
diff --git
a/includes/page/header.inc
b/includes/page/header.inc
index 87d0ee870c751ad1ba6045a90ff32a2190e1e5f2..721ba242d258ad3a6cc495054b40a2b170ef3f41 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,27
+34,28
@@
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)
{
- $fpath = company_path().'/js_cache/'.$jsfile;
+ $cached_name = basename($jsfile);
+ $fpath = user_js_cache().'/'.$cached_name;
// compress also static files
// 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="'.
@@
-72,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
;
+ global $path_to_root, $
SysPrefs, $db_connections
;
if (in_ajax())
return; // just for speed up
if (in_ajax())
return; // just for speed up
@@
-84,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->SysPrefs->
use_popup_windows && $js == '')
{
if (!function_exists('get_js_open_window'))
{
{
if (!function_exists('get_js_open_window'))
{
@@
-113,17
+114,22
@@
function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
if (isset($_SESSION["App"]) && is_object($_SESSION["App"]))
$_SESSION["App"]->selected_application =
isset($_SESSION["App"]->applications[$sel_app]) ? $sel_app : 'orders';
if (isset($_SESSION["App"]) && is_object($_SESSION["App"]))
$_SESSION["App"]->selected_application =
isset($_SESSION["App"]->applications[$sel_app]) ? $sel_app : 'orders';
-
+
+ $page_header_args = func_get_args();
+ if(isset($db_connections)) // skip before installation
+ hook_invoke_all('pre_header', $page_header_args);
+
$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 "<!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><title>$title</title>";
+ echo "<head
profile=\"http://www.w3.org/2005/10/profile\"
><title>$title</title>";
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 "<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";
if ($css)
echo '<link href="'.$css.'" rel="stylesheet" type="text/css">';
if ($css)
echo '<link href="'.$css.'" rel="stylesheet" type="text/css">';
@@
-135,10
+141,9
@@
function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
else
echo "<body onload=\"$onload\">";
else
echo "<body onload=\"$onload\">";
- include_once($path_to_root . "/themes/
".user_theme()."
/renderer.php");
+ include_once($path_to_root . "/themes/
$theme
/renderer.php");
$rend = new renderer();
$rend->menu_header($title, $no_menu, $is_index);
error_box();
}
$rend = new renderer();
$rend->menu_header($title, $no_menu, $is_index);
error_box();
}
-?>
\ No newline at end of file