Removed remaining bits of funambol config from server

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 6f8a27d6fae1562f4d1d7ca20f92182fbef04c33..34458a61cbe045570d9d49fabb0d78f204bc51cc 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -214,7 +214,7 @@ install-data:
                 network/systems; do \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
        done
-       @for i in funambol_newmail_soap.xml notify_about_newmail.js public_clients citadel_urlshorteners.rc \
+       @for i in notify_about_newmail.js public_clients citadel_urlshorteners.rc \
                 `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
@@ -241,7 +241,7 @@ install-data-new:
        done
 
        $(srcdir)/mkinstalldirs $(DESTDIR)$(HELP_DIR)/help
-       @for i in  funambol_newmail_soap.xml notify_about_newmail.js \
+       @for i in  notify_about_newmail.js \
                 `find $(srcdir)/help -type f | grep -v .svn`; do \
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \

diff --git a/citadel/config.c b/citadel/config.c
index 76a342c7a4c4a2473fd5940586928a04fee1248e..d9eee63e739b40a00d8880986c7c933c07d22944 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -207,10 +207,6 @@ void migrate_legacy_config(struct legacy_config *lconfig)
        CtdlSetConfigInt(       "c_pftcpdict_port"      ,       lconfig->c_pftcpdict_port       );
        CtdlSetConfigInt(       "c_managesieve_port"    ,       lconfig->c_managesieve_port     );
        CtdlSetConfigInt(       "c_auth_mode"           ,       lconfig->c_auth_mode            );
-       CtdlSetConfigStr(       "c_funambol_host"       ,       lconfig->c_funambol_host        );
-       CtdlSetConfigInt(       "c_funambol_port"       ,       lconfig->c_funambol_port        );
-       CtdlSetConfigStr(       "c_funambol_source"     ,       lconfig->c_funambol_source      );
-       CtdlSetConfigStr(       "c_funambol_auth"       ,       lconfig->c_funambol_auth        );
        CtdlSetConfigInt(       "c_rbl_at_greeting"     ,       lconfig->c_rbl_at_greeting      );
        CtdlSetConfigStr(       "c_master_user"         ,       lconfig->c_master_user          );
        CtdlSetConfigStr(       "c_master_pass"         ,       lconfig->c_master_pass          );

diff --git a/citadel/config.h b/citadel/config.h
index 8419a8c79c70f9b990a8b5ab1de62c6091f0c87e..2dc63c51f7b7efb61991402b7a4e5c07f8bda8dc 100644 (file)
--- a/citadel/config.h
+++ b/citadel/config.h
@@ -81,10 +81,10 @@ struct legacy_config {
        int c_pftcpdict_port;
        int c_managesieve_port;
        int c_auth_mode;
-       char c_funambol_host[256];
-       int c_funambol_port;
-       char c_funambol_source[256];
-       char c_funambol_auth[256];
+       char c_niu_8[256];
+       int c_niu_9;
+       char c_niu_10[256];
+       char c_niu_11[256];
        char c_rbl_at_greeting;
        char c_master_user[32];
        char c_master_pass[32];

diff --git a/citadel/control.c b/citadel/control.c
index ef9a27fed4b764d0dc6c0948e6a85255101ae0db..f541f982ddbc5ba9ef5eaac33b762da1ec093c7b 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -308,10 +308,10 @@ void cmd_conf(char *argbuf)
                cprintf("%d\n",         CtdlGetConfigInt("c_pftcpdict_port"));
                cprintf("%d\n",         CtdlGetConfigInt("c_managesieve_port"));
                cprintf("%d\n",         CtdlGetConfigInt("c_auth_mode"));
-               cprintf("%s\n",         CtdlGetConfigStr("c_funambol_host"));
-               cprintf("%d\n",         CtdlGetConfigInt("c_funambol_port"));
-               cprintf("%s\n",         CtdlGetConfigStr("c_funambol_source"));
-               cprintf("%s\n",         CtdlGetConfigStr("c_funambol_auth"));
+               cprintf("\n");
+               cprintf("\n");
+               cprintf("\n");
+               cprintf("\n");
                cprintf("%d\n",         CtdlGetConfigInt("c_rbl_at_greeting"));
                cprintf("%s\n",         CtdlGetConfigStr("c_master_user"));
                cprintf("%s\n",         CtdlGetConfigStr("c_master_pass"));
@@ -518,16 +518,16 @@ void cmd_conf(char *argbuf)
                                CtdlSetConfigInt("c_auth_mode", atoi(buf));
                                break;
                        case 53:
-                               CtdlSetConfigStr("c_funambol_host", buf);
+                               /* niu */
                                break;
                        case 54:
-                               CtdlSetConfigInt("c_funambol_port", atoi(buf));
+                               /* niu */
                                break;
                        case 55:
-                               CtdlSetConfigStr("c_funambol_source", buf);
+                               /* niu */
                                break;
                        case 56:
-                               CtdlSetConfigStr("c_funambol_auth", buf);
+                               /* niu */
                                break;
                        case 57:
                                CtdlSetConfigInt("c_rbl_at_greeting", confbool(buf));

diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install
index 191d856d1f65bf1c538bbecd397ae6ffbde8c02e..1676e27f94f996700a20dba4423e9cc356e8b2cb 100644 (file)
--- a/citadel/debian/citadel-server.install
+++ b/citadel/debian/citadel-server.install
@@ -2,7 +2,6 @@ etc/citadel/mail.aliases
 etc/citadel/public_clients
 etc/citadel/citadel_urlshorteners.rc
 usr/share/citadel-server/help
-usr/share/citadel-server/funambol_newmail_soap.xml
 etc/citadel/messages
 usr/lib/citadel-server/ctdlmigrate 
 usr/lib/citadel-server/setup

diff --git a/citadel/funambol_newmail_soap.xml b/citadel/funambol_newmail_soap.xml
deleted file mode 100644 (file)
index 1656c38..0000000
--- a/citadel/funambol_newmail_soap.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soapenv:Body><sendNotificationMessages soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
-<arg0 xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">^notifyuser</arg0><arg1 xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
-&lt;java version=&quot;1.5.0_13&quot; class=&quot;java.beans.XMLDecoder&quot;&gt; 
- &lt;array class=&quot;com.funambol.framework.core.Alert&quot; length=&quot;1&quot;&gt; 
-  &lt;void index=&quot;0&quot;&gt; 
-   &lt;object class=&quot;com.funambol.framework.core.Alert&quot;&gt; 
-    &lt;void property=&quot;cmdID&quot;&gt; 
-     &lt;object class=&quot;com.funambol.framework.core.CmdID&quot;/&gt; 
-    &lt;/void&gt; 
-    &lt;void property=&quot;data&quot;&gt; 
-     &lt;int&gt;206&lt;/int&gt; 
-    &lt;/void&gt; 
-    &lt;void property=&quot;items&quot;&gt; 
-     &lt;void method=&quot;add&quot;&gt; 
-      &lt;object class=&quot;com.funambol.framework.core.Item&quot;&gt; 
-       &lt;void property=&quot;meta&quot;&gt; 
-        &lt;object class=&quot;com.funambol.framework.core.Meta&quot;&gt; 
-         &lt;void property=&quot;metInf&quot;&gt; 
-          &lt;void property=&quot;type&quot;&gt; 
-           &lt;string&gt;application/vnd.omads-email+xml&lt;/string&gt; 
-          &lt;/void&gt; 
-         &lt;/void&gt; 
-        &lt;/object&gt; 
-       &lt;/void&gt; 
-       &lt;void property=&quot;target&quot;&gt; 
-        &lt;object class=&quot;com.funambol.framework.core.Target&quot;&gt; 
-         &lt;void property=&quot;locURI&quot;&gt; 
-          &lt;string&gt;^syncsource&lt;/string&gt; 
-         &lt;/void&gt; 
-        &lt;/object&gt; 
-       &lt;/void&gt; 
-      &lt;/object&gt; 
-     &lt;/void&gt; 
-    &lt;/void&gt; 
-   &lt;/object&gt; 
-  &lt;/void&gt; 
- &lt;/array&gt; 
-&lt;/java&gt; 
-</arg1><arg2 href="#id0"/></sendNotificationMessages>
-<multiRef id="id0" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="soapenc:int" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">1</multiRef></soapenv:Body></soapenv:Envelope>

diff --git a/citadel/include/citadel_dirs.h b/citadel/include/citadel_dirs.h
index e417ed35b2221b525d0cf74cb410a24e8abb866b..86b7310dde466edcce257af84420c21c41f792c6 100644 (file)
--- a/citadel/include/citadel_dirs.h
+++ b/citadel/include/citadel_dirs.h
@@ -55,8 +55,6 @@ extern char file_guesstimezone[PATH_MAX];
 extern char file_dpsam_conf[PATH_MAX];
 extern char file_dspam_log[PATH_MAX];
 
-extern char file_funambol_msg[PATH_MAX];
-
 extern void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir, int dbg);
 
 

diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index daacbe3d7730e2f63fd2c11ac37f1cf839f91ff3..95f644e244bfed9b1415426623a53fa1c2eb6460 100644 (file)
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@ -69,7 +69,6 @@ char file_crpt_file_cer[PATH_MAX]="";
 char file_chkpwd[PATH_MAX]="";
 char file_base64[PATH_MAX]="";
 char file_guesstimezone[PATH_MAX]="";
-char file_funambol_msg[PATH_MAX] = "";
 char file_dpsam_conf[PATH_MAX] = "";
 char file_dspam_log[PATH_MAX] = "";
 
@@ -299,11 +298,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 #endif
                );
        StripSlashes(file_mail_aliases, 0);
-        snprintf(file_funambol_msg,
-                sizeof file_funambol_msg,
-                "%sfunambol_newmail_soap.xml",
-                ctdl_shared_dir);
-       StripSlashes(file_funambol_msg, 0);
 
        DBG_PRINT(ctdl_bio_dir);
        DBG_PRINT(ctdl_data_dir);
@@ -341,7 +335,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
        DBG_PRINT(file_chkpwd);
        DBG_PRINT(file_base64);
        DBG_PRINT(file_guesstimezone);
-       DBG_PRINT(file_funambol_msg);
 }