]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
/WHO and routing fixes
[user/henk/code/inspircd.git] / src / inspircd.cpp
index dc57048b18a3c240be0a5fade2fe92587f1e9189..1398ec90c131795f9d7ea595b17849dfdf2272c9 100644 (file)
@@ -51,6 +51,8 @@ using namespace std;
 #include "modules.h"
 #include "dynamic.h"
 #include "wildcard.h"
+#include "message.h"
+#include "mode.h"
 
 #ifdef GCC3
 #define nspace __gnu_cxx
@@ -187,108 +189,6 @@ void AddWhoWas(userrec* u);
 std::vector<long> auth_cookies;
 std::stringstream config_f(stringstream::in | stringstream::out);
 
-void safedelete(userrec *p)
-{
-       if (p)
-       {
-               log(DEBUG,"deleting %s %s %s %s",p->nick,p->ident,p->dhost,p->fullname);
-               log(DEBUG,"safedelete(userrec*): pointer is safe to delete");
-               delete p;
-               p = NULL;
-       }
-       else
-       {
-               log(DEBUG,"safedelete(userrec*): unsafe pointer operation squished");
-       }
-}
-
-void safedelete(chanrec *p)
-{
-       if (p)
-       {
-               delete p;
-               p = NULL;
-               log(DEBUG,"safedelete(chanrec*): pointer is safe to delete");
-       }
-       else
-       {
-               log(DEBUG,"safedelete(chanrec*): unsafe pointer operation squished");
-       }
-}
-
-
-void tidystring(char* str)
-{
-       // strips out double spaces before a : parameter
-       
-       char temp[MAXBUF];
-       bool go_again = true;
-       
-       if (!str)
-       {
-               return;
-       }
-       
-       while ((str[0] == ' ') && (strlen(str)>0))
-       {
-               str++;
-       }
-       
-       while (go_again)
-       {
-               bool noparse = false;
-               int t = 0, a = 0;
-               go_again = false;
-               while (a < strlen(str))
-               {
-                       if ((a<strlen(str)-1) && (noparse==false))
-                       {
-                               if ((str[a] == ' ') && (str[a+1] == ' '))
-                               {
-                                       log(DEBUG,"Tidied extra space out of string: %s",str);
-                                       go_again = true;
-                                       a++;
-                               }
-                       }
-                       
-                       if (a<strlen(str)-1)
-                       {
-                               if ((str[a] == ' ') && (str[a+1] == ':'))
-                               {
-                                       noparse = true;
-                               }
-                       }
-                       
-                       temp[t++] = str[a++];
-               }
-               temp[t] = '\0';
-               strncpy(str,temp,MAXBUF);
-       }
-}
-
-/* chop a string down to 512 characters and preserve linefeed (irc max
- * line length) */
-
-void chop(char* str)
-{
-  if (!str)
-  {
-       log(DEBUG,"ERROR! Null string passed to chop()!");
-       return;
-  }
-  string temp = str;
-  FOREACH_MOD OnServerRaw(temp,false);
-  const char* str2 = temp.c_str();
-  sprintf(str,"%s",str2);
-  
-
-  if (strlen(str) >= 512)
-  {
-       str[509] = '\r';
-       str[510] = '\n';
-       str[511] = '\0';
-  }
-}
 
 
 long GetRevision()
@@ -472,42 +372,6 @@ void ReadConfig(void)
   }
 }
 
-void Blocking(int s)
-{
-  int flags;
-  log(DEBUG,"Blocking: %d",s);
-  flags = fcntl(s, F_GETFL, 0);
-  fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
-}
-
-void NonBlocking(int s)
-{
-  int flags;
-  log(DEBUG,"NonBlocking: %d",s);
-  flags = fcntl(s, F_GETFL, 0);
-  //fcntl(s, F_SETFL, O_NONBLOCK);
-  fcntl(s, F_SETFL, flags | O_NONBLOCK);
-}
-
-
-int CleanAndResolve (char *resolvedHost, const char *unresolvedHost)
-{
-  struct hostent *hostPtr = NULL;
-  struct in_addr addr;
-
-  memset (resolvedHost, '\0',MAXBUF);
-  if(unresolvedHost == NULL)
-       return(ERROR);
-  if ((inet_aton(unresolvedHost,&addr)) == 0)
-       return(ERROR);
-  hostPtr = gethostbyaddr ((char *)&addr.s_addr,sizeof(addr.s_addr),AF_INET);
-  if (hostPtr != NULL)
-       snprintf(resolvedHost,MAXBUF,"%s",hostPtr->h_name);
-  else
-       snprintf(resolvedHost,MAXBUF,"%s",unresolvedHost);
-  return (TRUE);
-}
-
 /* write formatted text to a socket, in same format as printf */
 
 void Write(int sock,char *text, ...)
@@ -721,16 +585,6 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...)
        }
 }
 
-int c_count(userrec* u)
-{
-       int z = 0;
-       for (int i =0; i != MAXCHANS; i++)
-               if (u->chans[i].channel != NULL)
-                       z++;
-       return z;
-
-}
-
 
 std::string GetServerDescription(char* servername)
 {
@@ -751,38 +605,6 @@ std::string GetServerDescription(char* servername)
 }
 
 
-/* return 0 or 1 depending if users u and u2 share one or more common channels
- * (used by QUIT, NICK etc which arent channel specific notices) */
-
-int common_channels(userrec *u, userrec *u2)
-{
-       int i = 0;
-       int z = 0;
-
-       if ((!u) || (!u2))
-       {
-               log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter");
-               return 0;
-       }
-       for (int i = 0; i != MAXCHANS; i++)
-       {
-               for (z = 0; z != MAXCHANS; z++)
-               {
-                       if ((u->chans[i].channel != NULL) && (u2->chans[z].channel != NULL))
-                       {
-                               if ((u->chans[i].channel == u2->chans[z].channel) && (u->chans[i].channel) && (u2->chans[z].channel) && (u->registered == 7) && (u2->registered == 7))
-                               {
-                                       if ((c_count(u)) && (c_count(u2)))
-                                       {
-                                               return 1;
-                                       }
-                               }
-                       }
-               }
-       }
-       return 0;
-}
-
 /* write a formatted string to all users who share at least one common
  * channel, including the source user e.g. for use in NICK */
 
@@ -1036,15 +858,6 @@ void NetSendToAllExcept(const char* target,char* s)
 }
 
 
-bool hasumode(userrec* user, char mode)
-{
-       if (user)
-       {
-               return (strchr(user->modes,mode)>0);
-       }
-       else return false;
-}
-
 void WriteMode(const char* modes, int flags, const char* text, ...)
 {
        if ((!text) || (!modes) || (!flags))
@@ -1098,29 +911,6 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
        }
 }
 
-void ChangeName(userrec* user, const char* gecos)
-{
-       strncpy(user->fullname,gecos,MAXBUF);
-
-       // TODO: replace these with functions:
-       // NetSendToAll - to all
-       // NetSendToCommon - to all that hold users sharing a common channel with another user
-       // NetSendToOne - to one server
-       // NetSendToAllExcept - send to all but one
-       // all by servername
-
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"a %s :%s",user->nick,gecos);
-       NetSendToAll(buffer);
-}
-
-void ChangeDisplayedHost(userrec* user, const char* host)
-{
-       strncpy(user->dhost,host,160);
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"b %s %s",user->nick,host);
-       NetSendToAll(buffer);
-}
 
 void WriteWallOps(userrec *source, bool local_only, char* text, ...)  
 {  
@@ -1184,71 +974,7 @@ void strlower(char *n)
        }
 }
 
-/* verify that a user's ident and nickname is valid */
-
-int isident(const char* n)
-{
-        char v[MAXBUF];
-        if (!n)
-
-        {
-                return 0;
-        }
-        if (!strcmp(n,""))
-        {
-                return 0;
-        }
-        for (int i = 0; i != strlen(n); i++)
-        {
-                if ((n[i] < 33) || (n[i] > 125))
-                {
-                        return 0;
-                }
-                /* can't occur ANYWHERE in an Ident! */
-                if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i]))
-                {
-                        return 0;
-                }
-        }
-        return 1;
-}
-
 
-int isnick(const char* n)
-{
-       int i = 0;
-       char v[MAXBUF];
-       if (!n)
-       {
-               return 0;
-       }
-       if (!strcmp(n,""))
-       {
-               return 0;
-       }
-       if (strlen(n) > NICKMAX-1)
-       {
-               return 0;
-       }
-       for (int i = 0; i != strlen(n); i++)
-       {
-               if ((n[i] < 33) || (n[i] > 125))
-               {
-                       return 0;
-               }
-               /* can't occur ANYWHERE in a nickname! */
-               if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i]))
-               {
-                       return 0;
-               }
-               /* can't occur as the first char of a nickname... */
-               if ((strchr("0123456789",n[i])) && (!i))
-               {
-                       return 0;
-               }
-       }
-       return 1;
-}
 
 /* Find a user record by nickname and return a pointer to it */
 
