From 66098d307c036997e51eaea21724615e27fdc3e9 Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Fri, 11 Aug 2006 00:15:07 +0000
Subject: (Bigger than it looks, i did this with perl inplace edit) -- commands
 now take an InspIRCd* param to their constructor, so that you can do stuff
 within them without an extern

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4862 e03df62e-2008-0410-955e-edbf42e46eb7
---
 include/commands/cmd_admin.h        | 2 +-
 include/commands/cmd_away.h         | 2 +-
 include/commands/cmd_commands.h     | 2 +-
 include/commands/cmd_connect.h      | 2 +-
 include/commands/cmd_die.h          | 2 +-
 include/commands/cmd_eline.h        | 2 +-
 include/commands/cmd_gline.h        | 2 +-
 include/commands/cmd_info.h         | 2 +-
 include/commands/cmd_invite.h       | 2 +-
 include/commands/cmd_ison.h         | 2 +-
 include/commands/cmd_join.h         | 2 +-
 include/commands/cmd_kick.h         | 2 +-
 include/commands/cmd_kill.h         | 2 +-
 include/commands/cmd_kline.h        | 2 +-
 include/commands/cmd_links.h        | 2 +-
 include/commands/cmd_list.h         | 2 +-
 include/commands/cmd_loadmodule.h   | 2 +-
 include/commands/cmd_lusers.h       | 2 +-
 include/commands/cmd_map.h          | 2 +-
 include/commands/cmd_modules.h      | 2 +-
 include/commands/cmd_motd.h         | 2 +-
 include/commands/cmd_names.h        | 2 +-
 include/commands/cmd_nick.h         | 2 +-
 include/commands/cmd_notice.h       | 2 +-
 include/commands/cmd_oper.h         | 2 +-
 include/commands/cmd_part.h         | 2 +-
 include/commands/cmd_pass.h         | 2 +-
 include/commands/cmd_ping.h         | 2 +-
 include/commands/cmd_pong.h         | 2 +-
 include/commands/cmd_privmsg.h      | 2 +-
 include/commands/cmd_qline.h        | 2 +-
 include/commands/cmd_quit.h         | 2 +-
 include/commands/cmd_rehash.h       | 2 +-
 include/commands/cmd_restart.h      | 2 +-
 include/commands/cmd_rules.h        | 2 +-
 include/commands/cmd_server.h       | 2 +-
 include/commands/cmd_squit.h        | 2 +-
 include/commands/cmd_stats.h        | 2 +-
 include/commands/cmd_summon.h       | 2 +-
 include/commands/cmd_time.h         | 2 +-
 include/commands/cmd_topic.h        | 2 +-
 include/commands/cmd_trace.h        | 2 +-
 include/commands/cmd_unloadmodule.h | 2 +-
 include/commands/cmd_user.h         | 2 +-
 include/commands/cmd_userhost.h     | 2 +-
 include/commands/cmd_users.h        | 2 +-
 include/commands/cmd_version.h      | 2 +-
 include/commands/cmd_wallops.h      | 2 +-
 include/commands/cmd_who.h          | 2 +-
 include/commands/cmd_whois.h        | 2 +-
 include/commands/cmd_whowas.h       | 2 +-
 include/commands/cmd_zline.h        | 2 +-
 include/ctables.h                   | 5 ++++-
 include/mode.h                      | 2 +-
 54 files changed, 57 insertions(+), 54 deletions(-)

(limited to 'include')

