--- TecajeviManagementa.php	2001/04/21 10:59:29	1.2
+++ TecajeviManagementa.php	2001/06/13 09:13:42	1.5
@@ -5,8 +5,8 @@
 	$p = $page;
 	if (isparam("wb_p")) $p--;
 	if (isparam("wb_OK")) $p++;
-	if (isparam("wb_h")) $p = 0;
-	if (isparam("wb_o")) $p = 15;
+	if (isparam("wb_h")) $p = $PG_HOME;
+	if (isparam("wb_o")) $p = $PG_OVERVIEW;
 	if (isparam("wb_T")) $p = 300;
 	if (isparam("wb_U")) $p = 200;
 	include("inc/conn.php");
@@ -25,24 +25,24 @@
 		$del = $match[1];
 	}
 	if ($del) {
-		unset($edit);
 		DBQuery("DELETE FROM edukacije WHERE (sifra=$del) AND (sif_radnika='$sifra') AND (sif_qualification=6)");
+		if (!$DBH->errstr && $edit == $del) unset($edit);
 	}
 	$warning = 0;
 	if ($update || $p != $page) {
 		if ($tecaj || $ustanova || $dat_od || $dat_do || $mjesto) {
 			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);
+					$dt = DateCheck($dat_do);
+					if ($dt) $datum_do = ComposeDate($dt);
+						else $warning = 3;
 				} else $warning = 4;
 			}
 			if (!$warning) {
@@ -58,20 +58,17 @@
 			}
 		} else if ($edit)
 			DBQuery("DELETE FROM edukacije WHERE (sifra=$edit) AND (sif_radnika='$sifra') AND (sif_qualification=6)");
-		if ($p != $page && !$warning) {
+		if ($p != $page && !$warning && !$DBH->errstr) {
 			DBClose();
 			Header("Location: $pages[$p]".Params($p,
 				($p == 300) ? array("q" => 6) : array()));
 			exit;
 		}
 	}
-	if (($new || $update) && !$warning) {
+	if (($new || $update) && !$warning && !$DBH->errstr) {
 		unset($edit, $tecaj, $ustanova, $mjesto);
 		unset($dat_od, $dat_od_d, $dat_od_m, $dat_od_g);
 		unset($dat_do, $dat_do_d, $dat_do_m, $dat_do_g);
-		unset($dat_pol, $dat_pol_d, $dat_pol_m, $dat_pol_g);
-		unset($dat_izd, $dat_izd_d, $dat_izd_m, $dat_izd_g);
-		unset($dat_ist, $dat_ist_d, $dat_ist_m, $dat_ist_g);
 	}
 	include("inc/util.php");
 	$rows = DBQuery("SELECT sifra,naziv FROM tecajevi WHERE (language='$language') AND (sif_qualification=6)");
@@ -90,8 +87,8 @@
 		array_push($ustanove, array("id" => $sif,
 			"name" => HTML_Escape(Win_ISO($naz))));
 	}
-	usort($tecajevi, "sort_name");
-	$rows = DBQuery("SELECT sifra,sif_tecaja,sif_ustanove,datum_upisa,datum_zavrsetka,grad_odrzavanja_tecaja FROM edukacije WHERE (sif_radnika='$sifra') AND (sif_qualification=6)");
+	usort($ustanove, "sort_name");
+	$rows = DBQuery("SELECT sifra,sif_tecaja,sif_ustanove,datum_upisa,datum_zavrsetka,grad_odrzavanja_tecaja FROM edukacije WHERE (sif_radnika='$sifra') AND (sif_qualification=6) ORDER BY datum_upisa");
 	$vars = array();
 	$fnd = false;
 	for ($i = 0; $i < count($rows); $i++) {
@@ -105,6 +102,7 @@
 				break;
 			}
 		}
+		nepoznato($tec2);
 		$ust2 = "";
 		for ($j = 0; $j < count($ustanove); $j++) {
 			if ($ustanove[$j]["id"] == $ust) {
@@ -112,6 +110,7 @@
 				break;
 			}
 		}
+		nepoznato($ust2);
 		$mj = HTML_Escape(Win_ISO($mj));
 		$mj2 = ereg_replace("\r?\n", "<BR>", $mj);
 		nepoznato($mj2);
@@ -125,26 +124,21 @@
 			"mjesto" => $mj2
 		));
 		if ($edit && $edit == $id) {
-			$tecaj = $tec;
-			$ustanova = $ust;
-			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"]);
-			$mjesto = $mj;
+			if (!$warning) {
+				$tecaj = $tec;
+				$ustanova = $ust;
+				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"]);
+				$mjesto = $mj;
+			}
 			$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);
@@ -163,7 +157,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();
 ?>