--- new.php	2001/02/22 20:51:10	1.4
+++ new.php	2001/02/23 16:36:56	1.7
@@ -25,7 +25,7 @@
 	$back_url="index.php";
 }
 
-$smarty->assign( array ( lpic=>$lpic, lext=>$lext, mpic=>$mpic, Section_title=>$title ) );
+$smarty->assign( array ( lpic=>$lpic, lext=>$lext, mpic=>$mpic, ) );
 
 $sql_where="where visible is true";
 
@@ -47,10 +47,59 @@
 		$sql_where.=" and id=$id ";
 	}
 
-	$sth = $dbh->prepare("select id,upper(title) as title,town_date,body,more,pdf from news $sql_where order by date desc");
+	if (isset($type)) {
+		if ($type == "n") {
+			$sql_where .= " and type='n'";
+			$title.=" : News";
+		} elseif ($type == "e") {
+			$sql_where .= " and type='e'";
+			$title.=" : Events";
+		}
+	}
+
+	if (! isset($show) && !isset($start)) {
+		$sql_limit="limit 10";
+	} elseif (isset($start)) {
+		$sql_limit="limit 10,$start";
+	}
+
+
+	$num_selected=0;
+	$sql="select
+			id,upper(title) as title,town_date,body,more,pdf,
+			(date-now()::date) as comming,type,title as title_lc
+		from news $sql_where order by priority desc,date desc $sql_limit";
+#	print "$sql";
+	$sth = $dbh->prepare("$sql");
 	$sth->execute();
 	while ($row=$sth->fetchrow_hash()) {
 		$data[]=$row;
+		$num_selected++;
+	}
+
+	if ($num_selected == 10) {
+		$smarty->assign(array(
+			"multi_page_show" => 1,
+			"multi_page_next" => "$PHP_SELF?start=".($start+10),
+		));
+	}
+	if ($start && $start >= 10) {
+		$smarty->assign(array(
+			"multi_page_show" => 1,
+			"multi_page_prev" => "$PHP_SELF?start=".($start-10),
+		));
+	}
+
+	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];
+		}
 	}
 
 	$smarty->assign("data",$data);
@@ -68,7 +117,8 @@
 }
 
 include("common.inc");
-$smarty->assign( array(back_url=>$back_url, MAIN=>$main));
+$smarty->assign( array(back_url=>$back_url, MAIN=>$main,
+	Section_title=>$title ) );
 
 $smarty->display("index.tpl");
 ?>