X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fbot_NeonHelp.c;h=3473d3c09f536c2b57ea8477d7c31ce2af4c3ee0;hb=0b17bccd2d7fbef5652168d11d4f0af1f41252d3;hp=aa75426c4743b7a363674b6010cdcc18cf3e26d4;hpb=9d77ca8f63040a3945f634090be990fdeb05c2f3;p=NeonServV5.git

diff --git a/src/bot_NeonHelp.c b/src/bot_NeonHelp.c
index aa75426..3473d3c 100644
--- a/src/bot_NeonHelp.c
+++ b/src/bot_NeonHelp.c
@@ -1,4 +1,4 @@
-/* bot_HelpServ.c - NeonServ v5.2
+/* bot_NeonHelp.c - NeonServ v5.3
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -49,14 +49,21 @@ static void neonhelp_bot_ready(struct ClientSocket *client) {
     }
 }
 
-static void neonhelp_trigger_callback(struct ChanNode *chan, char *trigger) {
+static void neonhelp_trigger_callback(int clientid, struct ChanNode *chan, char *trigger) {
     MYSQL_RES *res;
     MYSQL_ROW row;
     loadChannelSettings(chan);
-    printf_mysql_query("SELECT `trigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, BOTID);
+    if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) {
+        strcpy(trigger, "!");
+        return;
+    }
+    printf_mysql_query("SELECT `trigger`, `defaulttrigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, BOTID);
     res = mysql_use();
     row = mysql_fetch_row(res);
-    strcpy(trigger, (strlen(row[0]) ? row[0] : "!"));
+    if(row[0] && *row[0])
+        strcpy(trigger, row[0]);
+    else
+        strcpy(trigger, ((row[1] && *row[1]) ? row[1] : "!"));
 }
 
 static void start_bots() {