diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/db_plain.cpp | 24 | ||||
| -rw-r--r-- | src/protocol/inspircd12.cpp | 4 |
2 files changed, 24 insertions, 4 deletions
diff --git a/src/core/db_plain.cpp b/src/core/db_plain.cpp index 21164584f..fba374667 100644 --- a/src/core/db_plain.cpp +++ b/src/core/db_plain.cpp @@ -24,6 +24,7 @@ enum MDType MD_NONE, MD_NC, MD_NA, + MD_NR, MD_BI, MD_CH }; @@ -99,6 +100,11 @@ static void ReadDatabase(Module *m = NULL) na = findnick(params[2].c_str()); Type = MD_NA; } + else if (params[0] == "NR") + { + nr = findrequestnick(params[1].c_str()); + Type = MD_NR; + } else if (params[0] == "BI") { bi = findbot(params[1]); @@ -147,6 +153,22 @@ static void ReadDatabase(Module *m = NULL) Alog() << "[db_plain]: " << ex.GetReason(); } } + else if (Type == MD_NR && nr) + { + try + { + if (m) + m->OnDatabaseReadMetadata(nr, key, params); + else + { + FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(nr, key, params)); + } + } + catch (DatabaseException& ex) + { + Alog() << "[db_plain]: " << ex.GetReason(); + } + } else if (Type == MD_BI && bi) { try @@ -918,6 +940,8 @@ class DBPlain : public Module for (NickRequest *nr = nrlists[i]; nr; nr = nr->next) { db << "NR " << nr->nick << " " << nr->passcode << " " << nr->password << " " << nr->email << " " << nr->requested << endl; + + FOREACH_MOD(I_OnDatabaseWriteMetadata, OnDatabaseWriteMetadata(WriteMetadata, nr)); } } diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index 22a143493..5e20edb6f 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -1113,11 +1113,7 @@ int anope_event_capab(const char *source, int ac, const char **av) ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKICK, "CMODE_NOKICK", 'Q')); continue; case 'R': -<<<<<<< HEAD - ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, 'R')); -======= ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, "CMODE_REGISTEREDONLY", 'R')); ->>>>>>> modes continue; case 'S': ModeManager::AddChannelMode(new ChannelMode(CMODE_STRIPCOLOR, "CMODE_STRIPCOLOR", 'S')); |