--- RadSRacunalom.php	2001/04/20 08:25:32	1.1
+++ RadSRacunalom.php	2001/04/25 13:18:46	1.2
@@ -24,8 +24,8 @@
 		$del = $match[1];
 	}
 	if ($del) {
-		unset($edit);
 		DBQuery("DELETE FROM edukacije WHERE (sifra=$del) AND (sif_radnika='$sifra') AND (sif_qualification=4)");
+		if (!$DBH->errstr && $edit != $del) unset($edit);
 	}
 	$warning = 0;
 	if ($update || $p != $page) {
@@ -41,13 +41,13 @@
 			}
 		} else if ($edit)
 			DBQuery("DELETE FROM edukacije WHERE (sifra=$edit) AND (sif_radnika='$sifra') AND (sif_qualification=4)");
-		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, $tecaj);
 	include("inc/util.php");
 	$rows = DBQuery("SELECT sifra,naziv FROM tecajevi WHERE (language='$language') AND (sif_qualification=4) AND (naziv<>'')");
@@ -78,26 +78,17 @@
 			"naziv" => $ap2,
 		));
 		if ($edit && $edit == $id) {
-			$tecaj = $ap;
+			if (!$warning) $tecaj = $ap;
 			$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("tecajevi", $tecajevi);
 	$tpl->assign("tecaj", $tecaj);
 	$tpl->assign("warning", $warning);
-	$pg = basename($PHP_SELF);
-	$pg = eregi_replace("\.php$", "", $pg);
-	$tpl->display("$pg-$language.tpl");
+	$tpl->show();
 ?>