X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fsiteconfig.c;h=fba65fc7f4401b63a69d1f17fe46a9225d58ef8d;hp=9e6245029e8b82aa3a41ac201ae80aa4d94c9900;hb=d8abfc1ab880919a13cfc012427eab7ee0363334;hpb=276a9944e0503d0fb901b95bc660da83250fa1e7

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 9e6245029..fba65fc7f 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -492,21 +492,37 @@ void display_siteconfig(void)
 			sprintf(&general[strlen(general)], "</TD><TD>");
 			sprintf(&general[strlen(general)], "<select name=\"c_default_cal_zone\" size=\"1\">\n");
 
-			sprintf(&general[strlen(general)], "<option %s value=\"UTC\">UTC</option>\n",
-				(!strcasecmp(buf, "UTC") ? "selected" : "")
-			);
-
 			icalarray *zones;
 			int z;
+			long len;
 			char this_zone[128];
+			char *ZName, *ZNamee;
+			HashList *List;
+			HashPos  *it;
+
+			List = NewHash();
+			len = sizeof("UTC") + 1;
+			ZName = malloc(len + 1);
+			memcpy(ZName, "UTC", len + 1);
+			Put(List, ZName, len, ZName, NULL);
 			zones = icaltimezone_get_builtin_timezones();
 			for (z = 0; z < zones->num_elements; ++z) {
 				strcpy(this_zone, icaltimezone_get_location(icalarray_element_at(zones, z)));
+				len = strlen(this_zone);
+				ZName = (char*)malloc(len +1);
+				memcpy(ZName, this_zone, len + 1);
+				Put(List, ZName, len, ZName, NULL);
+			}
+			SortByHashKey(List);
+			it = GetNewHashPos();
+			while (GetNextHashPos(List, it, &len, &ZName, (void**)&ZNamee)) {
 				sprintf(&general[strlen(general)], "<option %s value=\"%s\">%s</option>\n",
-					(!strcasecmp(this_zone, buf) ? "selected" : ""),
-					this_zone, this_zone
+					(!strcasecmp(ZName, buf) ? "selected" : ""),
+					ZName, ZName
 				);
 			}
+			DeleteHashPos(&it);
+			DeleteHash(&List);
 
 			sprintf(&general[strlen(general)], "</select>");
 			sprintf(&general[strlen(general)], "</TD></TR>\n");