From: pk910 <philipp@zoelle1.de>
Date: Wed, 5 Oct 2011 20:57:38 +0000 (+0200)
Subject: neonserv_trigger_callback should return the right trigger
X-Git-Tag: v5.3~300
X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=commitdiff_plain;h=78fa8eb6844c73cf873ba52db6b9c69c86a63646

neonserv_trigger_callback should return the right trigger
---

diff --git a/src/bot_NeonServ.c b/src/bot_NeonServ.c
index 50f8c80..8b8866e 100644
--- a/src/bot_NeonServ.c
+++ b/src/bot_NeonServ.c
@@ -377,7 +377,13 @@ static void neonserv_bot_ready(struct ClientSocket *client) {
 }
 
 static void neonserv_trigger_callback(struct ChanNode *chan, char *trigger) {
-    strcpy(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);
+    res = mysql_use();
+    row = mysql_fetch_row(res);
+    strcpy(trigger, (strlen(row[0]) ? row[0] : "+"));
 }
 
 static void start_bots() {