Merge commit 'refs/pull/422/head' of github.com:znc/znc

include/znc/Modules.h

@@ -764,6 +764,19 @@ public:
 	 */
 	virtual EModRet OnTimerAutoJoin(CChan& Channel);
 
+	/** This module hook is called when a network is being added.
+	 *  @param Network The new IRC network.
+	 *  @param sErrorRet A message that may be displayed to the user if
+	 *                  the module stops adding the network.
+	 *  @return See CModule::EModRet.
+	 */
+	virtual EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet);
+	/** This module hook is called when a network is deleted.
+	 *  @param Network The IRC network which is going to be deleted.
+	 *  @return See CModule::EModRet.
+	 */
+	virtual EModRet OnDeleteNetwork(CIRCNetwork& Network);
+
 	ModHandle GetDLL() { return m_pDLL; }
 	static double GetCoreVersion() { return VERSION; }
 
@@ -1105,6 +1118,9 @@ public:
 	bool OnTopic(CNick& Nick, CChan& Channel, CString& sTopic);
 	bool OnTimerAutoJoin(CChan& Channel);
 
+	bool OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet);
+	bool OnDeleteNetwork(CIRCNetwork& Network);
+
 	bool OnServerCapAvailable(const CString& sCap);
 	bool OnServerCapResult(const CString& sCap, bool bSuccess);
 

include/znc/User.h

@@ -71,7 +71,7 @@ public:
 	// !Modules
 
 	// Networks
-	CIRCNetwork* AddNetwork(const CString &sNetwork);
+	CIRCNetwork* AddNetwork(const CString &sNetwork, CString& sErrorRet);
 	bool DeleteNetwork(const CString& sNetwork);
 	bool AddNetwork(CIRCNetwork *pNetwork);
 	void RemoveNetwork(CIRCNetwork *pNetwork);