--- multi.php	2001/07/09 13:40:26	1.3
+++ multi.php	2001/09/20 09:50:24	1.7
@@ -1,4 +1,7 @@
 <?php
+
+$max_title_len=20;	// max. length of titles in drop-down
+
 require("Smarty.class.php");
 require("conn.inc");
 
@@ -13,17 +16,20 @@
 	$section="domov";
 } else {
 	// fetch current page
-	$sql="select id,menu_num,name,html,path,type from multi where visible and id=$p";
+	$sql="select id,menu_num,name,html,path,type from multi where $visible_is_true and id=$p";
 	$sth = $dbh->prepare("$sql");
 	$sth->execute();
 	$row=$sth->fetchrow_hash();
 
 	$title.=" : $row[name]";
-	if ($row[type]=="h" && file_exists(find_html_file("multi",$row[html]))) {
+	if ($row[type]=="h" && find_html_file("multi",$row[html])) {
 		$main=join('',file(find_html_file("multi",$row[html])));
 	} elseif ($row[type]=="p") {
-		if (file_exists(find_html_file("",$row[path]))) {
+		if (find_html_file("",$row[path])) {
 			$main=join('',file(find_html_file("",$row[path])));
+			// fix entities from MS programs
+			include("fix_msshit.inc");
+			$main=fix_msshit($main);
 		} else {
 			$main="<b>can't find $row[path] for id $p</b>";
 		}
@@ -49,7 +55,7 @@
 	$title=str_replace("\\n"," ",$title);	// nuke nl chars
 
 	// fetch all pages in this multi-page
-	$sql="select id,name from multi where visible and menu_num=$row[menu_num] order by menu_num,num";
+	$sql="select id,name from multi where $visible_is_true and menu_num=$row[menu_num] order by menu_num,num";
 	$sth = $dbh->prepare("$sql");
 	$sth->execute();
 
@@ -60,8 +66,9 @@
 	while ($row=$sth->fetchrow_hash()) {
 		array_push($multi_page_url,"$PHP_SELF?p=$row[id]");
 		array_push($multi_page_id,$row[id]);
-		$multi_page_options[$row[id]]=$row[name];
-		#array_push($multi_page_options,array( value=>$row[id], output=>$row[name]));
+		$drop_title=$row[name];
+		if (strlen($drop_title) > $max_title_len) $drop_title=substr($drop_title,0,$max_title_len)."...";
+		$multi_page_options[$row[id]]=$drop_title;
 		if ($row[id] == $p) {
 			$current=$max;
 			$curr_id=$row[id];