Add VF_COMMON to a lot modules which require it. Reported by danielg in bug #369 and bug #370. Thanks, and sorry for the delay. Also fix one or two erroneous CMD_FAILURE that are more understandable as CMD_LOCALONLY. :)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7641 e03df62e-2008-0410-955e-edbf42e46eb7

30 files changed, 34 insertions, 32 deletions

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index c8e6a86b9..9835bdf43 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -195,7 +195,7 @@ class ModuleCBan : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	std::string EncodeCBan(const CBan &ban)
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 0ec88d7e1..ab762eabb 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -112,7 +112,7 @@ class ModuleChgHost : public Module
 	
 	Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 168adcc93..e13d211f4 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -83,7 +83,7 @@ public:
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index a4a31714b..763ef3c17 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -81,7 +81,7 @@ public:
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 57b525e42..124609536 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -224,7 +224,7 @@ class ModuleCustomTitle : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index eb20f4f99..0e3bd7ee2 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -91,7 +91,7 @@ class ModuleCycle : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index bfec3c5e1..6d8ccc7d3 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -482,7 +482,7 @@ class ModuleDCCAllow : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index e2ada413b..06413f0ec 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -49,7 +49,7 @@ class cmd_devoice : public command_t
 			ServerInstance->SendMode(modes,3,n);
 			delete n;
 
-			/* route it */
+			/* route it -- SendMode doesn't distribute over the whole network */
 			return CMD_SUCCESS;
 		}
 
@@ -74,7 +74,7 @@ class ModuleDeVoice : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index ae87451ba..f65e01d88 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -134,7 +134,7 @@ class ModuleGlobalLoad : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 3bc45cceb..8e7e14481 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -122,7 +122,7 @@ class ModuleKnock : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 26d5bfbd7..01b9d20a7 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -123,7 +123,7 @@ class ModuleNickLock : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index d28087ba8..fcd6ae958 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -280,7 +280,7 @@ class ModuleRemove : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,1,0,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 1, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 0c9822fb9..75e017044 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -106,7 +106,7 @@ class ModuleSajoin : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 88d0d666e..f4f00f55a 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -91,7 +91,7 @@ class ModuleSaMode : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,2,2,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 715d978c3..02f0c3fa5 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -89,7 +89,7 @@ class ModuleSanick : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 829607e58..1713e07c0 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -104,7 +104,7 @@ class ModuleSapart : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index d2fa8e89b..65dd4e21a 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -74,7 +74,7 @@ class ModuleSaquit : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index e69a944e7..48c31d4e2 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -100,7 +100,7 @@ class ModuleSetHost : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 3f33061cd..ecdf63fb0 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -74,7 +74,7 @@ class ModuleSetIdent : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index e16369aa4..c9368086f 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -67,7 +67,7 @@ class ModuleSetIdle : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index 586c6f84e..de3131c77 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -72,7 +72,7 @@ class ModuleSetName : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index b05689056..f44243126 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -208,7 +208,7 @@ class ModuleSilence : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp
index 06eee9dd4..1bb3b26e5 100644
--- a/src/modules/m_silence_ext.cpp
+++ b/src/modules/m_silence_ext.cpp
@@ -365,7 +365,7 @@ class ModuleSilence : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index 20b59977c..b33a0ba54 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -93,7 +93,7 @@ class cmd_spylist : public command_t
 		user->WriteServ("323 %s :End of channel list.",user->nick);
 
 		/* Dont send out across the network */
-		return CMD_FAILURE;
+		return CMD_LOCALONLY;
 	}
 };
 
@@ -132,7 +132,7 @@ class cmd_spynames : public command_t
 			user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
 		}
 
-		return CMD_FAILURE;
+		return CMD_LOCALONLY;
 	}
 };
 
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 4058c04d0..616655085 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -232,7 +232,7 @@ class ModuleSVSHold : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR|VF_COMMON,API_VERSION);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	std::string EncodeSVSHold(const SVSHold* ban)
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index d635654a5..b892d14ef 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -260,7 +260,7 @@ class ModuleSWhois : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index ae3da7549..e7655778d 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -196,7 +196,7 @@ class ModuleTimedBans : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 296d52300..5223a1af1 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -45,7 +45,7 @@ class cmd_userip : public command_t
 		user->WriteServ(retbuf);
 
 		/* Dont send to the network */
-		return CMD_FAILURE;
+		return CMD_LOCALONLY;
 	}
 };
 
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index c77a3f85f..3ce910456 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -38,16 +38,18 @@ class cmd_vhost : public command_t
 			std::string mask = Conf->ReadValue("vhost","host",index);
 			std::string username = Conf->ReadValue("vhost","user",index);
 			std::string pass = Conf->ReadValue("vhost","pass",index);
+
 			if ((!strcmp(parameters[0],username.c_str())) && (!strcmp(parameters[1],pass.c_str())))
 			{
 				if (!mask.empty())
 				{
 					user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
 					user->ChangeDisplayedHost(mask.c_str());
-					return CMD_FAILURE;
+					return CMD_LOCALONLY;
 				}
 			}
 		}
+
 		user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
 		return CMD_FAILURE;
 	}
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 552e3317a..1a2fcb76e 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -464,7 +464,7 @@ class Modulewatch : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };