From: pk910 <philipp@zoelle1.de>
Date: Thu, 29 Dec 2011 17:04:28 +0000 (+0100)
Subject: fixed neonspam cmd_set (support for default trigger)
X-Git-Tag: v5.3~96
X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=commitdiff_plain;h=f900eb4ffb9c9bc0d4f8008b21b5d3d6824cf0e9

fixed neonspam cmd_set (support for default trigger)
see: http://git.pk910.de/?p=NeonServV5.git;a=commit;h=fdca567267cf8843fb71a493b40343d5db3f3c3b
---

diff --git a/src/cmd_neonspam_set.c b/src/cmd_neonspam_set.c
index cb52314..00a4d1c 100644
--- a/src/cmd_neonspam_set.c
+++ b/src/cmd_neonspam_set.c
@@ -292,10 +292,10 @@ static char* neonspam_cmd_set_trigger(struct ClientSocket *client, struct UserNo
     //get current trigger
     MYSQL_RES *res;
     MYSQL_ROW row;
-    printf_mysql_query("SELECT `trigger` FROM `bot_channels` WHERE `chanid` = '%d' AND `botid` = '%d'", chan->channel_id, client->clientid);
+    printf_mysql_query("SELECT `trigger`, `defaulttrigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botid` = '%d'", chan->channel_id, client->clientid);
     res = mysql_use();
     row = mysql_fetch_row(res);
-    trigger = row[0];
+    trigger = (row[0] ? row[0] : row[1]);
     if(argument) {
         int uaccess = getChannelAccess(user, chan);
         if(uaccess < 500) {