X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fpage%2Fheader.inc;h=197f27fb3c3955b3a738c62387daf31bea6f0273;hb=231addc23887aa8b906dca18ea0b2a6fe63c3c39;hp=931616f1a7a38a07b1ef1c8298577af5e7d11f8f;hpb=eac78d6c63115a15ca659b0ef27ed76894777814;p=fa-stable.git
diff --git a/includes/page/header.inc b/includes/page/header.inc
index 931616f1..197f27fb 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 = $applications[$app];
+ $help_page_url = access_string($applications[$app], 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;
@@ -93,7 +101,9 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
$sel_app = $_SESSION["sel_app"];
else
$sel_app = $def_app;
- $_SESSION["App"]->selected_application = $_SESSION["sel_app"] = $sel_app;
+ $_SESSION["sel_app"] = $sel_app;
+ if (isset($_SESSION["App"]) && is_object($_SESSION["App"]))
+ $_SESSION["App"]->selected_application = $sel_app;
$encoding = $_SESSION['language']->encoding;
if (!headers_sent()){
@@ -102,11 +112,8 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
echo "\n";
echo "dir . "' >\n";
echo "$title";
- $local_stylesheet = $_SESSION['language']->get_stylesheet();
echo "";
echo " \n";
- if (file_exists($local_path_to_root. "/".$local_stylesheet))
- echo " \n";
send_scripts($js);
echo " \n";