-/* event_neonserv_join.c - NeonServ v5.3
+/* event_neonserv_join.c - NeonServ v5.6
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
struct neonserv_event_join_cache {
struct ClientSocket *client;
struct ChanUser *chanuser;
- int was_registering;
};
static USERAUTH_CALLBACK(neonserv_event_join_nick_lookup);
-static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser, int was_registering);
+static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser);
static TIMEQ_CALLBACK(neonserv_event_join_dynlimit);
static void neonserv_event_join(struct ChanUser *chanuser) {
if(!client) return; //we can't "see" this event
if(chanuser->user == client->user) {
requestOp(client->user, chanuser->chan);
+ module_neonbackup_recover_chan(chanuser->chan);
return;
}
if(chanuser->user->flags & USERFLAG_ISBOT) return;
if(!(user->flags & USERFLAG_ISAUTHED)) {
struct neonserv_event_join_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->chanuser = chanuser;
- cache->was_registering = (user->flags & USERFLAG_WAS_REGISTRING);
get_userauth(user, module_id, neonserv_event_join_nick_lookup, cache);
} else
- neonserv_event_join_async1(client, chanuser, (user->flags & USERFLAG_WAS_REGISTRING));
+ neonserv_event_join_async1(client, chanuser);
}
static USERAUTH_CALLBACK(neonserv_event_join_nick_lookup) {
struct neonserv_event_join_cache *cache = data;
- if(user) {
- neonserv_event_join_async1(cache->client, cache->chanuser, cache->was_registering);
- }
+ if(user)
+ neonserv_event_join_async1(cache->client, cache->chanuser);
free(cache);
}
-static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser, int was_registering) {
+static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser) {
struct ClientSocket *textclient = ((client->flags & SOCKET_FLAG_PREFERRED) ? client : get_prefered_bot(client->botid));
struct ChanNode *chan = chanuser->chan;
struct UserNode *user = chanuser->user;
struct ModeBuffer *modeBuf;
int with_halfops = get_int_field("General.have_halfop");
- MYSQL_RES *res;
+ MYSQL_RES *res, *res2;
MYSQL_ROW row, chanuserrow, defaultrow = NULL;
printf_mysql_query("SELECT `channel_maxusers`, `channel_greeting`, `channel_usergreeting`, `channel_getop`, `channel_getvoice`, `channel_userinfo`, `channel_dynlimit`, `channel_gethalfop` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
res = mysql_use();
if(a)
b = a+2;
} while(a);
- if(greetingPos && (!was_registering || *row[2]))
+ if(greetingPos && *row[2])
reply(textclient, user, "[%s] %s", chan->name, greeting);
//USER RIGHTS
if(!(userflags & DB_CHANUSER_NOAUTOOP)) {
}
if(chanuserrow[3] == NULL && defaultrow == NULL) {
printf_mysql_query("SELECT `channel_getinvite` FROM `channels` WHERE `channel_name` = 'defaults'");
- res = mysql_use();
- defaultrow = mysql_fetch_row(res);
+ res2 = mysql_use();
+ defaultrow = mysql_fetch_row(res2);
}
getinvite = atoi((chanuserrow[3] ? chanuserrow[3] : defaultrow[0]));
if(atoi(chanuserrow[0]) >= getinvite) {
char *chanName = data;
struct ChanNode *chan = getChanByName(chanName);
free(chanName);
+ if(!chan) return;
struct ClientSocket *client = getBotForChannel(chan);
if(!client) return;
loadChannelSettings(chan);