--- new.php	2001/09/18 10:26:46	1.17
+++ new.php	2002/04/29 13:11:39	1.24
@@ -6,7 +6,6 @@
 
 $smarty->assign( array ( Title=>"Pliva d.d." ) );
 
-
 if (isset($from)) {
 	$section=$from;
 } else {
@@ -15,29 +14,26 @@
 
 $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='f' 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, ) );
 
 include("find_html_file.inc");
+include("news_type.inc");
 
 if (file_exists(find_html_file("news",$more))) {
 
@@ -52,14 +48,10 @@
 	if (isset($type)) {
 		if ($type == "n") {
 			$sql_where .= " and (type='n' or type='i')";
-			$title.=" : News";
-		} elseif ($type == "e") {
-			$sql_where .= " and type='e'";
-			$title.=" : Events";
-		} elseif ($type == "c") {
-			$sql_where .= " and type='c'";
-			$title.=" : Community";
+		} elseif ($type == "e" || $type == "f" || $type == "c") {
+			$sql_where .= " and type='".$type."'";
 		}
+		$title.=" : ".$news_type[$type];
 	}
 
 	if (! isset($show) && !isset($start)) {
@@ -95,6 +87,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 +96,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
@@ -110,21 +104,7 @@
 	}
 
 	if (isset($id) && $num_selected == 1) {
-		if ($data[0][type] == "n") {
-			$title.=" : News : ".$data[0][title_lc];
-		} elseif ($data[0][type] == "e") {
-			$title.=" : Event : ".$data[0][title_lc];
-		} elseif ($data[0][type] == "c") {
-			$title.=" : Community : ".$data[0][title_lc];
-		} elseif ($data[0][type] == "r") {
-			$title.=" : Result : ".$data[0][title_lc];
-		} elseif ($data[0][type] == "i") {
-			$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];
-		}
+		$title.=" : ".$news_type[ $data[0][type] ]." : ".$data[0][title_lc];
 	}
 
 
@@ -152,5 +132,7 @@
 $smarty->assign( array(back_url=>$back_url, MAIN=>$main,
 	Section_title=>$title ) );
 
+include("inc/newsletter.php");
+
 $smarty->display("index.tpl");
 ?>