diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/config.php | 7 | ||||
| -rw-r--r-- | inc/functions.php | 19 |
2 files changed, 1 insertions, 25 deletions
diff --git a/inc/config.php b/inc/config.php index 1dbec895..4ffff767 100644 --- a/inc/config.php +++ b/inc/config.php @@ -773,14 +773,9 @@ // $config['board_path'] if you wish to change the URL. $config['board_abbreviation'] = '/%s/'; - // The default name (e.g. Anonymous). Can be an array - in that case it's picked randomly from the array. + // The default name (ie. Anonymous). Can be an array - in that case it's picked randomly from the array. // Example: $config['anonymous'] = array('Bernd', 'Senpai', 'Jonne', 'ChanPro'); $config['anonymous'] = 'Anonymous'; - // Pick the default name based on the poster's country. Can contain subarrays and is picked randomly from the them. - // If the user posts from a country you have not set a name for, his name is going to be whatever you set in $config['anonymous']. - // Example 1: $config['country_anonymous'] = array('cz' => 'Pepik', 'pl' => 'Karol Wojtyla', 'de' => 'Bernd', 'fi' => 'Jonne'); - // Example 2: $config['country_anonymous'] = array('cz' => array('Pepik', 'Bohus', 'Lada'), 'pl' => array('Karol Wojtyla', 'Demon Pedofyl'); - $config['country_anonymous'] = false; // Number of reports you can create at once. $config['report_limit'] = 3; diff --git a/inc/functions.php b/inc/functions.php index 4313e531..6ce76472 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -21,8 +21,6 @@ require_once 'inc/api.php'; require_once 'inc/bans.php'; require_once 'inc/lib/gettext/gettext.inc'; -use Lifo\IP\IP; - // the user is not currently logged in as a moderator $mod = false; @@ -244,23 +242,6 @@ function loadConfig() { if (is_array($config['anonymous'])) $config['anonymous'] = $config['anonymous'][array_rand($config['anonymous'])]; - - if ($config['country_flags'] || $config['country_anonymous']) { - require_once 'inc/lib/geoip/geoip.inc'; - $gi=geoip_open('inc/lib/geoip/GeoIPv6.dat', GEOIP_STANDARD); - $ipaddy = $_SERVER['REMOTE_ADDR']; - if (IP::isIPv4($ipaddy)) - $ipaddy = IP::to_ipv6($ipaddy, true); - global $country_code, $country_name; - $country_code = strtolower(geoip_country_code_by_addr_v6($gi, $ipaddy)); - $country_name = geoip_country_name_by_addr_v6($gi, $ipaddy); - if (isset($config['country_anonymous'][$country_code])) { - if (is_array($config['country_anonymous'][$country_code])) - $config['anonymous'] = $config['country_anonymous'][$country_code][array_rand($config['country_anonymous'][$country_code])]; - else - $config['anonymous'] = $config['country_anonymous'][$country_code]; - } - } event('load-config'); |