diff options
Diffstat (limited to 'modules/extra')
-rw-r--r-- | modules/extra/m_chanstats.cpp | 10 | ||||
-rw-r--r-- | modules/extra/m_httpd.cpp | 8 | ||||
-rw-r--r-- | modules/extra/m_ldap.cpp | 10 | ||||
-rw-r--r-- | modules/extra/m_ldap_authentication.cpp | 16 | ||||
-rw-r--r-- | modules/extra/m_ldap_oper.cpp | 10 | ||||
-rw-r--r-- | modules/extra/m_mysql.cpp | 12 | ||||
-rw-r--r-- | modules/extra/m_proxyscan.cpp | 16 | ||||
-rw-r--r-- | modules/extra/m_sql_authentication.cpp | 6 | ||||
-rw-r--r-- | modules/extra/m_sql_oper.cpp | 4 | ||||
-rw-r--r-- | modules/extra/m_sqlite.cpp | 6 | ||||
-rw-r--r-- | modules/extra/m_ssl.cpp | 4 | ||||
-rw-r--r-- | modules/extra/webcpanel/webcpanel.cpp | 6 |
12 files changed, 54 insertions, 54 deletions
diff --git a/modules/extra/m_chanstats.cpp b/modules/extra/m_chanstats.cpp index f5e20646b..65e71a5c0 100644 --- a/modules/extra/m_chanstats.cpp +++ b/modules/extra/m_chanstats.cpp @@ -352,12 +352,12 @@ class MChanstats : public Module void OnReload(Configuration::Conf *conf) anope_override { Configuration::Block *block = conf->GetModule(this); - prefix = block->Get<const Anope::string &>("prefix", "anope_"); - SmileysHappy = block->Get<const Anope::string &>("SmileysHappy"); - SmileysSad = block->Get<const Anope::string &>("SmileysSad"); - SmileysOther = block->Get<const Anope::string &>("SmileysOther"); + prefix = block->Get<const Anope::string>("prefix", "anope_"); + SmileysHappy = block->Get<const Anope::string>("SmileysHappy"); + SmileysSad = block->Get<const Anope::string>("SmileysSad"); + SmileysOther = block->Get<const Anope::string>("SmileysOther"); - Anope::string engine = block->Get<const Anope::string &>("engine"); + Anope::string engine = block->Get<const Anope::string>("engine"); this->sql = ServiceReference<SQL::Provider>("SQL::Provider", engine); if (sql) this->CheckTables(); diff --git a/modules/extra/m_httpd.cpp b/modules/extra/m_httpd.cpp index 87d1ad6a1..1941985d1 100644 --- a/modules/extra/m_httpd.cpp +++ b/modules/extra/m_httpd.cpp @@ -361,15 +361,15 @@ class HTTPD : public Module Configuration::Block *block = conf->GetBlock("httpd", i); - const Anope::string &hname = block->Get<const Anope::string &>("name", "httpd/main"); + const Anope::string &hname = block->Get<const Anope::string>("name", "httpd/main"); existing.insert(hname); - Anope::string ip = block->Get<const Anope::string &>("ip"); + Anope::string ip = block->Get<const Anope::string>("ip"); int port = block->Get<int>("port", "8080"); int timeout = block->Get<int>("timeout", "30"); bool ssl = block->Get<bool>("ssl", "no"); - Anope::string ext_ip = block->Get<const Anope::string &>("extforward_ip"); - Anope::string ext_header = block->Get<const Anope::string &>("extforward_header"); + Anope::string ext_ip = block->Get<const Anope::string>("extforward_ip"); + Anope::string ext_header = block->Get<const Anope::string>("extforward_header"); if (ip.empty()) { diff --git a/modules/extra/m_ldap.cpp b/modules/extra/m_ldap.cpp index a6066c008..7ded21d6f 100644 --- a/modules/extra/m_ldap.cpp +++ b/modules/extra/m_ldap.cpp @@ -434,7 +434,7 @@ class ModuleLDAP : public Module, public Pipe ++it; for (i = 0; i < Config->CountBlock("ldap"); ++i) - if (Config->GetBlock("ldap", i)->Get<const Anope::string &>("name", "ldap/main") == cname) + if (Config->GetBlock("ldap", i)->Get<const Anope::string>("name", "ldap/main") == cname) break; if (i == num) @@ -449,14 +449,14 @@ class ModuleLDAP : public Module, public Pipe for (i = 0; i < Config->CountBlock("ldap"); ++i) { - const Anope::string &connname = Config->GetBlock("ldap", i)->Get<const Anope::string &>("name", "ldap/main"); + const Anope::string &connname = Config->GetBlock("ldap", i)->Get<const Anope::string>("name", "ldap/main"); if (this->LDAPServices.find(connname) == this->LDAPServices.end()) { - const Anope::string &server = Config->GetBlock("ldap", i)->Get<const Anope::string &>("server", "127.0.0.1"); + const Anope::string &server = Config->GetBlock("ldap", i)->Get<const Anope::string>("server", "127.0.0.1"); int port = Config->GetBlock("ldap", i)->Get<int>("port", "389"); - const Anope::string &admin_binddn = Config->GetBlock("ldap", i)->Get<const Anope::string &>("admin_binddn"); - const Anope::string &admin_password = Config->GetBlock("ldap", i)->Get<const Anope::string &>("admin_password"); + const Anope::string &admin_binddn = Config->GetBlock("ldap", i)->Get<const Anope::string>("admin_binddn"); + const Anope::string &admin_password = Config->GetBlock("ldap", i)->Get<const Anope::string>("admin_password"); try { diff --git a/modules/extra/m_ldap_authentication.cpp b/modules/extra/m_ldap_authentication.cpp index a8ece73ff..8238082a5 100644 --- a/modules/extra/m_ldap_authentication.cpp +++ b/modules/extra/m_ldap_authentication.cpp @@ -225,14 +225,14 @@ class NSIdentifyLDAP : public Module { Configuration::Block *config = Config->GetModule(this); - basedn = conf->Get<const Anope::string &>("basedn"); - search_filter = conf->Get<const Anope::string &>("search_filter"); - object_class = conf->Get<const Anope::string &>("object_class"); - username_attribute = conf->Get<const Anope::string &>("username_attribute"); - this->password_attribute = conf->Get<const Anope::string &>("password_attribute"); - email_attribute = conf->Get<const Anope::string &>("email_attribute"); - this->disable_register_reason = conf->Get<const Anope::string &>("disable_register_reason"); - this->disable_email_reason = conf->Get<const Anope::string &>("disable_email_reason"); + basedn = conf->Get<const Anope::string>("basedn"); + search_filter = conf->Get<const Anope::string>("search_filter"); + object_class = conf->Get<const Anope::string>("object_class"); + username_attribute = conf->Get<const Anope::string>("username_attribute"); + this->password_attribute = conf->Get<const Anope::string>("password_attribute"); + email_attribute = conf->Get<const Anope::string>("email_attribute"); + this->disable_register_reason = conf->Get<const Anope::string>("disable_register_reason"); + this->disable_email_reason = conf->Get<const Anope::string>("disable_email_reason"); if (!email_attribute.empty()) /* Don't complain to users about how they need to update their email, we will do it for them */ diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/m_ldap_oper.cpp index 4324a7bc0..a54556c80 100644 --- a/modules/extra/m_ldap_oper.cpp +++ b/modules/extra/m_ldap_oper.cpp @@ -97,11 +97,11 @@ class LDAPOper : public Module { Configuration::Block *config = Config->GetModule(this); - this->binddn = config->Get<const Anope::string &>("binddn"); - this->password = config->Get<const Anope::string &>("password"); - this->basedn = config->Get<const Anope::string &>("basedn"); - this->filter = config->Get<const Anope::string &>("filter"); - opertype_attribute = config->Get<const Anope::string &>("opertype_attribute"); + this->binddn = config->Get<const Anope::string>("binddn"); + this->password = config->Get<const Anope::string>("password"); + this->basedn = config->Get<const Anope::string>("basedn"); + this->filter = config->Get<const Anope::string>("filter"); + opertype_attribute = config->Get<const Anope::string>("opertype_attribute"); for (std::set<Oper *>::iterator it = my_opers.begin(), it_end = my_opers.end(); it != it_end; ++it) delete *it; diff --git a/modules/extra/m_mysql.cpp b/modules/extra/m_mysql.cpp index 372cb6982..b8270b91f 100644 --- a/modules/extra/m_mysql.cpp +++ b/modules/extra/m_mysql.cpp @@ -200,7 +200,7 @@ class ModuleSQL : public Module, public Pipe ++it; for (i = 0; i < Config->CountBlock("mysql"); ++i) - if (Config->GetBlock("mysql", i)->Get<const Anope::string &>("name", "main") == cname) + if (Config->GetBlock("mysql", i)->Get<const Anope::string>("name", "main") == cname) break; if (i == num) @@ -215,14 +215,14 @@ class ModuleSQL : public Module, public Pipe for (i = 0; i < Config->CountBlock("mysql"); ++i) { Configuration::Block *block = Config->GetBlock("mysql", i); - const Anope::string &connname = block->Get<const Anope::string &>("name", "mysql/main"); + const Anope::string &connname = block->Get<const Anope::string>("name", "mysql/main"); if (this->MySQLServices.find(connname) == this->MySQLServices.end()) { - const Anope::string &database = block->Get<const Anope::string &>("database", "anope"); - const Anope::string &server = block->Get<const Anope::string &>("server", "127.0.0.1"); - const Anope::string &user = block->Get<const Anope::string &>("username", "anope"); - const Anope::string &password = block->Get<const Anope::string &>("password"); + const Anope::string &database = block->Get<const Anope::string>("database", "anope"); + const Anope::string &server = block->Get<const Anope::string>("server", "127.0.0.1"); + const Anope::string &user = block->Get<const Anope::string>("username", "anope"); + const Anope::string &password = block->Get<const Anope::string>("password"); int port = block->Get<int>("port", "3306"); try diff --git a/modules/extra/m_proxyscan.cpp b/modules/extra/m_proxyscan.cpp index c77f0f9cd..075f9067e 100644 --- a/modules/extra/m_proxyscan.cpp +++ b/modules/extra/m_proxyscan.cpp @@ -257,7 +257,7 @@ class ModuleProxyScan : public Module { Configuration::Block *config = Config->GetModule(this); - Anope::string s_target_ip = config->Get<const Anope::string &>("target_ip"); + Anope::string s_target_ip = config->Get<const Anope::string>("target_ip"); if (s_target_ip.empty()) throw ConfigException(this->name + " target_ip may not be empty"); @@ -265,7 +265,7 @@ class ModuleProxyScan : public Module if (s_target_port <= 0) throw ConfigException(this->name + " target_port may not be empty and must be a positive number"); - Anope::string s_listen_ip = config->Get<const Anope::string &>("listen_ip"); + Anope::string s_listen_ip = config->Get<const Anope::string>("listen_ip"); if (s_listen_ip.empty()) throw ConfigException(this->name + " listen_ip may not be empty"); @@ -277,12 +277,12 @@ class ModuleProxyScan : public Module target_port = s_target_port; this->listen_ip = s_listen_ip; this->listen_port = s_listen_port; - this->con_notice = config->Get<const Anope::string &>("connect_notice"); - this->con_source = config->Get<const Anope::string &>("connect_source"); + this->con_notice = config->Get<const Anope::string>("connect_notice"); + this->con_source = config->Get<const Anope::string>("connect_source"); add_to_akill = config->Get<bool>("add_to_akill", "true"); this->connectionTimeout.SetSecs(config->Get<time_t>("timeout", "5s")); - ProxyCheckString = Config->GetBlock("networkinfo")->Get<const Anope::string &>("networkname") + " proxy check"; + ProxyCheckString = Config->GetBlock("networkinfo")->Get<const Anope::string>("networkname") + " proxy check"; delete this->listener; this->listener = NULL; try @@ -301,7 +301,7 @@ class ModuleProxyScan : public Module ProxyCheck p; Anope::string token; - commasepstream sep(block->Get<const Anope::string &>("type")); + commasepstream sep(block->Get<const Anope::string>("type")); while (sep.GetToken(token)) { if (!token.equals_ci("HTTP") && !token.equals_ci("SOCKS5")) @@ -311,7 +311,7 @@ class ModuleProxyScan : public Module if (p.types.empty()) continue; - commasepstream sep2(block->Get<const Anope::string &>("port")); + commasepstream sep2(block->Get<const Anope::string>("port")); while (sep2.GetToken(token)) { try @@ -325,7 +325,7 @@ class ModuleProxyScan : public Module continue; p.duration = block->Get<time_t>("time", "4h"); - p.reason = block->Get<const Anope::string &>("reason"); + p.reason = block->Get<const Anope::string>("reason"); if (p.reason.empty()) continue; diff --git a/modules/extra/m_sql_authentication.cpp b/modules/extra/m_sql_authentication.cpp index 98fd4c2e9..693f06b33 100644 --- a/modules/extra/m_sql_authentication.cpp +++ b/modules/extra/m_sql_authentication.cpp @@ -85,9 +85,9 @@ class ModuleSQLAuthentication : public Module void OnReload(Configuration::Conf *conf) anope_override { Configuration::Block *config = conf->GetModule(this); - this->engine = config->Get<const Anope::string &>("engine"); - this->query = config->Get<const Anope::string &>("query"); - this->disable_reason = config->Get<const Anope::string &>("disable_reason"); + this->engine = config->Get<const Anope::string>("engine"); + this->query = config->Get<const Anope::string>("query"); + this->disable_reason = config->Get<const Anope::string>("disable_reason"); this->SQL = ServiceReference<SQL::Provider>("SQL::Provider", this->engine); } diff --git a/modules/extra/m_sql_oper.cpp b/modules/extra/m_sql_oper.cpp index 480bcf5a0..a45001835 100644 --- a/modules/extra/m_sql_oper.cpp +++ b/modules/extra/m_sql_oper.cpp @@ -105,8 +105,8 @@ class ModuleSQLOper : public Module { Configuration::Block *config = conf->GetModule(this); - this->engine = config->Get<const Anope::string &>("engine"); - this->query = config->Get<const Anope::string &>("query"); + this->engine = config->Get<const Anope::string>("engine"); + this->query = config->Get<const Anope::string>("query"); this->SQL = ServiceReference<SQL::Provider>("SQL::Provider", this->engine); } diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/m_sqlite.cpp index b0f947985..91bdd4e64 100644 --- a/modules/extra/m_sqlite.cpp +++ b/modules/extra/m_sqlite.cpp @@ -89,7 +89,7 @@ class ModuleSQLite : public Module ++it; for (i = 0, num = config->CountBlock("sqlite"); i < num; ++i) - if (config->GetBlock("sqlite", i)->Get<const Anope::string &>("name", "sqlite/main") == cname) + if (config->GetBlock("sqlite", i)->Get<const Anope::string>("name", "sqlite/main") == cname) break; if (i == num) @@ -104,11 +104,11 @@ class ModuleSQLite : public Module for (int i = 0; i < config->CountBlock("sqlite"); ++i) { Configuration::Block *block = config->GetBlock("sqlite", i); - Anope::string connname = block->Get<const Anope::string &>("name", "sqlite/main"); + Anope::string connname = block->Get<const Anope::string>("name", "sqlite/main"); if (this->SQLiteServices.find(connname) == this->SQLiteServices.end()) { - Anope::string database = Anope::DataDir + "/" + block->Get<const Anope::string &>("database", "anope"); + Anope::string database = Anope::DataDir + "/" + block->Get<const Anope::string>("database", "anope"); try { diff --git a/modules/extra/m_ssl.cpp b/modules/extra/m_ssl.cpp index 3219830e7..bc29b783f 100644 --- a/modules/extra/m_ssl.cpp +++ b/modules/extra/m_ssl.cpp @@ -140,8 +140,8 @@ class SSLModule : public Module { Configuration::Block *config = conf->GetModule(this); - this->certfile = config->Get<const Anope::string &>("cert", "data/anope.crt"); - this->keyfile = config->Get<const Anope::string &>("key", "data/anope.key"); + this->certfile = config->Get<const Anope::string>("cert", "data/anope.crt"); + this->keyfile = config->Get<const Anope::string>("key", "data/anope.key"); if (Anope::IsFile(this->certfile.c_str())) { diff --git a/modules/extra/webcpanel/webcpanel.cpp b/modules/extra/webcpanel/webcpanel.cpp index ca0b2f93d..88606cf67 100644 --- a/modules/extra/webcpanel/webcpanel.cpp +++ b/modules/extra/webcpanel/webcpanel.cpp @@ -53,10 +53,10 @@ class ModuleWebCPanel : public Module me = this; Configuration::Block *block = Config->GetModule(this); - provider_name = block->Get<const Anope::string &>("server", "httpd/main"); - template_name = block->Get<const Anope::string &>("template", "default"); + provider_name = block->Get<const Anope::string>("server", "httpd/main"); + template_name = block->Get<const Anope::string>("template", "default"); template_base = Anope::DataDir + "/modules/webcpanel/templates/" + template_name; - page_title = block->Get<const Anope::string &>("title", "Anope IRC Services"); + page_title = block->Get<const Anope::string>("title", "Anope IRC Services"); use_ssl = block->Get<bool>("ssl", "no"); // This is dumb, is there a better way to do this? ServiceReference<HTTPProvider> provider("HTTPProvider", provider_name); |