Access level checking moved to page() function to make session start and access...

[fa-stable.git] / includes / page / header.inc

diff --git a/includes/page/header.inc b/includes/page/header.inc
index 6abf7c93617ee1d2cc8eda5169e91145b5c465c9..17bd333d22a15a193eb034e12baec744ef97e133 100644 (file)
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -41,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)
        {
@@ -60,10 +58,6 @@ function send_scripts()
                $jsfile . '"></script>';
        }
 
-       foreach($js_lib as $text)
-       {
-               $js .= $text;
-       }
     echo $js;
 }
 
@@ -75,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;
 
@@ -101,7 +100,7 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
        elseif (isset($_SESSION["sel_app"]) && $_SESSION["sel_app"] != "")
                $sel_app = $_SESSION["sel_app"];
        else
-               $sel_app = $def_app;
+               $sel_app = user_startup_tab();
        $_SESSION["sel_app"] = $sel_app;
        if (isset($_SESSION["App"]) && is_object($_SESSION["App"]))
                $_SESSION["App"]->selected_application = $sel_app;
@@ -125,6 +124,7 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
        include_once($local_path_to_root."/themes/".user_theme()."/renderer.php");
        $rend = new renderer();
        $rend->menu_header($title, $no_menu, $is_index);
+       error_box();
 }
 
 ?>
\ No newline at end of file