@@ -1332,39 +1058,6 @@ void purge_empty_chans(void)
        log(DEBUG,"completed channel purge, killed %d",purge);
 }
 
-/* returns the status character for a given user on a channel, e.g. @ for op,
- * % for halfop etc. If the user has several modes set, the highest mode
- * the user has must be returned. */
-
-char* cmode(userrec *user, chanrec *chan)
-{
-       if ((!user) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** cmode was given an invalid parameter");
-               return "";
-       }
-
-       int i;
-       for (int i = 0; i != MAXCHANS; i++)
-       {
-               if ((user->chans[i].channel == chan) && (chan != NULL))
-               {
-                       if ((user->chans[i].uc_modes & UCMODE_OP) > 0)
-                       {
-                               return "@";
-                       }
-                       if ((user->chans[i].uc_modes & UCMODE_HOP) > 0)
-                       {
-                               return "%";
-                       }
-                       if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0)
-                       {
-                               return "+";
-                       }
-                       return "";
-               }
-       }
-}
 
 char scratch[MAXBUF];
 char sparam[MAXBUF];
@@ -1440,39 +1133,6 @@ char* chanmodes(chanrec *chan)
        return scratch;
 }
 
-/* returns the status value for a given user on a channel, e.g. STATUS_OP for
- * op, STATUS_VOICE for voice etc. If the user has several modes set, the
- * highest mode the user has must be returned. */
-
-int cstatus(userrec *user, chanrec *chan)
-{
-       if ((!chan) || (!user))
-       {
-               log(DEFAULT,"*** BUG *** cstatus was given an invalid parameter");
-               return 0;
-       }
-
-       for (int i = 0; i != MAXCHANS; i++)
-       {
-               if ((user->chans[i].channel == chan) && (chan != NULL))
-               {
-                       if ((user->chans[i].uc_modes & UCMODE_OP) > 0)
-                       {
-                               return STATUS_OP;
-                       }
-                       if ((user->chans[i].uc_modes & UCMODE_HOP) > 0)
-                       {
-                               return STATUS_HOP;
-                       }
-                       if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0)
-                       {
-                               return STATUS_VOICE;
-                       }
-                       return STATUS_NORMAL;
-               }
-       }
-}
-
 
 /* compile a userlist of a channel into a string, each nick seperated by
  * spaces and op, voice etc status shown as @ and + */
@@ -1773,1910 +1433,187 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                        WriteChannel(Ptr,user,"JOIN :%s",Ptr->name);
                        
                        if (!override) // we're not overriding... so this isnt part of a netburst, broadcast it.
