--- html/obavijest.php	2000/06/27 11:43:01	1.9
+++ html/obavijest.php	2000/07/31 18:30:49	1.15.2.1
@@ -2,16 +2,17 @@
 
 include("inc/head.inc");
 include("inc/prava.inc");
-include("inc/show_bool.inc");
+include("inc/print_bool2.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");
-	$korow=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();
+	$korow=$sth->fetchrow_hash();
 #	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]));
+	$curr_md5_passwd=md5($korow[passwd]);
 	if ( (!isset($md5_passwd) && $korow[passwd] != $passwd) ||
 		(isset($md5_passwd) && $curr_md5_passwd != $md5_passwd) ) {
 		include("inc/auth.inc");
@@ -21,7 +22,7 @@
 		print '<p><a href="index.php">Povratak na početnu stranicu</a>';
 	} else {
 		session_register("md5_passwd");
-		$md5_passwd=base64_encode(mhash(MHASH_MD5,$korow[passwd]));
+		$md5_passwd=md5($korow[passwd]);
 	}
 }
 
@@ -35,8 +36,7 @@
 	include("inc/obavjest-forma.inc");
 } elseif (isset($id) && $what!="auth") {
 
-
-$result = pg_Exec ($conn, "
+$sth = $dbh->prepare("
 	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,podesavanje,
@@ -48,8 +48,9 @@
 	order by lokacije.naziv,org_jed.naziv
 	");
 
-if (pg_numrows($result) > 0) {
-	$row=pg_fetch_array($result,0);
+$sth->execute();
+
+if ($row=$sth->fetchrow_hash()) {
 
 	print "
 <h1>Podaci o osobi</h1>
@@ -70,41 +71,51 @@
 <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>
+<tr><td>Shell: ".print_bool($row[shell])."</td>
+	<td>Umrežavanje: ".print_bool($row[umrezavanje])."</td>
+	<td>Podešavanje: ".print_bool($row[podesavanje])."</td>
 </table>
 	";
 
+
+if ($prava & $pr_promjena) {
+	print "<small><a href=\"osoba.php?what=select-osoba&id=$id\">[promjeni podatke o osobi]</a></small>";
+}
+
 // kreiraj statuse, zapamti da li je instaliran
 
 $instaliran=0;
 
-$result = pg_Exec ($conn, "select datum,opis,ime,prezime,status_tip_id as st
+$sth = $dbh->prepare("select status.id as status_id,datum,opis,ime,prezime,status_tip_id as st
 	from status,kontakt_osobe,status_tip
 	where kontakt_osoba_id=kontakt_osobe.id and status_tip_id=status_tip.id
 	and osoba_id=$id order by datum");
+$sth->execute();
 
 $statusi="";
 
-$nr = pg_numrows($result);
-if ($nr > 0) {
-	for ($i=0;$i<$nr; $i++) {
-		$row=pg_fetch_array($result,$i);
+$nr=0;
+while($row=$sth->fetchrow_hash()) {
+	if ($row[st] != 2) {
 		$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 {
+		$statusi.="<tr ".bgcolor()."><td><small>$row[datum]</small></td><td><a href=\"promjene.php?osoba_id=$id&status_id=$row[status_id]\">$row[opis]</a></td><td>$row[ime] $row[prezime]</td></tr>";
 	}
-} else {
+	if ($row[st] == 6) { $instaliran = 1; };
+	$nr++;
+}
+
+if ($nr == 0) {
 	$statusi.="<p><big>Nema podataka o korisničkom računu</big>";
 }
 
 
-$result = pg_Exec ($conn, "select racuni.login as login,
+$sth = $dbh->prepare("select racuni.login as login,
 	racuni.passwd as passwd,e_mail.alias as email
 	where racuni.osoba_id=$id and e_mail.osoba_id=$id");
+$sth->execute();
 
-if (pg_numrows($result) > 0) {
-	$row=pg_fetch_array($result,0);
+if ($row=$sth->fetchrow_hash()) {
 
 	print "
 <h1>Podaci o korisničkom računu</h1>
@@ -136,28 +147,50 @@
 
 <table border=0>
 <tr><th>datum</th><th>status</th><th>status postavio/la</th></tr>
-$statusi
-<tr><td align=right><b>Dodati status:</b></td>
+$statusi";
+
+$statusi="<tr>";
+
+if ($prava == $pr_admin) {
+	$statusi.="<td><select name=date_offset>
+		<option value=>danas</option>
+		<option value=1>sutra</option>";
+	$dani=array("nedjelju","ponedjeljak","utorak","srijedu",
+		"četvrtak","petak","subotu");
+	for ($d=2; $d<10; $d++) {
+		$statusi.="<option value=$d>u ".$dani[(date("w")+$d) % 7].", ". date("d.m.Y",time()+$d*24*60*60)."</option>";
+	}
+	$statusi.="</select></td>";
+} else {
+	$statusi.="<td align=right><b>Dodati status:</b></td>";
+}
 
-<td><select name=status_tip_id>";
+$statusi.="<td><select name=status_tip_id>";
 
-	$result = pg_Exec ($conn, "select id,opis
+	$sth = $dbh->prepare("select id,opis
 		from status_tip
 		where id >= 5
 		");
+	$sth->execute();
 
-//		where id >= 5 and (2^id && $prava)
-	for ($i=0; $i<pg_numrows($result); $i++) {
-		$row=pg_fetch_array($result,$i);
+	$num_prava=0;
+
+	while ($row=$sth->fetchrow_hash()) {
 		if ($prava & pow(2,$row[id])) {
-			print "<option value=$row[id]>$row[opis]</option>\n";
+			$statusi.="<option value=$row[id]>$row[opis]</option>\n";
+			$num_prava++;
 		}
 	}
 
-print "</select></td>
-
+$statusi.="</select></td>
 <td>$korow[ime] $korow[prezime]</td>
-<td><input type=submit value=\"Dodaj\"></td></tr>
+<td><input type=submit value=\"Dodaj\"></td></tr>";
+
+if ($num_prava>0) {
+	print "$statusi";
+}
+
+print "
 </table>
 </form>
 
@@ -165,16 +198,20 @@
 <hr>
 ";
 
-} else { // pg_numrows($result) > 0
+} else { // nema rezultata
 	print "<p><big>Nema podataka o osobi sa id-jem $id</big>";
-}	// pg_numrows($result) > 0
+}
 
 include("inc/obavjest-forma.inc");
 
 } // isset($id)
 
-print '<p>Povratak na <a href="lista.php">listu zahtjeva</a> ili
-	<a href="/">početnu stranicu</a>.';
+print "<p>Povratak na ";
+if (isset($HTTP_REFERER)) {
+	print "<a href=\"$HTTP_REFERER\">stranicu sa koje ste došli</a> ili ";
+}
+print "<a href=\"/\">početnu stranicu</a>.";
+
 
 include("inc/footer.inc");