REQUIRE_PARAMS(2);
- if(IsProtected(channel->channel_info))
+ if(IsProtected(channel->channel_info) && !IsOper(user))
{
reply("CSMSG_MOVE_NODELETE", channel->name);
return 0;
return 0;
}
- if(IsProtected(channel->channel_info))
+ if(IsProtected(channel->channel_info) && !IsOper(user))
{
reply("CSMSG_MERGE_NODELETE");
return 0;
if(!isdigit(topic[pos]))
break;
}
- if(advtopic_index < 0 || advtopic_index > MAXADVTOPICENTRIES)
+ if(advtopic_index < 0 || advtopic_index >= MAXADVTOPICENTRIES)
{
//invalid id!
- reply("CSMSG_ADVTOPIC_INVALID_ID", advtopic_index);
+ reply("CSMSG_ADVTOPIC_INVALID_ID", advtopic_index+1);
return 0;
}
if(cData->advtopic[advtopic_index])
REQUIRE_PARAMS(3);
- if(IsProtected(channel->channel_info))
+ if(IsProtected(channel->channel_info) && !IsOper(user))
{
reply("CSMSG_SUSPEND_NODELETE", channel->name);
return 0;