Don't allow SAQUIT, SANICK, SAPART and SAJOIN on ulined clients :)

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

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 2471efe91fae41e54c8c34d24b138217a87c5d7f..2c9273e7099d65bdce93e315af220304d96f63af 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *               <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -40,6 +40,11 @@ class cmd_sajoin : public command_t
                userrec* dest = Srv->FindNick(std::string(parameters[0]));
                if (dest)
                {
+                       if (Srv->IsUlined(dest->server))
+                       {
+                               WriteServ(user->fd,"990 %s :Cannot use an SA command on a u-lined client",user->nick);
+                               return;
+                       }
                        if (!IsValidChannelName(parameters[1]))
                        {
                                /* we didn't need to check this for each character ;) */

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 8fbf8dd5a1ea1faba4a7bce8c5ec972e2e81e17a..5d449d7e05d811eca127d9e52a724ffcea4939c5 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *               <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -39,6 +39,11 @@ class cmd_sanick : public command_t
                userrec* source = Srv->FindNick(std::string(parameters[0]));
                if (source)
                {
+                       if (Srv->IsUlined(source->server))
+                       {
+                               WriteServ(user->fd,"990 %s :Cannot use an SA command on a u-lined client",user->nick);
+                               return;
+                       }
                        if (Srv->IsNick(std::string(parameters[1])))
                        {
                                // FIX by brain: Cant use source->nick here because if it traverses a server link then

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 33b323fea22c60144ec829aefb31a87c8d93d7e5..9203b7d36f4ecbe7286adc27508e524701d83c9d 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *               <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -40,6 +40,11 @@ class cmd_sapart : public command_t
                userrec* dest = Srv->FindNick(std::string(parameters[0]));
                if (dest)
                {
+                       if (Srv->IsUlined(dest->server))
+                       {
+                               WriteServ(user->fd,"990 %s :Cannot use an SA command on a u-lined client",user->nick);
+                               return;
+                       }
                        if (!IsValidChannelName(parameters[1]))
                        {
                                Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index e5722bffeaa0e000954734cfd7b18b6fcd5f1a3e..8174d5a642a6f9b069817547885e1571f40ae1a1 100644 (file)
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *               <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -49,6 +49,11 @@ class cmd_saquit : public command_t
                userrec* dest = Srv->FindNick(std::string(parameters[0]));
                if (dest)
                {
+                       if (Srv->IsUlined(dest->server))
+                       {
+                               WriteServ(user->fd,"990 %s :Cannot use an SA command on a u-lined client",user->nick);
+                               return;
+                       }
                        std::string line = "";
                        for (int i = 1; i < pcnt - 1; i++)
                        {