--- wap.php	2001/06/19 06:52:17	1.9
+++ wap.php	2002/06/06 11:29:44	1.11
@@ -21,10 +21,12 @@
 	$wml=$smarty->fetch("wap-$part.tpl");
 
 } else {
+	include("news_type.inc");
 
 	$on_page=5;
 
-	$sql_where="where visible is true and type<>'p'";
+#	$sql_where="where visible is true and type<>'p'";
+	$sql_where="where visible is true and (type='".join("' or type='",array_keys($wap_pics))."')";
 
 	if (!isset($s)) {
 		$sql_limit="limit $on_page";
@@ -52,7 +54,8 @@
 		} else {
 			$tmp=$html;
 		}
-		return utf8_encode(htmlspecialchars($tmp));
+		$tmp=str_replace('$','$$',$tmp);
+		return utf8_encode(htmlentities($tmp));
 	}
 
 
@@ -60,6 +63,8 @@
 		$row[title]=fixup($row[title]);
 		$row[body]=fixup($row[body]);
 		$row[town_date]=fixup($row[town_date]);
+		$row[pic]=$wap_pics{$row[type]};
+		$row[alt]=$news_type{$row[type]};
 		$data[]=$row;
 
 		$num_selected++;
@@ -78,7 +83,7 @@
 		body=>$wml_body,
 		prev=>$prev, next=>$next,
 		num_selected=>$num_selected,
-		on_page=>$on_page
+		on_page=>$on_page,
 		) );
 	$wml=$smarty->fetch("wap.tpl");
 }