Moved all threading code into threads.c

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index e9e545da865f6798daba4c216fd58a790dfdb58f..6fc437faf5ace9b3ad333b3fc70b73d0b5ef18c6 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -53,7 +53,7 @@
 #include "citadel_dirs.h"
 #include "clientsocket.h"
 #include "serv_network.h"
-
+#include "threads.h"
 
 long config_msgnum;
 struct addresses_to_be_filed *atbf = NULL;
@@ -3103,48 +3103,45 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf,
                return (ERROR + NOT_LOGGED_IN);
        }
        else if (PostPublic == CHECK_EXISTANCE) {
-               SpoolControl *sc;
-               char filename[SIZ];
-               char room_to_spool[SIZ];
-               int found;
-
-               if (RemoteIdentifier == NULL)
-               {
-                       snprintf(errmsgbuf, n, "Need sender to permit access.");
-                       return (0);
-               }
-               if (getroom(&CC->room, room_to_spool) != 0) {
-                       lprintf(CTDL_CRIT, "ERROR: cannot load <%s>\n", room_to_spool);
-                       return (0);
-               }
-               
-               assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
-               
-               lprintf(CTDL_INFO, "Networking started for <%s>\n", CC->room.QRname);
-               begin_critical_section(S_NETCONFIGS);
-               if (!read_spoolcontrol_file(&sc, filename))
-               {
-                       end_critical_section(S_NETCONFIGS);
-                       snprintf(errmsgbuf, n, "No Subscribers found.");
-                       return (0);
-               }
-               end_critical_section(S_NETCONFIGS);
-               found = is_recipient (sc, RemoteIdentifier);
-               free_spoolcontrol_struct(&sc);
-               return (found);
+               return (0); // We're Evaling whether a recipient exists
        }
        else if (!(CC->logged_in)) {
                if ((CC->room.QRflags & QR_READONLY)) {
                        snprintf(errmsgbuf, n, "Not logged in.");
                        return (ERROR + NOT_LOGGED_IN);
                }
-               else if (CC->room.QRflags2 & QR2_SUBSONLY){
-                       ////TODO: check if we're in that list...
-                       return (0);
+               if (CC->room.QRflags2 & QR2_MODERATED) {
+                       snprintf(errmsgbuf, n, "Not logged in Moderation feature not yet implemented!");
+                       return (ERROR + NOT_LOGGED_IN);
                }
-               else if (CC->room.QRflags2 & QR2_MODERATED) {
-                       return (0);
+               if (CC->room.QRflags2 & QR2_SMTP_PUBLIC == 0){
+                       SpoolControl *sc;
+                       char filename[SIZ];
+                       int found;
+
+                       if (RemoteIdentifier == NULL)
+                       {
+                               snprintf(errmsgbuf, n, "Need sender to permit access.");
+                               return (ERROR + USERNAME_REQUIRED);
+                       }
+
+                       assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
+                       begin_critical_section(S_NETCONFIGS);
+                       if (!read_spoolcontrol_file(&sc, filename))
+                       {
+                               end_critical_section(S_NETCONFIGS);
+                               snprintf(errmsgbuf, n, "No Subscribers found.");
+                               return (ERROR + NO_SUCH_USER);
+                       }
+                       end_critical_section(S_NETCONFIGS);
+                       found = is_recipient (sc, RemoteIdentifier);
+                       free_spoolcontrol_struct(&sc);
+                       if (found)
+                               return (0);
+                       else
+                               return (ERROR + NO_SUCH_USER);
                }
+               return (0);
 
        }