]> code.citadel.org Git - citadel.git/blobdiff - webcit/siteconfig.c
projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* this way arround some compilers like the casts better.
[citadel.git] / webcit / siteconfig.c
diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index fba65fc7f4401b63a69d1f17fe46a9225d58ef8d..0ab15744aadd314508b24dbd2094fd59e784909e 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -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")
        };
 
        sprintf(general, "<center><h1>%s</h1><table border=\"0\">",
@@ -107,6 +108,10 @@ void display_siteconfig(void)
                _("Push Email")
                );
 
+       sprintf(pop3, "<center><h1>%s</h1><table border=\"0\">",
+               _("POP3")
+               );
+               
        wprintf("<form method=\"post\" action=\"siteconfig\">\n");
        wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
        
@@ -289,11 +294,11 @@ void display_siteconfig(void)
                        sprintf(&tuning[strlen(tuning)], "</td></tr>\n");
                        break;
                case 23:
-                       sprintf(&network[strlen(network)], "<tr><td>");
-                       sprintf(&network[strlen(network)], _("POP3 listener port (-1 to disable)"));
-                       sprintf(&network[strlen(network)], "</td><td>");
-                       sprintf(&network[strlen(network)], "<input type=\"text\" name=\"c_pop3_port\" maxlength=\"5\" value=\"%s\">", buf);
-                       sprintf(&network[strlen(network)], "</TD></TR>\n");
+                       sprintf(&pop3[strlen(pop3)], "<tr><td>");
+                       sprintf(&pop3[strlen(pop3)], _("POP3 listener port (-1 to disable)"));
+                       sprintf(&pop3[strlen(pop3)], "</td><td>");
+                       sprintf(&pop3[strlen(pop3)], "<input type=\"text\" name=\"c_pop3_port\" maxlength=\"5\" value=\"%s\">", buf);
+                       sprintf(&pop3[strlen(pop3)], "</TD></TR>\n");
                        break;
                case 24:
                        sprintf(&network[strlen(network)], "<TR><TD>");
@@ -414,11 +419,11 @@ void display_siteconfig(void)
                        sprintf(&network[strlen(network)], "</TD></TR>\n");
                        break;
                case 40:
-                       sprintf(&network[strlen(network)], "<TR><TD>");
-                       sprintf(&network[strlen(network)], _("POP3 over SSL port (-1 to disable)"));
-                       sprintf(&network[strlen(network)], "</TD><TD>");
-                       sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_pop3s_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-                       sprintf(&network[strlen(network)], "</TD></TR>\n");
+                       sprintf(&pop3[strlen(pop3)], "<TR><TD>");
+                       sprintf(&pop3[strlen(pop3)], _("POP3 over SSL port (-1 to disable)"));
+                       sprintf(&pop3[strlen(pop3)], "</TD><TD>");
+                       sprintf(&pop3[strlen(pop3)], "<input type=\"text\" NAME=\"c_pop3s_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+                       sprintf(&pop3[strlen(pop3)], "</TD></TR>\n");
                        break;
                case 41:
                        sprintf(&network[strlen(network)], "<TR><TD>");
@@ -486,7 +491,6 @@ 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>");
@@ -496,7 +500,8 @@ void display_siteconfig(void)
                        int z;
                        long len;
                        char this_zone[128];
-                       char *ZName, *ZNamee;
+                       char *ZName;
+                       void *ZNamee;
                        HashList *List;
                        HashPos  *it;
 
@@ -515,9 +520,9 @@ void display_siteconfig(void)
                        }
                        SortByHashKey(List);
                        it = GetNewHashPos();
-                       while (GetNextHashPos(List, it, &len, &ZName, (void**)&ZNamee)) {
+                       while (GetNextHashPos(List, it, &len, &ZName, &ZNamee)) {
                                sprintf(&general[strlen(general)], "<option %s value=\"%s\">%s</option>\n",
-                                       (!strcasecmp(ZName, buf) ? "selected" : ""),
+                                       (!strcasecmp((char*)ZName, buf) ? "selected" : ""),
                                        ZName, ZName
                                );
                        }
@@ -526,9 +531,6 @@ void display_siteconfig(void)
 
                        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>");
@@ -632,6 +634,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;
+               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;
+                       
                }
        
        }
@@ -708,17 +725,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;");
@@ -810,6 +829,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")));
Citadel server, clients, utilities