* make server_getln return the number of bytes it read

[citadel.git] / webcit / siteconfig.c

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index ecc63972a51c8b0c9d7b6191a43991363536d147..fba65fc7f4401b63a69d1f17fe46a9225d58ef8d 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -109,6 +109,9 @@ void display_siteconfig(void)
 
        wprintf("<form method=\"post\" action=\"siteconfig\">\n");
        wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       
+       sprintf(&general[strlen(general)], "<tr><td><a href=\"display_edithello\"> %s </a></td>",           _("Change Login Logo"));
+       sprintf(&general[strlen(general)],     "<td><a href=\"display_editgoodbuye\"> %s </a></td></tr>\n", _("Change Logout Logo"));
 
        i = 0;
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -346,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>");
@@ -489,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");
@@ -609,7 +628,7 @@ void display_siteconfig(void)
                case 63:
                        sprintf(&network[strlen(network)], "<tr><td>");
                        sprintf(&network[strlen(network)], _("XMPP (Jabber) server to server port (-1 to disable)"));
-                       sprintf(&network[strlen(network)], "</td><td>-1");
+                       sprintf(&network[strlen(network)], "</td><td>");
                        sprintf(&network[strlen(network)], "<input type=\"hidden\" name=\"c_xmpp_s2s_port\" value=\"%s\">\n", buf);
                        sprintf(&network[strlen(network)], "</TD></TR>\n");
                        break;