-                       {
-                               // use the stamdard J token with no privilages.
-                               char buffer[MAXBUF];
-                               snprintf(buffer,MAXBUF,"J %s :%s",user->nick,Ptr->name);
-                               NetSendToAll(buffer);
-                       }
-
-                       log(DEBUG,"Sent JOIN to client");
-
-                       if (Ptr->topicset)
-                       {
-                               WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
-                               WriteServ(user->fd,"333 %s %s %s %d", user->nick, Ptr->name, Ptr->setby, Ptr->topicset);
-                       }
-                       userlist(user,Ptr);
-                       WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-                       WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name,chanmodes(Ptr));
-                       WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
-                       FOREACH_MOD OnUserJoin(user,Ptr);
-                       return Ptr;
-               }
-       }
-       log(DEBUG,"add_channel: user channel max exceeded: %s %s",user->nick,cname);
-       WriteServ(user->fd,"405 %s %s :You are on too many channels",user->nick, cname);
-       return NULL;
-}
-
-/* remove a channel from a users record, and remove the record from memory
- * if the channel has become empty */
-
-chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool local)
-{
-       if ((!user) || (!cname))
-       {
-               log(DEFAULT,"*** BUG *** del_channel was given an invalid parameter");
-               return NULL;
-       }
-
-       chanrec* Ptr;
-       int created = 0;
-
-       if ((!cname) || (!user))
-       {
-               return NULL;
-       }
-
-       Ptr = FindChan(cname);
-       
-       if (!Ptr)
-       {
-               return NULL;
-       }
-
-       FOREACH_MOD OnUserPart(user,Ptr);
-       log(DEBUG,"del_channel: removing: %s %s",user->nick,Ptr->name);
-       
-       for (int i =0; i != MAXCHANS; i++)
-       {
-               /* zap it from the channel list of the user */
-               if (user->chans[i].channel == Ptr)
-               {
-                       if (reason)
-                       {
-                               WriteChannel(Ptr,user,"PART %s :%s",Ptr->name, reason);
-
-                               if (!local)
-                               {
-                                       char buffer[MAXBUF];
-                                       snprintf(buffer,MAXBUF,"L %s %s :%s",user->nick,Ptr->name,reason);
-                                       NetSendToAll(buffer);
-                               }
-
-                               
-                       }
-                       else
-                       {
-                               if (!local)
-                               {
-                                       char buffer[MAXBUF];
-                                       snprintf(buffer,MAXBUF,"L %s %s :",user->nick,Ptr->name);
-                                       NetSendToAll(buffer);
-                               }
-                       
-                               WriteChannel(Ptr,user,"PART :%s",Ptr->name);
-                       }
-                       user->chans[i].uc_modes = 0;
-                       user->chans[i].channel = NULL;
-                       log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name);
-                       break;
-               }
-       }
-       
-       /* if there are no users left on the channel */
-       if (!usercount(Ptr))
-       {
-               chan_hash::iterator iter = chanlist.find(Ptr->name);
-
-               log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
-
-               /* kill the record */
-               if (iter != chanlist.end())
-               {
-                       log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
-                       delete iter->second;
-                       chanlist.erase(iter);
-               }
-       }
-}
-
-
-void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
-{
-       if ((!src) || (!user) || (!Ptr) || (!reason))
-       {
-               log(DEFAULT,"*** BUG *** kick_channel was given an invalid parameter");
-               return;
-       }
-
-       int i = 0;
-       int created = 0;
-
-       if ((!Ptr) || (!user) || (!src))
-       {
-               return;
-       }
-
-       log(DEBUG,"kick_channel: removing: %s %s %s",user->nick,Ptr->name,src->nick);
-
-       if (!has_channel(user,Ptr))
-       {
-               WriteServ(src->fd,"441 %s %s %s :They are not on that channel",src->nick, user->nick, Ptr->name);
-               return;
-       }
-       if ((cstatus(src,Ptr) < STATUS_HOP) || (cstatus(src,Ptr) < cstatus(user,Ptr)))
-       {
-               if (cstatus(src,Ptr) == STATUS_HOP)
-               {
-                       WriteServ(src->fd,"482 %s %s :You must be a channel operator",src->nick, Ptr->name);
-               }
-               else
-               {
-                       WriteServ(src->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",src->nick, Ptr->name);
-               }
-               
-               return;
-       }
-       
-       for (int i =0; i != MAXCHANS; i++)
-       {
-               /* zap it from the channel list of the user */
-               if (user->chans[i].channel)
-               if (!strcasecmp(user->chans[i].channel->name,Ptr->name))
-               {
-                       WriteChannel(Ptr,src,"KICK %s %s :%s",Ptr->name, user->nick, reason);
-                       user->chans[i].uc_modes = 0;
-                       user->chans[i].channel = NULL;
-                       log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name);
-                       break;
-               }
-       }
-       
-       /* if there are no users left on the channel */
-       if (!usercount(Ptr))
-       {
-               chan_hash::iterator iter = chanlist.find(Ptr->name);
-
-               log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
-
-               /* kill the record */
-               if (iter != chanlist.end())
-               {
-                       log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
-                       delete iter->second;
-                       chanlist.erase(iter);
-               }
-       }
-}
-
-
-/* returns 1 if user u has channel c in their record, 0 if not */
-
-int has_channel(userrec *u, chanrec *c)
-{
-       if ((!u) || (!c))
-       {
-               log(DEFAULT,"*** BUG *** has_channel was given an invalid parameter");
-               return 0;
-       }
-       for (int i =0; i != MAXCHANS; i++)
-       {
-               if (u->chans[i].channel == c)
-               {
-                       return 1;
-               }
-       }
-       return 0;
-}
-
-int give_ops(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** give_ops was given an invalid parameter");
-               return 0;
-       }
-       if (status < STATUS_OP)
-       {
-               log(DEBUG,"%s cant give ops to %s because they nave status %d and needs %d",user->nick,dest,status,STATUS_OP);
-               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
-               return 0;
-       }
-       else
-       {
-               if (!isnick(dest))
-               {
-                       log(DEFAULT,"the target nickname given to give_ops was invalid");
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               d = Find(dest);
-               if (!d)
-               {
-                       log(DEFAULT,"the target nickname given to give_ops couldnt be found");
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               else
-               {
-                       for (int i = 0; i != MAXCHANS; i++)
-                       {
-                               if ((d->chans[i].channel != NULL) && (chan != NULL))
-                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
-                               {
-                                       if (d->chans[i].uc_modes & UCMODE_OP)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               log(DEFAULT,"The target user given to give_ops was already opped on the channel");
-                                               return 0;
-                                       }
-                                       d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_OP;
-                                       log(DEBUG,"gave ops: %s %s",d->chans[i].channel->name,d->nick);
-                                       return 1;
-                               }
-                       }
-                       log(DEFAULT,"The target channel given to give_ops was not in the users mode list");
-               }
-       }
-       return 1;
-}
-
-int give_hops(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** give_hops was given an invalid parameter");
-               return 0;
-       }
-       if (status != STATUS_OP)
-       {
-               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
-               return 0;
-       }
-       else
-       {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               if (!d)
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               else
-               {
-                       for (int i = 0; i != MAXCHANS; i++)
-                       {
-                               if ((d->chans[i].channel != NULL) && (chan != NULL))
-                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
-                               {
-                                       if (d->chans[i].uc_modes & UCMODE_HOP)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return 0;
-                                       }
-                                       d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_HOP;
-                                       log(DEBUG,"gave h-ops: %s %s",d->chans[i].channel->name,d->nick);
-                                       return 1;
-                               }
-                       }
-               }
-       }
-       return 1;
-}
-
-int give_voice(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** give_voice was given an invalid parameter");
-               return 0;
-       }
-       if (status < STATUS_HOP)
-       {
-               WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
-               return 0;
-       }
-       else
-       {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               if (!d)
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               else
-               {
-                       for (int i = 0; i != MAXCHANS; i++)
-                       {
-                               if ((d->chans[i].channel != NULL) && (chan != NULL))
-                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
-                               {
-                                       if (d->chans[i].uc_modes & UCMODE_VOICE)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return 0;
-                                       }
-                                       d->chans[i].uc_modes = d->chans[i].uc_modes | UCMODE_VOICE;
-                                       log(DEBUG,"gave voice: %s %s",d->chans[i].channel->name,d->nick);
-                                       return 1;
-                               }
-                       }
-               }
-       }
-       return 1;
-}
-
-int take_ops(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** take_ops was given an invalid parameter");
-               return 0;
-       }
-       if (status < STATUS_OP)
-       {
-               log(DEBUG,"%s cant give ops to %s because they have status %d and needs %d",user->nick,dest,status,STATUS_OP);
-               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
-               return 0;
-       }
-       else
-       {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       log(DEBUG,"take_ops was given an invalid target nickname of %s",dest);
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               if (!d)
-               {
-                       log(DEBUG,"take_ops couldnt resolve the target nickname: %s",dest);
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               else
-               {
-                       for (int i = 0; i != MAXCHANS; i++)
-                       {
-                               if ((d->chans[i].channel != NULL) && (chan != NULL))
-                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
-                               {
-                                       if ((d->chans[i].uc_modes & UCMODE_OP) == 0)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return 0;
-                                       }
-                                       d->chans[i].uc_modes ^= UCMODE_OP;
-                                       log(DEBUG,"took ops: %s %s",d->chans[i].channel->name,d->nick);
-                                       return 1;
-                               }
-                       }
-                       log(DEBUG,"take_ops couldnt locate the target channel in the target users list");
-               }
-       }
-       return 1;
-}
-
-int take_hops(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** take_hops was given an invalid parameter");
-               return 0;
-       }
-       if (status != STATUS_OP)
-       {
-               WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
-               return 0;
-       }
-       else
-       {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               if (!d)
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               else
-               {
-                       for (int i = 0; i != MAXCHANS; i++)
-                       {
-                               if ((d->chans[i].channel != NULL) && (chan != NULL))
-                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
-                               {
-                                       if ((d->chans[i].uc_modes & UCMODE_HOP) == 0)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return 0;
-                                       }
-                                       d->chans[i].uc_modes ^= UCMODE_HOP;
-                                       log(DEBUG,"took h-ops: %s %s",d->chans[i].channel->name,d->nick);
-                                       return 1;
-                               }
-                       }
-               }
-       }
-       return 1;
-}
-
-int take_voice(userrec *user,char *dest,chanrec *chan,int status)
-{
-       userrec *d;
-       int i;
-       
-       if ((!user) || (!dest) || (!chan))
-       {
-               log(DEFAULT,"*** BUG *** take_voice was given an invalid parameter");
-               return 0;
-       }
-       if (status < STATUS_HOP)
-       {
-               WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
-               return 0;
-       }
-       else
-       {
-               d = Find(dest);
-               if (!isnick(dest))
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               if (!d)
-               {
-                       WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, dest);
-                       return 0;
-               }
-               else
-               {
-                       for (int i = 0; i != MAXCHANS; i++)
-                       {
-                               if ((d->chans[i].channel != NULL) && (chan != NULL))
-                               if (!strcasecmp(d->chans[i].channel->name,chan->name))
-                               {
-                                       if ((d->chans[i].uc_modes & UCMODE_VOICE) == 0)
-                                       {
-                                               /* mode already set on user, dont allow multiple */
-                                               return 0;
-                                       }
-                                       d->chans[i].uc_modes ^= UCMODE_VOICE;
-                                       log(DEBUG,"took voice: %s %s",d->chans[i].channel->name,d->nick);
-                                       return 1;
-                               }
-                       }
-               }
-       }
-       return 1;
-}
-
-void TidyBan(char *ban)
-{
-       if (!ban) {
-               log(DEFAULT,"*** BUG *** TidyBan was given an invalid parameter");
-               return;
-       }
-       
-       char temp[MAXBUF],NICK[MAXBUF],IDENT[MAXBUF],HOST[MAXBUF];
-
-       strcpy(temp,ban);
-
-       char* pos_of_pling = strchr(temp,'!');
-       char* pos_of_at = strchr(temp,'@');
-
-       pos_of_pling[0] = '\0';
-       pos_of_at[0] = '\0';
-       pos_of_pling++;
-       pos_of_at++;
-
-       strncpy(NICK,temp,NICKMAX);
-       strncpy(IDENT,pos_of_pling,IDENTMAX+1);
-       strncpy(HOST,pos_of_at,160);
-
-       sprintf(ban,"%s!%s@%s",NICK,IDENT,HOST);
-}
-
-int add_ban(userrec *user,char *dest,chanrec *chan,int status)
-{
-       if ((!user) || (!dest) || (!chan)) {
-               log(DEFAULT,"*** BUG *** add_ban was given an invalid parameter");
-               return 0;
-       }
-
-       BanItem b;
-       if ((!user) || (!dest) || (!chan))
-               return 0;
-       if (strchr(dest,'!')==0)
-               return 0;
-       if (strchr(dest,'@')==0)
-               return 0;
-       for (int i = 0; i < strlen(dest); i++)
-               if (dest[i] < 32)
-                       return 0;
-       for (int i = 0; i < strlen(dest); i++)
-               if (dest[i] > 126)
-                       return 0;
-       int c = 0;
-       for (int i = 0; i < strlen(dest); i++)
-               if (dest[i] == '!')
-                       c++;
-       if (c>1)
-               return 0;
-       c = 0;
-       for (int i = 0; i < strlen(dest); i++)
-               if (dest[i] == '@')
-                       c++;
-       if (c>1)
-               return 0;
-       log(DEBUG,"add_ban: %s %s",chan->name,user->nick);
-
-       TidyBan(dest);
-       for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
-       {
-               if (!strcasecmp(i->data,dest))
-               {
-                       // dont allow a user to set the same ban twice
-                       return 0;
-               }
-       }
-
-       b.set_time = time(NULL);
-       strncpy(b.data,dest,MAXBUF);
-       strncpy(b.set_by,user->nick,NICKMAX);
-       chan->bans.push_back(b);
-       return 1;
-}
-
-int take_ban(userrec *user,char *dest,chanrec *chan,int status)
-{
-       if ((!user) || (!dest) || (!chan)) {
-               log(DEFAULT,"*** BUG *** take_ban was given an invalid parameter");
-               return 0;
-       }
-
-       log(DEBUG,"del_ban: %s %s",chan->name,user->nick);
-       for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
-       {
-               if (!strcasecmp(i->data,dest))
-               {
-                       chan->bans.erase(i);
-                       return 1;
-               }
-       }
-       return 0;
-}
-
-void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int pcnt, bool servermode, bool silent, bool local)
-{
-       if (!parameters) {
-               log(DEFAULT,"*** BUG *** process_modes was given an invalid parameter");
-               return;
-       }
-
-       char modelist[MAXBUF];
-       char outlist[MAXBUF];
-       char outstr[MAXBUF];
-       char outpars[32][MAXBUF];
-       int param = 2;
-       int pc = 0;
-       int ptr = 0;
-       int mdir = 1;
-       int r = 0;
-       bool k_set = false, l_set = false;
-
-       if (pcnt < 2)
-       {
-               return;
-       }
-
-       log(DEBUG,"process_modes: start: parameters=%d",pcnt);
-
-       strcpy(modelist,parameters[1]); /* mode list, e.g. +oo-o */
-                                       /* parameters[2] onwards are parameters for
-                                        * modes that require them :) */
-       strcpy(outlist,"+");
-       mdir = 1;
-
-       log(DEBUG,"process_modes: modelist: %s",modelist);
-
-       for (ptr = 0; ptr < strlen(modelist); ptr++)
-       {
-               r = 0;
-
-               {
-                       log(DEBUG,"process_modes: modechar: %c",modelist[ptr]);
-                       char modechar = modelist[ptr];
-                       switch (modelist[ptr])
-                       {
-                               case '-':
-                                       if (mdir != 0)
-                                       {
-                                               if ((outlist[strlen(outlist)-1] == '+') || (outlist[strlen(outlist)-1] == '-'))
-                                               {
-                                                       outlist[strlen(outlist)-1] = '-';
-                                               }
-                                               else
-                                               {
-                                                       strcat(outlist,"-");
-                                               }
-                                       }
-                                       mdir = 0;
-                                       
-                               break;                  
-
-                               case '+':
-                                       if (mdir != 1)
-                                       {
-                                               if ((outlist[strlen(outlist)-1] == '+') || (outlist[strlen(outlist)-1] == '-'))
-                                               {
-                                                       outlist[strlen(outlist)-1] = '+';
-                                               }
-                                               else
-                                               {
-                                                       strcat(outlist,"+");
-                                               }
-                                       }
-                                       mdir = 1;
-                               break;
-
-                               case 'o':
-                                       log(DEBUG,"Ops");
-                                       if ((param >= pcnt)) break;
-                                       log(DEBUG,"Enough parameters left");
-                                       if (mdir == 1)
-                                       {
-                                               log(DEBUG,"calling give_ops");
-                                               r = give_ops(user,parameters[param++],chan,status);
-                                       }
-                                       else
-                                       {
-                                               log(DEBUG,"calling take_ops");
-                                               r = take_ops(user,parameters[param++],chan,status);
-                                       }
-                                       if (r)
-                                       {
-                                               strcat(outlist,"o");
-                                               strcpy(outpars[pc++],parameters[param-1]);
-                                       }
-                               break;
-                       
-                               case 'h':
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
-                                       {
-                                               r = give_hops(user,parameters[param++],chan,status);
-                                       }
-                                       else
-                                       {
-                                               r = take_hops(user,parameters[param++],chan,status);
-                                       }
-                                       if (r)
-                                       {
-                                               strcat(outlist,"h");
-                                               strcpy(outpars[pc++],parameters[param-1]);
-                                       }
-                               break;
-                       
-                               
-                               case 'v':
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
-                                       {
-                                               r = give_voice(user,parameters[param++],chan,status);
-                                       }
-                                       else
-                                       {
-                                               r = take_voice(user,parameters[param++],chan,status);
-                                       }
-                                       if (r)
-                                       {
-                                               strcat(outlist,"v");
-                                               strcpy(outpars[pc++],parameters[param-1]);
-                                       }
-                               break;
-                               
-                               case 'b':
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
-                                       {
-                                               r = add_ban(user,parameters[param++],chan,status);
-                                       }
-                                       else
-                                       {
-                                               r = take_ban(user,parameters[param++],chan,status);
-                                       }
-                                       if (r)
-                                       {
-                                               strcat(outlist,"b");
-                                               strcpy(outpars[pc++],parameters[param-1]);
-                                       }
-                               break;
-
-
-                               case 'k':
-                                       if ((param >= pcnt))
-                                               break;
-
-                                       if (mdir == 1)
-                                       {
-                                               if (k_set)
-                                                       break;
-                                               
-                                               if (!strcmp(chan->key,""))
-                                               {
-                                                       strcat(outlist,"k");
-                                                       char key[MAXBUF];
-                                                       strcpy(key,parameters[param++]);
-                                                       if (strlen(key)>32) {
-                                                               key[31] = '\0';
-                                                       }
-                                                       strcpy(outpars[pc++],key);
-                                                       strcpy(chan->key,key);
-                                                       k_set = true;
-                                               }
-                                       }
-                                       else
-                                       {
-                                               /* checks on -k are case sensitive and only accurate to the
-                                                  first 32 characters */
-                                               char key[MAXBUF];
-                                               strcpy(key,parameters[param++]);
-                                               if (strlen(key)>32) {
-                                                       key[31] = '\0';
-                                               }
-                                               /* only allow -k if correct key given */
-                                               if (!strcmp(chan->key,key))
-                                               {
-                                                       strcat(outlist,"k");
-                                                       strcpy(chan->key,"");
-                                                       strcpy(outpars[pc++],key);
-                                               }
-                                       }
-                               break;
-                               
-                               case 'l':
-                                       if (mdir == 0)
-                                       {
-                                               if (chan->limit)
-                                               {
-                                                       strcat(outlist,"l");
-                                                       chan->limit = 0;
-                                               }
-                                       }
-                                       
-                                       if ((param >= pcnt)) break;
-                                       if (mdir == 1)
-                                       {
-                                               if (l_set)
-                                                       break;
-                                               
-                                               bool invalid = false;
-                                               for (int i = 0; i < strlen(parameters[param]); i++)
-                                               {
-                                                       if ((parameters[param][i] < '0') || (parameters[param][i] > '9'))
-                                                       {
-                                                               invalid = true;
-                                                       }
-                                               }
-                                               if (atoi(parameters[param]) < 1)
-                                               {
-                                                       invalid = true;
-                                               }
-
-                                               if (invalid)
-                                                       break;
-                                               
-                                               chan->limit = atoi(parameters[param]);
-                                               if (chan->limit)
-                                               {
-                                                       strcat(outlist,"l");
-                                                       strcpy(outpars[pc++],parameters[param++]);
-                                                       l_set = true;
-                                               }
-                                       }
-                               break;
-                               
-                               case 'i':
-                                       if (chan->inviteonly != mdir)
-                                       {
-                                               strcat(outlist,"i");
-                                       }
-                                       chan->inviteonly = mdir;
-                               break;
-                               
-                               case 't':
-                                       if (chan->topiclock != mdir)
-                                       {
-                                               strcat(outlist,"t");
-                                       }
-                                       chan->topiclock = mdir;
-                               break;
-                               
-                               case 'n':
-                                       if (chan->noexternal != mdir)
-                                       {
-                                               strcat(outlist,"n");
-                                       }
-                                       chan->noexternal = mdir;
-                               break;
-                               
-                               case 'm':
-                                       if (chan->moderated != mdir)
-                                       {
-                                               strcat(outlist,"m");
-                                       }
-                                       chan->moderated = mdir;
-                               break;
-                               
-                               case 's':
-                                       if (chan->secret != mdir)
-                                       {
-                                               strcat(outlist,"s");
-                                               if (chan->c_private)
-                                               {
-                                                       chan->c_private = 0;
-                                                       if (mdir)
-                                                       {
-                                                               strcat(outlist,"-p+");
-                                                       }
-                                                       else
-                                                       {
-                                                               strcat(outlist,"+p-");
-                                                       }
-                                               }
-                                       }
-                                       chan->secret = mdir;
-                               break;
-                               
-                               case 'p':
-                                       if (chan->c_private != mdir)
-                                       {
-                                               strcat(outlist,"p");
-                                               if (chan->secret)
-                                               {
-                                                       chan->secret = 0;
-                                                       if (mdir)
-                                                       {
-                                                               strcat(outlist,"-s+");
-                                                       }
-                                                       else
-                                                       {
-                                                               strcat(outlist,"+s-");
-                                                       }
-                                               }
-                                       }
-                                       chan->c_private = mdir;
-                               break;
-                               
-                               default:
-                                       log(DEBUG,"Preprocessing custom mode %c",modechar);
-                                       string_list p;
-                                       p.clear();
-                                       if (((!strchr(chan->custom_modes,modechar)) && (!mdir)) || ((strchr(chan->custom_modes,modechar)) && (mdir)))
-                                       {
-                                               log(DEBUG,"Mode %c isnt set on %s but trying to remove!",modechar,chan->name);
-                                               break;
-                                       }
-                                       if (ModeDefined(modechar,MT_CHANNEL))
-                                       {
-                                               log(DEBUG,"A module has claimed this mode");
-                                               if (param<pcnt)
-                                               {
-                                                       if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
-                                                       {
-                                                               p.push_back(parameters[param]);
-                                                       }
-                                                       if ((ModeDefinedOff(modechar,MT_CHANNEL)>0) && (!mdir))
-                                                       {
-                                                               p.push_back(parameters[param]);
-                                                       }
-                                               }
-                                               bool handled = false;
-                                               if (param>=pcnt)
-                                               {
-                                                       log(DEBUG,"Not enough parameters for module-mode %c",modechar);
-                                                       // we're supposed to have a parameter, but none was given... so dont handle the mode.
-                                                       if (((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir)) || ((ModeDefinedOff(modechar,MT_CHANNEL)>0) && (!mdir))) 
-                                                       {
-                                                               handled = true;
-                                                               param++;
-                                                       }
-                                               }
-                                               for (int i = 0; i <= MODCOUNT; i++)
-                                               {
-                                                       if (!handled)
-                                                       {
-                                                               if (modules[i]->OnExtendedMode(user,chan,modechar,MT_CHANNEL,mdir,p))
-                                                               {
-                                                                       log(DEBUG,"OnExtendedMode returned nonzero for a module");
-                                                                       char app[] = {modechar, 0};
-                                                                       if (ptr>0)
-                                                                       {
-                                                                               if ((modelist[ptr-1] == '+') || (modelist[ptr-1] == '-'))
-                                                                               {
-                                                                                       strcat(outlist, app);
-                                                                               }
-                                                                               else if (!strchr(outlist,modechar))
-                                                                               {
-                                                                                       strcat(outlist, app);
-                                                                               }
-                                                                       }
-                                                                       chan->SetCustomMode(modechar,mdir);
-                                                                       // include parameters in output if mode has them
-                                                                       if ((ModeDefinedOn(modechar,MT_CHANNEL)>0) && (mdir))
-                                                                       {
-                                                                               chan->SetCustomModeParam(modelist[ptr],parameters[param],mdir);
-                                                                               strcpy(outpars[pc++],parameters[param++]);
-                                                                       }
-                                                                       // break, because only one module can handle the mode.
-                                                                       handled = true;
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               break;
-                               
-                       }
-               }
-       }
-
-       /* this ensures only the *valid* modes are sent out onto the network */
-       while ((outlist[strlen(outlist)-1] == '-') || (outlist[strlen(outlist)-1] == '+'))
-       {
-               outlist[strlen(outlist)-1] = '\0';
-       }
-       if (strcmp(outlist,""))
-       {
-               strcpy(outstr,outlist);
-               for (ptr = 0; ptr < pc; ptr++)
-               {
-                       strcat(outstr," ");
-                       strcat(outstr,outpars[ptr]);
-               }
-               if (local)
-               {
-                       log(DEBUG,"Local mode change");
-                       WriteChannelLocal(chan, user, "MODE %s %s",chan->name,outstr);
-               }
-               else
-               {
-                       if (servermode)
-                       {
-                               if (!silent)
-                               {
-                                       WriteChannelWithServ(ServerName,chan,user,"MODE %s %s",chan->name,outstr);
-                                       // M token for a usermode must go to all servers
-                                       char buffer[MAXBUF];
-                                       snprintf(buffer,MAXBUF,"M %s %s",chan->name, outstr);
-                                       NetSendToAll(buffer);
-                               }
-                                       
-                       }
-                       else
-                       {
-                               if (!silent)
-                               {
-                                       WriteChannel(chan,user,"MODE %s %s",chan->name,outstr);
-                                       // M token for a usermode must go to all servers
-                                       char buffer[MAXBUF];
-                                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick,chan->name, outstr);
-                                       NetSendToAll(buffer);
-                               }
-                       }
-               }
-       }
-}
-
-// based on sourcemodes, return true or false to determine if umode is a valid mode a user may set on themselves or others.
-
-bool allowed_umode(char umode, char* sourcemodes,bool adding)
-{
-       log(DEBUG,"Allowed_umode: %c %s",umode,sourcemodes);
-       // RFC1459 specified modes
-       if ((umode == 'w') || (umode == 's') || (umode == 'i'))
-       {
-               log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
-               return true;
-       }
-       
-       // user may not +o themselves or others, but an oper may de-oper other opers or themselves
-       if ((strchr(sourcemodes,'o')) && (!adding))
-       {
-               log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
-               return true;
-       }
-       else if (umode == 'o')
-       {
-               log(DEBUG,"umode %c allowed by RFC1459 scemantics",umode);
-               return false;
-       }
-       
-       // process any module-defined modes that need oper
-       if ((ModeDefinedOper(umode,MT_CLIENT)) && (strchr(sourcemodes,'o')))
-       {
-               log(DEBUG,"umode %c allowed by module handler (oper only mode)",umode);
-               return true;
-       }
-       else
-       if (ModeDefined(umode,MT_CLIENT))
-       {
-               // process any module-defined modes that don't need oper
-               log(DEBUG,"umode %c allowed by module handler (non-oper mode)",umode);
-               if ((ModeDefinedOper(umode,MT_CLIENT)) && (!strchr(sourcemodes,'o')))
-               {
-                       // no, this mode needs oper, and this user 'aint got what it takes!
-                       return false;
-               }
-               return true;
-       }
-
-       // anything else - return false.
-       log(DEBUG,"umode %c not known by any ruleset",umode);
-       return false;
-}
-
-bool process_module_umode(char umode, userrec* source, void* dest, bool adding)
-{
-       userrec* s2;
-       bool faked = false;
-       if (!source)
-       {
-               s2 = new userrec;
-               strncpy(s2->nick,ServerName,NICKMAX);
-               strcpy(s2->modes,"o");
-               s2->fd = -1;
-               source = s2;
-               faked = true;
-       }
-       string_list p;
-       p.clear();
-       if (ModeDefined(umode,MT_CLIENT))
-       {
-               for (int i = 0; i <= MODCOUNT; i++)
-               {
-                       if (modules[i]->OnExtendedMode(source,(void*)dest,umode,MT_CLIENT,adding,p))
-                       {
-                               log(DEBUG,"Module claims umode %c",umode);
-                               return true;
-                       }
-               }
-               log(DEBUG,"No module claims umode %c",umode);
-               if (faked)
-               {
-                       delete s2;
-                       source = NULL;
-               }
-               return false;
-       }
-       else
-       {
-               if (faked)
-               {
-                       delete s2;
-                       source = NULL;
-               }
-               return false;
-       }
-}
-
-void handle_mode(char **parameters, int pcnt, userrec *user)
-{
-       chanrec* Ptr;
-       userrec* dest;
-       int can_change,i;
-       int direction = 1;
-       char outpars[MAXBUF];
-
-       dest = Find(parameters[0]);
-
-       if (!user)
-       {
-               return;
-       }
-
-       if ((dest) && (pcnt == 1))
-       {
-               WriteServ(user->fd,"221 %s :+%s",user->nick,user->modes);
-               return;
-       }
-
-       if ((dest) && (pcnt > 1))
-       {
-               char dmodes[MAXBUF];
-               strncpy(dmodes,dest->modes,MAXBUF);
-               log(DEBUG,"pulled up dest user modes: %s",dmodes);
-       
-               can_change = 0;
-               if (user != dest)
-               {
-                       if (strchr(user->modes,'o'))
-                       {
-                               can_change = 1;
-                       }
-               }
-               else
-               {
-                       can_change = 1;
-               }
-               if (!can_change)
-               {
-                       WriteServ(user->fd,"482 %s :Can't change mode for other users",user->nick);
-                       return;
-               }
-               
-               strcpy(outpars,"+");
-               direction = 1;
-
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-                       return;
-
-               for (int i = 0; i < strlen(parameters[1]); i++)
-               {
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '-';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"-");
-                                       }
-                               }
-                               direction = 0;
-                       }
-                       else
-                       {
-                               can_change = 0;
-                               if (strchr(user->modes,'o'))
-                               {
-                                       can_change = 1;
-                               }
-                               else
-                               {
-                                       if ((parameters[1][i] == 'i') || (parameters[1][i] == 'w') || (parameters[1][i] == 's') || (allowed_umode(parameters[1][i],user->modes,direction)))
-                                       {
-                                               can_change = 1;
-                                       }
-                               }
-                               if (can_change)
-                               {
-                                       if (direction == 1)
-                                       {
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               dmodes[strlen(dmodes)+1]='\0';
-                                                               dmodes[strlen(dmodes)] = parameters[1][i];
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               int q = 0;
-                                                               char temp[MAXBUF];      
-                                                               char moo[MAXBUF];       
-
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       
-                                                               strcpy(temp,"");
-                                                               for (q = 0; q < strlen(dmodes); q++)
-                                                               {
-                                                                       if (dmodes[q] != parameters[1][i])
-                                                                       {
-                                                                               moo[0] = dmodes[q];
-                                                                               moo[1] = '\0';
-                                                                               strcat(temp,moo);
-                                                                       }
-                                                               }
-                                                               strcpy(dmodes,temp);
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-               if (strlen(outpars))
-               {
-                       char b[MAXBUF];
-                       strcpy(b,"");
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
-                       {
-                               b[z++] = outpars[i++];
-                               b[z] = '\0';
-                               if (i<strlen(outpars)-1)
-                               {
-                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
-                                       {
-                                               // someones playing silly buggers and trying
-                                               // to put a +- or -+ into the line...
-                                               i++;
-                                       }
-                               }
-                               if (i == strlen(outpars)-1)
-                               {
-                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
-                                       {
-                                               i++;
-                                       }
-                               }
-                       }
-
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] == '\0';
-
-                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
-                               return;
-
-                       WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
-
-                       // M token for a usermode must go to all servers
-                       char buffer[MAXBUF];
-                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
-                       NetSendToAll(buffer);
-
-                       if (strlen(dmodes)>MAXMODES)
-                       {
-                               dmodes[MAXMODES-1] = '\0';
-                       }
-                       log(DEBUG,"Stripped mode line");
-                       log(DEBUG,"Line dest is now %s",dmodes);
-                       strncpy(dest->modes,dmodes,MAXMODES);
-
-               }
-
-               return;
-       }
-       
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
-       {
-               if (pcnt == 1)
-               {
-                       /* just /modes #channel */
-                       WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name, chanmodes(Ptr));
-                       WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
-                       return;
-               }
-               else
-               if (pcnt == 2)
-               {
-                       if ((!strcmp(parameters[1],"+b")) || (!strcmp(parameters[1],"b")))
-                       {
-
-                               for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
-                               {
-                                       WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, Ptr->name, i->data, i->set_by, i->set_time);
-                               }
-                               WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, Ptr->name);
-                               return;
-                       }
-               }
-
-               if ((cstatus(user,Ptr) < STATUS_HOP) && (Ptr))
-               {
-                       WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, Ptr->name);
-                       return;
-               }
-
-               process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,false);
-       }
-       else
-       {
-               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-       }
-}
-
-
-
-
-void server_mode(char **parameters, int pcnt, userrec *user)
-{
-       chanrec* Ptr;
-       userrec* dest;
-       int can_change,i;
-       int direction = 1;
-       char outpars[MAXBUF];
-
-       dest = Find(parameters[0]);
-       
-       // fix: ChroNiCk found this - we cant use this as debug if its null!
-       if (dest)
-       {
-               log(DEBUG,"server_mode on %s",dest->nick);
-       }
-
-       if ((dest) && (pcnt > 1))
-       {
-               log(DEBUG,"params > 1");
-
-               char dmodes[MAXBUF];
-               strncpy(dmodes,dest->modes,MAXBUF);
-
-               strcpy(outpars,"+");
-               direction = 1;
-
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-                       return;
-
-               for (int i = 0; i < strlen(parameters[1]); i++)
-               {
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '-';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"-");
-                                       }
-                               }
-                               direction = 0;
-                       }
-                       else
-                       {
-                               log(DEBUG,"begin mode processing entry");
-                               can_change = 1;
-                               if (can_change)
-                               {
-                                       if (direction == 1)
-                                       {
-                                               log(DEBUG,"umode %c being added",parameters[1][i]);
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               dmodes[strlen(dmodes)+1]='\0';
-                                                               dmodes[strlen(dmodes)] = parameters[1][i];
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               // can only remove a mode they already have
-                                               log(DEBUG,"umode %c being removed",parameters[1][i]);
-                                               if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, user, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               int q = 0;
-                                                               char temp[MAXBUF];
-                                                               char moo[MAXBUF];       
-
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       
-                                                               strcpy(temp,"");
-                                                               for (q = 0; q < strlen(dmodes); q++)
-                                                               {
-                                                                       if (dmodes[q] != parameters[1][i])
-                                                                       {
-                                                                               moo[0] = dmodes[q];
-                                                                               moo[1] = '\0';
-                                                                               strcat(temp,moo);
-                                                                       }
-                                                               }
-                                                               strcpy(dmodes,temp);
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-               if (strlen(outpars))
-               {
-                       char b[MAXBUF];
-                       strcpy(b,"");
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
-                       {
-                               b[z++] = outpars[i++];
-                               b[z] = '\0';
-                               if (i<strlen(outpars)-1)
-                               {
-                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
-                                       {
-                                               // someones playing silly buggers and trying
-                                               // to put a +- or -+ into the line...
-                                               i++;
-                                       }
-                               }
-                               if (i == strlen(outpars)-1)
-                               {
-                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
-                                       {
-                                               i++;
-                                       }
-                               }
-                       }
-
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] == '\0';
-
-                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
-                               return;
-
-                       WriteTo(user, dest, "MODE %s :%s", dest->nick, b);
-
-                       // M token for a usermode must go to all servers
-                       char buffer[MAXBUF];
-                       snprintf(buffer,MAXBUF,"m %s %s %s",user->nick, dest->nick, b);
-                       NetSendToAll(buffer);
-                       
-                       if (strlen(dmodes)>MAXMODES)
-                       {
-                               dmodes[MAXMODES-1] = '\0';
-                       }
-                       log(DEBUG,"Stripped mode line");
-                       log(DEBUG,"Line dest is now %s",dmodes);
-                       strncpy(dest->modes,dmodes,MAXMODES);
-
-               }
-
-               return;
-       }
-       
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
-       {
-               process_modes(parameters,user,Ptr,STATUS_OP,pcnt,true,false,false);
-       }
-       else
-       {
-               WriteServ(user->fd,"401 %s %s :No suck nick/channel",user->nick, parameters[0]);
-       }
-}
-
-
-
-void merge_mode(char **parameters, int pcnt)
-{
-       chanrec* Ptr;
-       userrec* dest;
-       int can_change,i;
-       int direction = 1;
-       char outpars[MAXBUF];
-
-       dest = Find(parameters[0]);
-       
-       // fix: ChroNiCk found this - we cant use this as debug if its null!
-       if (dest)
-       {
-               log(DEBUG,"merge_mode on %s",dest->nick);
-       }
-
-       if ((dest) && (pcnt > 1))
-       {
-               log(DEBUG,"params > 1");
-
-               char dmodes[MAXBUF];
-               strncpy(dmodes,dest->modes,MAXBUF);
-
-               strcpy(outpars,"+");
-               direction = 1;
-
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-                       return;
-
-               for (int i = 0; i < strlen(parameters[1]); i++)
-               {
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
-                       {
-                               if (direction != 0)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '-';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"-");
-                                       }
-                               }
-                               direction = 0;
-                       }
-                       else
-                       {
-                               log(DEBUG,"begin mode processing entry");
-                               can_change = 1;
-                               if (can_change)
-                               {
-                                       if (direction == 1)
-                                       {
-                                               log(DEBUG,"umode %c being added",parameters[1][i]);
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],"o",true)))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               dmodes[strlen(dmodes)+1]='\0';
-                                                               dmodes[strlen(dmodes)] = parameters[1][i];
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               // can only remove a mode they already have
-                                               log(DEBUG,"umode %c being removed",parameters[1][i]);
-                                               if ((allowed_umode(parameters[1][i],"o",false)) && (strchr(dmodes,parameters[1][i])))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               int q = 0;
-                                                               char temp[MAXBUF];
-                                                               char moo[MAXBUF];       
-
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       
-                                                               strcpy(temp,"");
-                                                               for (q = 0; q < strlen(dmodes); q++)
-                                                               {
-                                                                       if (dmodes[q] != parameters[1][i])
-                                                                       {
-                                                                               moo[0] = dmodes[q];
-                                                                               moo[1] = '\0';
-                                                                               strcat(temp,moo);
-                                                                       }
-                                                               }
-                                                               strcpy(dmodes,temp);
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-               if (strlen(outpars))
-               {
-                       char b[MAXBUF];
-                       strcpy(b,"");
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
-                       {
-                               b[z++] = outpars[i++];
-                               b[z] = '\0';
-                               if (i<strlen(outpars)-1)
-                               {
-                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
-                                       {
-                                               // someones playing silly buggers and trying
-                                               // to put a +- or -+ into the line...
-                                               i++;
-                                       }
-                               }
-                               if (i == strlen(outpars)-1)
-                               {
-                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
-                                       {
-                                               i++;
-                                       }
-                               }
+                       {
+                               // use the stamdard J token with no privilages.
+                               char buffer[MAXBUF];
+                               snprintf(buffer,MAXBUF,"J %s :%s",user->nick,Ptr->name);
+                               NetSendToAll(buffer);
                        }
 
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] == '\0';
-
-                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
-                               return;
+                       log(DEBUG,"Sent JOIN to client");
 
-                       if (strlen(dmodes)>MAXMODES)
+                       if (Ptr->topicset)
                        {
-                               dmodes[MAXMODES-1] = '\0';
+                               WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
+                               WriteServ(user->fd,"333 %s %s %s %d", user->nick, Ptr->name, Ptr->setby, Ptr->topicset);
                        }
-                       log(DEBUG,"Stripped mode line");
-                       log(DEBUG,"Line dest is now %s",dmodes);
-                       strncpy(dest->modes,dmodes,MAXMODES);
-
+                       userlist(user,Ptr);
+                       WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
+                       WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name,chanmodes(Ptr));
+                       WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created);
+                       FOREACH_MOD OnUserJoin(user,Ptr);
+                       return Ptr;
                }
