X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fbot_NeonServ.c;h=9ec41e4445c9acab73606ca377c60e881fdd2a5a;hb=be17e22b842b7b831694422b204777c93fd478bb;hp=64ba2419b9f4e21852247584821c82feb43afea1;hpb=44436a96352a38631237978c9fd431cef3d85cfb;p=NeonServV5.git

diff --git a/src/bot_NeonServ.c b/src/bot_NeonServ.c
index 64ba241..9ec41e4 100644
--- a/src/bot_NeonServ.c
+++ b/src/bot_NeonServ.c
@@ -347,9 +347,9 @@ static const struct default_language_entry msgtab[] = {
     {"NS_NICKLIST_SYNC", "use `nicklist sync` to fix all red and orange entrys in the list above (add opped users with 200 and voiced with 100 access)"},
     {"NS_SETBOT_UNKNOWN", "`%d` is an unknown botid."}, /* {ARGS: 50} */
     {"NS_SETBOT_HEADER", "$bSettings for botid `%d`:$b"}, /* {ARGS: 50} */
-    {"NS_SETBOT_SETTING", "$b%s$b is an unknown bot setting."},
+    {"NS_SETBOT_SETTING", "$b%s$b is an unknown bot setting."}, /* {ARGS: "strangeSetting"} */
     {"NS_SETBOT_NICK_INVALID", "`%s` is an invalid botnick."}, /* {ARGS: "-SuperMagicBananaBotWithManyFunctions"} */
-    {"NS_SETBOT_NEED_RESTART", "You need to reconnect to bot to apply this setting."},
+    {"NS_SETBOT_NEED_RESTART", "You need to reconnect the bot to apply this setting."},
     {"NS_SETBOT_PORT_INVALID", "`%s` is an invalid port number."}, /* {ARGS: "-1"} */
     {"NS_SETBOT_INVALID_CLASS", "`%s` is an invalid botclass."}, /* {ARGS: "MistColaLeer"} */
     {"NS_SETBOT_MAXCHAN_INVALID", "`%s` is an invalid maxchan value."}, /* {ARGS: "-1"} */
@@ -361,6 +361,9 @@ static const struct default_language_entry msgtab[] = {
     {"NS_DELBOT_NOT_FOUND", "Bot with BotID / nick $b%s$b not found."}, /* {ARGS: "NeonServ"} */
     {"NS_DELBOT_DONE", "Bot deleted."},
     {"NS_RECONNECT_DONE", "Reconnected bot."},
+    {"NS_MODCMD_SETTING", "$b%s$b is an unknown modcmd setting."}, /* {ARGS: "strangeSetting"} */
+    {"NS_MODCMD_HEADER", "$bSettings for command %s:$b"}, /* {ARGS: "access"} */
+    {"NS_MODCMD_OUTRANKED", "$b%s$b outranks you. (required access: %d)"}, /* {ARGS: "die", 1000} */
     {NULL, NULL}
 };
 
@@ -419,10 +422,13 @@ static void neonserv_trigger_callback(int clientid, struct ChanNode *chan, char
         strcpy(trigger, "+");
         return;
     }
-    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);
+    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, ((row && 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() {