-/* bots.c - NeonServ v5.2
- * Copyright (C) 2011 Philipp Kreil (pk910)
+/* bots.c - NeonServ v5.3
+ * Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
client->clientid = atoi(row[7]);
connect_socket(client);
- printf_mysql_query("SELECT `command`, `function`, `parameters`, `global_access`, `chan_access` FROM `bot_binds` WHERE `botclass` = '0' AND `botid` = '%d'", client->clientid);
+ printf_mysql_query("SELECT `command`, `function`, `parameters`, `global_access`, `chan_access`, `flags` FROM `bot_binds` WHERE `botclass` = '0' AND `botid` = '%d'", client->clientid);
res2 = mysql_use();
while ((row = mysql_fetch_row(res2)) != NULL) {
if(bind_botwise_cmd_to_command(0, client->clientid, row[0], row[1])) {
if(row[4]) {
bind_botwise_set_channel_access(0, client->clientid, row[0], row[4]);
}
+ if(strcmp(row[5], "0"))
+ bind_botwise_set_bind_flags(0, client->clientid, row[0], atoi(row[5]));
}
}
bind_botwise_unbound_required_functions(0, client->clientid);
strcpy(trigger, "+");
return;
}
- printf_mysql_query("SELECT `trigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '0' AND `botid` = '%d'", chan->channel_id, clientid);
+ printf_mysql_query("SELECT `trigger`, `defaulttrigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '0' AND `botid` = '%d'", chan->channel_id, clientid);
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] : "+"));
}
void init_bots() {