--- RadSRacunalom.php	2001/04/20 08:25:32	1.1.1.1
+++ RadSRacunalom.php	2002/07/23 13:08:57	1.6
@@ -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_A")) $p = 100;
 	include("inc/conn.php");
 	DBOpen();
@@ -24,33 +24,33 @@
 		$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) {
 		if ($tecaj) {
 			if (!$warning) {
 				if ($edit)
-					DBQuery("UPDATE edukacije SET sif_tecaja=$tecaj (sifra=$edit) AND (sif_radnika='$sifra') AND (sif_qualification=4)");
+					DBQuery("UPDATE edukacije SET sif_tecaja=$tecaj WHERE (sifra=$edit) AND (sif_radnika='$sifra') AND (sif_qualification=4)");
 				else {
-					$id = DBQuery("SELECT MAX(sifra) FROM edukacije WHERE (sif_qualification=4)");
+					$id = DBQuery("SELECT MAX(sifra) FROM edukacije");
 					$id = $id[0][0] + 1;
 					DBQuery("INSERT INTO edukacije (sifra,sif_radnika,sif_tecaja,sif_qualification) VALUES ($id,'$sifra',$tecaj,4)");
 				}
 			}
 		} 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<>'')");
+	$rows = DBQuery("SELECT sifra, naziv FROM tecajevi WHERE (sif_qualification=4) AND (naziv<>'') AND (language='$language')");
 	$tecajevi = array();
 	for ($i = 0; $i < count($rows); $i++) {
 		list($sif, $naz) = $rows[$i];
@@ -70,7 +70,7 @@
 				break;
 			}
 		}
-		$ap2 = ereg_replace("\r?\n", "<BR>", $ap2);
+		$ap2 = nl2br($ap2);
 		nepoznato($ap2);
 		array_push($vars, array(
 			"id" => $id,
@@ -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();
 ?>