philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add PC_TOPIC flag to prepare_command() for topic-change commands.

Browse Source 
Clean up e_topic(), splitting out untopic() and using prepare_command()
to check for ops.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@136 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2011-09-05 12:57:31 +00:00
parent 83ac47c4f5
commit 02e4ced684
5 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/misc.c
View File

@@ -4831,16 +4831,17 @@ int matchmcommand(char *origline,int count)
return(0);
}
ChannelList *BX_prepare_command(int *active_server, char *channel, int need_op)
ChannelList *BX_prepare_command(int *active_server, char *channel, int flags)
{
int server = 0;
ChannelList *chan = NULL;
int need_op;
if (!channel) {
channel = get_current_channel_by_refnum(0);
if (!channel) {
if (need_op != 3) {
if (flags != 3) {
if (current_window)
message_to(current_window->refnum);
bitchsay("You're not on a channel!");
@@ -4853,7 +4854,7 @@ ChannelList *chan = NULL;
*active_server = server;
if (!(chan = lookup_channel(channel, server, 0)))
{
if (need_op != 3) {
if (flags != 3) {
if (current_window)
message_to(current_window->refnum);
bitchsay("You're not on the channel: %s", channel);
@@ -4861,7 +4862,9 @@ ChannelList *chan = NULL;
}
return NULL;
}
if (need_op == NEED_OP && chan && !chan->have_op && !chan->hop)
need_op = flags == NEED_OP || (flags == PC_TOPIC && (chan->mode & MODE_TOPIC));
if (need_op && !chan->have_op && !chan->hop)
{
error_not_opped(chan->channel);
return NULL;