-
-               return;
-       }
-       
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
-       {
-               userrec s2;
-               strncpy(s2.nick,ServerName,NICKMAX);
-               strcpy(s2.modes,"o");
-               s2.fd = -1;
-               process_modes(parameters,&s2,Ptr,STATUS_OP,pcnt,true,true,false);
        }
+       log(DEBUG,"add_channel: user channel max exceeded: %s %s",user->nick,cname);
+       WriteServ(user->fd,"405 %s %s :You are on too many channels",user->nick, cname);
+       return NULL;
 }
 
+/* remove a channel from a users record, and remove the record from memory
+ * if the channel has become empty */
 
-void merge_mode2(char **parameters, int pcnt, userrec* user)
+chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool local)
 {
+       if ((!user) || (!cname))
+       {
+               log(DEFAULT,"*** BUG *** del_channel was given an invalid parameter");
+               return NULL;
+       }
+
        chanrec* Ptr;
-       userrec* dest;
-       int can_change,i;
-       int direction = 1;
-       char outpars[MAXBUF];
+       int created = 0;
 
-       dest = Find(parameters[0]);
-       
-       // fix: ChroNiCk found this - we cant use this as debug if its null!
-       if (dest)
+       if ((!cname) || (!user))
        {
-               log(DEBUG,"merge_mode on %s",dest->nick);
+               return NULL;
        }
 
-       if ((dest) && (pcnt > 1))
+       Ptr = FindChan(cname);
+       
+       if (!Ptr)
        {
-               log(DEBUG,"params > 1");
-
-               char dmodes[MAXBUF];
-               strncpy(dmodes,dest->modes,MAXBUF);
-
-               strcpy(outpars,"+");
-               direction = 1;
-
-               if ((parameters[1][0] != '+') && (parameters[1][0] != '-'))
-                       return;
+               return NULL;
+       }
 
-               for (int i = 0; i < strlen(parameters[1]); i++)
+       FOREACH_MOD OnUserPart(user,Ptr);
+       log(DEBUG,"del_channel: removing: %s %s",user->nick,Ptr->name);
+       
+       for (int i =0; i != MAXCHANS; i++)
+       {
+               /* zap it from the channel list of the user */
+               if (user->chans[i].channel == Ptr)
                {
-                       if (parameters[1][i] == '+')
-                       {
-                               if (direction != 1)
-                               {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '+';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"+");
-                                       }
-                               }
-                               direction = 1;
-                       }
-                       else
-                       if (parameters[1][i] == '-')
+                       if (reason)
                        {
-                               if (direction != 0)
+                               WriteChannel(Ptr,user,"PART %s :%s",Ptr->name, reason);
+
+                               if (!local)
                                {
-                                       if ((outpars[strlen(outpars)-1] == '+') || (outpars[strlen(outpars)-1] == '-'))
-                                       {
-                                               outpars[strlen(outpars)-1] = '-';
-                                       }
-                                       else
-                                       {
-                                               strcat(outpars,"-");
-                                       }
+                                       char buffer[MAXBUF];
+                                       snprintf(buffer,MAXBUF,"L %s %s :%s",user->nick,Ptr->name,reason);
+                                       NetSendToAll(buffer);
                                }
-                               direction = 0;
+
+                               
                        }
                        else
                        {
-                               log(DEBUG,"begin mode processing entry");
-                               can_change = 1;
-                               if (can_change)
+                               if (!local)
                                {
-                                       if (direction == 1)
-                                       {
-                                               log(DEBUG,"umode %c being added",parameters[1][i]);
-                                               if ((!strchr(dmodes,parameters[1][i])) && (allowed_umode(parameters[1][i],user->modes,true)))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               dmodes[strlen(dmodes)+1]='\0';
-                                                               dmodes[strlen(dmodes)] = parameters[1][i];
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               // can only remove a mode they already have
-                                               log(DEBUG,"umode %c being removed",parameters[1][i]);
-                                               if ((allowed_umode(parameters[1][i],user->modes,false)) && (strchr(dmodes,parameters[1][i])))
-                                               {
-                                                       char umode = parameters[1][i];
-                                                       log(DEBUG,"umode %c is an allowed umode",umode);
-                                                       if ((process_module_umode(umode, NULL, dest, direction)) || (umode == 'i') || (umode == 's') || (umode == 'w') || (umode == 'o'))
-                                                       {
-                                                               int q = 0;
-                                                               char temp[MAXBUF];
-                                                               char moo[MAXBUF];       
-
-                                                               outpars[strlen(outpars)+1]='\0';
-                                                               outpars[strlen(outpars)] = parameters[1][i];
-                                                       
-                                                               strcpy(temp,"");
-                                                               for (q = 0; q < strlen(dmodes); q++)
-                                                               {
-                                                                       if (dmodes[q] != parameters[1][i])
-                                                                       {
-                                                                               moo[0] = dmodes[q];
-                                                                               moo[1] = '\0';
-                                                                               strcat(temp,moo);
-                                                                       }
-                                                               }
-                                                               strcpy(dmodes,temp);
-                                                       }
-                                               }
-                                       }
+                                       char buffer[MAXBUF];
+                                       snprintf(buffer,MAXBUF,"L %s %s :",user->nick,Ptr->name);
+                                       NetSendToAll(buffer);
                                }
+                       
+                               WriteChannel(Ptr,user,"PART :%s",Ptr->name);
                        }
+                       user->chans[i].uc_modes = 0;
+                       user->chans[i].channel = NULL;
+                       log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name);
+                       break;
                }
