Replace all discrete checks for empty message fields by CM_IsEmpty()

[citadel.git] / citadel / modules / network / serv_netfilter.c

diff --git a/citadel/modules/network/serv_netfilter.c b/citadel/modules/network/serv_netfilter.c
index 0c2ca0e587d477e8bd2ae293c1dfdcb7737af5bc..588cced6ad6cea299220ae3dac6090af244afbd6 100644 (file)
--- a/citadel/modules/network/serv_netfilter.c
+++ b/citadel/modules/network/serv_netfilter.c
@@ -149,28 +149,28 @@ int filter_the_idiots(struct CtdlMessage *msg, char *target_room) {
                zap_room = 0;
                zap_node = 0;
 
-               if (msg->cm_fields[eAuthor] != NULL) {
+               if (!CM_IsEmpty(msg, eAuthor)) {
                        if ( (!strcasecmp(msg->cm_fields[eAuthor], fptr->fl_user))
                           || (fptr->fl_user[0] == 0) ) {
                                zap_user = 1;
                        }
                }
 
-               if (msg->cm_fields[eRemoteRoom] != NULL) {
+               if (!CM_IsEmpty(msg, eRemoteRoom)) {
                        if ( (!strcasecmp(msg->cm_fields[eRemoteRoom], fptr->fl_room))
                           || (fptr->fl_room[0] == 0) ) {
                                zap_room = 1;
                        }
                }
 
-               if (msg->cm_fields[eOriginalRoom] != NULL) {
+               if (!CM_IsEmpty(msg, eOriginalRoom)) {
                        if ( (!strcasecmp(msg->cm_fields[eOriginalRoom], fptr->fl_room))
                           || (fptr->fl_room[0] == 0) ) {
                                zap_room = 1;
                        }
                }
 
-               if (msg->cm_fields[eNodeName] != NULL) {
+               if (!CM_IsEmpty(msg, eNodeName)) {
                        if ( (!strcasecmp(msg->cm_fields[eNodeName], fptr->fl_node))
                           || (fptr->fl_node[0] == 0) ) {
                                zap_node = 1;