Ticket #239: im_log.patch

im_log.c

@@ +1 @@
+  /********************************************************************\
+  * BitlBee -- An IRC to other IM-networks gateway                     *
+  *                                                                    *
+  * Copyright 2002-2007 Wilmer van der Gaast and others                *
+  \********************************************************************/
+
+/* Log IM messages to a text file                             */
+
+/*
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#define BITLBEE_CORE
+#include <time.h>
+#include "bitlbee.h"
+#include "im_log.h"
+
+static FILE* out = NULL;
+
+static void open_log ( irc_t* irc );
+static void close_log ( void );
+
+static void handle_error ( irc_t* irc )
+{
+    irc_usermsg ( irc, "There was a problem opening the logfile. Disabling logging" );
+    set_setstr ( &irc->set, "enable_logging", "false" );
+}
+
+static void open_log ( irc_t* irc )
+{
+    char logfile[512];
+    char *nick;
+    int ret;
+
+    nick = g_strdup( irc->nick );
+    nick_lc( nick );
+
+    ret = g_snprintf ( logfile, sizeof ( logfile ), "%s%s%s", global.conf->configdir, nick, ".log");
+    if ( ret < 0 )
+    {
+        handle_error ( irc );
+        return;
+    }
+
+    out = fopen ( logfile, "a+" );
+
+    if ( out == NULL )
+        handle_error ( irc );
+}
+
+static void close_log ( void )
+{
+    fclose ( out );
+    out = NULL;
+}
+
+static void write_message ( const char* who, const char* msg )
+{
+    time_t now = time ( NULL );
+    char* timestamp = asctime ( localtime ( &now ) );
+        
+    /* Because asctime adds a '\n' */
+    timestamp[strlen ( timestamp ) - 1 ] = 0;
+        
+    fprintf ( out, "%s %s %s\n", timestamp, who, msg );
+    fflush ( out );
+}
+
+void im_log_message (irc_t* irc, const char* who, const char* msg)
+{
+    if ( set_getbool ( &irc->set, "enable_logging") )
+    {
+        if ( ! out )
+            open_log ( irc );
+
+        if ( out )
+            /* Because open_log could fail */
+            write_message ( who, msg );
+    }
+    else
+    {
+        if ( out )
+            close_log ();
+    }
+}
+

im_log.h

@@ +1 @@
+  /********************************************************************\
+  * BitlBee -- An IRC to other IM-networks gateway                     *
+  *                                                                    *
+  * Copyright 2002-2007 Wilmer van der Gaast and others                *
+  \********************************************************************/
+
+/* Log IM messages to a text file                             */
+
+/*
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef _IM_LOG_H
+#define _IM_LOG_H
+
+void im_log_message (irc_t* irc, const char* nick, const char *message);
+
+#endif

Makefile

@@ -9 +9 @@
 -include Makefile.settings
 
 # Program variables
-objects = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o user.o
-headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ini.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h url.h user.h protocols/http_client.h protocols/md5.h protocols/nogaim.h protocols/proxy.h protocols/sha.h protocols/ssl_client.h
+objects = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o user.o im_log.o
+headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ini.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h url.h user.h protocols/http_client.h protocols/md5.h protocols/nogaim.h protocols/proxy.h protocols/sha.h protocols/ssl_client.h im_log.h
 subdirs = lib protocols
 
 # Expansion of variables

bitlbee.h

@@ -132 +132 @@
 #include "sock.h"
 #include "misc.h"
 #include "proxy.h"
+#include "im_log.h"
 
 typedef struct global {
         /* In forked mode, child processes store the fd of the IPC socket here. */

irc.c

@@ -145 +145 @@
         set_add( &irc->set, "strip_html", "true", NULL, irc );
         set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );
         set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc );
-        
+        set_add ( &irc->set, "enable_logging", "false", set_eval_bool, irc );
+
         conf_loaddefaults( irc );
         
         return( irc );

protocols/nogaim.c

@@ -193 +193 @@
         for( a = ic->irc->accounts; a; a = a->next )
                 if( a->prpl == ic->acc->prpl && a->ic != ic )
                         break;
-        
+
+        im_log_message ( ic->irc, ic->acc->prpl->name, text);
+
         /* If we found one, include the screenname in the message. */
         if( a )
                 irc_usermsg( ic->irc, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text );
@@ -650 +652 @@
                         tmp = *nl;
                         *nl = 0;
                 }
-                
+
+                im_log_message ( irc, u->nick, msg );
                 irc_msgfrom( irc, u->nick, msg );
                 
                 /* Move on. */
@@ -665 +668 @@
                         msg += 425;
                 }
         }
+
+        im_log_message ( irc, u->nick, msg );
         irc_msgfrom( irc, u->nick, msg );
 }
 
@@ -725 +730 @@
 {
         struct im_connection *ic = c->ic;
         user_t *u;
+
+        im_log_message ( ic->irc, who, msg );
         
         /* Gaim sends own messages through this too. IRC doesn't want this, so kill them */
         if( g_strcasecmp( who, ic->acc->user ) == 0 )
@@ -945 +952 @@
                 buf = escape_html( msg );
                 msg = buf;
         }
-        
+
+        im_log_message ( ic->irc, handle, msg );
         st = ic->acc->prpl->buddy_msg( ic, handle, msg, flags );
         g_free( buf );