-               if (strlen(outpars))
+       }
+       
+       /* if there are no users left on the channel */
+       if (!usercount(Ptr))
+       {
+               chan_hash::iterator iter = chanlist.find(Ptr->name);
+
+               log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
+
+               /* kill the record */
+               if (iter != chanlist.end())
                {
-                       char b[MAXBUF];
-                       strcpy(b,"");
-                       int z = 0;
-                       int i = 0;
-                       while (i < strlen (outpars))
-                       {
-                               b[z++] = outpars[i++];
-                               b[z] = '\0';
-                               if (i<strlen(outpars)-1)
-                               {
-                                       if (((outpars[i] == '-') || (outpars[i] == '+')) && ((outpars[i+1] == '-') || (outpars[i+1] == '+')))
-                                       {
-                                               // someones playing silly buggers and trying
-                                               // to put a +- or -+ into the line...
-                                               i++;
-                                       }
-                               }
-                               if (i == strlen(outpars)-1)
-                               {
-                                       if ((outpars[i] == '-') || (outpars[i] == '+'))
-                                       {
-                                               i++;
-                                       }
-                               }
-                       }
+                       log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
+                       delete iter->second;
+                       chanlist.erase(iter);
+               }
+       }
+}
 
-                       z = strlen(b)-1;
-                       if ((b[z] == '-') || (b[z] == '+'))
-                               b[z] == '\0';
 
