adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-31 14:03:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

decided to restore the config checking during rehash to original state. I came to what i figure is a good compromise which is to allow global modules to have config lines that are prefixed with 'GM:', thus allowing core config checking and allowing global modules to do their own config checking

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@985 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
imaginos
2008-03-17 18:26:06 +00:00
parent 6f80fdd02f
commit 322483ab8e
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
znc.cpp
+23 -18
View File
@@ -12,10 +12,11 @@
#include "Server.h"
#include "User.h"
#include <pwd.h>
#include <list>
namespace
{ // private namespace for local things
struct CUnhandledConfigLines
struct CGlobalModuleConfigLine
{
CString m_sName;
CString m_sValue;
@@ -940,7 +941,7 @@ bool CZNC::DoRehash(CString& sError)
MCString msModules; // Modules are queued for later loading
#endif
vector<CUnhandledConfigLines> vUnHandledLines;
std::list<CGlobalModuleConfigLine> lGlobalModuleConfigLine;
while (File.ReadLine(sLine)) {
uLineNum++;
@@ -1392,20 +1393,24 @@ bool CZNC::DoRehash(CString& sError)
continue;
}
}
}
CUnhandledConfigLines cTmp;
cTmp.m_sName = sName;
cTmp.m_sValue = sValue;
cTmp.m_pChan = pChan;
cTmp.m_pUser = pUser;
vUnHandledLines.push_back( cTmp );
/*
* giving global modules a chance to work on these, if they aren't handled then a warn is print out, but not an error
sError = "Unhandled line " + CString(uLineNum) + " in config: [" + sLine + "]";
CUtils::PrintError(sError);
return false;
*/
if( sName.CaseCmp( "GM:", 3 ) == 0 )
{ // GM: prefix is a pass through to config lines for global modules
CGlobalModuleConfigLine cTmp;
cTmp.m_sName = sName.substr( 3, CString::npos );
cTmp.m_sValue = sValue;
cTmp.m_pChan = pChan;
cTmp.m_pUser = pUser;
lGlobalModuleConfigLine.push_back( cTmp );
}
else
{
sError = "Unhandled line " + CString(uLineNum) + " in config: [" + sLine + "]";
CUtils::PrintError(sError);
return false;
}
}
#ifdef _MODULES
@@ -1480,13 +1485,13 @@ bool CZNC::DoRehash(CString& sError)
}
// last step, throw unhandled config items at global config
for( u_long a = 0; a < vUnHandledLines.size(); a++ )
for( std::list<CGlobalModuleConfigLine>::iterator it = lGlobalModuleConfigLine.begin(); it != lGlobalModuleConfigLine.end(); it++ )
{
if( ( pChan && pChan == vUnHandledLines[a].m_pChan ) || ( pUser && pUser == vUnHandledLines[a].m_pUser ) )
if( ( pChan && pChan == it->m_pChan ) || ( pUser && pUser == it->m_pUser ) )
continue; // skip unclosed user or chan
if( !GetModules().OnConfigLine( vUnHandledLines[a].m_sName, vUnHandledLines[a].m_sValue, vUnHandledLines[a].m_pUser, vUnHandledLines[a].m_pChan ) )
if( !GetModules().OnConfigLine( it->m_sName, it->m_sValue, it->m_pUser, it->m_pChan ) )
{
CUtils::PrintMessage( "Unhandled config line [" + vUnHandledLines[a].m_sName + "] = [" + vUnHandledLines[a].m_sValue + "]" );
CUtils::PrintMessage( "unhandled global module config line [GM:" + it->m_sName + "] = [" + it->m_sValue + "]" );
}
}
#endif