diff options
| author | Adam <Adam@anope.org> | 2014-01-21 17:33:57 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2014-01-21 17:33:57 -0500 |
| commit | 1027ec667a84b918f21b57fc4842bf6bb818105e (patch) | |
| tree | fc8f137c2f5cc1bc471f7b9c104a4c7d0eecac2c /modules/extra/stats/irc2sql/tables.cpp | |
| parent | 4d9273efa42a16380de8ac81c615eaac89052f68 (diff) | |
Made the chanstats confs try and look similar to every other configuration file
Diffstat (limited to 'modules/extra/stats/irc2sql/tables.cpp')
| -rw-r--r-- | modules/extra/stats/irc2sql/tables.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/modules/extra/stats/irc2sql/tables.cpp b/modules/extra/stats/irc2sql/tables.cpp index d80f37535..661069443 100644 --- a/modules/extra/stats/irc2sql/tables.cpp +++ b/modules/extra/stats/irc2sql/tables.cpp @@ -17,7 +17,7 @@ void IRC2SQL::CheckTables() this->GetTables(); - if (UseGeoIP && GeoIPDB.equals_ci("country") && !this->HasTable(prefix + "geoip_country")) + if (GeoIPDB.equals_ci("country") && !this->HasTable(prefix + "geoip_country")) { query = "CREATE TABLE `" + prefix + "geoip_country` (" "`start` INT UNSIGNED NOT NULL," @@ -29,7 +29,7 @@ void IRC2SQL::CheckTables() ") ENGINE=MyISAM DEFAULT CHARSET=utf8;"; this->RunQuery(query); } - if (UseGeoIP && GeoIPDB.equals_ci("city") && !this->HasTable(prefix + "geoip_city_blocks")) + if (GeoIPDB.equals_ci("city") && !this->HasTable(prefix + "geoip_city_blocks")) { query = "CREATE TABLE `" + prefix + "geoip_city_blocks` (" "`start` INT UNSIGNED NOT NULL," @@ -41,7 +41,7 @@ void IRC2SQL::CheckTables() this->RunQuery(query); } - if (UseGeoIP && GeoIPDB.equals_ci("city") && !this->HasTable(prefix + "geoip_city_location")) + if (GeoIPDB.equals_ci("city") && !this->HasTable(prefix + "geoip_city_location")) { query = "CREATE TABLE `" + prefix + "geoip_city_location` (" "`locId` INT UNSIGNED NOT NULL," @@ -55,7 +55,7 @@ void IRC2SQL::CheckTables() ") ENGINE=MyISAM DEFAULT CHARSET=utf8;"; this->RunQuery(query); } - if (UseGeoIP && GeoIPDB.equals_ci("city") && !this->HasTable(prefix + "geoip_city_region")) + if (GeoIPDB.equals_ci("city") && !this->HasTable(prefix + "geoip_city_region")) { query = "CREATE TABLE `" + prefix + "geoip_city_region` (" "`country` CHAR(2) NOT NULL," "`region` CHAR(2) NOT NULL," @@ -157,10 +157,8 @@ void IRC2SQL::CheckTables() if (this->HasProcedure(prefix + "UserConnect")) this->RunQuery(SQL::Query("DROP PROCEDURE " + prefix + "UserConnect")); - if (UseGeoIP) - { - if (GeoIPDB.equals_ci("country")) - geoquery = "UPDATE `" + prefix + "user` AS u " + if (GeoIPDB.equals_ci("country")) + geoquery = "UPDATE `" + prefix + "user` AS u " "JOIN ( SELECT `countrycode`, `countryname` " "FROM `" + prefix + "geoip_country` " "WHERE INET_ATON(ip_) <= `end` " @@ -168,8 +166,8 @@ void IRC2SQL::CheckTables() "ORDER BY `end` ASC LIMIT 1 ) as c " "SET u.geocode = c.countrycode, u.geocountry = c.countryname " "WHERE u.nick = nick_; "; - else if (GeoIPDB.equals_ci("city")) - geoquery = "UPDATE `" + prefix + "user` as u " + else if (GeoIPDB.equals_ci("city")) + geoquery = "UPDATE `" + prefix + "user` as u " "JOIN ( SELECT * FROM `" + prefix + "geoip_city_location` " "WHERE `locID` = ( SELECT `locID` " "FROM `" + prefix + "geoip_city_blocks` " @@ -185,7 +183,7 @@ void IRC2SQL::CheckTables() "WHERE `country` = l.country " "AND `region` = l.region )" "WHERE u.nick = nick_;"; - } + query = "CREATE PROCEDURE `" + prefix + "UserConnect`" "(nick_ varchar(255), host_ varchar(255), vhost_ varchar(255), " "chost_ varchar(255), realname_ varchar(255), ip_ varchar(255), " |