diff options
Diffstat (limited to 'modules/extra')
| -rw-r--r-- | modules/extra/db_mysql.cpp | 31 | ||||
| -rw-r--r-- | modules/extra/m_ldap.cpp | 6 | ||||
| -rw-r--r-- | modules/extra/m_mysql.cpp | 2 | ||||
| -rw-r--r-- | modules/extra/ns_identify_ldap.cpp | 2 |
4 files changed, 10 insertions, 31 deletions
diff --git a/modules/extra/db_mysql.cpp b/modules/extra/db_mysql.cpp index 4b06c8ef1..f6dce95d2 100644 --- a/modules/extra/db_mysql.cpp +++ b/modules/extra/db_mysql.cpp @@ -217,8 +217,8 @@ class DBMySQL : public Module I_OnSaveDatabase, I_OnPostCommand, /* NickServ */ I_OnNickAddAccess, I_OnNickEraseAccess, I_OnNickClearAccess, - I_OnDelCore, I_OnNickForbidden, I_OnNickGroup, I_OnMakeNickRequest, - I_OnDelNickRequest, I_OnNickRegister, I_OnChangeCoreDisplay, + I_OnDelCore, I_OnNickForbidden, I_OnNickGroup, + I_OnNickRegister, I_OnChangeCoreDisplay, I_OnNickSuspended, I_OnDelNick, /* ChanServ */ I_OnAccessAdd, I_OnAccessDel, I_OnAccessChange, I_OnAccessClear, I_OnLevelChange, @@ -236,7 +236,7 @@ class DBMySQL : public Module /* HostServ */ I_OnSetVhost, I_OnDeleteVhost }; - ModuleManager::Attach(i, this, 42); + ModuleManager::Attach(i, this, 40); } EventReturn OnLoadDatabase() @@ -588,16 +588,6 @@ class DBMySQL : public Module FOREACH_RESULT(I_OnDatabaseReadMetadata, OnDatabaseReadMetadata(ci, ci->name, Params)); } - r = SQL->RunQuery("SELECT * FROM `anope_ns_request`"); - for (int i = 0; i < r.Rows(); ++i) - { - NickRequest *nr = new NickRequest(r.Get(i, "nick")); - nr->password = r.Get(i, "passcode"); - nr->password = r.Get(i, "password"); - nr->email = r.Get(i, "email"); - nr->requested = r.Get(i, "requested").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "requested")) : Anope::CurTime; - } - r = SQL->RunQuery("SELECT * FROM `anope_ms_info`"); for (int i = 0; i < r.Rows(); ++i) { @@ -947,16 +937,6 @@ class DBMySQL : public Module OnNickRegister(findnick(u->nick)); } - void OnMakeNickRequest(NickRequest *nr) - { - this->RunQuery("INSERT INTO `anope_ns_request` (nick, passcode, password, email, requested) VALUES('" + this->Escape(nr->nick) + "', '" + this->Escape(nr->passcode) + "', '" + this->Escape(nr->password) + "', '" + this->Escape(nr->email) + "', " + stringify(nr->requested) + ")"); - } - - void OnDelNickRequest(NickRequest *nr) - { - this->RunQuery("DELETE FROM `anope_ns_request` WHERE `nick` = '" + this->Escape(nr->nick) + "'"); - } - void InsertAlias(NickAlias *na) { this->RunQuery("INSERT INTO `anope_ns_alias` (nick, last_quit, last_realname, last_usermask, time_registered, last_seen, flags, display) VALUES('" + @@ -1369,11 +1349,6 @@ static void SaveDatabases() } } - me->RunQuery("TRUNCATE TABLE `anope_ns_request`"); - - for (nickrequest_map::const_iterator it = NickRequestList.begin(), it_end = NickRequestList.end(); it != it_end; ++it) - me->OnMakeNickRequest(it->second); - if (SGLine) for (unsigned i = 0, end = SGLine->GetCount(); i < end; ++i) me->OnAddAkill(NULL, SGLine->GetEntry(i)); diff --git a/modules/extra/m_ldap.cpp b/modules/extra/m_ldap.cpp index 0d198e27d..1d5aeca09 100644 --- a/modules/extra/m_ldap.cpp +++ b/modules/extra/m_ldap.cpp @@ -222,7 +222,10 @@ class ModuleLDAP : public Module, public Pipe ~ModuleLDAP() { for (std::map<Anope::string, LDAPService *>::iterator it = this->LDAPServices.begin(); it != this->LDAPServices.end(); ++it) + { it->second->SetExitState(); + it->second->Wakeup(); + } LDAPServices.clear(); } @@ -239,7 +242,7 @@ class ModuleLDAP : public Module, public Pipe for (i = 0, num = config.Enumerate("ldap"); i < num; ++i) { - if (config.ReadValue("ldap", "name", "", i) == cname) + if (config.ReadValue("ldap", "name", "main", i) == cname) { break; } @@ -250,6 +253,7 @@ class ModuleLDAP : public Module, public Pipe Log(LOG_NORMAL, "ldap") << "LDAP: Removing server connection " << cname; s->SetExitState(); + s->Wakeup(); this->LDAPServices.erase(cname); } } diff --git a/modules/extra/m_mysql.cpp b/modules/extra/m_mysql.cpp index e26d13b6a..9895d025d 100644 --- a/modules/extra/m_mysql.cpp +++ b/modules/extra/m_mysql.cpp @@ -186,7 +186,7 @@ class ModuleSQL : public Module, public Pipe for (i = 0, num = config.Enumerate("mysql"); i < num; ++i) { - if (config.ReadValue("mysql", "name", "", i) == cname) + if (config.ReadValue("mysql", "name", "main", i) == cname) { break; } diff --git a/modules/extra/ns_identify_ldap.cpp b/modules/extra/ns_identify_ldap.cpp index 7bc237289..6e01e0103 100644 --- a/modules/extra/ns_identify_ldap.cpp +++ b/modules/extra/ns_identify_ldap.cpp @@ -68,7 +68,7 @@ class IdentifyInterface : public LDAPInterface, public Command ircdproto->SendAccountLogin(u, u->Account()); ircdproto->SetAutoIdentificationToken(u); - if (this_na && this_na->nc == na->nc) + if (this_na && this_na->nc == na->nc && this_na->nc->HasFlag(NI_UNCONFIRMED) == false) u->SetMode(NickServ, UMODE_REGISTERED); u->UpdateHost(); |