--- new.php	2001/09/18 10:26:46	1.17
+++ new.php	2002/04/05 11:31:13	1.21
@@ -6,7 +6,6 @@
 
 $smarty->assign( array ( Title=>"Pliva d.d." ) );
 
-
 if (isset($from)) {
 	$section=$from;
 } else {
@@ -15,24 +14,20 @@
 
 $sql_where="where $visible_is_true";
 
+include("section.inc");
+
 if ($section == "investor") {
-	$title="INVESTOR'S PAGE";
-	$lpic="investor"; $lext=".jpg";
-	$mpic="investors.gif";
 	$back_url="investor.php";
 	if (! isset($type)) {
 		$sql_where .= " and type='i'";
 	}
 	$title.=" : Investors News";
-} elseif ($section == "about") {
-	$title="ABOUT US";
-	$lpic="about"; $lext=".gif";
-	$mpic="about.gif";
 } else {
 	$title="What's New";
 	$lpic="new"; $lext=".jpg";
 	$mpic="new.gif";
 	$back_url="index.php";
+	$sql_where.=" and (type='a' or type='c' or type='e' or type='i' or type='n' or type='p' or type='r')";		// don't show company profile
 }
 
 $smarty->assign( array ( lpic=>$lpic, lext=>$lext, mpic=>$mpic, ) );
@@ -95,6 +90,7 @@
 	if ($num_selected == 10) {
 		$tmp="$PHP_SELF?start=".($start+10);
 		if ($days) $tmp.="&days=$days";
+		if ($from) $tmp.="&from=$from";
 		$smarty->assign(array(
 			"multi_page_show" => 1,
 			"multi_page_next" => $tmp
@@ -103,6 +99,7 @@
 	if ($start && $start >= 10) {
 		$tmp="$PHP_SELF?start=".($start-10);
 		if ($days) $tmp.="&days=$days";
+		if ($from) $tmp.="&from=$from";
 		$smarty->assign(array(
 			"multi_page_show" => 1,
 			"multi_page_prev" => $tmp
@@ -152,5 +149,7 @@
 $smarty->assign( array(back_url=>$back_url, MAIN=>$main,
 	Section_title=>$title ) );
 
+include("inc/newsletter.php");
+
 $smarty->display("index.tpl");
 ?>