X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fmodules%2FNeonServ.mod%2Fcmd_neonserv_mode.c;h=41e0455e11d50fe003358c867bc2b72e6a89e5f2;hp=8a11e36ea1d3612cd2a9515c889b904bdb62f5f8;hb=b7d5b504598e2019fea973877143adde4504f413;hpb=706e48b1e666054030c491d864f740071e390038 diff --git a/src/modules/NeonServ.mod/cmd_neonserv_mode.c b/src/modules/NeonServ.mod/cmd_neonserv_mode.c index 8a11e36..41e0455 100644 --- a/src/modules/NeonServ.mod/cmd_neonserv_mode.c +++ b/src/modules/NeonServ.mod/cmd_neonserv_mode.c @@ -1,4 +1,4 @@ -/* cmd_neonserv_mode.c - NeonServ v5.3 +/* cmd_neonserv_mode.c - NeonServ v5.6 * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -34,15 +34,15 @@ struct neonserv_cmd_mode_cache { CMD_BIND(neonserv_cmd_mode) { struct neonserv_cmd_mode_cache *cache = malloc(sizeof(*cache)); if (!cache) { - perror("malloc() failed"); + printf_log("neonserv", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__); return; } cache->client = client; - cache->textclient = getTextBot(); + cache->textclient = textclient; cache->user = user; cache->event = event; cache->mode = strdup(merge_argv(argv, 0, argc)); - get_userlist_with_invisible(chan, neonserv_cmd_mode_userlist_lookup, cache); + get_userlist_with_invisible(chan, module_id, neonserv_cmd_mode_userlist_lookup, cache); } static USERLIST_CALLBACK(neonserv_cmd_mode_userlist_lookup) { @@ -64,7 +64,7 @@ static void neonserv_cmd_mode_async1(struct ClientSocket *client, struct ClientS modeBuf = initModeBuffer(client, chan); printf_mysql_query("SELECT `channel_canop`, `channel_canvoice`, `channel_canban`, `channel_enfmodes`, `channel_modes` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id); row = mysql_fetch_row(mysql_use()); - if(row[0] == NULL || row[1] == NULL || row[2] == NULL || row[3] == NULL) { + if(row[0] == NULL || row[1] == NULL || row[2] == NULL || row[3] == NULL || row[4] == NULL) { printf_mysql_query("SELECT `channel_canop`, `channel_canvoice`, `channel_canban`, `channel_enfmodes`, `channel_modes` FROM `channels` WHERE `channel_name` = 'defaults'"); defaults = mysql_fetch_row(mysql_use()); }