--- UPlivi.php	2001/04/21 10:59:29	1.2
+++ UPlivi.php	2001/04/25 13:18:46	1.3
@@ -23,51 +23,51 @@
 		$del = $match[1];
 	}
 	if ($del) {
-		unset($edit);
 		DBQuery("DELETE FROM u_plivi WHERE (id=$del) AND (sif_radnika='$sifra')");
+		if (!$DBH->errstr && $edit == $del) unset($edit);
 	}
 	$warning = 0;
 	if ($update || $p != $page) {
 		if ($radno_mjesto || $zadaci || $dat_od || $dat_do) {
 			if (!$warning) {
 				if ($dat_od) {
-					list($d, $m, $y) = split("\s*\.+\s*", $dat_od);
-					if (!checkdate($m, $d, $y)) $warning = 1;
-					$datum_od = ComposeDate($d, $m, $y);
+					$dt = DateCheck($dat_od);
+					if ($dt) $datum_od = ComposeDate($dt);
+						else $warning = 1;
 				} else $warning = 2;
 			}
 			if (!$warning) {
 				if ($dat_do) {
-					list($d, $m, $y) = split("\s*\.+\s*", $dat_do);
-					if (!checkdate($m, $d, $y)) $warning = 3;
-					$datum_do = ComposeDate($d, $m, $y);
-				} else $warning = 4;
+					$dt = DateCheck($dat_do);
+					if ($dt) $datum_do = ComposeDate($dt);
+						else $warning = 3;
+				} #else $warning = 4;
 			}
 			if (!$warning) {
 				$radno_mjesto = ereg_replace("\r?\n", "\n", ISO_Win($radno_mjesto));
 				$zadaci = ereg_replace("\r?\n", "\n", ISO_Win($zadaci));
 				if ($edit)
-					DBQuery("UPDATE u_plivi SET radno_mjesto='$radno_mjesto',zadaci='$zadaci',datum_od='$datum_od',datum_do='$datum_do' WHERE (sif_radnika='$sifra') AND (id=$edit)");
+					DBQuery("UPDATE u_plivi SET radno_mjesto='$radno_mjesto',zadaci='$zadaci',datum_od='$datum_od',datum_do=".($datum_do?"'$datum_do'":"NULL")." WHERE (sif_radnika='$sifra') AND (id=$edit)");
 				else {
 					$id = DBQuery("SELECT MAX(id) FROM u_plivi");
 					$id = $id[0][0] + 1;
-					DBQuery("INSERT INTO u_plivi (sif_radnika,radno_mjesto,zadaci,datum_od,datum_do,id) VALUES ('$sifra','$radno_mjesto','$zadaci','$datum_od','$datum_do',$id)");
+					DBQuery("INSERT INTO u_plivi (sif_radnika,radno_mjesto,zadaci,datum_od,datum_do,id) VALUES ('$sifra','$radno_mjesto','$zadaci','$datum_od',".($datum_do?"'$datum_do'":"NULL").",$id)");
 				}
 			}
 		} else if ($edit)
 			DBQuery("DELETE FROM u_plivi WHERE (sif_radnika='$sifra') AND (id=$edit)");
-		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, $radno_mjesto, $zadaci);
 		unset($dat_od, $dat_od_d, $dat_od_m, $dat_od_g);
 		unset($dat_do, $dat_do_d, $dat_do_m, $dat_do_g);
 	}
-	$rows = DBQuery("SELECT id,radno_mjesto,zadaci,datum_od,datum_do FROM u_plivi WHERE (sif_radnika='$sifra')");
+	$rows = DBQuery("SELECT id,radno_mjesto,zadaci,datum_od,datum_do FROM u_plivi WHERE (sif_radnika='$sifra') ORDER BY datum_od");
 	DBClose();
 	$vars = array();
 	$fnd = false;
@@ -90,24 +90,19 @@
 			"do_d" => $do["mday"], "do_m" => $do["mon"], "do_g" => $do["year"]
 		));
 		if ($edit && $edit == $id) {
-			$radno_mjesto = $rm;
-			$zadaci = $zad;
-			list($dat_od_d, $dat_od_m, $dat_od_g) =
-				array($od["mday"], $od["mon"], $od["year"]);
-			list($dat_do_d, $dat_do_m, $dat_do_g) =
-				array($do["mday"], $do["mon"], $do["year"]);
+			if (!$warning) {
+				$radno_mjesto = $rm;
+				$zadaci = $zad;
+				list($dat_od_d, $dat_od_m, $dat_od_g) =
+					array($od["mday"], $od["mon"], $od["year"]);
+				list($dat_do_d, $dat_do_m, $dat_do_g) =
+					array($do["mday"], $do["mon"], $do["year"]);
+			}
 			$fnd = true;
 		}
 	}
 	if (!$fnd) unset($edit);
-	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("radno_mjesto", $radno_mjesto);
@@ -123,7 +118,5 @@
 		$tpl->assign("dat_do_g", $dat_do_g);
 	} else $tpl->assign("dat_do", $dat_do);
 	$tpl->assign("warning", $warning);
-	$pg = basename($PHP_SELF);
-	$pg = eregi_replace("\.php$", "", $pg);
-	$tpl->display("$pg-$language.tpl");
+	$tpl->show();
 ?>