MYSQL_ROW row, defaults = NULL;
int i;
int resync_op = 1;
+ int with_halfop = get_int_field("General.have_halfop");
+ int resync_halfop = with_halfop;
int resync_voice = 1;
if(usermask && usermask[0] == '@') {
+ resync_voice = 0;
+ resync_halfop = 0;
+ usermask++;
+ if(!*usermask) usermask = NULL;
+ } else if(usermask && with_halfop && usermask[0] == 'h') {
+ resync_op = 0;
resync_voice = 0;
usermask++;
if(!*usermask) usermask = NULL;
} else if(usermask && usermask[0] == '+') {
resync_op = 0;
+ resync_halfop = 0;
usermask++;
if(!*usermask) usermask = NULL;
}
struct ChanUser *chanuser;
- int db_enfops, db_enfvoice;
- printf_mysql_query("SELECT `channel_getop`, `channel_getvoice` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
+ int db_enfops, db_enfhalfop, db_enfvoice;
+ printf_mysql_query("SELECT `channel_getop`, `channel_getvoice`, `channel_gethalfop` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
row = mysql_fetch_row(mysql_use());
if(row[0] == NULL || row[1] == NULL) {
- printf_mysql_query("SELECT `channel_getop`, `channel_getvoice` FROM `channels` WHERE `channel_name` = 'defaults'");
+ printf_mysql_query("SELECT `channel_getop`, `channel_getvoice`, `channel_gethalfop` FROM `channels` WHERE `channel_name` = 'defaults'");
defaults = mysql_fetch_row(mysql_use());
}
db_enfops = atoi((row[0] ? row[0] : defaults[0]));
db_enfvoice = atoi((row[1] ? row[1] : defaults[1]));
+ db_enfhalfop = (with_halfop ? atoi((row[2] ? row[2] : defaults[2])) : 0);
printf_mysql_query("SELECT `chanuser_access`, `user_user`, `chanuser_flags` FROM `chanusers` LEFT JOIN `users` ON `chanuser_uid` = `user_id` WHERE `chanuser_cid` = '%d' ORDER BY `chanuser_access` DESC, `user_user` ASC", chan->channel_id);
res = mysql_use();
char *db_users[mysql_num_rows(res)];
if(caccess >= db_enfops) {
if(!(chanuser->flags & CHANUSERFLAG_OPPED) && resync_op && (override_noautoop || !(cflags & DB_CHANUSER_NOAUTOOP)))
modeBufferOp(modeBuf, chanuser->user->nick);
+ } else if(with_halfop && caccess >= db_enfhalfop) {
+ if((chanuser->flags & CHANUSERFLAG_OPPED) && resync_op && !(chanuser->user->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP)))
+ modeBufferDeop(modeBuf, chanuser->user->nick);
+ if(!(chanuser->flags & CHANUSERFLAG_HALFOPPED) && resync_halfop && (override_noautoop || !(cflags & DB_CHANUSER_NOAUTOOP)))
+ modeBufferHalfop(modeBuf, chanuser->user->nick);
} else if(caccess >= db_enfvoice) {
if((chanuser->flags & CHANUSERFLAG_OPPED) && resync_op && !(chanuser->user->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP)))
modeBufferDeop(modeBuf, chanuser->user->nick);
+ if((chanuser->flags & CHANUSERFLAG_HALFOPPED) && resync_halfop && !(chanuser->user->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP)))
+ modeBufferDehalfop(modeBuf, chanuser->user->nick);
if(!(chanuser->flags & CHANUSERFLAG_VOICED) && resync_voice && (override_noautoop || !(cflags & DB_CHANUSER_NOAUTOOP)))
modeBufferVoice(modeBuf, chanuser->user->nick);
} else {
if((chanuser->flags & CHANUSERFLAG_OPPED) && resync_op && !(chanuser->user->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP)))
modeBufferDeop(modeBuf, chanuser->user->nick);
+ if((chanuser->flags & CHANUSERFLAG_HALFOPPED) && resync_halfop && !(chanuser->user->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP)))
+ modeBufferDehalfop(modeBuf, chanuser->user->nick);
if((chanuser->flags & CHANUSERFLAG_VOICED) && resync_voice && !(chanuser->user->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP)))
modeBufferDevoice(modeBuf, chanuser->user->nick);
}