--- nagios-2.5/cgi/extinfo.c	2006-03-21 21:31:46.000000000 +0000
+++ nagios-2.5.extinfo_div_fixes/cgi/extinfo.c	2006-10-03 11:12:39.809179433 +0100
@@ -298,7 +298,7 @@
 		printf("</td>\n");
 
 		/* middle column of top row */
-		printf("<td align=center valign=center width=33%%>\n");
+		printf("<td align=center valign=middle width=33%%>\n");
 
 		if(((display_type==DISPLAY_HOST_INFO || display_type==DISPLAY_SERVICE_INFO) && temp_host!=NULL) || (display_type==DISPLAY_HOSTGROUP_INFO && temp_hostgroup!=NULL) || (display_type==DISPLAY_SERVICEGROUP_INFO && temp_servicegroup!=NULL)){
 
@@ -698,7 +698,7 @@
 		return;
 	        }
 
-	printf("<P>\n");
+	printf("<BR />\n");
 	printf("<DIV ALIGN=CENTER>\n");
 
 	printf("<TABLE BORDER=0 CELLPADDING=20>\n");
@@ -864,6 +864,7 @@
 	printf("</TABLE>\n");
 
 	printf("</TD></TR></TABLE>\n");
+	printf("</DIV>\n");
 
 #ifdef REMOVED_081203
 	printf("<P>");
@@ -1758,9 +1759,9 @@
 	/* read in all comments */
 	read_comment_data(get_cgi_config_location());
 
-	printf("<P>\n");
+	printf("<BR />\n");
 	printf("<DIV CLASS='commentNav'>[&nbsp;<A HREF='#HOSTCOMMENTS' CLASS='commentNav'>Host Comments</A>&nbsp;|&nbsp;<A HREF='#SERVICECOMMENTS' CLASS='commentNav'>Service Comments</A>&nbsp;]</DIV>\n");
-	printf("</P>\n");
+	printf("<BR />\n");
 
 	printf("<A NAME=HOSTCOMMENTS></A>\n");
 	printf("<DIV CLASS='commentTitle'>Host Comments</DIV>\n");
@@ -1769,7 +1770,7 @@
 	printf("<a href='%s?cmd_typ=%d'>",COMMAND_CGI,CMD_ADD_HOST_COMMENT);
 	printf("Add a new host comment</a></div>\n");
 
-	printf("<P>\n");
+	printf("<BR />\n");
 	printf("<DIV ALIGN=CENTER>\n");
 	printf("<TABLE BORDER=0 CLASS='comment'>\n");
 	printf("<TR CLASS='comment'><TH CLASS='comment'>Host Name</TH><TH CLASS='comment'>Entry Time</TH><TH CLASS='comment'>Author</TH><TH CLASS='comment'>Comment</TH><TH CLASS='comment'>Comment ID</TH><TH CLASS='comment'>Persistent</TH><TH CLASS='comment'>Type</TH><TH CLASS='comment'>Expires</TH><TH CLASS='comment'>Actions</TH></TR>\n");
@@ -1826,10 +1827,10 @@
 	if(total_comments==0)
 		printf("<TR CLASS='commentOdd'><TD CLASS='commentOdd' COLSPAN=9>There are no host comments</TD></TR>");
 
-	printf("</TD></TR>\n");
 	printf("</TABLE>\n");
+	printf("</DIV>\n");
 
-	printf("<P><BR></P>\n");
+	printf("<BR /><BR /><BR />\n");
 
 
 	printf("<A NAME=SERVICECOMMENTS></A>\n");
@@ -1839,7 +1840,7 @@
 	printf("<a href='%s?cmd_typ=%d'>",COMMAND_CGI,CMD_ADD_SVC_COMMENT);
 	printf("Add a new service comment</a></div>\n");
 