-                       if ((!strcmp(b,"+")) || (!strcmp(b,"-")))
-                               return;
+void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
+{
+       if ((!src) || (!user) || (!Ptr) || (!reason))
+       {
+               log(DEFAULT,"*** BUG *** kick_channel was given an invalid parameter");
+               return;
+       }
 
-                       WriteTo(user,dest,"MODE :%s",b);
+       int i = 0;
+       int created = 0;
 
-                       if (strlen(dmodes)>MAXMODES)
-                       {
-                               dmodes[MAXMODES-1] = '\0';
-                       }
-                       log(DEBUG,"Stripped mode line");
-                       log(DEBUG,"Line dest is now %s",dmodes);
-                       strncpy(dest->modes,dmodes,MAXMODES);
+       if ((!Ptr) || (!user) || (!src))
+       {
+               return;
+       }
 
-               }
+       log(DEBUG,"kick_channel: removing: %s %s %s",user->nick,Ptr->name,src->nick);
 
+       if (!has_channel(user,Ptr))
+       {
+               WriteServ(src->fd,"441 %s %s %s :They are not on that channel",src->nick, user->nick, Ptr->name);
+               return;
+       }
+       if ((cstatus(src,Ptr) < STATUS_HOP) || (cstatus(src,Ptr) < cstatus(user,Ptr)))
+       {
+               if (cstatus(src,Ptr) == STATUS_HOP)
+               {
+                       WriteServ(src->fd,"482 %s %s :You must be a channel operator",src->nick, Ptr->name);
+               }
+               else
+               {
+                       WriteServ(src->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",src->nick, Ptr->name);
+               }
+               
                return;
        }
        
-       Ptr = FindChan(parameters[0]);
-       if (Ptr)
+       for (int i =0; i != MAXCHANS; i++)
        {
-               if ((cstatus(user,Ptr) < STATUS_HOP) && (Ptr))
+               /* zap it from the channel list of the user */
+               if (user->chans[i].channel)
+               if (!strcasecmp(user->chans[i].channel->name,Ptr->name))
                {
-                       return;
+                       WriteChannel(Ptr,src,"KICK %s %s :%s",Ptr->name, user->nick, reason);
+                       user->chans[i].uc_modes = 0;
+                       user->chans[i].channel = NULL;
+                       log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name);
+                       break;
                }
+       }
+       
+       /* if there are no users left on the channel */
+       if (!usercount(Ptr))
+       {
+               chan_hash::iterator iter = chanlist.find(Ptr->name);
+
+               log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
 
-               process_modes(parameters,user,Ptr,cstatus(user,Ptr),pcnt,false,false,true);
+               /* kill the record */
+               if (iter != chanlist.end())
+               {
+                       log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
+                       delete iter->second;
+                       chanlist.erase(iter);
+               }
        }
 }
 
 
 
