--- new.php	2001/04/09 13:30:14	1.15
+++ new.php	2002/01/29 13:24:27	1.20
@@ -6,33 +6,28 @@
 
 $smarty->assign( array ( Title=>"Pliva d.d." ) );
 
-
 if (isset($from)) {
 	$section=$from;
 } else {
 	$section="new";
 }
 
-$sql_where="where visible is true";
+$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
@@ -122,6 +119,8 @@
 			$title.=" : Investors News : ".$data[0][title_lc];
 		} elseif ($data[0][type] == "a") {
 			$title.=" : Annual Report : ".$data[0][title_lc];
+		} elseif ($data[0][type] == "p") {
+			$title.=" : Presentations : ".$data[0][title_lc];
 		}
 	}