--- contact.php	2001/03/05 11:56:10	1.4
+++ contact.php	2001/03/12 12:53:16	1.8
@@ -18,12 +18,20 @@
 $smarty->assign( array ( lpic=>$lpic, lext=>$lext, mpic=>$mpic, Section_title=>$title ) );
 
 $from=str_replace(".php","",basename($HTTP_REFERER));
+if (strstr($from,"?")) $from=substr($from,0,strpos($from,"?"));
+
+$email="webmaster@pliva.hr";	// default
 
 $sth = $dbh->prepare("select email from emails where referer='$from' limit 1");
 $sth->execute();
-$email="webmaster@pliva.hr";
 if ($row=$sth->fetchrow_hash()) {
 	$email=$row[email];
+} else {
+	$sth = $dbh->prepare("select email from emails,menu where menu.section=referer and url='results.php?type=a'");
+	$sth->execute();
+	if ($row=$sth->fetchrow_hash()) {
+		$email=$row[email];
+	}
 }
 
 $email=str_replace("\n","",$email);
@@ -46,18 +54,13 @@
 } else {
 	$main="Your comment is sent to $mailto. Thank you.";
 	include("quoted-printable.inc");
-	iso_mail("$fullname ($country) <$email>",$mailto,$subject,$comment);
-#	$main.="<pre>$mailto $fullname $email $country $subject $comment</pre>";
+	iso_mail("$fullname ($country) <$mailfrom>",$mailto,$subject,$comment);
+#	$main.="<pre>$mailto $fullname $mailfrom $country $subject $comment</pre>";
 }
 
 $smarty->assign( array(MAIN=>$main, from=>$from,
 	contact_section=>1,
 	));
 
-
-$smarty->assign("debug",$PHP_SELF." -- ".basename($PHP_SELF)." -- $section --".
-	$url[0] . "from: $from");
-
-
 $smarty->display("index.tpl");
 ?>