--- html/ko_admin.php	2001/04/24 13:57:19	1.2
+++ html/ko_admin.php	2001/04/24 14:24:56	1.3
@@ -46,14 +46,14 @@
 	return $foo;
 }
 
-if ($zadatak=="Obriši" && isset($id) && $id != "") {
+if ($do_obrisi && isset($id) && $id != "") {
 	$result=pg_Exec($conn,"update kontakt_osobe set prava=0,aktivna=false where id=$id");
 	if ($delete_from_db == "on") {
 		$result=pg_Exec($conn,"delete from kontakt_osobe where id=$id");
 	}
 }
 
-if ($zadatak=="Reset upita" || $zadatak == "Obriši") {
+if ($do_reset || $do_obrisi ) {
 	$ime="";
 	$prezime="";
 	$e_mail="";
@@ -63,15 +63,15 @@
 	unset ($id);
 }
 
-if ($zadatak=="Promjeni") {
+if ($do_promjeni) {
 	$result=pg_Exec($conn,"update kontakt_osobe set ime='$ime',prezime='$prezime',e_mail='$e_mail',passwd='$passwd', prava=".vrati_nova_prava()." where id=$id");
 }
 
-if ($zadatak=="Dodaj") {
+if ($do_dodaj) {
 	$result=pg_Exec($conn,"insert into kontakt_osobe (ime,prezime,e_mail,passwd,prava) values ('$ime','$prezime','$e_mail','$passwd',".vrati_nova_prava().")");
 }
 
-if ($zadatak == "Traži") {
+if ($do_trazi) {
 	$result=pg_Exec($conn,"select id,ime,prezime,e_mail,passwd,prava
 		from kontakt_osobe
 		where upper(ime) like upper('$ime%') and
@@ -82,28 +82,24 @@
 		$row=pg_fetch_array($result,$i);
 		$id=$row[id];
 	}
-	$zadatak="";
 }
 
 
-if (isset($id) && "$zadatak" != "Traži" && "$zadatak" != "Dodaj") {
-	echo "$zadatak";
-	echo "ID je setiran";
-	$result=pg_Exec($conn,"select id,ime,prezime,e_mail,passwd,prava from kontakt_osobe where id=$id");
+if (isset($id) && !$do_dodaj) {
+	$result=pg_Exec($conn,"select id,ime,prezime,e_mail,passwd,prava,aktivna from kontakt_osobe where id=$id");
 	$row=pg_fetch_array($result,0);
 	while (list($key,$val) = each($row)) {
 		$GLOBALS["$key"]=$val;
 	}
-} else {
-	echo "ID NIJE setiran!";
 }
 
 ?>
 
-submit = <? echo $zadatak ?>
+<p><a href="#lista">Lista svih kontakt osoba</a>
+
 <h1>Podaci o kontakt osobi</h1>
 <form method="post" action="<? echo $PHP_SELF ?>" name="forma">
-<table>
+<table border=0>
     <tr bgcolor="#f0f0f0">
       <td>Ime</td>
       <td colspan="4">
@@ -124,9 +120,10 @@
     </tr>
     <tr>
       <td>password</td>
-      <td colspan="4">
+      <td>
         <input type="text" name="passwd" size="10" value="<? echo $passwd ?>"> 
       </td>
+      <td>aktivna: <? echo show_bool($aktivna) ?></td>
     </tr>
     <tr bgcolor="#f0f0f0">
              <td>prava</td>
@@ -151,13 +148,15 @@
 	print "<i>Trenutno: $nova_prava</i>";
 ?>
 	</td>
-
       <td>
-	  <input type="submit" name="zadatak" value="Traži"><P>
-	  <input type="submit" name="zadatak" value="Reset upita"><P>
-	  <input type="submit" name="zadatak" value="Promjeni"><P>
-	  <input type="submit" name="zadatak" value="Obriši"> <small><input type=checkbox name=delete_from_db> stvarno obriši iz baze</small><P>
-	  <input type="submit" name="zadatak" value="Dodaj"><P>
+<?  if (! isset($id)): ?>
+	  <input type="submit" name="do_trazi" value="Pronađi"><P>
+	  <input type="submit" name="do_dodaj" value="Dodaj novog"><P>
+<? else: ?>
+	  <input type="submit" name="do_promjeni" value="Promjeni"><P>
+	  <input type="submit" name="do_obrisi" value="Obriši"> <small><input type=checkbox name=delete_from_db> stvarno obriši iz baze</small><P>
+<? endif; ?>
+	  <input type="submit" name="do_reset" value="Odustani"><P>
       </td>
     </tr>
   </table>
@@ -165,8 +164,10 @@
 </form>
 <HR>
 
+<a name="lista">
+
 <TABLE>
-<th><TD>id</td><td>ime</TD><TD>prezime</TD><TD>e_mail</TD><TD>passwd</TD><TD>prava</TD><td>aktivna</td></TH>
+<th><TD>id</td><td>ime</TD><TD>prezime</TD><TD>e_mail</TD><TD>prava</TD><td>aktivna</td></TH>
 <?
 
 
@@ -180,7 +181,7 @@
         while (list($key,$val) = each($row)) {
                 $GLOBALS["$key"]=$val;
 	}
-	print "<TR".bgcolor()."><td></td><TD><a href=\"$PHP_SELF?id=$id\"> $id</a></TD><TD>$ime</td><td> $prezime</td><td> $e_mail</td><td> $passwd</td><td> $prava</td><td>".show_bool($aktivna)."</td></tr>";
+	print "<TR".bgcolor()."><td></td><TD><a href=\"$PHP_SELF?id=$id\"> $id</a></TD><TD>$ime</td><td> $prezime</td><td> $e_mail</td><td> $prava</td><td>".show_bool($aktivna)."</td></tr>";
 }
 
 ?>