--- Poslijediplomski.php	2001/04/20 08:25:32	1.1.1.1
+++ Poslijediplomski.php	2002/09/05 08:52:21	1.7
@@ -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;
 	include("inc/conn.php");
 	DBOpen();
 	$del = 0;
@@ -23,25 +23,25 @@
 		$del = $match[1];
 	}
 	if ($del) {
-		unset($edit);
 		DBQuery("DELETE FROM edukacije WHERE (sifra=$del) AND (sif_radnika='$sifra') AND (sif_qualification=2)");
+		if (!$DBH->errstr && $edit == $del) unset($edit);
 	}
 	$warning = 0;
 	if ($update || $p != $page) {
 		if ($obr_ust || $studij || $st_spreme || $vr_spreme || $dat_od || $dat_do || $zvanje || $uispita || $pispita || $usemestara || $psemestara) {
 			if (!$warning) {
 				if ($dat_od) {
-					list($d, $m, $y) = split("\s*\.+\s*", $dat_od);
-					if (!checkdate($m, $d, $y)) $warning = 1;
-					$datum_od = ComposeDate($dm, $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($dm, $m, $y);
-				} else $warning = 4;
+					$dt = DateCheck($dat_do);
+					if ($dt) $datum_do = ComposeDate($dt);
+						else $warning = 3;
+				} #else $warning = 4;
 			}
 			if (!$warning) {
 				if (!$st_spreme) $warning = 5;
@@ -62,60 +62,93 @@
 				if ($psemestara == "") $warning = 10;
 			}
 			if (!$warning) {
-				$studij = ereg_replace("\r?\n", "\n", ISO_Win($studij));
-				$zvanje = ereg_replace("\r?\n", "\n", ISO_Win($zvanje));
+				$studij = ISO_Win($studij);
+				$zvanje = ISO_Win($zvanje);
 				$sif = DBQuery("SELECT sif_str_spreme FROM strucne_spreme WHERE (language='$language') AND (stupanj='$st_spreme') AND (sif_vrsta_str_spreme=$vr_spreme)");
 				$sif = $sif[0][0];
 				if (!$sif) $sif = 0;
 				if ($edit) {
-					DBQuery("UPDATE edukacije SET sif_ustanove=$obr_ust,naziv='$studij',titula='$zvanje',sif_strucna_sprema=$sif,datum_upisa='$datum_od',datum_zavrsetka='$datum_do',ukupno_ispita=$uispita,polozenih_ispita=$pispita,ukupno_semestara=$usemestara,polozenih_semestara=$psemestara WHERE (sif_radnika='$sifra') AND (sifra=$edit) AND (language='$language') AND (sif_qualification=2)");
+					DBQuery("UPDATE edukacije SET sif_ustanove=$obr_ust,naziv='$studij',titula='$zvanje',sif_strucna_sprema=$sif,datum_upisa='$datum_od',datum_zavrsetka=".($datum_do?"'$datum_do'":"NULL").",ukupno_ispita=$uispita,polozenih_ispita=$pispita,ukupno_semestara=$usemestara,polozenih_semestara=$psemestara WHERE (sif_radnika='$sifra') AND (sifra=$edit) AND (sif_qualification=2)");
 				} else {
-					$id = DBQuery("SELECT MAX(sifra) FROM edukacije WHERE (sif_qualification=2)");
+					$id = DBQuery("SELECT MAX(sifra) FROM edukacije");
 					$id = $id[0][0] + 1;
-					DBQuery("INSERT INTO edukacije (sifra,sif_radnika,sif_ustanove,naziv,titula,sif_strucna_sprema,datum_upisa,datum_zavrsetka,ukupno_ispita,polozenih_ispita,ukupno_semestara,polozenih_semestara,sif_qualification) VALUES ($id,'$sifra',$obr_ust,'$studij','$zvanje',$sif,'$datum_od','$datum_do',$uispita,$pispita,$usemestara,$psemestara,2)");
+					DBQuery("INSERT INTO edukacije (sifra,sif_radnika,sif_ustanove,naziv,titula,sif_strucna_sprema,datum_upisa,datum_zavrsetka,ukupno_ispita,polozenih_ispita,ukupno_semestara,polozenih_semestara,sif_qualification) VALUES ($id,'$sifra',$obr_ust,'$studij','$zvanje',$sif,'$datum_od',".($datum_do?"'$datum_do'":"NULL").",$uispita,$pispita,$usemestara,$psemestara,2)");
 				}
 			}
-		} else if ($edit)
-			DBQuery("DELETE FROM edukacije WHERE (sifra=$edit) AND (sif_radnika='$sifra') AND (sif_qualification=2)");
-		if ($p != $page && !$warning) {
+		} else if ($edit) DBQuery("DELETE FROM edukacije WHERE (sifra=$edit) AND (sif_radnika='$sifra') AND (sif_qualification=2)");
+		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, $obr_ust, $studij, $zvanje, $st_spreme, $vr_spreme, $uispita, $pispita, $usemestara, $psemestara);
 		unset($dat_od, $dat_od_d, $dat_od_m, $dat_od_g);
 		unset($dat_do, $dat_do_d, $dat_do_m, $dat_do_g);
 	}
 	include("inc/util.php");
