--- html/lista.php	2000/04/12 09:05:15	1.3
+++ html/lista.php	2000/07/30 18:16:12	1.12.2.2
@@ -1,20 +1,23 @@
 <?
 
 	include("inc/head.inc");
+	include("inc/prava.inc");
+	include("inc/checkbox.inc");
 
 	if (! isset($from)) {
 		$from=0;
+		$podesavanje="on"; $umrezavanje="on";
 	}
 
-	if (! isset($kontakt_osoba_id) || ! is_int($kontakt_osoba_id)) {
+	if (! isset($kontakt_osoba_id) || ! intval($kontakt_osoba_id)!=0) {
 		echo '<form method="post" action="'.$PHP_SELF.'?'.$QUERY_STRING.'" name="forma">
 			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";
@@ -23,9 +26,11 @@
 			<input type=submit value="Posebno označi moje zahtjeve">
 			</form>';
 	} else {
-		$result = pg_Exec ($conn, "select ime,prezime,passwd 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];
 	}
 
 	function option($value,$text,$current) {
@@ -36,18 +41,13 @@
 		echo ">$text</option>";
 	}
 
-	function checkbox($name,$current) {
-        	echo "<input type=\"checkbox\" name=\"$name\"";
-		if (isset($current)) {
-			echo " checked";
-		}
-		echo ">";
-	}
 
 	if (! isset($sql_upit)) { $sql_upit="novi_na_vrh"; }
 
 	echo '	<form method="post" action="'.$PHP_SELF.'?'.$QUERY_STRING.'" name="forma2">
-		<input type=submit value="Prikaži">
+		Upišite ime ili prezime po kojem želite pretraživati:
+			<input type=text name=imepr size=40 value="'.$imepr.'">
+		<br><input type=submit value="Prikaži">
 		slogove
 		<select name="sql_upit">
 		';
@@ -57,6 +57,7 @@
 		option("novi_na_vrh","noviji na početak popisa",$sql_upit);
 		option("order_ime","sortirano po imenu",$sql_upit);
 		option("order_prezime","sortirano po prezimenu",$sql_upit);
+		option("umrezavanje","potrebno umrežavanje",$sql_upit);
 
 	echo '	</select>
 		<small><i>za opcije označenje zvjezdicom (*) prvo morate
@@ -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,21 +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";
+	$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) {
@@ -108,6 +107,9 @@
 			case "novi_na_vrh":
 				$sql_order="order by id desc";
 				break;
+			case "umrezavanje":
+				$sql_where.=" and umrezavanje is true";
+				break;
 		}
 	}
 
@@ -121,10 +123,16 @@
 		$sql_polja.=",umrezavanje";
 	}
 
+	if (isset($imepr) && $imepr != "") {
+		$sql_where.=" and ( upper(toczs(osobe.ime)) like upper(toczs('$imepr')) or upper(toczs(osobe.prezime)) like upper(toczs('$imepr')) )";
+	}
+
 	$sql="select $sql_polja from $sql_tablice where $sql_where $sql_order limit $on_page,$from";
 
 #	echo "<pre>$sql</pre>";
-	$result = pg_Exec ($conn, "$sql");
+#	echo "<pre>$sql_where</pre>";
+	$sth = $dbh->prepare("$sql");
+	$sth->execute();
 
 	echo "<table border=1>
 		<tr>
@@ -133,28 +141,22 @@
 		<th>organizacijska jedinica</th>
 		<th>status zahtjeva</th>
 		<th>kontakt osoba</th>
+		<td><small>",$sth->rows(),"</small></td>
 		</tr>
 		";
 
-	function print_bool($val) {
-		if ($val == 't') {
-			print "da";
-		} elseif ($val == 'f') {
-			print "ne";
-		} else {
-			print "nepoznato";
-		}
-	}
+	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) {
+		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>";
 		} else {
 			print "$row[id]";
@@ -162,27 +164,30 @@
 		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]");
-		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");
+		$sth->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>";
 
 
 		if (isset($shell)) {
-			print "<br>shell: ";
-			print_bool($row[shell]);
+			print "<br>shell: ".print_bool($row[shell]);
 		}
 		if (isset($podesavanje)) {
-			print "<br>podešavanje: ";
-			print_bool($row[podesavanje]);
+			print "<br>podešavanje: ".print_bool($row[podesavanje]);
 		}
 		if (isset($umrezavanje)) {
-			print "<br>umrežavanje: ";
-			print_bool($row[umrezavanje]);
+			print "<br>umrežavanje: ".print_bool($row[umrezavanje]);
 		}
-		print "</small></td></tr>";
+		print "</small>";
+		print "</td><td>
+			<a href=\"obavijest.php?id=$row[id]\">
+			<img src=pix/text.gif border=0
+			alt=\"Prikaži sve podatke o ovom zahtjevu\"></a>
+			";
+		print "</td></tr>";
 	}
 
 
@@ -196,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;";