--- Nagrade.php	2001/04/20 08:25:32	1.1.1.1
+++ Nagrade.php	2001/04/25 13:18:46	1.2
@@ -24,11 +24,10 @@
 		$del = $match[1];
 	}
 	if ($del) {
-		unset($edit);
 		DBQuery("DELETE FROM nagrade WHERE (id=$del) AND (sif_radnika='$sifra')");
+		if (!$DBH->errstr && $edit == $del) unset($edit);
 	}
-	if ($godina && $godina < 1900)
-		if ($godina <= 40) $godina += 2000; else $godina += 1900;
+	YearFix($godina);
 	$warning = 0;
 	if ($update || $p != $page) {
 		if ($naziv || $ustanova || $urucitelj || $godina) {
@@ -45,14 +44,15 @@
 			}
 		} else if ($edit)
 			DBQuery("DELETE FROM nagrade WHERE (id=$edit) AND (sif_radnika='$sifra')");
-		if ($p != $page && !$warning) {
+		if ($p != $page && !$warning && !$DBH->errstr) {
 			DBClose();
 			Header("Location: $pages[$p]".Params($p));
 			exit;
 		}
 	}
-	if (($new || $update) && !$warning)
+	if (($new || $update) && !$warning && !$DBH->errstr)
 		unset($edit, $naziv, $ustanova, $urucitelj, $godina);
+	include("inc/util.php");
 	$rows = DBQuery("SELECT sifra,naziv,grad FROM ustanove WHERE (language='$language')");
 	$ustanove = array();
 	for ($i = 0; $i < count($rows); $i++) {
@@ -61,7 +61,8 @@
 		array_push($ustanove, array("id" => $sif,
 			"name" => HTML_Escape(Win_ISO($naz))));
 	}
-	$rows = DBQuery("SELECT id,naziv,sif_ustanove,urucitelj,godina FROM nagrade WHERE (sif_radnika='$sifra')");
+	usort($ustanove, "sort_name");
+	$rows = DBQuery("SELECT id,naziv,sif_ustanove,urucitelj,godina FROM nagrade WHERE (sif_radnika='$sifra') ORDER BY godina");
 	$vars = array();
 	$fnd = false;
 	for ($i = 0; $i < count($rows); $i++) {
@@ -91,31 +92,25 @@
 			"godina" => $god2
 		));
 		if ($edit && $edit == $id) {
-			$naziv = $naz;
-			$ustanova = $ust;
-			$urucitelj = $ur;
-			$godina = $god;
+			if (!$warning && !$DBH->errstr) {
+				$naziv = $naz;
+				$ustanova = $ust;
+				$urucitelj = $ur;
+				$godina = $god;
+			}
 			$fnd = true;
 		}
 	}
 	if (!$fnd) unset($edit);
 	DBClose();
-	include("inc/Smarty.class.php");
-	$tpl = new Smarty;
-	$tpl->template_dir = "./tpl";
-	$tpl->compile_dir = "./tpc";
-	$tpl->assign("action", $PHP_SELF.Params($page,
-		$edit ? array("edit" => $edit) : array()));
-	$tpl->assign("language", $language);
-	$tpl->assign("sifra", $sifra);
+	$tpl = new MySmarty($page, $edit ? array("edit" => $edit) : array());
 	$tpl->assign("vars", $vars);
 	$tpl->assign("edit", $edit);
 	$tpl->assign("ustanove", $ustanove);
 	$tpl->assign("naziv", $naziv);
 	$tpl->assign("ustanova", $ustanova);
+	$tpl->assign("urucitelj", $urucitelj);
 	$tpl->assign("godina", $godina);
 	$tpl->assign("warning", $warning);
-	$pg = basename($PHP_SELF);
-	$pg = eregi_replace("\.php$", "", $pg);
-	$tpl->display("$pg-$language.tpl");
+	$tpl->show("$pg-$language.tpl");
 ?>