Server::GetAdmin, Server::GetServerDescription, Server::GetNetworkName --- *REMOVED*

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

6 files changed, 13 insertions, 57 deletions

diff --git a/include/modules.h b/include/modules.h
index eced8edb2..f3d7ab18e 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -182,18 +182,6 @@ class Version : public classbase
 	 Version(int major, int minor, int revision, int build, int flags);
 };
 
-/** Holds /ADMIN data
- *  This class contains the admin details of the local server. It is constructed by class Server,
- *  and has three read-only values, Name, Email and Nick that contain the specified values for the
- *  server where the module is running.
- */
-class Admin : public classbase
-{
- public:
-	 const std::string Name, Email, Nick;
-	 Admin(std::string name, std::string email, std::string nick);
-};
-
 /** The ModuleMessage class is the base class of Request and Event
  * This class is used to represent a basic data structure which is passed
  * between modules for safe inter-module communications.
@@ -1341,21 +1329,6 @@ class Server : public Extensible
 	 */
 	std::string GetServerName();
 
-	/** Returns the network name, global to all linked servers.
-	 */
-	std::string GetNetworkName();
-
-	/** Returns the server description string of the local server
-	 */
-	std::string GetServerDescription();
-
-	/** Returns the information of the server as returned by the /ADMIN command.
-	 * See the Admin class for further information of the return value. The members
-	 * Admin::Nick, Admin::Email and Admin::Name contain the information for the
-	 * server where the module is loaded.
-	 */
-	Admin GetAdmin();
-
 	bool AddMode(ModeHandler* mh, const unsigned char modechar);
 
 	bool AddModeWatcher(ModeWatcher* mw);
diff --git a/src/modules.cpp b/src/modules.cpp
index 824da10f3..a367f7b8d 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -64,13 +64,6 @@ Version::Version(int major, int minor, int revision, int build, int flags)
 {
 }
 
-// admin is a simple class for holding a server's administrative info
-
-Admin::Admin(std::string name, std::string email, std::string nick)
-: Name(name), Email(email), Nick(nick)
-{
-}
-
 Request::Request(char* anydata, Module* src, Module* dst)
 : data(anydata), source(src), dest(dst)
 {
@@ -427,22 +420,6 @@ std::string Server::GetServerName()
 	return ServerInstance->Config->ServerName;
 }
 
-std::string Server::GetNetworkName()
-{
-	return ServerInstance->Config->Network;
-}
-
-std::string Server::GetServerDescription()
-{
-	return ServerInstance->Config->ServerDesc;
-}
-
-Admin Server::GetAdmin()
-{
-	return Admin(ServerInstance->Config->AdminName,ServerInstance->Config->AdminEmail,ServerInstance->Config->AdminNick);
-}
-
-
 bool Server::AddMode(ModeHandler* mh, const unsigned char mode)
 {
 	return ServerInstance->ModeGrok->AddMode(mh,mode);
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 1d3d22575..0f402a1ed 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -21,10 +21,14 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
+#include "configreader.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style umode +B */
 
+extern InspIRCd* ServerInstance;
+
 class BotMode : public ModeHandler
 {
  public:
@@ -89,7 +93,7 @@ class ModuleBotMode : public Module
 	{
 		if (dst->IsModeSet('B'))
 		{
-			src->WriteServ("335 "+std::string(src->nick)+" "+std::string(dst->nick)+" :is a \2bot\2 on "+Srv->GetNetworkName());
+			src->WriteServ("335 "+std::string(src->nick)+" "+std::string(dst->nick)+" :is a \2bot\2 on "+ServerInstance->Config->Network);
 		}
 	}
 
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index b8164d9ba..5a0e28bb5 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -35,6 +35,7 @@
 #ifdef HAS_STDINT
 #include <stdint.h>
 #endif
+#include "configreader.h"
 #include "inspircd.h"
 #include "users.h"
 #include "channels.h"
@@ -42,6 +43,7 @@
 
 /* $ModDesc: Provides masking of user hostnames */
 
+extern InspIRCd* ServerInstance;
 
 /* The four core functions - F1 is optimized somewhat */
 
@@ -382,7 +384,7 @@ class CloakUser : public ModeHandler
 		prefix = Conf.ReadValue("cloak","prefix",0);
 		if (prefix == "")
 		{
-			prefix = Srv->GetNetworkName();
+			prefix = ServerInstance->Config->Network;
 		}
 		if (!key1 && !key2 && !key3 && !key4)
 		{
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index a8f66b6a7..8b2ce75f5 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -106,9 +106,9 @@ class ModuleHttpStats : public Module
 
 				data << "<head>";
 				data << "<link rel='stylesheet' href='" << this->stylesheet << "' type='text/css' />";
-				data << "<title>InspIRCd server statisitics for " << Srv->GetServerName() << " (" << Srv->GetServerDescription() << ")</title>";
+				data << "<title>InspIRCd server statisitics for " << Srv->GetServerName() << " (" << ServerInstance->Config->ServerDesc << ")</title>";
 				data << "</head><body>";
-				data << "<h1>InspIRCd server statisitics for " << Srv->GetServerName() << " (" << Srv->GetServerDescription() << ")</h1>";
+				data << "<h1>InspIRCd server statisitics for " << Srv->GetServerName() << " (" << ServerInstance->Config->ServerDesc << ")</h1>";
 
 				data << "<div class='totals'>";
 				data << "<h2>Totals</h2>";
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 19a217178..bc8e94b1d 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -756,7 +756,7 @@ class TreeSocket : public InspSocket
 						}
 					}
 					/* found who we're supposed to be connecting to, send the neccessary gubbins. */
-					this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+Srv->GetServerDescription());
+					this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+ServerInstance->Config->ServerDesc);
 					return true;
 				}
 			}
@@ -2548,7 +2548,7 @@ class TreeSocket : public InspSocket
 				this->InboundDescription = description;
 				// this is good. Send our details: Our server name and description and hopcount of 0,
 				// along with the sendpass from this block.
-				this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+Srv->GetServerDescription());
+				this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+ServerInstance->Config->ServerDesc);
 				// move to the next state, we are now waiting for THEM.
 				this->LinkState = WAIT_AUTH_2;
 				return true;
@@ -3432,7 +3432,7 @@ class ModuleSpanningTree : public Module
 		Bindings.clear();
 
 		// Create the root of the tree
-		TreeRoot = new TreeServer(Srv->GetServerName(),Srv->GetServerDescription());
+		TreeRoot = new TreeServer(ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc);
 
 		ReadConfiguration(true);