-	printf("<P>\n");
+	printf("<BR />\n");
 	printf("<DIV ALIGN=CENTER>\n");
 	printf("<TABLE BORDER=0 CLASS='comment'>\n");
 	printf("<TR CLASS='comment'><TH CLASS='comment'>Host Name</TH><TH CLASS='comment'>Service</TH><TH CLASS='comment'>Entry Time</TH><TH CLASS='comment'>Author</TH><TH CLASS='comment'>Comment</TH><TH CLASS='comment'>Comment ID</TH><TH CLASS='comment'>Persistent</TH><TH CLASS='comment'>Type</TH><TH CLASS='comment'>Expires</TH><TH CLASS='comment'>Actions</TH></TR>\n");
@@ -1898,8 +1899,8 @@
 	if(total_comments==0)
 		printf("<TR CLASS='commentOdd'><TD CLASS='commentOdd' COLSPAN=10>There are no service comments</TD></TR>");
 
-	printf("</TD></TR>\n");
 	printf("</TABLE>\n");
+	printf("</DIV>\n");
 
 	return;
         }
@@ -2170,7 +2171,7 @@
 	/***** ACTIVE SERVICE CHECKS *****/
 
 	printf("<tr>\n");
-	printf("<td valign=center><div class='perfTypeTitle'>Active Service Checks:</div></td>\n");
+	printf("<td valign=middle><div class='perfTypeTitle'>Active Service Checks:</div></td>\n");
 	printf("<td valign=top>\n");
 
 	/* fake this so we don't divide by zero for just showing the table */
@@ -2218,7 +2219,7 @@
 	/***** PASSIVE SERVICE CHECKS *****/
 
 	printf("<tr>\n");
-	printf("<td valign=center><div class='perfTypeTitle'>Passive Service Checks:</div></td>\n");
+	printf("<td valign=middle><div class='perfTypeTitle'>Passive Service Checks:</div></td>\n");
 	printf("<td valign=top>\n");
 	
 
@@ -2261,7 +2262,7 @@
 	/***** ACTIVE HOST CHECKS *****/
 
 	printf("<tr>\n");
-	printf("<td valign=center><div class='perfTypeTitle'>Active Host Checks:</div></td>\n");
+	printf("<td valign=middle><div class='perfTypeTitle'>Active Host Checks:</div></td>\n");
 	printf("<td valign=top>\n");
 
 	/* fake this so we don't divide by zero for just showing the table */
@@ -2309,7 +2310,7 @@
 	/***** PASSIVE HOST CHECKS *****/
 
 	printf("<tr>\n");
-	printf("<td valign=center><div class='perfTypeTitle'>Passive Host Checks:</div></td>\n");
+	printf("<td valign=middle><div class='perfTypeTitle'>Passive Host Checks:</div></td>\n");
 	printf("<td valign=top>\n");
 	
 
@@ -2389,7 +2390,7 @@
 	printf("<DIV CLASS='commentTitle'>%s Comments</DIV>\n",(type==HOST_COMMENT)?"Host":"Service");
 	printf("<TABLE BORDER=0>\n");
 
-	printf("<tr><td valign=center><img src='%s%s' border=0 align=center></td><td CLASS='comment'>",url_images_path,COMMENT_ICON);
+	printf("<tr><td valign=middle><img src='%s%s' border=0 align=center></td><td CLASS='comment'>",url_images_path,COMMENT_ICON);
 	if(type==HOST_COMMENT)
 		printf("<a href='%s?cmd_typ=%d&host=%s' CLASS='comment'>",COMMAND_CGI,CMD_ADD_HOST_COMMENT,url_encode(host_name));
 	else{
@@ -2398,7 +2399,7 @@
 	        }
 	printf("Add a new comment</a></td></tr>\n");
 
