Changeset 8961950

Timestamp:

2008-02-16T16:25:24Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

4eb4c0f

Parents:

903a2fc

Message:

read root's welcome message from a file (like tho MOTD)

Files:

• Makefile (modified) (1 diff)
• bitlbee.conf (modified) (1 diff)
• conf.c (modified) (2 diffs)
• conf.h (modified) (1 diff)
• irc.c (modified) (3 diffs)
• welcome.txt (added)

Makefile

@@ -85 +85 @@
         mkdir -p $(DESTDIR)$(ETCDIR)
         install -m 0644 motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
+        install -m 0644 welcome.txt $(DESTDIR)$(ETCDIR)/welcome.txt
         install -m 0644 bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
 
 uninstall-etc:
         rm -f $(DESTDIR)$(ETCDIR)/motd.txt
+        rm -f $(DESTDIR)$(ETCDIR)/welcome.txt
         rm -f $(DESTDIR)$(ETCDIR)/bitlbee.conf
         -rmdir $(DESTDIR)$(ETCDIR)

bitlbee.conf

@@ -73 +73 @@
 # MotdFile = /etc/bitlbee/motd.txt
 
+## WelcomeFile
+##
+## Specify an alternative file for the welcome message displayed when joining the
+## control channel. Default value depends on the --etcdir argument to configure.
+##
+# WelcomeFile = /etc/bitlbee/welcome.txt
+
 ## ConfigDir
 ##

conf.c

@@ -61 +61 @@
         conf->pidfile = g_strdup( PIDFILE );
         conf->motdfile = g_strdup( ETCDIR "/motd.txt" );
+        conf->welcomefile = g_strdup( ETCDIR "/welcome.txt" );
         conf->ping_interval = 180;
         conf->ping_timeout = 300;
@@ -240 +241 @@
                                 g_free( conf->motdfile );
                                 conf->motdfile = g_strdup( ini->value );
+                        }
+                        else if( g_strcasecmp( ini->key, "welcomefile" ) == 0 )
+                        {
+                                g_free( conf->welcomefile );
+                                conf->welcomefile = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "account_storage" ) == 0 )

conf.h

@@ -45 +45 @@
         char *pidfile;
         char *motdfile;
+        char *welcomefile;
         char *primary_storage;
         char **migrate_storage;

irc.c

@@ -32 +32 @@
 
 static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );
+static void irc_welcome( irc_t *irc );
 
 GSList *irc_connection_list = NULL;
@@ -787 +788 @@
         irc_spawn( irc, u );
         
-        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the \x02help\x02 command. Lots of FAQs are answered there." );
-        #ifdef WITH_OTR
-        irc_usermsg( irc, "\nOTR users please note: Private key files are owned by the user BitlBee is running as." );
-        #endif
+        irc_welcome( irc );
         
         if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )
@@ -796 +794 @@
         
         irc->status |= USTATUS_LOGGED_IN;
+}
+
+static void irc_welcome( irc_t *irc )
+{
+        FILE *f;
+        
+        f = fopen( global.conf->welcomefile, "r" );
+        if( !f )
+        {
+                irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the \x02help\x02 command. Lots of FAQs are answered there.\n\nOTR users please note: Private key files are owned by the user BitlBee is running as." );
+        }
+        else
+        {
+                char linebuf[380];
+                
+                while( fgets( linebuf, 380, f ) )
+                {
+                        irc_usermsg( irc, linebuf );
+                }
+                
+                fclose( f );
+        }
 }