--- index.php	2001/09/29 00:57:58	1.15
+++ index.php	2001/10/12 09:22:02	1.21
@@ -2,12 +2,19 @@
 	if ($redir) {
 		if ($redir == "harrison") include_once("inc/harrison.php");
 		else {
+			include_once("inc/global.php");
+			include_once("inc/util.php");
 			include_once("inc/banneri.php");
 			// Sad tu neki brojac klikova ili nesto...
-			Header("Location: ".$banneri[$redir - 1]["url"]);
+			$loc = $banneri[$redir - 1]["url"];
+			if (!$loc) $loc = "?section=home";
+			Header("Location: $loc");
 		}
 		exit;
 	}
+	Header("Pragma: no-cache");
+	Header("Cache-Control: no-cache");
+	Header("Cache-Policy: no-cache");
 	include_once("inc/global.php");
 	include_once("inc/util.php");
 	$picdir = str_replace("//", "/", dirname($PHP_SELF));
@@ -54,30 +61,49 @@
 		} else if ($section == "knjiznica") {
 			$section_name = "Knjižnica";
 			$inc = "pgKnjiznica2";
+			$mnu = "";
 		} else if ($section == "linkovi") {
 			$section_name = "Linkovi";
 			$inc = "pgLinkovi";
-		} else if ($section == "pretrazivanje") {
-			$section_name = "Pretraživanje";
-			$inc = "pgPretrazivanje";
 		} else if ($section == "vademecum") {
 			$section_name = "PLIVA Vademecum";
 			$inc = "pgKnjiznica-vademecum";
+			$mnu = "";
 			$fname = "vademecum.tpl";
 		} else if ($section == "lijekovi") {
 			$section_name = "Lista lijekova";
 			$inc = "pgKnjiznica-lijekovi";
+			$mnu = "";
 			$fname = "lijekovi.tpl";
 		} else if ($section == "harrison") {
 			$section_name = "Harrison's Online";
-			$inc = "";
+			$inc = $mnu = "";
 			$fname = "harrisons.tpl";
 		} else if ($section == "qa") {
 			$section_name = "Pitanja i odgovori";
 			$inc = "pgQA";
+			$mnu = "";
+		} else if ($section == "qa2") {
+			$section_name = "Pitanja i odgovori #2";
+			$inc = "pgQA2";
+		} else if ($section == "kalendar") {
+			$section_name = "Kalendar događanja";
+			$inc = "pgKalendar";
 		} else if ($section == "zanimljivo") {
 			$section_name = "Zanimljivosti";
+			$mnu = "";
 			$inc = "pgZanimljivosti";
+		} else if ($section == "lozinka") {
+			$section_name = "Promjena lozinke";
+			$mnu = "";
+			$inc = "pgLozinka";
+		} else if ($section == "arhiva") {
+			$section_name = "Arhiva";
+			if ($acat == "z") $mnu = "";
+			$inc = "pgArhiva";
+		} else {
+			Header("Location: ?");
+			exit;
 		}
 	} else {
 		if ($section == "home") {
@@ -90,8 +116,7 @@
 			$inc = "pgSearch";
 		} else if ($section == "onama") {
 			$section_name = "O nama";
-			$mnu = "";
-			$inc = "";
+			$mnu = $inc = "";
 		} else if ($section == "bolesti") {
 			$section_name = "Bolesti";
 			$mnu = "menuBolesti.php";
@@ -127,9 +152,22 @@
 		} else if ($section == "qa") {
 			$section_name = "Pitanja i odgovori";
 			$inc = "pgQA";
+		} else if ($section == "qa2") {
+			$section_name = "Pitanja i odgovori #2";
+			$inc = "pgQA2";
 		} else if ($section == "duk") {
 			$section_name = "Doktor u kući";
 			$mnu = $inc = "";
+		} else if ($section == "arhiva") {
+			$section_name = "Arhiva";
+			$mnu = "";
+			$inc = "pgArhiva";
+		} else if ($section == "semafor") {
+			$section_name = "Alergijski semafor";
+			$mnu = $inc = "";
+		} else {
+			Header("Location: ?");
+			exit;
 		}
 	}
 	$push_menu = true;
@@ -144,16 +182,17 @@
 			if ($v["name"] == $section_menu) $section_menu_name = $v["caption"];
 		}
 		$tpl->assign("MENU", $menu);
-		if ($section_menu && !$keep_template)
-			$fname = eregi_replace("(".$tpl->tpl_file_ext.")$", "-$section_menu\\1", $fname);
-		$inc2 = $inc.($section_menu?"-$section_menu":"");
-		if ($inc2 && file_exists("inc/$inc2.php")) $inc = $inc2;
 	}
+	if ($section_menu && !$keep_template)
+		$fname = eregi_replace("(".$tpl->tpl_file_ext.")$", "-$section_menu\\1", $fname);
+	$inc2 = $inc.($section_menu?"-$section_menu":"");
+	if ($inc2 && file_exists("inc/$inc2.php")) $inc = $inc2;
 	$inc .= ".php";
 	if ($section_name) array_push($PATH, MyUpper($section_name));
 	if ($section_menu_name && $push_menu) array_push($PATH, MyUpper($section_menu_name));
 	if ($section_menu2_name) array_push($PATH, MyUpper($section_menu2_name));
 	if ($inc && file_exists("inc/$inc")) include_once("inc/$inc");
+	unset($dbh);
 	if ($isMed) {
 		$tpl->assign("mainmenu", array(
 			array("sec" => "home", "alt" => "home", "w" => 56, "h" => 23),
@@ -182,18 +221,23 @@
 	$tpl->assign("section_menu", $section_menu);
 	$tpl->assign("section_menu2", $section_menu2);
 	$tpl->assign("spec", $spec);
+	$tpl->assign("offset", $offset);
 	if ($fname && $section_name) $main = $tpl->fetch($fname);
 	$tpl->assign("MAIN", $main);
 	$tpl->assign("FOOTER", $tpl->fetch("footer.tpl"));
 	$tpl->assign("onload", $onload);
 	$tpl->assign("refresh", $refresh);
-	$tpl->assign("query", $query);
+	$tpl->assign("trazi", $trazi);
 	include_once("inc/banneri.php");
 	$idx = rand(0, count($banneri) - 1);
 	$tpl->assign("banner", $banneri[$idx]["slika"]);
 	$tpl->assign("banner_alt", $banneri[$idx]["alt"]);
 	$tpl->assign("banner_url", "?redir=".($idx + 1));
 	$tpl->assign("show", $show ? true : false);
+	$tpl->assign("date", strftime("%d.%m.%Y."));
+	$tpl->assign("acat", $acat);
+	$tpl->assign("acat2", $acat2);
+	$tpl->assign("SEMAFOR", GetSemafor());
 	$tpl->display($main_template);
 	include_once("inc/tracker.php");
 ?>