Merge remote branch 'upstream/master'

diff --cc src/chanserv.c
index a0aca8e93cba58d3bbbb6a5104b91616b34253a1,8bdad625b8f63bec3d3224049d6a7917ae0db7ad..9e856960333c238dd26b214bf890b304ce2c21f0
--- 1/src/chanserv.c
--- 2/src/chanserv.c
+++ b/src/chanserv.c
@@@ -4489,31 -4203,10 +4438,28 @@@ static CHANSERV_FUNC(cmd_mode
      return 1;
  }
  
 +static void
 +chanserv_del_invite_mark(void *data)
 +{
 +      struct ChanUser *chanuser = data;
 +      struct chanNode *channel = chanuser->chan;
 +      unsigned int i;
 +      if(!channel) return;
 +      for(i = 0; i < channel->invited.used; i++)
 +    {
 +        if(channel->invited.list[i] == chanuser->user) {
 +                      userList_remove(&channel->invited, chanuser->user);
 +              }
 +      }
 +      free(chanuser);
 +}
 +
  static CHANSERV_FUNC(cmd_invite)
  {
-     struct userData *uData;
      struct userNode *invite;
 +    struct ChanUser *chanuser;
 +    unsigned int i;
  
-     uData = GetChannelUser(channel->channel_info, user->handle_info);
- 
      if(argc > 1)
      {
          if(!(invite = GetUserH(argv[1])))
@@@ -8688,21 -7853,10 +8633,21 @@@ init_chanserv(const char *nick
      DEFINE_COMMAND(unf, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
      DEFINE_COMMAND(ping, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
      DEFINE_COMMAND(wut, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
-     DEFINE_COMMAND(8ball, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
-     DEFINE_COMMAND(d, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
+     DEFINE_COMMAND(8ball, 2, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
+     DEFINE_COMMAND(d, 2, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
      DEFINE_COMMAND(huggle, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
 -
 +    
 +    DEFINE_COMMAND(addvote, 1, MODCMD_REQUIRE_AUTHED, NULL);
 +    DEFINE_COMMAND(delvote, 1, MODCMD_REQUIRE_AUTHED, NULL);
 +    DEFINE_COMMAND(addoption, 1, MODCMD_REQUIRE_AUTHED, NULL);
 +    DEFINE_COMMAND(deloption, 1, MODCMD_REQUIRE_AUTHED, NULL);
 +    DEFINE_COMMAND(vote, 1, MODCMD_REQUIRE_AUTHED, NULL);
 +    DEFINE_COMMAND(startvote, 1, MODCMD_REQUIRE_AUTHED, NULL);
 +    DEFINE_COMMAND(endvote, 1, MODCMD_REQUIRE_AUTHED, NULL);
 +    DEFINE_COMMAND(voteresults, 1, MODCMD_REQUIRE_AUTHED, NULL);
 +
 +    DEFINE_COMMAND(opme, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
 +    
      /* Channel options */
      DEFINE_CHANNEL_OPTION(defaulttopic);
      DEFINE_CHANNEL_OPTION(topicmask);

diff --cc src/helpfile.c
Simple merge

diff --cc src/mod-helpserv.c
Simple merge

diff --cc src/modcmd.c
Simple merge

diff --cc src/nickserv.c
Simple merge

diff --cc src/proto-p10.c
Simple merge