Merged branch "branches/hooks" into "trunk".
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
@@ -12,9 +12,11 @@
|
||||
|
||||
cWebPlugin::cWebPlugin()
|
||||
{
|
||||
LOG("cWebPlugin::cWebPlugin()");
|
||||
cWebAdmin* WebAdmin = cRoot::Get()->GetWebAdmin();
|
||||
if( WebAdmin ) WebAdmin->AddPlugin( this );
|
||||
cWebAdmin * WebAdmin = cRoot::Get()->GetWebAdmin();
|
||||
if (WebAdmin != NULL)
|
||||
{
|
||||
WebAdmin->AddPlugin(this);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -23,11 +25,13 @@ cWebPlugin::cWebPlugin()
|
||||
|
||||
cWebPlugin::~cWebPlugin()
|
||||
{
|
||||
LOG("~cWebPlugin::cWebPlugin()");
|
||||
cWebAdmin* WebAdmin = cRoot::Get()->GetWebAdmin();
|
||||
if( WebAdmin ) WebAdmin->RemovePlugin( this );
|
||||
cWebAdmin * WebAdmin = cRoot::Get()->GetWebAdmin();
|
||||
if (WebAdmin != NULL)
|
||||
{
|
||||
WebAdmin->RemovePlugin(this);
|
||||
}
|
||||
|
||||
for( TabList::iterator itr = m_Tabs.begin(); itr != m_Tabs.end(); ++itr )
|
||||
for (TabList::iterator itr = m_Tabs.begin(); itr != m_Tabs.end(); ++itr)
|
||||
{
|
||||
delete *itr;
|
||||
}
|
||||
@@ -38,7 +42,7 @@ cWebPlugin::~cWebPlugin()
|
||||
|
||||
|
||||
|
||||
std::list< std::pair<AString, AString> > cWebPlugin::GetTabNames()
|
||||
std::list<std::pair<AString, AString> > cWebPlugin::GetTabNames(void)
|
||||
{
|
||||
std::list< std::pair< AString, AString > > NameList;
|
||||
for( TabList::iterator itr = GetTabs().begin(); itr != GetTabs().end(); ++itr )
|
||||
@@ -55,7 +59,7 @@ std::list< std::pair<AString, AString> > cWebPlugin::GetTabNames()
|
||||
|
||||
|
||||
|
||||
std::pair< AString, AString > cWebPlugin::GetTabNameForRequest( HTTPRequest* a_Request )
|
||||
std::pair< AString, AString > cWebPlugin::GetTabNameForRequest(HTTPRequest * a_Request)
|
||||
{
|
||||
std::pair< AString, AString > Names;
|
||||
AStringVector Split = StringSplit(a_Request->Path, "/");
|
||||
|
||||
Reference in New Issue
Block a user