--- html/lista.php	2000/07/04 08:45:32	1.12
+++ html/lista.php	2000/08/02 11:52:20	1.12.2.4
@@ -14,10 +14,10 @@
 			Odaberite Vaše ime i prezime:
 			<select name="kontakt_osoba_id">';
 
-		$result = pg_Exec ($conn, "select id,ime,prezime from kontakt_osobe
+		$sth = $dbh->prepare("select id,ime,prezime from kontakt_osobe
 			where aktivna=true order by ime");
-		for ($k = 0; $k < pg_numrows($result); $k++) {
-			$row=pg_fetch_array($result,$k);
+		$sth->execute();
+		while ($row=$sth->fetchrow_hash()) {
 			echo "<option value=\"$row[id]\"";
 			if ($row[id]==$kontakt_osoba_id) { echo " selected"; }
 			echo ">$row[ime] $row[prezime]</option>\n";
@@ -26,8 +26,9 @@
 			<input type=submit value="Posebno označi moje zahtjeve">
 			</form>';
 	} else {
-		$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);
+		$sth = $dbh->prepare("select ime,prezime,passwd,prava from kontakt_osobe where aktivna=true and id=$kontakt_osoba_id");
+		$sth->execute();
+		$row=$sth->fetchrow_hash();
 		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>";
 		$prava=$row[prava];
 	}
@@ -66,6 +67,7 @@
 	if (isset($kontakt_osoba_id)) {
 		echo '<input type=hidden name=kontakt_osoba_id value='.$kontakt_osoba_id.'>';
 	}
+
 	echo '<br><small>Prikaži status zahtjeva za:
 		',checkbox("shell",$shell),' shell
 		',checkbox("podesavanje",$podesavanje),' podešavanje
@@ -76,20 +78,18 @@
 
 	$on_page=50;
 
-	$conn = pg_connect("dbname=informatika user=dpavlin");
-
-		$sql_polja="osobe.id as id,osobe.ime as ime,
-			osobe.prezime as prezime,
-			org_jed.naziv||'<br><small>'||org_pod_jed.pod_naziv||'<small>' as orgjed,
-			kontakt_osobe.ime||' '||kontakt_osobe.prezime as kontakt_osoba,
-			e_mail,kontakt_osoba_id
-			";
-		$sql_tablice="osobe,org_jed,kontakt_osobe";
-		$sql_where="org_jed.id=org_jed_id
-			and org_pod_jed.pod_id=org_pod_jed_id
-			and kontakt_osoba_id=kontakt_osobe.id
-			";
-		$sql_order="order by id";
+	$sql_polja="osobe.id as id,osobe.ime as ime,
+		osobe.prezime as prezime,
+		org_jed.naziv||'<br><small>'||org_pod_jed.pod_naziv||'<small>' as orgjed,
+		kontakt_osobe.ime||' '||kontakt_osobe.prezime as kontakt_osoba,
+		e_mail,kontakt_osoba_id
+		";
+	$sql_tablice="osobe,org_jed,kontakt_osobe,org_pod_jed";
+	$sql_where="org_jed.id=org_jed_id
+		and org_pod_jed.pod_id=org_pod_jed_id
+		and kontakt_osoba_id=kontakt_osobe.id
+		";
+	$sql_order="order by id";
 
 	if (isset($sql_upit)) {
 		switch($sql_upit) {
@@ -131,7 +131,8 @@
 
 #	echo "<pre>$sql</pre>";
 #	echo "<pre>$sql_where</pre>";
-	$result = pg_Exec ($conn, "$sql");
+	$sth = $dbh->prepare("$sql");
+	$sth->execute();
 
 	echo "<table border=1>
 		<tr>
@@ -140,20 +141,20 @@
 		<th>organizacijska jedinica</th>
 		<th>status zahtjeva</th>
 		<th>kontakt osoba</th>
-		<td><small>",pg_numrows($result),"</small></td>
+		<td><small>",$sth->rows(),"</small></td>
 		</tr>
 		";
 
 	include("inc/print_bool2.inc");
 
-
-	for ($k = 0; $k < pg_numrows($result); $k++) {
-		$row=pg_fetch_array($result,$k);
+	$k=0;
+	while ($row=$sth->fetchrow_hash()) {
 		if ($k % 2 != 0) {
 			print "<tr>";
 		} else {
 			print '<tr bgcolor="#f0f0f0">';
 		}
+		$k++;
 		print "<td>";
 		if ($row[kontakt_osoba_id]==$kontakt_osoba_id || isset($prava) && $prava==$pr_admin) {
 			print "<a href=\"osoba.php?what=select-osoba&id=$row[id]\">$row[id]</a>";
@@ -163,9 +164,9 @@
 		print "</td><td>$row[ime] $row[prezime]</td>
 			<td>$row[orgjed]</td><td>";
 			
-		$result1 = pg_Exec ($conn, "select datum,opis from status,status_tip where status.status_tip_id=status_tip.id and osoba_id=$row[id] order by datum");
-		for ($l = 0; $l < pg_numrows($result1); $l++) {
-			$row1=pg_fetch_array($result1,$l);
+		$sth1 = $dbh->prepare("select datum,opis from status,status_tip where status.status_tip_id=status_tip.id and osoba_id=$row[id] order by datum");
+		$sth1->execute();
+		while ($row1=$sth1->fetchrow_hash()) {
 			print "<small>$row1[datum]</small> $row1[opis]<br>";
 		}
 		print "</td><td><a href=\"mailto:$row[e_mail]\">$row[kontakt_osoba]</a><small>";
@@ -200,7 +201,7 @@
 		echo "&nbsp;&nbsp;";
 	}
 
-	if (pg_numrows($result) >= $on_page) {
+	if ($sth->rows() >= $on_page) {
 		echo "<a href=$PHP_SELF?from=".($from+$on_page)."&sql_upit=$sql_upit>+</a>&nbsp;";
 	} else {
 		echo "&nbsp;&nbsp;";