-	$rows = DBQuery("SELECT sifra,naziv,grad FROM obrazovna_ustanova WHERE (language='$language')");
+	$rows = DBQuery("SELECT sifra, naziv, grad FROM ustanove WHERE language='$language' AND naziv||grad<>'' AND obrazovna");
 	$ustanove = array();
 	for ($i = 0; $i < count($rows); $i++) {
 		list($sif, $naz, $grad) = $rows[$i];
 		if ($grad) $naz = "$naz, $grad";
-		array_push($ustanove, array("id" => $sif,
-			"name" => HTML_Escape(Win_ISO($naz))));
+		array_push($ustanove, array(
+			"id" => $sif,
+			"name" => HTML_Escape(Win_ISO($naz))
+		));
 	}
 	usort($ustanove, "sort_name");
+/* STARO!!!
 	$rows = DBQuery("SELECT DISTINCT stupanj FROM strucne_spreme WHERE (language='$language')");
 	$sss = array();
 	for ($i = 0; $i < count($rows); $i++) {
 		list($naz) = $rows[$i];
 		$naz = Win_ISO($naz);
-		array_push($sss, array("id" => $naz,
-			"name" => HTML_Escape(Win_ISO($naz))));
+		array_push($sss, array(
+			"id" => $naz,
+			"name" => HTML_Escape(Win_ISO($naz))
+		));
 	}
 	usort($sss, "sort_name");
+*/
+	$sss = array();
+	switch ($language) {
+		case "HR":
+			$sss = array(
+				array("id" => "VSS", "name" => "VSS"),
+				array("id" => "Dr", "name" => "Dr"),
+				array("id" => "Mr", "name" => "Mr"),
+				array("id" => "MBA", "name" => "MBA"),
+				array("id" => "Spec", "name" => "specijalizacija"),
+				array("id" => "Stud", "name" => "studijski boravak")
+			);
+			break;
+		case "EN":
+			$sss = array(
+				array("id" => "VSS", "name" => "VSS"),
+				array("id" => "Dr", "name" => "PhD"),
+				array("id" => "Mr", "name" => "Mr"),
+				array("id" => "MBA", "name" => "MBA"),
+				array("id" => "Spec", "name" => "specialization"),
+				array("id" => "Stud", "name" => "professional experience")
+			);
+			break;
+		default:
+			$sss = array();
+			break;
+	}
 	$rows = DBQuery("SELECT sifra,opis FROM vrsta_strucne_spreme WHERE (language='$language') AND (opis<>'')");
 	$vss = array();
 	for ($i = 0; $i < count($rows); $i++) {
 		list($sif, $naz) = $rows[$i];
-		array_push($vss, array("id" => $sif,
-			"name" => HTML_Escape(Win_ISO($naz))));
+		array_push($vss, array(
+			"id" => $sif,
+			"name" => HTML_Escape(Win_ISO($naz))
+		));
 	}
 	usort($vss, "sort_name");
-	$rows = DBQuery("SELECT edukacije.sifra,sif_ustanove,naziv,titula,stupanj,sif_vrsta_str_spreme,datum_upisa,datum_zavrsetka,ukupno_ispita,polozenih_ispita,ukupno_semestara,polozenih_semestara FROM edukacije,strucne_spreme WHERE (sif_radnika='$sifra') AND (sif_qualification=2) AND (strucne_spreme.sif_str_spreme=edukacije.sif_strucna_sprema)");
+	$rows = DBQuery("SELECT edukacije.sifra,sif_ustanove,naziv,titula,stupanj,sif_vrsta_str_spreme,datum_upisa,datum_zavrsetka,ukupno_ispita,polozenih_ispita,ukupno_semestara,polozenih_semestara FROM edukacije,strucne_spreme WHERE (sif_radnika='$sifra') AND (sif_qualification=2) AND (strucne_spreme.sif_str_spreme=edukacije.sif_strucna_sprema) ORDER BY datum_upisa");
 	$vars = array();
 	$fnd = false;
 	for ($i = 0; $i < count($rows); $i++) {
@@ -139,11 +172,11 @@
 		$sm = HTML_Escape(Win_ISO($sm));
 		$zv = HTML_Escape(Win_ISO($zv));
 		$st = HTML_Escape(Win_ISO($st));
-		$ust2 = ereg_replace("\r?\n", "<BR>", $ust2);
-		$sm2 = ereg_replace("\r?\n", "<BR>", $sm);
-		$zv2 = ereg_replace("\r?\n", "<BR>", $zv);
-		$st2 = ereg_replace("\r?\n", "<BR>", $st);
-		$vr2 = ereg_replace("\r?\n", "<BR>", $vr2);
+		$ust2 = nl2br($ust2);
+		$sm2 = nl2br($sm);
+		$zv2 = nl2br($zv);
+		$st2 = nl2br($st);
+		$vr2 = nl2br($vr2);
 		nepoznato($ust2);
 		nepoznato($sm2);
 		nepoznato($zv2);
@@ -163,32 +196,27 @@
 			"usemestara" => $us, "psemestara" => $ps
 		));
 		if ($edit && $edit == $id) {
-			$obr_ust = $ust;
-			$studij = $sm;
-			$zvanje = $zv;
-			$st_spreme = $st;
-			$vr_spreme = $vr;
-			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"]);
-			$uispita = $ui;
-			$pispita = $pi;
-			$usemestara = $us;
-			$psemestara = $ps;
+			if (!$warning) {
+				$obr_ust = $ust;
+				$studij = $sm;
+				$zvanje = $zv;
+				$st_spreme = $st;
+				$vr_spreme = $vr;
+				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"]);
+				$uispita = $ui;
+				$pispita = $pi;
+				$usemestara = $us;
+				$psemestara = $ps;
+			}
 			$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("ou", $ustanove);
@@ -214,7 +242,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();
 ?>