Make it optional to show opermotd on /OPER, defaults to showing the motd if not specified.

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

2 files changed, 8 insertions, 2 deletions

diff --git a/conf/modules.conf.example b/conf/modules.conf.example
index 7fb0b69a1..dc99a61ba 100644
--- a/conf/modules.conf.example
+++ b/conf/modules.conf.example
@@ -1084,7 +1084,10 @@
 #                                                                     #
 # If you are using the m_opermotd.so module, specify the motd here    #
 #                                                                     #
-#<opermotd file="oper.motd">
+# onoper      -      Should the message be sent on /OPER or only when #
+#                    /OPERMOTD is used. Use "yes" or "no".            #
+#                                                                     #
+#<opermotd file="oper.motd" onoper="yes">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Override module: Adds support for oper override
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index e64239950..aa927ad38 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -59,6 +59,7 @@ class CommandOpermotd : public Command
 class ModuleOpermotd : public Module
 {
 	CommandOpermotd* mycommand;
+	bool onoper;
  public:
 
 	void LoadOperMOTD()
@@ -72,6 +73,7 @@ class ModuleOpermotd : public Module
 			opermotd = NULL;
 		}
 		opermotd = new FileReader(ServerInstance, filename);
+		onoper = conf->ReadFlag("opermoth","onoper","yes",0);
 		delete conf;
 	}
 
@@ -99,7 +101,8 @@ class ModuleOpermotd : public Module
 
 	virtual void OnOper(User* user, const std::string &opertype)
 	{
-		ShowOperMOTD(user);
+		if (onoper)
+			ShowOperMOTD(user);
 	}
 
 	virtual void OnRehash(User* user, const std::string &parameter)