-/* event_neonserv_join.c - NeonServ v5.0
+/* event_neonserv_join.c - NeonServ v5.2
* Copyright (C) 2011 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);
+static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser, int was_registering);
static TIMEQ_CALLBACK(neonserv_event_join_dynlimit);
static void neonserv_event_join(struct ChanUser *chanuser) {
}
cache->client = client;
cache->chanuser = chanuser;
+ cache->was_registering = (user->flags & USERFLAG_WAS_REGISTRING);
get_userauth(user, neonserv_event_join_nick_lookup, cache);
} else
- neonserv_event_join_async1(client, chanuser);
+ neonserv_event_join_async1(client, chanuser, (user->flags & USERFLAG_WAS_REGISTRING));
}
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);
+ neonserv_event_join_async1(cache->client, cache->chanuser, cache->was_registering);
}
free(cache);
}
-static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser) {
+static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser, int was_registering) {
struct ClientSocket *textclient = ((client->flags & SOCKET_FLAG_PREFERRED) ? client : get_prefered_bot(client->botid));
struct ChanNode *chan = chanuser->chan;
struct UserNode *user = chanuser->user;
printf_mysql_query("SELECT `channel_maxusers`, `channel_greeting`, `channel_usergreeting`, `channel_getop`, `channel_getvoice`, `channel_userinfo`, `channel_dynlimit` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
res = mysql_use();
if ((row = mysql_fetch_row(res)) == NULL) return;
- if(!row[3] || !row[4]) {
+ if(!row[3] || !row[4] || !row[5]) {
printf_mysql_query("SELECT `channel_getop`, `channel_getvoice`, `channel_userinfo` FROM `channels` WHERE `channel_name` = 'defaults'");
res = mysql_use();
defaultrow = mysql_fetch_row(res);
chanuserrow = mysql_fetch_row(res);
} else
chanuserrow = NULL;
+ if(!chanuserrow)
+ printf_mysql_query("UPDATE `channels` SET `channel_lastvisit` = UNIX_TIMESTAMP() WHERE `channel_id` = '%d'", chan->channel_id);
int userflags = (chanuserrow ? atoi(chanuserrow[1]) : 0);
int uaccess = ((chanuserrow && !(userflags & DB_CHANUSER_SUSPENDED)) ? atoi(chanuserrow[0]) : 0);
//GREETING
if(a)
b = a+2;
} while(a);
- if(greetingPos)
+ if(greetingPos && (!was_registering || *row[2]))
reply(textclient, user, "[%s] %s", chan->name, greeting);
//USER RIGHTS
if(!(userflags & DB_CHANUSER_NOAUTOOP)) {