--- html/obavijest.php	2000/06/01 07:48:01	1.6
+++ html/obavijest.php	2000/06/02 06:05:08	1.7
@@ -2,15 +2,17 @@
 
 include("inc/head.inc");
 include("inc/prava.inc");
+include("inc/show_bool.inc");
+include("inc/bgcolor.inc");
 
 if (isset($kontakt_osoba_id) && $what!="relogin") {
 	$result = pg_Exec ($conn, "select ime,prezime,passwd,prava from kontakt_osobe where aktivna=true and id=$kontakt_osoba_id");
-	$row=pg_fetch_array($result,0);
-#	print "--$row[passwd] | $md5_passwd | $passwd ";
-	$prava=$row[prava];
-	print "<small>Trenutno ste prijavljeni kao $row[ime] $row[prezime], ako je to krivo odaberite <a href=\"$PHP_SELF?what=relogin\">ovaj link</a>.</small>";
-	$curr_md5_passwd=base64_encode(mhash(MHASH_MD5,$row[passwd]));
-	if ( (!isset($md5_passwd) && $row[passwd] != $passwd) ||
+	$korow=pg_fetch_array($result,0);
+#	print "--$korow[passwd] | $md5_passwd | $passwd ";
+	$prava=$korow[prava];
+	print "<small>Trenutno ste prijavljeni kao $korow[ime] $korow[prezime], ako je to krivo odaberite <a href=\"$PHP_SELF?what=relogin\">ovaj link</a>.</small>";
+	$curr_md5_passwd=base64_encode(mhash(MHASH_MD5,$korow[passwd]));
+	if ( (!isset($md5_passwd) && $korow[passwd] != $passwd) ||
 		(isset($md5_passwd) && $curr_md5_passwd != $md5_passwd) ) {
 		include("inc/auth.inc");
 		$what="auth";
@@ -19,11 +21,11 @@
 		print '<p><a href="index.php">Povratak na početnu stranicu</a>';
 	} else {
 		session_register("md5_passwd");
-		$md5_passwd=base64_encode(mhash(MHASH_MD5,$row[passwd]));
+		$md5_passwd=base64_encode(mhash(MHASH_MD5,$korow[passwd]));
 	}
 }
 
-print "--$pr_ko--";
+#print "--$pr_ko--";
 
 if (! isset($kontakt_osoba_id)) {
 	include("inc/auth.inc");
@@ -31,13 +33,14 @@
 
 } elseif (! isset($id)) {
 	include("inc/obavjest-forma.inc");
-} elseif (isset($id)) {
+} elseif (isset($id) && $what!="auth") {
 
 
 $result = pg_Exec ($conn, "
 	select osobe.id as id,ime,prezime,tel,lokacije.naziv as lok,sifra,
 		org_jed.naziv as orgjed,org_pod_jed.pod_naziv as orgpodjed,
-		lok_racunala as lokrac,objekt,kat,soba,z_rac
+		lok_racunala as lokrac,objekt,kat,soba,z_rac,podesavanje,
+		umrezavanje,shell
 	from osobe
 	where osobe.id=$id
 		and lokacija_id=lokacije.id and org_jed_id=org_jed.id
@@ -67,6 +70,9 @@
 <tr><td><small>Objekt/soba/kat:</small></td>
 	<td>$row[objekt] / $row[soba] / $row[kat]</td>
 	<td><small>Ž računala:</small> $row[z_rac]</td></tr>
+<tr><td>Shell: ".show_bool($row[shell])."</td>
+	<td>Umrežavanje: ".show_bool($row[umrezavanje])."</td>
+	<td>Podešavanje: ".show_bool($row[podesavanje])."</td>
 </table>
 	";
 } else {
@@ -88,7 +94,7 @@
 if ($nr > 0) {
 	for ($i=0;$i<$nr; $i++) {
 		$row=pg_fetch_array($result,$i);
-		$statusi.="<tr><td><small>$row[datum]</small></td><td>$row[opis]</td><td>$row[ime] $row[prezime]</td></tr>";
+		$statusi.="<tr ".bgcolor()."><td><small>$row[datum]</small></td><td>$row[opis]</td><td>$row[ime] $row[prezime]</td></tr>";
 		if ($row[st] == 6) { $instaliran = 1; };
 	}
 } else {
@@ -109,7 +115,7 @@
 <table>
 <tr><td>Korisnička oznaka:</td><td><tt>$row[login]</tt></td></tr>
 ";
-if ($prava and $pr_instalacija) {
+if ($prava & $pr_instalacija) {
 	print "<tr><td>Lozinka:</td><td><tt>$row[passwd]</tt></td></tr>";
 } else {
 	print "<tr><td colspan=2><i>Nemate ovlaštenja vidjeti lozinku ovog korisnika!</i></td></tr>";
@@ -127,12 +133,42 @@
 	print "
 <h1>Podaci o statusima korisničkog računa</h1>
 
-<table>
+<form action=oznaci.php>
+<input type=hidden name=kontakt_osoba_id value=$kontakt_osoba_id>
+<input type=hidden name=osoba_id value=$id>
+
+<table border=0>
 <tr><th>datum</th><th>status</th><th>status postavio/la</th></tr>
 $statusi
-</table>";
+<tr><td align=right><b>Dodati status:</b></td>
+
+<td><select name=status_tip_id>";
+
+	$result = pg_Exec ($conn, "select id,opis
+		from status_tip
+		where id >= 5
+		");
+
+	for ($i=0; $i<pg_numrows($result); $i++) {
+		$row=pg_fetch_array($result,$i);
+		print "<option value=$row[id]>$row[opis]</option>\n";
+	}
+
+print "</select></td>
+
+<td>$korow[ime] $korow[prezime]</td>
+<td><input type=submit value=\"Dodaj\"></td></tr>
+</table>
+</form>
+
+";
 
 } // isset($id)
 
+print '<p>Povratak na <a href="lista.php">listu zahtjeva</a> ili
+	<a href="/">početnu stranicu</a>.';
+
+include("inc/footer.inc");
+
 ?>