--- index.php	2001/07/22 18:03:31	1.9
+++ index.php	2001/11/07 14:24:02	1.15
@@ -4,7 +4,6 @@
 
 $smarty = new Smarty;
 
-
 $smarty->assign( array ( Title=>"PLIVA Ljubljana" ) );
 
 $section=str_replace(".php","",basename($PHP_SELF));
@@ -13,22 +12,24 @@
 $main_file=$section;
 
 require("inc/section.php");
-
 include("common.inc");
-
 include("find_html_file.inc");
+include("fix_msshit.inc");
+
+if ($menu_item) {
+	$title.=" : $menu_item";
+	$smarty->assign("mtext",$menu_item);
+} else {
+	$smarty->assign("mtext",$title);
+}
 
 if (isset($h) && file_exists(find_html_file("h/$section",$h))) {
 	$main=join('',file(find_html_file("h/$section",$h)));
-	if ($menu_item) {
-		$title.=" : $menu_item";
-	}
+	$main=fix_msshit($main);
 } elseif (isset($p) && file_exists("sections/$p.inc")) {
 	include("sections/$p.inc");
 } elseif (file_exists("template/$main_file.tpl")) {
 	$main=$smarty->fetch("$main_file.tpl");
-} elseif (find_html_file("h",$section)) {
-	$main=join('',file(find_html_file("h",$section)));
 } elseif (isset($static)) {
 	if (strstr($static,",")) {
 		$d=explode(",",$static);	// dir,file
@@ -38,16 +39,22 @@
 	if (find_html_file("static/$d[0]",$d[1])) {
 		$main=join('',file(find_html_file("static/$d[0]",$d[1])));
 		// fix entities from MS programs
-		include("fix_msshit.inc");
 		$main=fix_msshit($main);
 	} else {
 		$main="<b>Can't find static/$d[0]/$d[1]</b>";
 	}
+} elseif (find_html_file("h",$section)) {
+	$main=join('',file(find_html_file("h",$section)));
+	$main=fix_msshit($main);
+	if (file_exists("sections/$section.inc")) {
+		include("sections/$section.inc");
+	}
 } elseif (file_exists("sections/$section.inc")) {
 	include("sections/$section.inc");
 } else {
 	$main="<b>can't find template or html file for section $section</b>";
 }
+
 $smarty->assign(array(section=>$section,
 	mpic=>$mpic,
 	Section_title=>$title,