From: Dave West <davew@uncensored.citadel.org>
Date: Wed, 13 Feb 2008 18:25:56 +0000 (+0000)
Subject: Now the auto purger time drop list obeys the 24 hour option in the user
X-Git-Tag: v7.86~2485
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=900adad78574b40107485f87f68dd5acdeffd393

Now the auto purger time drop list obeys the 24 hour option in the user
preferances.
Its a little obfuscated though.
---

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index daf3ee8d6..3536f4829 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -349,8 +349,8 @@ void display_siteconfig(void)
 				sprintf(&purger[strlen(purger)], "<OPTION %s VALUE=\"%d\">%d:00%s</OPTION>\n",
 					((atoi(buf) == j) ? "SELECTED" : ""),
 					j,
-					((j == 0) ? 12 : ((j>12) ? j-12 : j)),
-					((j >= 12) ? "pm" : "am")
+					(get_time_format_cached() == WC_TIMEFORMAT_24) ? j : ((j == 0) ? 12 : ((j>12) ? j-12 : j)),
+					(get_time_format_cached() == WC_TIMEFORMAT_24) ? "" : ((j >= 12) ? "pm" : "am")
 				);
 			}
 			sprintf(&purger[strlen(purger)], "</SELECT>");