--- html/obavijest.php	2000/09/04 13:52:14	1.16
+++ html/obavijest.php	2002/01/25 14:47:46	1.21
@@ -4,6 +4,9 @@
 include("inc/prava.inc");
 include("inc/print_bool2.inc");
 include("inc/bgcolor.inc");
+include("inc/show_bool.inc");
+include("inc/auth_pop3.inc");
+include("inc/sap_org_jed.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");
@@ -38,14 +41,12 @@
 
 $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,podesavanje,
 		umrezavanje,shell
 	from osobe
 	where osobe.id=$id
-		and lokacija_id=lokacije.id and org_jed_id=org_jed.id
-		and org_pod_jed_id=org_pod_jed.pod_id
-	order by lokacije.naziv,org_jed.naziv
+		and lokacija_id=lokacije.id
+	order by lokacije.naziv
 	");
 
 if (pg_numrows($result) > 0) {
@@ -59,10 +60,9 @@
 	<td>$row[ime] $row[prezime]</td>
 	<td><small>Tel:</small> $row[tel]</td></tr>
 <tr><td><small>Org. jedinica:</small></td>
-	<td>$row[orgjed]</td>
+	<td rowspan=2>".sap_org_jed($row[sifra])." </td>
 	<td><small>Šifra radnika:</small> $row[sifra]</td></tr>
-<tr><td><small>Podjedinica:</small></td>
-	<td>$row[orgpodjed]</td>
+<tr><td></td>
 	<td><small>Lokacija računala:</small></td></tr>
 <tr><td><small>Lokacija:</small></td>
 	<td>$row[lok]</td>
@@ -81,6 +81,26 @@
 	print "<small><a href=\"osoba.php?what=select-osoba&id=$id\">[promjeni podatke o osobi]</a></small>";
 }
 
+// update nove lozinke i upis statusa
+if (($prava & $pr_lozinke) && $update_newpasswd) {
+	$result = pg_Exec ($conn, "select login,passwd from racuni where id=$racuni_id");
+	$row=pg_fetch_array($result,0);
+
+	include("inc/poppassd.inc");
+	$tmp=poppassd($row[login],$row[passwd],$newpasswd);
+
+	if ($tmp[0]) {
+
+		$sql="update racuni set passwd='$newpasswd' where racuni.id=$racuni_id";
+		pg_Exec ($conn, "$sql");
+		$sql="insert into status (osoba_id,kontakt_osoba_id,datum,status_tip_id) values ($id,$kontakt_osoba_id,'now'::datetime,7)";
+		$result = pg_Exec ($conn, $sql);
+		$promjena_lozinke_result="Lozinka upisana! ".$tmp[1];
+	} else {
+		$promjena_lozinke_result="<b>Greška</b>: ".$tmp[1];
+	}
+}
+
 // kreiraj statuse, zapamti da li je instaliran
 
 $instaliran=0;
@@ -88,7 +108,7 @@
 $result = pg_Exec ($conn, "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");
+	and status.osoba_id=$id order by datum");
 
 $statusi="";
 
@@ -107,10 +127,12 @@
 	$statusi.="<p><big>Nema podataka o korisničkom računu</big>";
 }
 
-
+$server=3;
 $result = pg_Exec ($conn, "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");
+	racuni.passwd as passwd,e_mail.alias as email,
+	racuni.id as racuni_id
+	where racuni.osoba_id=$id and e_mail.osoba_id=$id 
+        and racuni.server_id=$server");
 
 if (pg_numrows($result) > 0) {
 	$row=pg_fetch_array($result,0);
@@ -118,11 +140,44 @@
 	print "
 <h1>Podaci o korisničkom računu</h1>
 
+<form action=$PHP_SELF method=post>
+
 <table>
 <tr><td>Korisnička oznaka:</td><td><tt>$row[login]</tt></td></tr>
 ";
-if ($prava & $pr_instalacija) {
-	print "<tr><td>Lozinka:</td><td><tt>$row[passwd]</tt></td></tr>";
+if ($prava & $pr_instalacija || $prava & $pr_lozinke) {
+	print "<tr><td>Lozinka:</td><td><tt>".htmlspecialchars($row[passwd])."</tt>";
+	$passwd_ok="?";
+	if ($check_pop) {
+		$pop3 = new POP3();
+		$pop3->connect("intranet.pliva.hr");
+		if ($pop3->checklogin($row[login],$row[passwd])) {
+			$passwd_ok="t";
+		} else {
+			$passwd_ok="f";
+		}
+		$pop3->quit();
+		print show_bool($passwd_ok);
+	} else {
+		print "<input type=hidden name=id value=$id>
+			<input type=submit name=check_pop value=\"Provjeri\">
+			";
+	}
+	if ($prava & $pr_lozinke) {
+	    if ($input_newpasswd) {
+		print "<input type=hidden name=id value=$id>
+			<input type=text name=newpasswd value=\"$row[passwd]\" size=8>
+			<input type=hidden name=racuni_id value=\"$row[racuni_id]\">
+			<input type=submit name=update_newpasswd value=\"Promjeni\">";
+
+	    } elseif ($update_newpasswd) {
+		print $promjena_lozinke_result;
+	    } else {
+		print "<input type=hidden name=id value=$id>
+			<input type=submit name=input_newpasswd value=\"Promjeni\">";
+	   }
+	}// prava=pr_lozinke
+	print "</td></tr>";
 } else {
 	print "<tr><td colspan=2><i>Nemate ovlaštenja vidjeti lozinku ovog korisnika!</i></td></tr>";
 }
@@ -137,6 +192,8 @@
 
 
 	print "
+</form>
+
 <h1>Podaci o statusima korisničkog računa</h1>
 
 <form action=oznaci.php>