Added new POP3 client config options
[citadel.git] / webcit / siteconfig.c
index 96e481c9b3c7df21adb08860c03ac39cf5c0b98b..a68a6c7464a38f7707556adee384fdb1f85d2f30 100644 (file)
@@ -1,16 +1,14 @@
 /*
  * $Id$
+ *
+ * Administrative screen for site-wide configuration
  */
-/**
- * \defgroup AdminConfig Administrative screen for site-wide configuration
- * \ingroup CitadelConfig
- */
-/*@{*/
+
 
 #include "webcit.h"
 #include "webserver.h"
 
-/**
+/*
  * \brief display all configuration items
  */
 void display_siteconfig(void)
@@ -26,6 +24,8 @@ void display_siteconfig(void)
        char purger[SIZ];
        char idxjnl[SIZ];
        char funambol[SIZ];
+       char pop3[SIZ];
+       
        /** expire policy settings */
        int sitepolicy = 0;
        int sitevalue = 0;
@@ -63,7 +63,8 @@ void display_siteconfig(void)
                _("Directory"),
                _("Auto-purger"),
                _("Indexing/Journaling"),
-               _("Push Email")
+               _("Push Email"),
+               _("Pop3 Fetching")
        };
 
        sprintf(general, "<center><h1>%s</h1><table border=\"0\">",
@@ -107,8 +108,15 @@ void display_siteconfig(void)
                _("Push Email")
                );
 
+       sprintf(pop3, "<center><h1>%s</h1><table border=\"0\">",
+               _("POP3 Mail Fetching")
+               );
+               
        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 +354,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>");
@@ -483,33 +491,45 @@ void display_siteconfig(void)
                        if (strlen(buf) == 0) {
                                strcpy(buf, "UTC");
                        }
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
                        sprintf(&general[strlen(general)], "<TR><TD>");
                        sprintf(&general[strlen(general)], _("Default timezone for unzoned calendar items"));
                        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");
-#else /* WEBCIT_WITH_CALENDAR_SERVICE */
-                       wprintf("<input type=\"hidden\" name=\"c_default_cal_zone\" value=\"%s\">\n", buf);
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
                        break;
                case 50:
                        sprintf(&network[strlen(network)], "<TR><TD>");
@@ -599,8 +619,6 @@ void display_siteconfig(void)
                                ((atoi(buf) != 0) ? "CHECKED" : ""));
                        sprintf(&network[strlen(network)], "</TD></TR>\n");
                        break;
-
-#ifdef TECH_PREVIEW
                case 62:
                        sprintf(&network[strlen(network)], "<tr><td>");
                        sprintf(&network[strlen(network)], _("XMPP (Jabber) client to server port (-1 to disable)"));
@@ -615,20 +633,21 @@ void display_siteconfig(void)
                        sprintf(&network[strlen(network)], "<input type=\"hidden\" name=\"c_xmpp_s2s_port\" value=\"%s\">\n", buf);
                        sprintf(&network[strlen(network)], "</TD></TR>\n");
                        break;
-#else  /* TECH_PREVIEW */
-               case 62:
-                       sprintf(&network[strlen(network)], "<tr><td>");
-                       sprintf(&network[strlen(network)], "</td><td>");
-                       sprintf(&network[strlen(network)], "<input type=\"hidden\" name=\"c_xmpp_c2s_port\" value=\"%s\">", buf);
-                       sprintf(&network[strlen(network)], "</TD></TR>\n");
-                       break;
-               case 63:
-                       sprintf(&network[strlen(network)], "<tr><td>");
-                       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;
-#endif /* TECH_PREVIEW */
+               case 64:
+                       sprintf(&pop3[strlen(pop3)], "<tr><td>");
+                       sprintf(&pop3[strlen(pop3)], _("POP3 fetch frequency in seconds"));
+                       sprintf(&pop3[strlen(pop3)], "</td><td>");
+                       sprintf(&pop3[strlen(pop3)], "<input type=\"text\" name=\"c_pop3_fetch\" MAXLENGTH=\"5\" value=\"%s\">\n", buf);
+                       sprintf(&pop3[strlen(pop3)], "</TD></TR>\n");
+                       break;
+               case 65:
+                       sprintf(&pop3[strlen(pop3)], "<tr><td>");
+                       sprintf(&pop3[strlen(pop3)], _("POP3 fastest fetch frequency in seconds"));
+                       sprintf(&pop3[strlen(pop3)], "</td><td>");
+                       sprintf(&pop3[strlen(pop3)], "<input type=\"text\" name=\"c_pop3_fastest\" MAXLENGTH=\"5\" value=\"%s\">\n", buf);
+                       sprintf(&pop3[strlen(pop3)], "</TD></TR>\n");
+                       break;
+                       
                }
        
        }
@@ -705,17 +724,19 @@ void display_siteconfig(void)
        sprintf(&purger[strlen(purger)], "</table>");
        sprintf(&idxjnl[strlen(idxjnl)], "</table>");
        sprintf(&funambol[strlen(funambol)], "</table>");
-
-       tabbed_dialog(8, tabnames);
-
-       begin_tab(0, 8);        client_write(general, strlen(general));          end_tab(0, 8);
-       begin_tab(1, 8);        client_write(access, strlen(access));            end_tab(1, 8);
-       begin_tab(2, 8);        client_write(network, strlen(network));          end_tab(2, 8);
-       begin_tab(3, 8);        client_write(tuning, strlen(tuning));            end_tab(3, 8);
-       begin_tab(4, 8);        client_write(directory, strlen(directory));      end_tab(4, 8);
-       begin_tab(5, 8);        client_write(purger, strlen(purger));            end_tab(5, 8);
-       begin_tab(6, 8);        client_write(idxjnl, strlen(idxjnl));            end_tab(6, 8);
-       begin_tab(7, 8);        client_write(funambol, strlen(funambol));        end_tab(7, 8);
+       sprintf(&pop3[strlen(pop3)], "</table>");
+
+       tabbed_dialog(9, tabnames);
+
+       begin_tab(0, 9);        client_write(general, strlen(general));          end_tab(0, 9);
+       begin_tab(1, 9);        client_write(access, strlen(access));            end_tab(1, 9);
+       begin_tab(2, 9);        client_write(network, strlen(network));          end_tab(2, 9);
+       begin_tab(3, 9);        client_write(tuning, strlen(tuning));            end_tab(3, 9);
+       begin_tab(4, 9);        client_write(directory, strlen(directory));      end_tab(4, 9);
+       begin_tab(5, 9);        client_write(purger, strlen(purger));            end_tab(5, 9);
+       begin_tab(6, 9);        client_write(idxjnl, strlen(idxjnl));            end_tab(6, 9);
+       begin_tab(7, 9);        client_write(funambol, strlen(funambol));        end_tab(7, 9);
+       begin_tab(8, 9);        client_write(pop3, strlen(pop3));                end_tab(8, 9);
        wprintf("<div class=\"tabcontent_submit\">");
        wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
        wprintf("&nbsp;");
@@ -807,6 +828,8 @@ void siteconfig(void)
        serv_printf("%s", ((!strcasecmp(bstr("c_imap_keep_from"), "yes") ? "1" : "0")));
        serv_printf("%s", bstr("c_xmpp_c2s_port"));
        serv_printf("%s", bstr("c_xmpp_s2s_port"));
+       serv_printf("%s", bstr("c_pop3_fetch"));
+       serv_printf("%s", bstr("c_pop3_fastest"));
        serv_printf("000");
 
        serv_printf("SPEX site|%d|%d", atoi(bstr("sitepolicy")), atoi(bstr("sitevalue")));