+
 /* This function pokes and hacks at a parameter list like the following:
  *
  * PART #winbot, #darkgalaxy :m00!
@@ -4628,45 +2565,6 @@ void handle_notice(char **parameters, int pcnt, userrec *user)
        }
 }
 
-char lst[MAXBUF];
-
-char* chlist(userrec *user)
-{
-       int i = 0;
-       char cmp[MAXBUF];
-
-        log(DEBUG,"chlist: %s",user->nick);
-       strcpy(lst,"");
-       if (!user)
-       {
-               return lst;
-       }
-       for (int i = 0; i != MAXCHANS; i++)
-       {
-               if (user->chans[i].channel != NULL)
-               {
-                       if (user->chans[i].channel->name)
-                       {
-                               strcpy(cmp,user->chans[i].channel->name);
-                               strcat(cmp," ");
-                               if (!strstr(lst,cmp))
-                               {
-                                       if ((!user->chans[i].channel->c_private) && (!user->chans[i].channel->secret))
-                                       {
-                                               strcat(lst,cmode(user,user->chans[i].channel));
-                                               strcat(lst,user->chans[i].channel->name);
-                                               strcat(lst," ");
-                                       }
-                               }
-                       }
-               }
-       }
-       if (strlen(lst))
-       {
-               lst[strlen(lst)-1] = '\0'; // chop trailing space
-       }
-       return lst;
-}
 
 void handle_info(char **parameters, int pcnt, userrec *user)
 {
@@ -4740,13 +2638,6 @@ void handle_whois(char **parameters, int pcnt, userrec *user)
        }
 }
 
-void send_network_quit(const char* nick, const char* reason)
-{
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"Q %s :%s",nick,reason);
-       NetSendToAll(buffer);
-}
-
 void handle_quit(char **parameters, int pcnt, userrec *user)
 {
        user_hash::iterator iter = clientlist.find(user->nick);
@@ -4859,25 +2750,28 @@ void handle_who(char **parameters, int pcnt, userrec *user)
                else
                {
                        userrec* u = Find(parameters[0]);
-                       WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, u->nick, u->ident, u->dhost, u->server, u->nick, u->fullname);
+                       if (u)
+                       {
+                               WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, u->nick, u->ident, u->dhost, u->server, u->nick, u->fullname);
+                       }
+                       WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, parameters[0]);
                }
        }
        if (pcnt == 2)
        {
                 if ((!strcmp(parameters[0],"0")) || (!strcmp(parameters[0],"*")) && (!strcmp(parameters[1],"o")))
                 {
-                        Ptr = user->chans[0].channel;
                        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
                         {
                                 if ((common_channels(user,i->second)) && (isnick(i->second->nick)))
                                 {
                                         if (strchr(i->second->modes,'o'))
                                         {
-                                                WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, i->second->server, i->second->nick, i->second->fullname);
+                                                WriteServ(user->fd,"352 %s %s %s %s %s %s Hr@ :0 %s",user->nick, user->nick, i->second->ident, i->second->dhost, i->second->server, i->second->nick, i->second->fullname);
                                         }
                                 }
                         }
-                        WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, Ptr->name);
+                        WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, user->nick);
                         return;
                 }
        }
@@ -6714,6 +4608,34 @@ void DoSplit(const char* params)
        }
 }
 
+// removes a server. Will NOT remove its users!
+
+void RemoveServer(const char* name)
+{
+       bool go_again = true;
+       while (go_again)
+       {
+               go_again = false;
+               for (int i = 0; i < 32; i++)
+               {
+                       if (me[i] != NULL)
+                       {
+                               for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
+                               {
+                                       if (!strcasecmp(j->GetServerName().c_str(),name))
+                                       {
+                                               j->routes.clear();
+                                               j->CloseConnection();
+                                               me[i]->connectors.erase(j);
+                                               go_again = true;
+                                               break;
+                                       }
+                               }
+                       }
+               }
+       }
+}
+
 void handle_amp(char token,char* params,serverrec* source,serverrec* reply, char* udp_host)
 {
        log(DEBUG,"Netsplit! %s split from mesh, removing!",params);
@@ -6998,12 +4920,26 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
 
                WriteOpers("CONNECT from %s (%s) (their port: %d)",servername,udp_host,atoi(myport));
                
+               ircd_connector* cn = serv->FindHost(servername);
+               
+               if (cn)
+               {
+                       WriteOpers("CONNECT aborted: Server %s already exists from %s",servername,ServerName);
+                       char buffer[MAXBUF];
+                       sprintf(buffer,"E :Server %s already exists!",servername);
+                       serv->SendPacket(buffer,udp_host);
+                       RemoveServer(udp_host);
+                       return;
+               }
+
                if (atoi(revision) != GetRevision())
                {
-                       WriteOpers("Could not link to %s, is an incompatible version %s, our version is %d",servername,revision,GetRevision());
+                       WriteOpers("CONNECT aborted: Could not link to %s, is an incompatible version %s, our version is %d",servername,revision,GetRevision());
                        char buffer[MAXBUF];
                        sprintf(buffer,"E :Version number mismatch");
                        serv->SendPacket(buffer,udp_host);
+                       RemoveServer(udp_host);
+                       RemoveServer(servername);
                        return;
                }
 
@@ -7057,6 +4993,8 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                sprintf(buffer,"E :Access is denied (no matching link block)");
                serv->SendPacket(buffer,udp_host);
                WriteOpers("CONNECT from %s denied, no matching link block",servername);
+               RemoveServer(udp_host);
+               RemoveServer(servername);
                return;
        }
        else
@@ -7127,13 +5065,14 @@ void handle_link_packet(char* udp_msg, char* udp_host, serverrec *serv)
                sprintf(buffer,"E :Access is denied (no matching link block)");
                serv->SendPacket(buffer,udp_host);
                WriteOpers("CONNECT from %s denied, no matching link block",servername);
+               RemoveServer(udp_host);
+               RemoveServer(servername);
                return;
        }
        else
        if (token == 'E') {
                char* error_message = finalparam+2;
                WriteOpers("ERROR from %s: %s",udp_host,error_message);
-               // remove this server from any lists
                return;
        }
        else {
@@ -7419,7 +5358,7 @@ int InspIRCd(void)
                                        char udp_msg[MAXBUF];
                                        strncpy(udp_msg,msgs[ctr].c_str(),MAXBUF);
                                        if (strlen(udp_msg)<1)
-                                               {
+                                       {
                                                log(DEBUG,"Invalid string from %s [route%d]",udp_host,x);
                                                break;
                                        }