--- index.php	2001/10/04 14:59:34	1.18
+++ index.php	2001/10/23 16:13:59	1.22
@@ -1,15 +1,12 @@
 <?php
 	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...
-			$loc = $banneri[$redir - 1]["url"];
-			if (!$loc) $loc = "?section=home";
-			Header("Location: $loc");
-		}
+		include_once("inc/global.php");
+		include_once("inc/util.php");
+		include_once("inc/banneri.php");
+		Click($redir);
+		$loc = $banneri[$redir]["url"];
+		if (!$loc) $loc = "?section=home";
+		Header("Location: $loc");
 		exit;
 	}
 	Header("Pragma: no-cache");
@@ -17,15 +14,16 @@
 	Header("Cache-Policy: no-cache");
 	include_once("inc/global.php");
 	include_once("inc/util.php");
-	$picdir = str_replace("//", "/", dirname($PHP_SELF));
-	$picdir = ($picdir == "/") ? "" : $picdir;
-	$aupicdir = $vadpicdir = $picdir;
+	$mydir = str_replace("//", "/", dirname($PHP_SELF));
+	$mydir = ($mydir == "/") ? "" : $mydir;
+	$sysmydir = $HTTP_SERVER_VARS["DOCUMENT_ROOT"];
+	$aupicdir = $vadpicdir = $picdir = $mydir;
 	$picdir .= "/img/news";
 	$aupicdir .= "/img/autori";
 	$vadpicdir .= "/img/vademecum";
-	$syspicdir = $HTTP_SERVER_VARS["DOCUMENT_ROOT"].$picdir;
-	$sysaupicdir = $HTTP_SERVER_VARS["DOCUMENT_ROOT"].$aupicdir;
-	$sysvadpicdir = $HTTP_SERVER_VARS["DOCUMENT_ROOT"].$vadpicdir;
+	$syspicdir = $sysmydir.$picdir;
+	$sysaupicdir = $sysmydir.$aupicdir;
+	$sysvadpicdir = $sysmydir.$vadpicdir;
 	include_once("inc/Smarty.class.php");
 	include_once("inc/Smarty.local.php");
 	$onload = $refresh = $main = "";
@@ -61,36 +59,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") {
@@ -103,8 +114,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";
@@ -140,6 +150,9 @@
 		} 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 = "";
@@ -147,6 +160,12 @@
 			$section_name = "Arhiva";
 			$mnu = "";
 			$inc = "pgArhiva";
+		} else if ($section == "semafor") {
+			$section_name = "Alergijski semafor";
+			$mnu = $inc = "";
+		} else {
+			Header("Location: ?");
+			exit;
 		}
 	}
 	$push_menu = true;
@@ -161,16 +180,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),
@@ -206,11 +226,20 @@
 	$tpl->assign("onload", $onload);
 	$tpl->assign("refresh", $refresh);
 	$tpl->assign("trazi", $trazi);
+	$tpl->assign("SEMAFOR", GetSemafor());
 	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));
+	$idx2 = $i = 0;
+	$bnr = array();
+	reset($banneri);
+	while (list($k, $v) = each($banneri)) {
+		$idx2 = $k;
+		$bnr = $v;
+		if ($i++ >= $idx) break;
+	}
+	$tpl->assign("banner", $bnr["slika"]);
+	$tpl->assign("banner_alt", $bnr["alt"]);
+	$tpl->assign("banner_url", "?redir=$idx2");
 	$tpl->assign("show", $show ? true : false);
 	$tpl->assign("date", strftime("%d.%m.%Y."));
 	$tpl->assign("acat", $acat);