--- contact.php	2001/03/27 10:26:34	1.12
+++ contact.php	2001/11/21 10:29:57	1.16
@@ -6,15 +6,9 @@
 
 $smarty->assign( array ( Title=>"Pliva d.d." ) );
 
-$section=str_replace(".php","",basename($PHP_SELF));
-$smarty->assign("section",$section);
-
+include("section.inc");
 $main_file=$section;
 
-$title="CONTACT US";
-$lpic="cont"; $lext=".jpg";
-$mpic="contactus.gif";
-
 $smarty->assign( array ( lpic=>$lpic, lext=>$lext, mpic=>$mpic, Section_title=>$title ) );
 
 if (! isset($from) || $from == "") {
@@ -52,6 +46,8 @@
 
 include("common.inc");
 
+$smarty->assign("from",$from);
+
 if (isset($mailto) && check_required()) {
 	$main="Your comment is sent to $mailto. Thank you.";
 	include("quoted-printable.inc");
@@ -61,7 +57,7 @@
 	$main=$smarty->fetch("$main_file.tpl");
 }
 
-$smarty->assign( array(MAIN=>$main, from=>$from,
+$smarty->assign( array(MAIN=>$main, 
 	contact_section=>1,
 	));