From be00863d58a61c8ee070e346fb0ac70c5b7f6a8e Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Mon, 6 Oct 2008 14:05:22 +0000
Subject: [PATCH] Cleaned up some bad html

---
 webcit/inetconf.c |  2 +-
 webcit/mainmenu.c |  2 +-
 webcit/messages.c | 10 ++++----
 webcit/summary.c  | 60 ++++++++++++++++++++---------------------------
 4 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index f865e7607..92b76de22 100644
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -103,7 +103,7 @@ void display_inetconf(void)
 	wprintf("<div id=\"content\" class=\"service\">\n");
 
 	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table border=0 width=100%% cellspacing=\"10px\" cellpadding=\"10px\"> "
+		"<table border=0 width=100%% cellspacing=\"10\" cellpadding=\"10\"> "
 		"<tr><td valign=top width=50%%>\n");
 	for (which=0; which<ic_max; ++which) {
 		if (which == (ic_max / 2)) {
diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index d9337fda4..4c1943817 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -19,7 +19,7 @@ void display_main_menu(void)
 	output_headers(1, 1, 1, 0, 0, 0);
 
 	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table width=\"100%%\" cellspacing=\"10px\" cellpadding=\"0\">"
+		"<table width=\"100%%\" cellspacing=\"10\" cellpadding=\"0\">"
 		"<tr><td colspan=\"2\" class=\"advanced\">\n");
 
 	svput("BOXTITLE", WCS_STRING, _("Basic commands"));
diff --git a/webcit/messages.c b/webcit/messages.c
index 29899788e..d4036a133 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -2118,9 +2118,9 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
 	
 		wprintf("<td>");
 
-		wprintf("<a href=\"readfwd?startmsg=%ld&is_singlecard=1",
+		wprintf("<a href=\"readfwd?startmsg=%ld?is_singlecard=1",
 			addrbook[i].ab_msgnum);
-		wprintf("?maxmsgs=1&is_summary=0&alpha=%s\">", bstr("alpha"));
+		wprintf("?maxmsgs=1?is_summary=0?alpha=%s\">", bstr("alpha"));
 		vcard_n_prettyize(addrbook[i].ab_name);
 		escputs(addrbook[i].ab_name);
 		wprintf("</a></td>\n");
@@ -2646,9 +2646,9 @@ void readloop(char *oper)
 			"<table cellspacing=0 style=\"width:100%%\">"
 			"<tr>"
 		);
-		wprintf("<th width=%d%%>%s <a href=\"readfwd?startmsg=1&maxmsgs=9999999&is_summary=1&sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
-			"<th width=%d%%>%s <a href=\"readfwd?startmsg=1&maxmsgs=9999999&is_summary=1&sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
-			"<th width=%d%%>%s <a href=\"readfwd?startmsg=1&maxmsgs=9999999&is_summary=1&sortby=%s\"><img border=\"0\" src=\"%s\" /></a> \n"
+		wprintf("<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
+			"<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
+			"<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> \n"
 			"&nbsp;"
 			"<input type=\"submit\" name=\"delete_button\" id=\"delbutton\" "
 			" onClick=\"CtdlDeleteSelectedMessages(event)\" "
diff --git a/webcit/summary.c b/webcit/summary.c
index 2752cbd3a..ffd840853 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -24,8 +24,8 @@ void output_date(void) {
 
 
 
-/**
- * \brief Dummy section
+/*
+ * Dummy section
  */
 void dummy_section(void) {
 	svput("BOXTITLE", WCS_STRING, "(dummy&nbsp;section)");
@@ -35,8 +35,8 @@ void dummy_section(void) {
 }
 
 
-/**
- * \brief New messages section
+/*
+ * New messages section
  */
 void new_messages_section(void) {
 	char buf[SIZ];
@@ -72,8 +72,8 @@ void new_messages_section(void) {
 }
 
 
-/**
- * \brief Task list section
+/*
+ * Task list section
  */
 void tasks_section(void) {
 	int num_msgs = 0;
@@ -102,8 +102,8 @@ void tasks_section(void) {
 }
 
 
-/**
- * \brief Calendar section
+/*
+ * Calendar section
  */
 void calendar_section(void) {
 	int num_msgs = 0;
@@ -130,8 +130,8 @@ void calendar_section(void) {
 	}
 }
 
-/**
- * \brief Server info section (fluff, really)
+/*
+ * Server info section (fluff, really)
  */
 void server_info_section(void) {
 	char message[512];
@@ -147,26 +147,19 @@ void server_info_section(void) {
 	escputs(message);
 }
 
-/**
- * \brief summary of inner div????
+/*
+ * Now let's do three columns of crap.  All portals and all groupware
+ * clients seem to want to do three columns, so we'll do three
+ * columns too.  Conformity is not inherently a virtue, but there are
+ * a lot of really shallow people out there, and even though they're
+ * not people I consider worthwhile, I still want them to use WebCit.
  */
-
-
-
 void summary_inner_div(void) {
-	/**
-	 * Now let's do three columns of crap.  All portals and all groupware
-	 * clients seem to want to do three columns, so we'll do three
-	 * columns too.  Conformity is not inherently a virtue, but there are
-	 * a lot of really shallow people out there, and even though they're
-	 * not people I consider worthwhile, I still want them to use WebCit.
-	 */
-
 	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table width=\"100%%\" cellspacing=\"10px\" cellpadding=\"0\">"
+		"<table width=\"100%%\" cellspacing=\"10\" cellpadding=\"0\">"
 		"<tr valign=top>");
 
-	/**
+	/*
 	 * Column One
 	 */
 	wprintf("<td width=33%%>");
@@ -179,7 +172,7 @@ void summary_inner_div(void) {
 	wprintf("</div></div></div>");
 	wprintf("</td>");
 
-	/**
+	/*
 	 * Column Two 
 	 */
 	wprintf("<td width=33%%>");
@@ -192,7 +185,7 @@ void summary_inner_div(void) {
 	wprintf("</div></div></div>");
 	wprintf("</td>");
 
-	/**
+	/*
 	 * Column Three
 	 */
 	wprintf("<td width=33%%>");
@@ -207,7 +200,7 @@ void summary_inner_div(void) {
 
 	wprintf("</tr><tr valign=top>");
 
-	/**
+	/*
 	 * Row Two - Column One
 	 */
 	wprintf("<td colspan=2>");
@@ -220,7 +213,7 @@ void summary_inner_div(void) {
 	wprintf("</div></div></div>");
 	wprintf("</td>");
 
-	/**
+	/*
 	 * Row Two - Column Two
 	 */
 	wprintf("<td width=33%%>");
@@ -234,15 +227,15 @@ void summary_inner_div(void) {
 	wprintf("</td>");
 
 
-	/**
+	/*
 	 * End of columns
 	 */
 	wprintf("</tr></table>");
 }
 
 
-/**
- * \brief Display this user's summary page
+/*
+ * Display this user's summary page
  */
 void summary(void) {
 	char title[256];
@@ -263,7 +256,7 @@ void summary(void) {
         wprintf("</li></ul>");
         wprintf("</div>");
 
-	/**
+	/*
 	 * You guessed it ... we're going to refresh using ajax.
 	 * In the future we might consider updating individual sections of the summary
 	 * instead of the whole thing.
@@ -300,4 +293,3 @@ InitModule_SUMMARY
 	WebcitAddUrlHandler(HKEY("summary_inner_div"), summary_inner_div, AJAX);
 }
 
-/*@}*/
-- 
2.30.2