--- nagios-2.5/cgi/history.c	2006-03-21 21:31:46.000000000 +0000
+++ history.c	2006-08-22 10:57:20.866507168 +0100
@@ -148,8 +148,8 @@
 		printf("<TABLE BORDER=1 CELLPADDING=0 CELLSPACING=0 CLASS='linkBox'>\n");
 		printf("<TR><TD CLASS='linkBox'>\n");
 		if(display_type==DISPLAY_HOSTS){
-			printf("<A HREF='%s?host=%s'>View Status Detail For %s</A><BR>\n",STATUS_CGI,(show_all_hosts==TRUE)?"all":url_encode(host_name),(show_all_hosts==TRUE)?"All Hosts":"This Host");
-			printf("<A HREF='%s?host=%s'>View Notifications For %s</A><BR>\n",NOTIFICATIONS_CGI,(show_all_hosts==TRUE)?"all":url_encode(host_name),(show_all_hosts==TRUE)?"All Hosts":"This Host");
+			printf("<A HREF='%s?host=%s'>View Status Detail For %s</A><BR />\n",STATUS_CGI,(show_all_hosts==TRUE)?"all":url_encode(host_name),(show_all_hosts==TRUE)?"All Hosts":"This Host");
+			printf("<A HREF='%s?host=%s'>View Notifications For %s</A><BR />\n",NOTIFICATIONS_CGI,(show_all_hosts==TRUE)?"all":url_encode(host_name),(show_all_hosts==TRUE)?"All Hosts":"This Host");
 #ifdef USE_TRENDS
 			if(show_all_hosts==FALSE)
 				printf("<A HREF='%s?host=%s'>View Trends For This Host</A>\n",TRENDS_CGI,url_encode(host_name));
@@ -157,10 +157,10 @@
 	                }
 		else{
 			printf("<A HREF='%s?host=%s&",NOTIFICATIONS_CGI,url_encode(host_name));
-			printf("service=%s'>View Notifications For This Service</A><BR>\n",url_encode(svc_description));
+			printf("service=%s'>View Notifications For This Service</A><BR />\n",url_encode(svc_description));
 #ifdef USE_TRENDS
 			printf("<A HREF='%s?host=%s&",TRENDS_CGI,url_encode(host_name));
-			printf("service=%s'>View Trends For This Service</A><BR>\n",url_encode(svc_description));
+			printf("service=%s'>View Trends For This Service</A><BR />\n",url_encode(svc_description));
 #endif
 			printf("<A HREF='%s?host=%s'>View History For This Host</A>\n",HISTORY_CGI,url_encode(host_name));
 	                }
@@ -181,7 +181,7 @@
 		else
 			printf("Host '%s'",host_name);
 		printf("</DIV>\n");
-		printf("<BR>\n");
+		printf("<BR />\n");
 
 		snprintf(temp_buffer,sizeof(temp_buffer)-1,"%s?%shost=%s&type=%d&statetype=%d&",HISTORY_CGI,(use_lifo==FALSE)?"oldestfirst&":"",url_encode(host_name),history_options,state_options);
 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
@@ -199,8 +199,8 @@
 		/* right hand column of top row */
 		printf("<td align=right valign=top width=33%%>\n");
 
-		printf("<table border=0 CLASS='optBox'>\n");
 		printf("<form method=\"GET\" action=\"%s\">\n",HISTORY_CGI);
+		printf("<table border=0 CLASS='optBox'>\n");
 		printf("<input type='hidden' name='host' value='%s'>\n",(show_all_hosts==TRUE)?"all":host_name);
 		if(display_type==DISPLAY_SERVICES)
 			printf("<input type='hidden' name='service' value='%s'>\n",svc_description);
@@ -271,8 +271,8 @@
 		printf("</td>\n");
 		printf("</tr>\n");
 
-		printf("</form>\n");
 		printf("</table>\n");
+		printf("</form>\n");
 
 		printf("</td>\n");
 
@@ -886,7 +886,7 @@
 			if(display_line==TRUE){
 
 				if(strcmp(last_message_date,current_message_date)!=0 && display_timebreaks==TRUE){
-					printf("<BR CLEAR='all'>\n");
+					printf("</DIV><BR CLEAR='all' />\n");
 					printf("<DIV CLASS='dateTimeBreak'>\n");
 					printf("<table border=0 width=95%%><tr>");
 					printf("<td width=40%%><hr width=100%%></td>");
@@ -894,21 +894,21 @@
 					printf("<td width=40%%><hr width=100%%></td>");
 					printf("</tr></table>\n");
 					printf("</DIV>\n");
-					printf("<BR CLEAR='all'><DIV CLASS='logEntries'>\n");
+					printf("<BR CLEAR='all' /><DIV CLASS='logEntries'>\n");
 					strncpy(last_message_date,current_message_date,sizeof(last_message_date));
 					last_message_date[sizeof(last_message_date)-1]='\x0';
 				        }
 
 				if(display_frills==TRUE)
-					printf("<img align='left' src='%s%s' alt='%s' title='%s'>",url_images_path,image,image_alt,image_alt);
-				printf("[%s] %s<br clear='all'>\n",date_time,strip_plugin_html(temp_buffer));
+					printf("<img align='left' src='%s%s' alt='%s' title='%s' />",url_images_path,image,image_alt,image_alt);
+				printf("[%s] %s<br clear='all' />\n",date_time,strip_plugin_html(temp_buffer));
 				found_line=TRUE;
 			        }
 		        }
 
                 }
 
-	printf("</P>\n");
+	printf("</DIV></P>\n");
 	
 	if(found_line==FALSE){
 		printf("<HR>\n");
@@ -916,7 +916,7 @@
 		if(display_type==DISPLAY_HOSTS)
 			printf("%s",(show_all_hosts==TRUE)?"":"for this host ");
 		else
-			printf("for this this service ");
+			printf("for this service ");
 		printf("in %s log file</DIV></P>",(log_archive==0)?"the current":"this archived");
 	        }