X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fpage%2Fheader.inc;h=17bd333d22a15a193eb034e12baec744ef97e133;hb=3141d7755efbca4d2eb7babc1d31629295451885;hp=cd454b6d50e7cf0172181a9bf090d47f3d2bb127;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/includes/page/header.inc b/includes/page/header.inc
index cd454b6d..17bd333d 100644
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 function help_url($title, $app)
 {
@@ -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