]> code.citadel.org Git - citadel.git/blobdiff - citadel/modules/dspam/serv_dspam.c
Removed references to Subversion in the code
[citadel.git] / citadel / modules / dspam / serv_dspam.c
index 8285b5368adc7967666dca8645ba21efb79b579b..9f06f6e13a9db8d654b52a15be1dd6eb7fa15f00 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module glues libDSpam to the Citadel server in order to implement
  * DSPAM Spamchecking 
  *
@@ -51,7 +49,6 @@
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "policy.h"
 #include "database.h"
 #include "msgbase.h"
 #include "internet_addressing.h"
@@ -160,12 +157,12 @@ void dspam_do_msg(long msgnum, void *userdata)
        if (dspam_process (CTX, msgtext) != 0)
        {
                free(msgtext);
-               CtdlLogPrintf(CTDL_CRIT, "ERROR: dspam_process failed");
+               syslog(LOG_CRIT, "ERROR: dspam_process failed");
                return;
        }
        if (CTX->signature == NULL)
        {
-               CtdlLogPrintf(CTDL_CRIT,"No signature provided\n");
+               syslog(LOG_CRIT,"No signature provided\n");
        }
        else
        {
@@ -178,7 +175,7 @@ void dspam_do_msg(long msgnum, void *userdata)
 
        SIG.length = CTX->signature->length;
        /* Print processing results */
-       CtdlLogPrintf (CTDL_DEBUG, "Probability: %2.4f Confidence: %2.4f, Result: %s\n",
+       syslog(LOG_DEBUG, "Probability: %2.4f Confidence: %2.4f, Result: %s\n",
                CTX->probability,
                CTX->confidence,
                (CTX->result == DSR_ISSPAM) ? "Spam" : "Innocent");
@@ -217,7 +214,7 @@ int serv_dspam_room(struct ctdlroom *room)
        /// else -> todo: global user for public rooms etc.
        if (CTX == NULL)
        {
-               CtdlLogPrintf(CTDL_CRIT, "ERROR: dspam_init failed!\n");
+               syslog(LOG_CRIT, "ERROR: dspam_init failed!\n");
                return ERROR + INTERNAL_ERROR;
        }
        /* Use graham and robinson algorithms, graham's p-values */
@@ -241,7 +238,7 @@ void serv_dspam_shutdown (void)
 
 CTDL_MODULE_INIT(dspam)
 {
-       return "$Id$" "disabled.";
+       return "disabled.";
        if (!threading)
        {
 #ifdef HAVE_LIBDSPAM
@@ -256,12 +253,12 @@ CTDL_MODULE_INIT(dspam)
 
 #else  /* HAVE_LIBDSPAM */
 
-               CtdlLogPrintf(CTDL_INFO, "This server is missing libdspam Spam filtering will be disabled.\n");
+               syslog(LOG_INFO, "This server is missing libdspam Spam filtering will be disabled.\n");
 
 #endif /* HAVE_LIBDSPAM */
        }
        
-        /* return our Subversion id for the Log */
-       return "$Id$";
+        /* return our module name for the log */
+       return "dspam";
 }