Merge pull request #242 from SaberUK/insp20-doxygen-fix

[2.0] Doxygen fixes

diff --git a/configure b/configure
index 61313c9fe2804e60be87b4550fa45a2e56799db0..8edcdfe08b0a2179c54c47f88f696d3d809c6530 100755 (executable)
--- a/configure
+++ b/configure
@@ -625,8 +625,8 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
        }
        else
        {
-               print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed if\n";
-               print "you intend to use OpenSSL, or that GnuTLS is in your path if you intend\nto use GnuTLS.\n\n";
+               print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed and\n";
+               print "is in your path.\n\n";
        }
 
        yesno('MODUPDATE',"Would you like to check for updates to third-party modules?");

diff --git a/src/configreader.cpp b/src/configreader.cpp
index b0bb6a92feb8455ee8b4c76edf2cc7f77415721c..1e6d96d0d815c08b076acb63fe42ebee84533c28 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -436,8 +436,11 @@ static const Deprecated ChangedConfig[] = {
        {"options", "somaxconn",                "has been moved to <performance:somaxconn> as of 1.2a3"},
        {"options", "netbuffersize",    "has been moved to <performance:netbuffersize> as of 1.2a3"},
        {"options", "maxwho",           "has been moved to <performance:maxwho> as of 1.2a3"},
-       {"options",     "loglevel",             "1.2 does not use the loglevel value. Please define <log> tags instead."},
+       {"options",     "loglevel",             "1.2+ does not use the loglevel value. Please define <log> tags instead."},
        {"die",     "value",            "you need to reread your config"},
+       {"bind",    "transport",                "has been moved to <bind:ssl> as of 2.0a1"},
+       {"link",    "transport",                "has been moved to <link:ssl> as of 2.0a1"},
+       
 };
 
 void ServerConfig::Fill()

diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index baa6355ade0ba51c30b851321b850b2d2e8b0669..1a0734ed9b01506f3ec3d4949f5ad02602576847 100644 (file)
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -18,14 +18,11 @@
 
 
 #include "inspircd.h"
-#include <stdarg.h>
 
 /* $ModDesc: Provides channelmode +d <int>, to deny messages to a channel until <int> seconds. */
 
 class DelayMsgMode : public ModeHandler
 {
- private:
-       CUList empty;
  public:
        LocalIntExt jointime;
        DelayMsgMode(Module* Parent) : ModeHandler(Parent, "delaymsg", 'd', PARAM_SETONLY, MODETYPE_CHANNEL)
@@ -55,7 +52,6 @@ class ModuleDelayMsg : public Module
                Implementation eventlist[] = { I_OnUserJoin, I_OnUserPreMessage};
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
-       ~ModuleDelayMsg();
        Version GetVersion();
        void OnUserJoin(Membership* memb, bool sync, bool created, CUList&);
        ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list);
@@ -65,6 +61,9 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel
 {
        if (adding)
        {
+               if ((channel->IsModeSet('d')) && (channel->GetModeParameter('d') == parameter))
+                       return MODEACTION_DENY;
+
                /* Setting a new limit, sanity check */
                long limit = atoi(parameter.c_str());
 
@@ -90,10 +89,6 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel
        return MODEACTION_ALLOW;
 }
 
-ModuleDelayMsg::~ModuleDelayMsg()
-{
-}
-
 Version ModuleDelayMsg::GetVersion()
 {
        return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_VENDOR);
@@ -101,7 +96,7 @@ Version ModuleDelayMsg::GetVersion()
 
 void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&)
 {
-       if (memb->chan->IsModeSet('d'))
+       if ((IS_LOCAL(memb->user)) && (memb->chan->IsModeSet('d')))
        {
                djm.jointime.set(memb, ServerInstance->Time());
        }
@@ -110,7 +105,7 @@ void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CULis
 ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
 {
        /* Server origin */
-       if (!user)
+       if ((!user) || (!IS_LOCAL(user)))
                return MOD_RES_PASSTHRU;
 
        if (target_type != TYPE_CHANNEL)
@@ -121,7 +116,7 @@ ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_ty
 
        if (!memb)
                return MOD_RES_PASSTHRU;
-       
+
        time_t ts = djm.jointime.get(memb);
 
        if (ts == 0)

diff --git a/src/modules/m_spanningtree/svspart.cpp b/src/modules/m_spanningtree/svspart.cpp
index 7edc720af4a9e4c53b816f7e3f618deb52398019..35bce781d0561f596a322ffadf352a3c68e50435 100644 (file)
--- a/src/modules/m_spanningtree/svspart.cpp
+++ b/src/modules/m_spanningtree/svspart.cpp
@@ -30,17 +30,19 @@
 
 CmdResult CommandSVSPart::Handle(const std::vector<std::string>& parameters, User *user)
 {
-       std::string reason = "Services forced part";
+       User* u = ServerInstance->FindUUID(parameters[0]);
+       if (!u)
+               return CMD_FAILURE;
 
-       if (parameters.size() == 3)
-               reason = parameters[2];
-
-       User* u = ServerInstance->FindNick(parameters[0]);
        Channel* c = ServerInstance->FindChan(parameters[1]);
+       if (!c)
+               return CMD_FAILURE;
 
-       if (u && IS_LOCAL(u))
+       if (IS_LOCAL(u))
+       {
+               std::string reason = (parameters.size() == 3) ? parameters[2] : "Services forced part";
                c->PartUser(u, reason);
-
+       }
        return CMD_SUCCESS;
 }