-	printf("<tr><td valign=center><img src='%s%s' border=0 align=center></td><td CLASS='comment'>",url_images_path,DELETE_ICON);
+	printf("<tr><td valign=middle><img src='%s%s' border=0 align=center></td><td CLASS='comment'>",url_images_path,DELETE_ICON);
 	if(type==HOST_COMMENT)
 		printf("<a href='%s?cmd_typ=%d&host=%s' CLASS='comment'>",COMMAND_CGI,CMD_DEL_ALL_HOST_COMMENTS,url_encode(host_name));
 	else{
@@ -2500,9 +2501,9 @@
 	/* read in all downtime */
 	read_downtime_data(get_cgi_config_location());
 
-	printf("<P>\n");
+	printf("<BR />\n");
 	printf("<DIV CLASS='downtimeNav'>[&nbsp;<A HREF='#HOSTDOWNTIME' CLASS='downtimeNav'>Host Downtime</A>&nbsp;|&nbsp;<A HREF='#SERVICEDOWNTIME' CLASS='downtimeNav'>Service Downtime</A>&nbsp;]</DIV>\n");
-	printf("</P>\n");
+	printf("<BR />\n");
 
 	printf("<A NAME=HOSTDOWNTIME></A>\n");
 	printf("<DIV CLASS='downtimeTitle'>Scheduled Host Downtime</DIV>\n");
@@ -2511,7 +2512,7 @@
 	printf("<a href='%s?cmd_typ=%d'>",COMMAND_CGI,CMD_SCHEDULE_HOST_DOWNTIME);
 	printf("Schedule host downtime</a></div>\n");
 
-	printf("<P>\n");
+	printf("<BR />\n");
 	printf("<DIV ALIGN=CENTER>\n");
 	printf("<TABLE BORDER=0 CLASS='downtime'>\n");
 	printf("<TR CLASS='downtime'><TH CLASS='downtime'>Host Name</TH><TH CLASS='downtime'>Entry Time</TH><TH CLASS='downtime'>Author</TH><TH CLASS='downtime'>Comment</TH><TH CLASS='downtime'>Start Time</TH><TH CLASS='downtime'>End Time</TH><TH CLASS='downtime'>Type</TH><TH CLASS='downtime'>Duration</TH><TH CLASS='downtime'>Downtime ID</TH><TH CLASS='downtime'>Trigger ID</TH><TH CLASS='downtime'>Actions</TH></TR>\n");
@@ -2566,10 +2567,10 @@
 	if(total_downtime==0)
 		printf("<TR CLASS='downtimeOdd'><TD CLASS='downtimeOdd' COLSPAN=11>There are no hosts with scheduled downtime</TD></TR>");
 
-	printf("</TD></TR>\n");
 	printf("</TABLE>\n");
+	printf("</DIV>\n");
 
-	printf("<P><BR></P>\n");
+	printf("<BR /><BR /><BR />\n");
 
 
 	printf("<A NAME=SERVICEDOWNTIME></A>\n");
@@ -2579,7 +2580,7 @@
 	printf("<a href='%s?cmd_typ=%d'>",COMMAND_CGI,CMD_SCHEDULE_SVC_DOWNTIME);
 	printf("Schedule service downtime</a></div>\n");
 
-	printf("<P>\n");
+	printf("<BR />\n");
 	printf("<DIV ALIGN=CENTER>\n");
 	printf("<TABLE BORDER=0 CLASS='downtime'>\n");
 	printf("<TR CLASS='downtime'><TH CLASS='downtime'>Host Name</TH><TH CLASS='downtime'>Service</TH><TH CLASS='downtime'>Entry Time</TH><TH CLASS='downtime'>Author</TH><TH CLASS='downtime'>Comment</TH><TH CLASS='downtime'>Start Time</TH><TH CLASS='downtime'>End Time</TH><TH CLASS='downtime'>Type</TH><TH CLASS='downtime'>Duration</TH><TH CLASS='downtime'>Downtime ID</TH><TH CLASS='downtime'>Trigger ID</TH><TH CLASS='downtime'>Actions</TH></TR>\n");
@@ -2636,8 +2637,8 @@
 	if(total_downtime==0)
 		printf("<TR CLASS='downtimeOdd'><TD CLASS='downtimeOdd' COLSPAN=12>There are no services with scheduled downtime</TD></TR>");
 
-	printf("</TD></TR>\n");
 	printf("</TABLE>\n");
+	printf("</DIV>\n");
 
 	return;
         }