!(chmode_table[i].set_func == chm_throttle) &&
!(chmode_table[i].set_func == chm_key) &&
!(chmode_table[i].set_func == chm_limit) &&
- !(chmode_table[i].set_func == chm_owner) &&
+ !(chmode_table[i].set_func == chm_admin) &&
!(chmode_table[i].set_func == chm_op) &&
!(chmode_table[i].set_func == chm_halfop) &&
!(chmode_table[i].set_func == chm_voice))
static int
get_channel_access(struct Client *source_p, struct membership *msptr)
{
- if(!MyClient(source_p) || is_owner(msptr))
- return CHFL_OWNER;
+ if(!MyClient(source_p) || is_admin(msptr))
+ return CHFL_ADMIN;
else if(is_chanop(msptr))
return CHFL_CHANOP;
else if(is_halfop(msptr))
struct Metadata *md;
struct DictionaryIter iter;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if (IsOverride(source_p))
override = 1;
*errors |= errorval;
/* non-ops cant see +eI lists.. */
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP && mode_type != CHFL_BAN &&
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP && mode_type != CHFL_BAN &&
mode_type != CHFL_QUIET)
{
if(IsOverride(source_p))
return;
}
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
}
void
-chm_owner(struct Client *source_p, struct Channel *chptr,
+chm_admin(struct Client *source_p, struct Channel *chptr,
int alevel, int parc, int *parn,
const char **parv, int *errors, int dir, char c, long mode_type)
{
struct membership *mstptr;
- const char *ownernick;
+ const char *adminnick;
struct Client *targ_p;
int override = 0;
- if(!ConfigChannel.use_owner)
+ if(!ConfigChannel.use_admin)
{
if(*errors & SM_ERR_UNKNOWN)
return;
return;
}
- if(alevel != CHFL_OWNER)
+ if(alevel != CHFL_ADMIN)
{
if(IsOverride(source_p))
override = 1;
if((dir == MODE_QUERY) || (parc <= *parn))
return;
- ownernick = parv[(*parn)];
+ adminnick = parv[(*parn)];
(*parn)++;
/* empty nick */
- if(EmptyString(ownernick))
+ if(EmptyString(adminnick))
{
sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), "*");
return;
}
- if((targ_p = find_chasing(source_p, ownernick, NULL)) == NULL)
+ if((targ_p = find_chasing(source_p, adminnick, NULL)) == NULL)
{
return;
}
{
if(!(*errors & SM_ERR_NOTONCHANNEL) && MyClient(source_p))
sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL,
- form_str(ERR_USERNOTINCHANNEL), ownernick, chptr->chname);
+ form_str(ERR_USERNOTINCHANNEL), adminnick, chptr->chname);
*errors |= SM_ERR_NOTONCHANNEL;
return;
}
mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
- mstptr->flags |= CHFL_OWNER;
+ mstptr->flags |= CHFL_ADMIN;
}
else
{
mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
- mstptr->flags &= ~CHFL_OWNER;
+ mstptr->flags &= ~CHFL_ADMIN;
}
}
struct Client *targ_p;
int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN)
{
if(IsOverride(source_p))
override = 1;
return;
}
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN)
{
if(IsOverride(source_p))
override = 1;
struct Client *targ_p;
int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
int limit;
int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
int joins = 0, timeslice = 0;
int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
}
#ifndef FORWARD_OPERONLY
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
char *key;
int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
{
int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if(IsOverride(source_p))
override = 1;
{chm_nosuch, 0 },
{chm_nosuch, 0 },
{chm_nosuch, 0 },
- {chm_owner, 0 }, /* a */
+ {chm_admin, 0 }, /* a */
{chm_ban, CHFL_BAN }, /* b */
{chm_simple, MODE_NOCOLOR }, /* c */
{chm_nosuch, 0 }, /* d */