diff options
| author | Adam <Adam@anope.org> | 2012-01-26 17:04:59 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2012-01-26 17:04:59 -0500 |
| commit | d09a30295b0f4cd8e0e5c69dbf035166a0c9df9b (patch) | |
| tree | 33ac36e61ddc8c3e835a2aa294aa744c86136ca9 | |
| parent | 0f909273e13ae97112dedd847bd78fc2dd90726b (diff) | |
Also refuse to load memoserv modules if memoserv isn't loaded
| -rw-r--r-- | modules/commands/ms_cancel.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/ms_ignore.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/ms_rsend.cpp | 5 | ||||
| -rw-r--r-- | modules/commands/ms_send.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/ms_sendall.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/ms_staff.cpp | 2 |
6 files changed, 13 insertions, 2 deletions
diff --git a/modules/commands/ms_cancel.cpp b/modules/commands/ms_cancel.cpp index 1f4f9b21c..7e382ac90 100644 --- a/modules/commands/ms_cancel.cpp +++ b/modules/commands/ms_cancel.cpp @@ -73,6 +73,8 @@ class MSCancel : public Module { this->SetAuthor("Anope"); + if (!memoserv) + throw ModuleException("No MemoServ!"); } }; diff --git a/modules/commands/ms_ignore.cpp b/modules/commands/ms_ignore.cpp index fd6d519ab..2acbcb91f 100644 --- a/modules/commands/ms_ignore.cpp +++ b/modules/commands/ms_ignore.cpp @@ -120,6 +120,8 @@ class MSIgnore : public Module { this->SetAuthor("Anope"); + if (!memoserv) + throw ModuleException("No MemoServ!"); } }; diff --git a/modules/commands/ms_rsend.cpp b/modules/commands/ms_rsend.cpp index b414095fd..1033060be 100644 --- a/modules/commands/ms_rsend.cpp +++ b/modules/commands/ms_rsend.cpp @@ -99,9 +99,10 @@ class MSRSend : public Module { this->SetAuthor("Anope"); - if (!Config->MSMemoReceipt) + if (!memoserv) + throw ModuleException("No MemoServ!"); + else if (!Config->MSMemoReceipt) throw ModuleException("Invalid value for memoreceipt"); - } }; diff --git a/modules/commands/ms_send.cpp b/modules/commands/ms_send.cpp index 3e5aeaaad..d125718a7 100644 --- a/modules/commands/ms_send.cpp +++ b/modules/commands/ms_send.cpp @@ -66,6 +66,8 @@ class MSSend : public Module { this->SetAuthor("Anope"); + if (!memoserv) + throw ModuleException("No MemoServ!"); } }; diff --git a/modules/commands/ms_sendall.cpp b/modules/commands/ms_sendall.cpp index 003bbc332..f52f824d6 100644 --- a/modules/commands/ms_sendall.cpp +++ b/modules/commands/ms_sendall.cpp @@ -70,6 +70,8 @@ class MSSendAll : public Module { this->SetAuthor("Anope"); + if (!memoserv) + throw ModuleException("No MemoServ!"); } }; diff --git a/modules/commands/ms_staff.cpp b/modules/commands/ms_staff.cpp index 524190bb4..a41a28be1 100644 --- a/modules/commands/ms_staff.cpp +++ b/modules/commands/ms_staff.cpp @@ -67,6 +67,8 @@ class MSStaff : public Module { this->SetAuthor("Anope"); + if (!memoserv) + throw ModuleException("No MemoServ!"); } }; |