diff --git a/include/commands/cmd_admin.h b/include/commands/cmd_admin.h
index e3972c398..310819d1b 100644
--- a/include/commands/cmd_admin.h
+++ b/include/commands/cmd_admin.h
@@ -24,7 +24,7 @@
 class cmd_admin : public command_t
 {
  public:
-        cmd_admin () : command_t("ADMIN",0,0) { syntax = "[<servername>]"; }
+        cmd_admin (InspIRCd* Instance) : command_t(Instance,"ADMIN",0,0) { syntax = "[<servername>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_away.h b/include/commands/cmd_away.h
index 92a51e549..52257bab1 100644
--- a/include/commands/cmd_away.h
+++ b/include/commands/cmd_away.h
@@ -31,7 +31,7 @@
 class cmd_away : public command_t
 {
  public:
-        cmd_away () : command_t("AWAY",0,0) { syntax = "[<message>]"; }
+        cmd_away (InspIRCd* Instance) : command_t(Instance,"AWAY",0,0) { syntax = "[<message>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_commands.h b/include/commands/cmd_commands.h
index 17b72f07b..031dec606 100644
--- a/include/commands/cmd_commands.h
+++ b/include/commands/cmd_commands.h
@@ -31,7 +31,7 @@
 class cmd_commands : public command_t
 {
  public:
-        cmd_commands () : command_t("COMMANDS",0,0) { }
+        cmd_commands (InspIRCd* Instance) : command_t(Instance,"COMMANDS",0,0) { }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_connect.h b/include/commands/cmd_connect.h
index 40fd8b752..68da0d231 100644
--- a/include/commands/cmd_connect.h
+++ b/include/commands/cmd_connect.h
@@ -24,7 +24,7 @@
 class cmd_connect : public command_t
 {
  public:
-        cmd_connect () : command_t("CONNECT",'o',1) { syntax = "<servername> [<remote-server>]"; }
+        cmd_connect (InspIRCd* Instance) : command_t(Instance,"CONNECT",'o',1) { syntax = "<servername> [<remote-server>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_die.h b/include/commands/cmd_die.h
index ef4555670..cd05c480e 100644
--- a/include/commands/cmd_die.h
+++ b/include/commands/cmd_die.h
@@ -31,7 +31,7 @@
 class cmd_die : public command_t
 {
  public:
-        cmd_die () : command_t("DIE",'o',1) { syntax = "<password>"; }
+        cmd_die (InspIRCd* Instance) : command_t(Instance,"DIE",'o',1) { syntax = "<password>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_eline.h b/include/commands/cmd_eline.h
index 85a1da47c..23cba4964 100644
--- a/include/commands/cmd_eline.h
+++ b/include/commands/cmd_eline.h
@@ -31,7 +31,7 @@
 class cmd_eline : public command_t
 {
  public:
-        cmd_eline () : command_t("ELINE",'o',1) { syntax = "<ident@host> [<duration> :<reason>]"; }
+        cmd_eline (InspIRCd* Instance) : command_t(Instance,"ELINE",'o',1) { syntax = "<ident@host> [<duration> :<reason>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_gline.h b/include/commands/cmd_gline.h
index 79552a274..622661e87 100644
--- a/include/commands/cmd_gline.h
+++ b/include/commands/cmd_gline.h
@@ -31,7 +31,7 @@
 class cmd_gline : public command_t
 {
  public:
-        cmd_gline () : command_t("GLINE",'o',1) { syntax = "<ident@host> [<duration> :<reason>]"; }
+        cmd_gline (InspIRCd* Instance) : command_t(Instance,"GLINE",'o',1) { syntax = "<ident@host> [<duration> :<reason>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_info.h b/include/commands/cmd_info.h
index 1b48f80b8..bcf12c146 100644
--- a/include/commands/cmd_info.h
+++ b/include/commands/cmd_info.h
@@ -31,7 +31,7 @@
 class cmd_info : public command_t
 {
  public:
-        cmd_info () : command_t("INFO",0,0) { syntax = "[<servermask>]"; }
+        cmd_info (InspIRCd* Instance) : command_t(Instance,"INFO",0,0) { syntax = "[<servermask>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_invite.h b/include/commands/cmd_invite.h
index b6c78c13c..88a0f180b 100644
--- a/include/commands/cmd_invite.h
+++ b/include/commands/cmd_invite.h
@@ -31,7 +31,7 @@
 class cmd_invite : public command_t
 {
  public:
-        cmd_invite () : command_t("INVITE",0,0) { syntax = "[<nick> <channel>]"; }
+        cmd_invite (InspIRCd* Instance) : command_t(Instance,"INVITE",0,0) { syntax = "[<nick> <channel>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_ison.h b/include/commands/cmd_ison.h
index e45c61e8d..0bc5da408 100644
--- a/include/commands/cmd_ison.h
+++ b/include/commands/cmd_ison.h
@@ -31,7 +31,7 @@
 class cmd_ison : public command_t
 {
  public:
-        cmd_ison () : command_t("ISON",0,0) { syntax = "<nick> {nick}"; }
+        cmd_ison (InspIRCd* Instance) : command_t(Instance,"ISON",0,0) { syntax = "<nick> {nick}"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_join.h b/include/commands/cmd_join.h
index 58863bb4c..4ead0e80e 100644
--- a/include/commands/cmd_join.h
+++ b/include/commands/cmd_join.h
@@ -31,7 +31,7 @@
 class cmd_join : public command_t
 {
  public:
-        cmd_join () : command_t("JOIN",0,1) { syntax = "<channel>{,<channel>} {<key>{,<key>}}"; }
+        cmd_join (InspIRCd* Instance) : command_t(Instance,"JOIN",0,1) { syntax = "<channel>{,<channel>} {<key>{,<key>}}"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_kick.h b/include/commands/cmd_kick.h
index 097636965..e57f9f78c 100644
--- a/include/commands/cmd_kick.h
+++ b/include/commands/cmd_kick.h
@@ -31,7 +31,7 @@
 class cmd_kick : public command_t
 {
  public:
-        cmd_kick () : command_t("KICK",0,2) { syntax = "<channel> <nick>{,<nick>} [<reason>]"; }
+        cmd_kick (InspIRCd* Instance) : command_t(Instance,"KICK",0,2) { syntax = "<channel> <nick>{,<nick>} [<reason>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_kill.h b/include/commands/cmd_kill.h
index 8f7a40141..0bf7517f6 100644
--- a/include/commands/cmd_kill.h
+++ b/include/commands/cmd_kill.h
@@ -31,7 +31,7 @@
 class cmd_kill : public command_t
 {
  public:
-        cmd_kill () : command_t("KILL",'o',2) { syntax = "<nickname> <reason>"; }
+        cmd_kill (InspIRCd* Instance) : command_t(Instance,"KILL",'o',2) { syntax = "<nickname> <reason>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_kline.h b/include/commands/cmd_kline.h
index de8a26779..86521484a 100644
--- a/include/commands/cmd_kline.h
+++ b/include/commands/cmd_kline.h
@@ -31,7 +31,7 @@
 class cmd_kline : public command_t
 {
  public:
-        cmd_kline () : command_t("KLINE",'o',1) { syntax = "<ident@host> [<duration> :<reason>]"; }
+        cmd_kline (InspIRCd* Instance) : command_t(Instance,"KLINE",'o',1) { syntax = "<ident@host> [<duration> :<reason>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_links.h b/include/commands/cmd_links.h
index ef465fe37..284728aee 100644
--- a/include/commands/cmd_links.h
+++ b/include/commands/cmd_links.h
@@ -31,7 +31,7 @@
 class cmd_links : public command_t
 {
  public:
-        cmd_links () : command_t("LINKS",0,0) { }
+        cmd_links (InspIRCd* Instance) : command_t(Instance,"LINKS",0,0) { }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_list.h b/include/commands/cmd_list.h
index 29e61d17a..af7d6d774 100644
--- a/include/commands/cmd_list.h
+++ b/include/commands/cmd_list.h
@@ -31,7 +31,7 @@
 class cmd_list : public command_t
 {
  public:
-        cmd_list () : command_t("LIST",0,0) { }
+        cmd_list (InspIRCd* Instance) : command_t(Instance,"LIST",0,0) { }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_loadmodule.h b/include/commands/cmd_loadmodule.h
index 0aa7d566b..4e86058ce 100644
--- a/include/commands/cmd_loadmodule.h
+++ b/include/commands/cmd_loadmodule.h
@@ -31,7 +31,7 @@
 class cmd_loadmodule : public command_t
 {
  public:
-        cmd_loadmodule () : command_t("LOADMODULE",'o',1) { syntax = "<modulename>"; }
+        cmd_loadmodule (InspIRCd* Instance) : command_t(Instance,"LOADMODULE",'o',1) { syntax = "<modulename>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_lusers.h b/include/commands/cmd_lusers.h
index 156635af0..3600cb8e9 100644
--- a/include/commands/cmd_lusers.h
+++ b/include/commands/cmd_lusers.h
@@ -31,7 +31,7 @@
 class cmd_lusers : public command_t
 {
  public:
-        cmd_lusers () : command_t("LUSERS",0,0) { }
+        cmd_lusers (InspIRCd* Instance) : command_t(Instance,"LUSERS",0,0) { }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_map.h b/include/commands/cmd_map.h
index c560198df..c472bada4 100644
--- a/include/commands/cmd_map.h
+++ b/include/commands/cmd_map.h
@@ -31,7 +31,7 @@
 class cmd_map : public command_t
 {
  public:
-        cmd_map () : command_t("MAP",0,0) { }
+        cmd_map (InspIRCd* Instance) : command_t(Instance,"MAP",0,0) { }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_modules.h b/include/commands/cmd_modules.h
index eb8b1c882..75b24d108 100644
--- a/include/commands/cmd_modules.h
+++ b/include/commands/cmd_modules.h
@@ -31,7 +31,7 @@
 class cmd_modules : public command_t
 {
  public:
-        cmd_modules () : command_t("MODULES",0,0) { syntax = "[debug]"; }
+        cmd_modules (InspIRCd* Instance) : command_t(Instance,"MODULES",0,0) { syntax = "[debug]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_motd.h b/include/commands/cmd_motd.h
index c3401b127..9389ea61e 100644
--- a/include/commands/cmd_motd.h
+++ b/include/commands/cmd_motd.h
@@ -31,7 +31,7 @@
 class cmd_motd : public command_t
 {
  public:
-        cmd_motd () : command_t("MOTD",0,0) { syntax = "[<servername>]"; }
+        cmd_motd (InspIRCd* Instance) : command_t(Instance,"MOTD",0,0) { syntax = "[<servername>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_names.h b/include/commands/cmd_names.h
index fdcf2ea40..1ec8e811c 100644
--- a/include/commands/cmd_names.h
+++ b/include/commands/cmd_names.h
@@ -31,7 +31,7 @@
 class cmd_names : public command_t
 {
  public:
-        cmd_names () : command_t("NAMES",0,0) { syntax = "{<channel>{,<channel>}}"; }
+        cmd_names (InspIRCd* Instance) : command_t(Instance,"NAMES",0,0) { syntax = "{<channel>{,<channel>}}"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_nick.h b/include/commands/cmd_nick.h
index a90930558..ee9195f0b 100644
--- a/include/commands/cmd_nick.h
+++ b/include/commands/cmd_nick.h
@@ -31,7 +31,7 @@
 class cmd_nick : public command_t
 {
  public:
-        cmd_nick () : command_t("NICK",0,1) { syntax = "<newnick>"; }
+        cmd_nick (InspIRCd* Instance) : command_t(Instance,"NICK",0,1) { syntax = "<newnick>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_notice.h b/include/commands/cmd_notice.h
index e91c65bb1..19fbc3365 100644
--- a/include/commands/cmd_notice.h
+++ b/include/commands/cmd_notice.h
@@ -31,7 +31,7 @@
 class cmd_notice : public command_t
 {
  public:
-        cmd_notice () : command_t("NOTICE",0,2) { syntax = "<target>{,<target>} <message>"; }
+        cmd_notice (InspIRCd* Instance) : command_t(Instance,"NOTICE",0,2) { syntax = "<target>{,<target>} <message>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_oper.h b/include/commands/cmd_oper.h
index 40bab6b06..afb10e3cb 100644
--- a/include/commands/cmd_oper.h
+++ b/include/commands/cmd_oper.h
@@ -33,7 +33,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist);
 class cmd_oper : public command_t
 {
  public:
-        cmd_oper () : command_t("OPER",0,2) { syntax = "<username> <password>"; }
+        cmd_oper (InspIRCd* Instance) : command_t(Instance,"OPER",0,2) { syntax = "<username> <password>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_part.h b/include/commands/cmd_part.h
index 1aaa7bca6..59af15a87 100644
--- a/include/commands/cmd_part.h
+++ b/include/commands/cmd_part.h
@@ -31,7 +31,7 @@
 class cmd_part : public command_t
 {
  public:
-        cmd_part () : command_t("PART",0,1) { syntax = "<channel>{,<channel>} [<reason>]"; }
+        cmd_part (InspIRCd* Instance) : command_t(Instance,"PART",0,1) { syntax = "<channel>{,<channel>} [<reason>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_pass.h b/include/commands/cmd_pass.h
index f2399f57c..412710a2b 100644
--- a/include/commands/cmd_pass.h
+++ b/include/commands/cmd_pass.h
@@ -31,7 +31,7 @@
 class cmd_pass : public command_t
 {
  public:
-        cmd_pass () : command_t("PASS",0,1) { syntax = "<password>"; }
+        cmd_pass (InspIRCd* Instance) : command_t(Instance,"PASS",0,1) { syntax = "<password>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_ping.h b/include/commands/cmd_ping.h
index c131af628..7afabc816 100644
--- a/include/commands/cmd_ping.h
+++ b/include/commands/cmd_ping.h
@@ -31,7 +31,7 @@
 class cmd_ping : public command_t
 {
  public:
-        cmd_ping () : command_t("PING",0,1) { syntax = "<servername> [:<servername>]"; }
+        cmd_ping (InspIRCd* Instance) : command_t(Instance,"PING",0,1) { syntax = "<servername> [:<servername>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_pong.h b/include/commands/cmd_pong.h
index 9d2006e0f..2857f0b86 100644
--- a/include/commands/cmd_pong.h
+++ b/include/commands/cmd_pong.h
@@ -31,7 +31,7 @@
 class cmd_pong : public command_t
 {
  public:
-        cmd_pong () : command_t("PONG",0,1) { syntax = "<ping-text>"; }
+        cmd_pong (InspIRCd* Instance) : command_t(Instance,"PONG",0,1) { syntax = "<ping-text>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_privmsg.h b/include/commands/cmd_privmsg.h
index 12b11cb22..8ed0bbe8d 100644
--- a/include/commands/cmd_privmsg.h
+++ b/include/commands/cmd_privmsg.h
@@ -31,7 +31,7 @@
 class cmd_privmsg : public command_t
 {
  public:
-        cmd_privmsg () : command_t("PRIVMSG",0,2) { syntax = "<target>{,<target>} <message>"; }
+        cmd_privmsg (InspIRCd* Instance) : command_t(Instance,"PRIVMSG",0,2) { syntax = "<target>{,<target>} <message>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_qline.h b/include/commands/cmd_qline.h
index 65232ee28..365561929 100644
--- a/include/commands/cmd_qline.h
+++ b/include/commands/cmd_qline.h
@@ -31,7 +31,7 @@
 class cmd_qline : public command_t
 {
  public:
-        cmd_qline () : command_t("QLINE",'o',1) { syntax = "<nick> [<duration> :<reason>]"; }
+        cmd_qline (InspIRCd* Instance) : command_t(Instance,"QLINE",'o',1) { syntax = "<nick> [<duration> :<reason>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_quit.h b/include/commands/cmd_quit.h
index 891b2f0a3..937836e81 100644
--- a/include/commands/cmd_quit.h
+++ b/include/commands/cmd_quit.h
@@ -31,7 +31,7 @@
 class cmd_quit : public command_t
 {
  public:
-        cmd_quit () : command_t("QUIT",0,0) { syntax = "[<message>]"; }
+        cmd_quit (InspIRCd* Instance) : command_t(Instance,"QUIT",0,0) { syntax = "[<message>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_rehash.h b/include/commands/cmd_rehash.h
index f9690a3ee..cb2d2e666 100644
--- a/include/commands/cmd_rehash.h
+++ b/include/commands/cmd_rehash.h
@@ -31,7 +31,7 @@
 class cmd_rehash : public command_t
 {
  public:
-        cmd_rehash () : command_t("REHASH",'o',0) { syntax = "[<servermask>]"; }
+        cmd_rehash (InspIRCd* Instance) : command_t(Instance,"REHASH",'o',0) { syntax = "[<servermask>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_restart.h b/include/commands/cmd_restart.h
index 394cf0df2..6d7e82f23 100644
--- a/include/commands/cmd_restart.h
+++ b/include/commands/cmd_restart.h
@@ -31,7 +31,7 @@
 class cmd_restart : public command_t
 {
  public:
-        cmd_restart () : command_t("RESTART",'o',1) { syntax = "<password>"; }
+        cmd_restart (InspIRCd* Instance) : command_t(Instance,"RESTART",'o',1) { syntax = "<password>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_rules.h b/include/commands/cmd_rules.h
index 36ccda645..ae6bc86c7 100644
--- a/include/commands/cmd_rules.h
+++ b/include/commands/cmd_rules.h
@@ -31,7 +31,7 @@
 class cmd_rules : public command_t
 {
  public:
-        cmd_rules () : command_t("RULES",0,0) { syntax = "[<servername>]"; }
+        cmd_rules (InspIRCd* Instance) : command_t(Instance,"RULES",0,0) { syntax = "[<servername>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_server.h b/include/commands/cmd_server.h
index 05e1d57d0..548c361a8 100644
--- a/include/commands/cmd_server.h
+++ b/include/commands/cmd_server.h
@@ -31,7 +31,7 @@
 class cmd_server : public command_t
 {
  public:
-        cmd_server () : command_t("SERVER",0,0) { }
+        cmd_server (InspIRCd* Instance) : command_t(Instance,"SERVER",0,0) { }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_squit.h b/include/commands/cmd_squit.h
index d22ee9264..11da3d832 100644
--- a/include/commands/cmd_squit.h
+++ b/include/commands/cmd_squit.h
@@ -31,7 +31,7 @@
 class cmd_squit : public command_t
 {
  public:
-        cmd_squit () : command_t("SQUIT",'o',1) { syntax = "<servername> [<reason>]"; }
+        cmd_squit (InspIRCd* Instance) : command_t(Instance,"SQUIT",'o',1) { syntax = "<servername> [<reason>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_stats.h b/include/commands/cmd_stats.h
index 8f98ad599..7e4cf905a 100644
--- a/include/commands/cmd_stats.h
+++ b/include/commands/cmd_stats.h
@@ -33,7 +33,7 @@ void DoStats(char statschar, userrec* user, string_list &results);
 class cmd_stats : public command_t
 {
  public:
-        cmd_stats () : command_t("STATS",0,1) { syntax = "[<servername>] <stats-symbol>"; }
+        cmd_stats (InspIRCd* Instance) : command_t(Instance,"STATS",0,1) { syntax = "[<servername>] <stats-symbol>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_summon.h b/include/commands/cmd_summon.h
index 467b1f71a..c0bc6e17a 100644
--- a/include/commands/cmd_summon.h
+++ b/include/commands/cmd_summon.h
@@ -31,7 +31,7 @@
 class cmd_summon : public command_t
 {
  public:
-        cmd_summon () : command_t("SUMMON",0,0) { }
+        cmd_summon (InspIRCd* Instance) : command_t(Instance,"SUMMON",0,0) { }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_time.h b/include/commands/cmd_time.h
index 9a3dd0c32..506bb8527 100644
--- a/include/commands/cmd_time.h
+++ b/include/commands/cmd_time.h
@@ -31,7 +31,7 @@
 class cmd_time : public command_t
 {
  public:
-        cmd_time () : command_t("TIME",0,0) { syntax = "[<servername>]"; }
+        cmd_time (InspIRCd* Instance) : command_t(Instance,"TIME",0,0) { syntax = "[<servername>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_topic.h b/include/commands/cmd_topic.h
index 2b6348803..6475adb43 100644
--- a/include/commands/cmd_topic.h
+++ b/include/commands/cmd_topic.h
@@ -31,7 +31,7 @@
 class cmd_topic : public command_t
 {
  public:
-        cmd_topic () : command_t("TOPIC",0,1) { syntax = "<channel> [<topic>]"; }
+        cmd_topic (InspIRCd* Instance) : command_t(Instance,"TOPIC",0,1) { syntax = "<channel> [<topic>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_trace.h b/include/commands/cmd_trace.h
index 44f308012..84ea8b6c3 100644
--- a/include/commands/cmd_trace.h
+++ b/include/commands/cmd_trace.h
@@ -31,7 +31,7 @@
 class cmd_trace : public command_t
 {
  public:
-        cmd_trace () : command_t("TRACE",'o',0) { syntax = "[<object>]"; }
+        cmd_trace (InspIRCd* Instance) : command_t(Instance,"TRACE",'o',0) { syntax = "[<object>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_unloadmodule.h b/include/commands/cmd_unloadmodule.h
index 05c5c32d6..222464525 100644
--- a/include/commands/cmd_unloadmodule.h
+++ b/include/commands/cmd_unloadmodule.h
@@ -31,7 +31,7 @@
 class cmd_unloadmodule : public command_t
 {
  public:
-        cmd_unloadmodule () : command_t("UNLOADMODULE",'o',1) { syntax = "<modulename>"; }
+        cmd_unloadmodule (InspIRCd* Instance) : command_t(Instance,"UNLOADMODULE",'o',1) { syntax = "<modulename>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_user.h b/include/commands/cmd_user.h
index b8e3201c1..f529f6108 100644
--- a/include/commands/cmd_user.h
+++ b/include/commands/cmd_user.h
@@ -31,7 +31,7 @@
 class cmd_user : public command_t
 {
  public:
-        cmd_user () : command_t("USER",0,4) { syntax = "<username> <localhost> <remotehost> <GECOS>"; }
+        cmd_user (InspIRCd* Instance) : command_t(Instance,"USER",0,4) { syntax = "<username> <localhost> <remotehost> <GECOS>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_userhost.h b/include/commands/cmd_userhost.h
index e50813b4e..f065b468c 100644
--- a/include/commands/cmd_userhost.h
+++ b/include/commands/cmd_userhost.h
@@ -31,7 +31,7 @@
 class cmd_userhost : public command_t
 {
  public:
-        cmd_userhost () : command_t("USERHOST",0,1) { syntax = "<nick>{,<nick>}"; }
+        cmd_userhost (InspIRCd* Instance) : command_t(Instance,"USERHOST",0,1) { syntax = "<nick>{,<nick>}"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_users.h b/include/commands/cmd_users.h
index a5e92f1a2..552a42382 100644
--- a/include/commands/cmd_users.h
+++ b/include/commands/cmd_users.h
@@ -31,7 +31,7 @@
 class cmd_users : public command_t
 {
  public:
-        cmd_users () : command_t("USERS",0,0) { }
+        cmd_users (InspIRCd* Instance) : command_t(Instance,"USERS",0,0) { }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_version.h b/include/commands/cmd_version.h
index 55b643f6e..478577a68 100644
--- a/include/commands/cmd_version.h
+++ b/include/commands/cmd_version.h
@@ -31,7 +31,7 @@
 class cmd_version : public command_t
 {
  public:
-        cmd_version () : command_t("VERSION",0,0) { syntax = "[<servername>]"; }
+        cmd_version (InspIRCd* Instance) : command_t(Instance,"VERSION",0,0) { syntax = "[<servername>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_wallops.h b/include/commands/cmd_wallops.h
index b8a4f690a..c637e6e98 100644
--- a/include/commands/cmd_wallops.h
+++ b/include/commands/cmd_wallops.h
@@ -31,7 +31,7 @@
 class cmd_wallops : public command_t
 {
  public:
-        cmd_wallops () : command_t("WALLOPS",'o',1) { syntax = "<any-text>"; }
+        cmd_wallops (InspIRCd* Instance) : command_t(Instance,"WALLOPS",'o',1) { syntax = "<any-text>"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_who.h b/include/commands/cmd_who.h
index d76e92aec..1181ac0e1 100644
--- a/include/commands/cmd_who.h
+++ b/include/commands/cmd_who.h
@@ -31,7 +31,7 @@
 class cmd_who : public command_t
 {
  public:
-        cmd_who () : command_t("WHO",0,1) { syntax = "<server>|<nickname>|<channel>|<realname>|<host>|0 [ohur]"; }
+        cmd_who (InspIRCd* Instance) : command_t(Instance,"WHO",0,1) { syntax = "<server>|<nickname>|<channel>|<realname>|<host>|0 [ohur]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_whois.h b/include/commands/cmd_whois.h
index 0daa1144c..5f44e3530 100644
--- a/include/commands/cmd_whois.h
+++ b/include/commands/cmd_whois.h
@@ -33,7 +33,7 @@ void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long i
 class cmd_whois : public command_t
 {
  public:
-        cmd_whois () : command_t("WHOIS",0,1) { syntax = "<nick>{,<nick>}"; }
+        cmd_whois (InspIRCd* Instance) : command_t(Instance,"WHOIS",0,1) { syntax = "<nick>{,<nick>}"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h
index 6ef30324f..951ba0f28 100644
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -31,7 +31,7 @@
 class cmd_whowas : public command_t
 {
  public:
-        cmd_whowas () : command_t("WHOWAS",0,1) { syntax = "<nick>{,<nick>}"; }
+        cmd_whowas (InspIRCd* Instance) : command_t(Instance,"WHOWAS",0,1) { syntax = "<nick>{,<nick>}"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/commands/cmd_zline.h b/include/commands/cmd_zline.h
index d27defa0f..0e2f1041d 100644
--- a/include/commands/cmd_zline.h
+++ b/include/commands/cmd_zline.h
@@ -31,7 +31,7 @@
 class cmd_zline : public command_t
 {
  public:
-        cmd_zline () : command_t("ZLINE",'o',1) { syntax = "<ipmask> [<duration> :<reason>]"; }
+        cmd_zline (InspIRCd* Instance) : command_t(Instance,"ZLINE",'o',1) { syntax = "<ipmask> [<duration> :<reason>]"; }
         void Handle(const char** parameters, int pcnt, userrec *user);
 };
 
diff --git a/include/ctables.h b/include/ctables.h
index 0b523a77f..c997cf68a 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -23,6 +23,7 @@
 #include "base.h"
 
 class userrec;
+class InspIRCd;
 
 /*typedef void (handlerfunc) (char**, int, userrec*);*/
 
@@ -30,6 +31,8 @@ class userrec;
  */
 class command_t : public Extensible
 {
+ protected:
+	InspIRCd* ServerInstance;
  public:
 	/** Command name
 	*/
@@ -57,7 +60,7 @@ class command_t : public Extensible
 	 */
 	std::string syntax;
 
-	command_t(const std::string &cmd, char flags, int minpara) : command(cmd), flags_needed(flags), min_params(minpara), disabled(false)
+	command_t(InspIRCd* Instance, const std::string &cmd, char flags, int minpara) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false)
 	{
 		use_count = total_bytes = 0;
 		source = "<core>";
diff --git a/include/mode.h b/include/mode.h
index 2e51946d0..121969fef 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -400,7 +400,7 @@ class cmd_mode : public command_t
 	/**
 	 * Standard constructor
 	 */
-	cmd_mode () : command_t("MODE",0,1) { syntax = "<target> <modes> {<mode-parameters>}"; }
+	cmd_mode (InspIRCd* Instance) : command_t(Instance,"MODE",0,1) { syntax = "<target> <modes> {<mode-parameters>}"; }
 	/**
 	 * Handle MODE
 	 */
-- 
cgit v1.2.3