X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fpage%2Fheader.inc;h=fc850b953b950172d173c2299d351463d3bd177a;hb=66a62190f99d83f958bb98195b5756b8b307e378;hp=ac9283ec471113936c7248f9259cae7b3f920058;hpb=ce2a1cae35df4f60c3b993d79cb9eb65cb2cb82e;p=fa-stable.git

diff --git a/includes/page/header.inc b/includes/page/header.inc
index ac9283ec..fc850b95 100644
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -9,42 +9,50 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-function help_url($title, $app)
+/*
+	If no context is set current page/menu screen is selected.
+*/
+function help_url($context=null)
 {
 
-	global $help_page_url, $help_base_url, $applications, $help_page_title;
+	global $help_base_url, $help_context, $old_style_help;
 
-	if (isset($help_page_url))
+	$country = $_SESSION['language']->code;
+	$clean = 0;
+	
+	if ($context!=null)
 	{
-		return $help_base_url.$help_page_url;
+		$help_page_url = $context;
 	}
-
-	$help_page_url = '';
-	if (isset($help_page_title))
-	{
-		$help_page_url = $help_page_title;
-	}
-	elseif ($title==_("Main Menu"))
+	elseif (isset($help_context))
 	{
-		$help_page_url = access_string($applications[$app], true);
-	}
-	else
+		$help_page_url = $help_context;
+	} else // main menu
 	{
-		$help_page_url = $title;
+		$app = $_SESSION['sel_app'];
+		$help_page_url = $_SESSION['App']->applications[$app]->help_context;
+		$clean = 1;
 	}
 
-	return $help_base_url.urlencode(str_replace(' ', '', ucwords($help_page_url)));
+	if (@$old_style_help)
+		$help_page_url = _($help_page_url);
+
+	if ($clean)
+		$help_page_url = access_string($help_page_url, true);
+
+	return $help_base_url
+		.urlencode(strtr(ucwords($help_page_url), array(' '=>'', '/'=>'', '&'=>'And')))
+		.'&ctxhelp=1&lang='.$country;
 }
 
 function send_scripts()
 {
-    global $js_lib, $js_static, $js_path, $js_userlib, $comp_path,
-	$path_to_root, $go_debug;
+    global $js_static, $js_path, $js_userlib, $path_to_root, $go_debug;
 
 	$js ='';
 	foreach($js_static as $jsfile)
 	{
-	    $fpath = $comp_path.'/'.user_company().'/js_cache/'.$jsfile;
+	    $fpath = company_path().'/js_cache/'.$jsfile;
 	    // compress also static files
 	  	if (!file_exists($fpath) || $go_debug)
 			cache_js_file($fpath, file_get_contents($js_path.$jsfile));
@@ -61,7 +69,7 @@ function send_scripts()
     echo $js;
 }
 
-function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="")
+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;
@@ -75,7 +83,6 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
 //		add_js_ufile($jsext);
 
 	$theme = user_theme();
-	$local_path_to_root = $path_to_root;
 
 	if ($help_base_url != null && $use_popup_windows && $js == '')
 	{
@@ -92,18 +99,23 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
 	{
 		$no_menu = false;
 	}
-	if (!isset($_SESSION["sel_app"]))
-		session_register("sel_app");
+	//if (!isset($_SESSION["sel_app"]))
+	//	session_register("sel_app");
 	if (isset($_SESSION["App"]) && is_object($_SESSION["App"]) && isset($_SESSION["App"]->selected_application) &&
 		$_SESSION["App"]->selected_application != "")
 		$sel_app = $_SESSION["App"]->selected_application;
 	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;
+
+	// When startup tab for current user was set to already 
+	// removed/inactivated extension module select Sales tab as default.
 	if (isset($_SESSION["App"]) && is_object($_SESSION["App"]))
-		$_SESSION["App"]->selected_application = $sel_app;
+		$_SESSION["App"]->selected_application = 
+			isset($_SESSION["App"]->applications[$sel_app]) ? $sel_app : 'orders';
+			
 	$encoding = $_SESSION['language']->encoding;
 
 	if (!headers_sent()){
@@ -113,15 +125,19 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
 	echo "<html dir='" . $_SESSION['language']->dir . "' >\n";
 	echo "<head><title>$title</title>";
 	echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding'>";
-	echo "<link href='$local_path_to_root/themes/$theme/default.css' rel='stylesheet' type='text/css'> \n";
-	send_scripts($js);
+	echo "<link href='$path_to_root/themes/$theme/default.css' rel='stylesheet' type='text/css'> \n";
+	if ($css)
+		echo '<link href="'.$css.'" rel="stylesheet" type="text/css">';
+
+	send_scripts();
 
 	echo "</head> \n";
 	if ($onload == "")
 		echo "<body>";
 	else
 		echo "<body onload=\"$onload\">";
-	include_once($local_path_to_root."/themes/".user_theme()."/renderer.php");
+
+	include_once($path_to_root . "/themes/".user_theme()."/renderer.php");
 	$rend = new renderer();
 	$rend->menu_header($title, $no_menu, $is_index);
 	error_box();