Remove GeoIP features and data

classes/permissions_form.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /********************************************************************************
  ************ Permissions form ********************** user.php and tools.php ****
@@ -98,7 +99,6 @@ $PermissionsArray = array(
   'admin_schedule' => 'Can run the site schedule.',
   'admin_login_watch' => 'Can manage login watch.',
   'admin_manage_wiki' => 'Can manage wiki access.',
-  'admin_update_geoip' => 'Can update geoIP data.',
   'site_collages_recover' => 'Can recover \'deleted\' collages.',
   'torrents_add_artist' => 'Can add artists to any group.',
   'edit_unknowns' => 'Can edit unknown release information.',
@@ -261,8 +261,7 @@ function permissions_form()
     display_perm('admin_manage_permissions', 'Can edit permission classes/user permissions.');
     display_perm('admin_schedule', 'Can run the site schedule.');
     display_perm('admin_login_watch', 'Can manage login watch.');
-    display_perm('admin_manage_wiki', 'Can manage wiki access.');
-    display_perm('admin_update_geoip', 'Can update geoIP data.'); ?>
+    display_perm('admin_manage_wiki', 'Can manage wiki access.'); ?>
         </td>
       </tr>
     </table>

classes/script_start.php

@@ -417,12 +417,6 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
         VALUES
           ('$LoggedUser[ID]', '".Crypto::encrypt($NewIP)."', NOW())");
 
-        $ipcc = Tools::geoip($NewIP);
-        $DB->query("
-        UPDATE users_main
-        SET IP = '".Crypto::encrypt($NewIP)."', ipcc = '$ipcc'
-          WHERE ID = '$LoggedUser[ID]'");
-
         $Cache->begin_transaction('user_info_heavy_'.$LoggedUser['ID']);
         $Cache->update_row(false, array('IP' => Crypto::encrypt($_SERVER['REMOTE_ADDR'])));
         $Cache->commit_transaction(0);

classes/tools.class.php

@@ -1,6 +1,6 @@
 <?php
+#declare(strict_types=1);
 
-# todo: Check strick equality gently
 class Tools
 {
     /**
@@ -60,45 +60,6 @@ class Tools
         return $IPnum;
     }
 
-    /**
-     * Geolocate an IP address using the database
-     *
-     * @param $IP the ip to fetch the country for
-     * @return the country of origin
-     */
-    public static function geoip($IP)
-    {
-        static $IPs = [];
-        if (isset($IPs[$IP])) {
-            return $IPs[$IP];
-        }
-
-        if (is_number($IP)) {
-            $Long = $IP;
-        } else {
-            $Long = Tools::ip_to_unsigned($IP);
-        }
-
-        if (!$Long || $Long == 2130706433) { // No need to check cc for 127.0.0.1
-            return false;
-        }
-
-        $QueryID = G::$DB->get_query_id();
-        G::$DB->query("
-        SELECT EndIP, Code
-        FROM geoip_country
-          WHERE $Long >= StartIP
-          ORDER BY StartIP DESC
-          LIMIT 1");
-
-        if ((!list($EndIP, $Country) = G::$DB->next_record()) || $EndIP < $Long) {
-            $Country = '?';
-        }
-
-        G::$DB->set_query_id($QueryID);
-        $IPs[$IP] = $Country;
-        return $Country;
-    }
 
     /**
      * Gets the hostname for an IP address
@@ -169,16 +130,7 @@ class Tools
      */
     public static function display_ip($IP)
     {
-        $Line = display_str($IP).' ('.Tools::get_country_code_by_ajax($IP).') ';
-        $Line .= '<a href="user.php?action=search&amp;ip_history=on&amp;ip='.display_str($IP).'&amp;matchtype=strict" title="Search" class="brackets tooltip">S</a>';
-        return $Line;
-    }
-
-    public static function get_country_code_by_ajax($IP)
-    {
-        static $ID = 0;
-        ++$ID;
-        return '<span id="cc_'.$ID.'">Resolving CC...<script type="text/javascript">ajax.get(\'tools.php?action=get_cc&ip='.$IP.'\', function(cc) {$(\'#cc_'.$ID.'\').raw().innerHTML = cc;});</script></span>';
+        return $Line = '<a href="user.php?action=search&amp;ip_history=on&amp;ip='.display_str($IP).'&amp;matchtype=strict" title="Search" class="brackets tooltip">S</a>';
     }
 
 

classes/util.php

@@ -208,7 +208,6 @@ function notify($Channel, $Message)
             . $LoggedUser['Username']
             . ")" : $_SERVER['REMOTE_ADDR']
             . " ("
-            . Tools::geoip($_SERVER['REMOTE_ADDR'])
         . ")")
         
         . " accessing https://"

gazelle.sql

@@ -483,22 +483,6 @@ CREATE TABLE `friends` (
   KEY `FriendID` (`FriendID`)
 ) ENGINE=InnoDB CHARSET=utf8mb4;
 
-CREATE TABLE `geoip_asn` (
-  `StartIP` varbinary(16) NOT NULL,
-  `EndIP` varbinary(16) NOT NULL,
-  `ASN` decimal(10,0) NOT NULL,
-  PRIMARY KEY (`StartIP`,`EndIP`)
-) ENGINE=InnoDB CHARSET=utf8mb4;
-
-CREATE TABLE `geoip_country` (
-  `StartIP` decimal(39,0) NOT NULL,
-  `EndIP` decimal(39,0) NOT NULL,
-  `Code` varchar(2) NOT NULL,
-  PRIMARY KEY (`StartIP`,`EndIP`)
-) ENGINE=InnoDB CHARSET=utf8mb4;
-
 -- 2020-03-09
 CREATE TABLE `group_log` (
   `ID` int NOT NULL AUTO_INCREMENT,
@@ -1493,7 +1477,6 @@ CREATE TABLE `users_main` (
   `torrent_pass` char(32) NOT NULL DEFAULT '',
   `RequiredRatio` double(10,8) NOT NULL DEFAULT '0.00000000',
   `RequiredRatioWork` double(10,8) NOT NULL DEFAULT '0.00000000',
-  `ipcc` varchar(2) NOT NULL DEFAULT '',
   `FLTokens` int NOT NULL DEFAULT '0',
   `BonusPoints` int unsigned NOT NULL DEFAULT '0',
   `IRCLines` int unsigned NOT NULL DEFAULT '0',
@@ -1511,7 +1494,6 @@ CREATE TABLE `users_main` (
   KEY `Invites` (`Invites`),
   KEY `torrent_pass` (`torrent_pass`),
   KEY `RequiredRatio` (`RequiredRatio`),
-  KEY `cc_index` (`ipcc`),
   KEY `PermissionID` (`PermissionID`)
 ) ENGINE=InnoDB CHARSET=utf8mb4;
 
@@ -1778,7 +1760,7 @@ CREATE TABLE `xbt_snatched` (
 SET FOREIGN_KEY_CHECKS = 1;
 
 INSERT INTO permissions (ID, Level, Name, `Values`, DisplayStaff) VALUES
-  (15, 1000, 'Sysop', 'a:100:{s:10:\"site_leech\";i:1;s:11:\"site_upload\";i:1;s:9:\"site_vote\";i:1;s:20:\"site_submit_requests\";i:1;s:20:\"site_advanced_search\";i:1;s:10:\"site_top10\";i:1;s:19:\"site_advanced_top10\";i:1;s:16:\"site_album_votes\";i:1;s:20:\"site_torrents_notify\";i:1;s:20:\"site_collages_create\";i:1;s:20:\"site_collages_manage\";i:1;s:20:\"site_collages_delete\";i:1;s:23:\"site_collages_subscribe\";i:1;s:22:\"site_collages_personal\";i:1;s:28:\"site_collages_renamepersonal\";i:1;s:19:\"site_make_bookmarks\";i:1;s:14:\"site_edit_wiki\";i:1;s:22:\"site_can_invite_always\";i:1;s:27:\"site_send_unlimited_invites\";i:1;s:22:\"site_moderate_requests\";i:1;s:18:\"site_delete_artist\";i:1;s:20:\"site_moderate_forums\";i:1;s:17:\"site_admin_forums\";i:1;s:23:\"site_forums_double_post\";i:1;s:14:\"site_view_flow\";i:1;s:18:\"site_view_full_log\";i:1;s:28:\"site_view_torrent_snatchlist\";i:1;s:18:\"site_recommend_own\";i:1;s:27:\"site_manage_recommendations\";i:1;s:15:\"site_delete_tag\";i:1;s:23:\"site_disable_ip_history\";i:1;s:14:\"zip_downloader\";i:1;s:10:\"site_debug\";i:1;s:17:\"site_proxy_images\";i:1;s:16:\"site_search_many\";i:1;s:20:\"users_edit_usernames\";i:1;s:16:\"users_edit_ratio\";i:1;s:20:\"users_edit_own_ratio\";i:1;s:17:\"users_edit_titles\";i:1;s:18:\"users_edit_avatars\";i:1;s:18:\"users_edit_invites\";i:1;s:22:\"users_edit_watch_hours\";i:1;s:21:\"users_edit_reset_keys\";i:1;s:19:\"users_edit_profiles\";i:1;s:18:\"users_view_friends\";i:1;s:20:\"users_reset_own_keys\";i:1;s:19:\"users_edit_password\";i:1;s:19:\"users_promote_below\";i:1;s:16:\"users_promote_to\";i:1;s:16:\"users_give_donor\";i:1;s:10:\"users_warn\";i:1;s:19:\"users_disable_users\";i:1;s:19:\"users_disable_posts\";i:1;s:17:\"users_disable_any\";i:1;s:18:\"users_delete_users\";i:1;s:18:\"users_view_invites\";i:1;s:20:\"users_view_seedleech\";i:1;s:19:\"users_view_uploaded\";i:1;s:15:\"users_view_keys\";i:1;s:14:\"users_view_ips\";i:1;s:16:\"users_view_email\";i:1;s:18:\"users_invite_notes\";i:1;s:23:\"users_override_paranoia\";i:1;s:12:\"users_logout\";i:1;s:20:\"users_make_invisible\";i:1;s:9:\"users_mod\";i:1;s:13:\"torrents_edit\";i:1;s:15:\"torrents_delete\";i:1;s:20:\"torrents_delete_fast\";i:1;s:18:\"torrents_freeleech\";i:1;s:20:\"torrents_search_fast\";i:1;i:1;s:19:\"torrents_fix_ghosts\";i:1;s:17:\"admin_manage_news\";i:1;s:17:\"admin_manage_blog\";i:1;s:18:\"admin_manage_polls\";i:1;s:19:\"admin_manage_forums\";i:1;s:16:\"admin_manage_fls\";i:1;s:13:\"admin_reports\";i:1;s:26:\"admin_advanced_user_search\";i:1;s:18:\"admin_create_users\";i:1;s:15:\"admin_donor_log\";i:1;s:19:\"admin_manage_ipbans\";i:1;i:1;s:17:\"admin_clear_cache\";i:1;s:15:\"admin_whitelist\";i:1;s:24:\"admin_manage_permissions\";i:1;s:14:\"admin_schedule\";i:1;s:17:\"admin_login_watch\";i:1;s:17:\"admin_manage_wiki\";i:1;s:18:\"admin_update_geoip\";i:1;s:21:\"site_collages_recover\";i:1;s:19:\"torrents_add_artist\";i:1;s:13:\"edit_unknowns\";i:1;s:19:\"forums_polls_create\";i:1;s:21:\"forums_polls_moderate\";i:1;s:12:\"project_team\";i:1;s:25:\"torrents_edit_vanityhouse\";i:1;s:23:\"artist_edit_vanityhouse\";i:1;s:21:\"site_tag_aliases_read\";i:1;}', '1'),
+  (15, 1000, 'Sysop', 'a:100:{s:10:\"site_leech\";i:1;s:11:\"site_upload\";i:1;s:9:\"site_vote\";i:1;s:20:\"site_submit_requests\";i:1;s:20:\"site_advanced_search\";i:1;s:10:\"site_top10\";i:1;s:19:\"site_advanced_top10\";i:1;s:16:\"site_album_votes\";i:1;s:20:\"site_torrents_notify\";i:1;s:20:\"site_collages_create\";i:1;s:20:\"site_collages_manage\";i:1;s:20:\"site_collages_delete\";i:1;s:23:\"site_collages_subscribe\";i:1;s:22:\"site_collages_personal\";i:1;s:28:\"site_collages_renamepersonal\";i:1;s:19:\"site_make_bookmarks\";i:1;s:14:\"site_edit_wiki\";i:1;s:22:\"site_can_invite_always\";i:1;s:27:\"site_send_unlimited_invites\";i:1;s:22:\"site_moderate_requests\";i:1;s:18:\"site_delete_artist\";i:1;s:20:\"site_moderate_forums\";i:1;s:17:\"site_admin_forums\";i:1;s:23:\"site_forums_double_post\";i:1;s:14:\"site_view_flow\";i:1;s:18:\"site_view_full_log\";i:1;s:28:\"site_view_torrent_snatchlist\";i:1;s:18:\"site_recommend_own\";i:1;s:27:\"site_manage_recommendations\";i:1;s:15:\"site_delete_tag\";i:1;s:23:\"site_disable_ip_history\";i:1;s:14:\"zip_downloader\";i:1;s:10:\"site_debug\";i:1;s:17:\"site_proxy_images\";i:1;s:16:\"site_search_many\";i:1;s:20:\"users_edit_usernames\";i:1;s:16:\"users_edit_ratio\";i:1;s:20:\"users_edit_own_ratio\";i:1;s:17:\"users_edit_titles\";i:1;s:18:\"users_edit_avatars\";i:1;s:18:\"users_edit_invites\";i:1;s:22:\"users_edit_watch_hours\";i:1;s:21:\"users_edit_reset_keys\";i:1;s:19:\"users_edit_profiles\";i:1;s:18:\"users_view_friends\";i:1;s:20:\"users_reset_own_keys\";i:1;s:19:\"users_edit_password\";i:1;s:19:\"users_promote_below\";i:1;s:16:\"users_promote_to\";i:1;s:16:\"users_give_donor\";i:1;s:10:\"users_warn\";i:1;s:19:\"users_disable_users\";i:1;s:19:\"users_disable_posts\";i:1;s:17:\"users_disable_any\";i:1;s:18:\"users_delete_users\";i:1;s:18:\"users_view_invites\";i:1;s:20:\"users_view_seedleech\";i:1;s:19:\"users_view_uploaded\";i:1;s:15:\"users_view_keys\";i:1;s:14:\"users_view_ips\";i:1;s:16:\"users_view_email\";i:1;s:18:\"users_invite_notes\";i:1;s:23:\"users_override_paranoia\";i:1;s:12:\"users_logout\";i:1;s:20:\"users_make_invisible\";i:1;s:9:\"users_mod\";i:1;s:13:\"torrents_edit\";i:1;s:15:\"torrents_delete\";i:1;s:20:\"torrents_delete_fast\";i:1;s:18:\"torrents_freeleech\";i:1;s:20:\"torrents_search_fast\";i:1;i:1;s:19:\"torrents_fix_ghosts\";i:1;s:17:\"admin_manage_news\";i:1;s:17:\"admin_manage_blog\";i:1;s:18:\"admin_manage_polls\";i:1;s:19:\"admin_manage_forums\";i:1;s:16:\"admin_manage_fls\";i:1;s:13:\"admin_reports\";i:1;s:26:\"admin_advanced_user_search\";i:1;s:18:\"admin_create_users\";i:1;s:15:\"admin_donor_log\";i:1;s:19:\"admin_manage_ipbans\";i:1;i:1;s:17:\"admin_clear_cache\";i:1;s:15:\"admin_whitelist\";i:1;s:24:\"admin_manage_permissions\";i:1;s:14:\"admin_schedule\";i:1;s:17:\"admin_login_watch\";i:1;s:17:\"admin_manage_wiki\";i:1;i:1;s:21:\"site_collages_recover\";i:1;s:19:\"torrents_add_artist\";i:1;s:13:\"edit_unknowns\";i:1;s:19:\"forums_polls_create\";i:1;s:21:\"forums_polls_moderate\";i:1;s:12:\"project_team\";i:1;s:25:\"torrents_edit_vanityhouse\";i:1;s:23:\"artist_edit_vanityhouse\";i:1;s:21:\"site_tag_aliases_read\";i:1;}', '1'),
   (11, 800, 'Moderator', 'a:89:{s:26:\"admin_advanced_user_search\";i:1;s:17:\"admin_clear_cache\";i:1;s:18:\"admin_create_users\";i:1;i:1;s:15:\"admin_donor_log\";i:1;s:17:\"admin_login_watch\";i:1;s:17:\"admin_manage_blog\";i:1;s:19:\"admin_manage_ipbans\";i:1;s:17:\"admin_manage_news\";i:1;s:18:\"admin_manage_polls\";i:1;s:17:\"admin_manage_wiki\";i:1;s:13:\"admin_reports\";i:1;s:23:\"artist_edit_vanityhouse\";i:1;s:13:\"edit_unknowns\";i:1;s:19:\"forums_polls_create\";i:1;s:21:\"forums_polls_moderate\";i:1;s:12:\"project_team\";i:1;s:17:\"site_admin_forums\";i:1;s:20:\"site_advanced_search\";i:1;s:19:\"site_advanced_top10\";i:1;s:16:\"site_album_votes\";i:1;s:22:\"site_can_invite_always\";i:1;s:20:\"site_collages_create\";i:1;s:20:\"site_collages_delete\";i:1;s:20:\"site_collages_manage\";i:1;s:22:\"site_collages_personal\";i:1;s:21:\"site_collages_recover\";i:1;s:28:\"site_collages_renamepersonal\";i:1;s:23:\"site_collages_subscribe\";i:1;s:18:\"site_delete_artist\";i:1;s:15:\"site_delete_tag\";i:1;s:23:\"site_disable_ip_history\";i:1;s:14:\"site_edit_wiki\";i:1;s:23:\"site_forums_double_post\";i:1;s:10:\"site_leech\";i:1;s:19:\"site_make_bookmarks\";i:1;s:27:\"site_manage_recommendations\";i:1;s:20:\"site_moderate_forums\";i:1;s:22:\"site_moderate_requests\";i:1;s:17:\"site_proxy_images\";i:1;s:18:\"site_recommend_own\";i:1;s:16:\"site_search_many\";i:1;s:27:\"site_send_unlimited_invites\";i:1;s:20:\"site_submit_requests\";i:1;s:21:\"site_tag_aliases_read\";i:1;s:10:\"site_top10\";i:1;s:20:\"site_torrents_notify\";i:1;s:11:\"site_upload\";i:1;s:14:\"site_view_flow\";i:1;s:18:\"site_view_full_log\";i:1;s:28:\"site_view_torrent_snatchlist\";i:1;s:9:\"site_vote\";i:1;s:19:\"torrents_add_artist\";i:1;s:15:\"torrents_delete\";i:1;s:20:\"torrents_delete_fast\";i:1;s:13:\"torrents_edit\";i:1;s:25:\"torrents_edit_vanityhouse\";i:1;s:19:\"torrents_fix_ghosts\";i:1;s:18:\"torrents_freeleech\";i:1;i:1;s:20:\"torrents_search_fast\";i:1;s:18:\"users_delete_users\";i:1;s:17:\"users_disable_any\";i:1;s:19:\"users_disable_posts\";i:1;s:19:\"users_disable_users\";i:1;s:18:\"users_edit_avatars\";i:1;s:18:\"users_edit_invites\";i:1;s:20:\"users_edit_own_ratio\";i:1;s:19:\"users_edit_password\";i:1;s:19:\"users_edit_profiles\";i:1;s:16:\"users_edit_ratio\";i:1;s:21:\"users_edit_reset_keys\";i:1;s:17:\"users_edit_titles\";i:1;s:16:\"users_give_donor\";i:1;s:12:\"users_logout\";i:1;s:20:\"users_make_invisible\";i:1;s:9:\"users_mod\";i:1;s:23:\"users_override_paranoia\";i:1;s:19:\"users_promote_below\";i:1;s:20:\"users_reset_own_keys\";i:1;s:10:\"users_warn\";i:1;s:16:\"users_view_email\";i:1;s:18:\"users_view_friends\";i:1;s:18:\"users_view_invites\";i:1;s:14:\"users_view_ips\";i:1;s:15:\"users_view_keys\";i:1;s:20:\"users_view_seedleech\";i:1;s:19:\"users_view_uploaded\";i:1;s:14:\"zip_downloader\";i:1;}', '1'),
   (2, 100, 'User', 'a:7:{s:10:\"site_leech\";i:1;s:11:\"site_upload\";i:1;s:9:\"site_vote\";i:1;s:20:\"site_advanced_search\";i:1;s:10:\"site_top10\";i:1;s:14:\"site_edit_wiki\";i:1;s:19:\"torrents_add_artist\";i:1;}', '0'),
   (3, 150, 'Member', 'a:10:{s:10:\"site_leech\";i:1;s:11:\"site_upload\";i:1;s:9:\"site_vote\";i:1;s:20:\"site_submit_requests\";i:1;s:20:\"site_advanced_search\";i:1;s:10:\"site_top10\";i:1;s:20:\"site_collages_manage\";i:1;s:19:\"site_make_bookmarks\";i:1;s:14:\"site_edit_wiki\";i:1;s:19:\"torrents_add_artist\";i:1;}', '0'),

sections/login/index.php

@@ -46,7 +46,6 @@ if (isset($_REQUEST['act']) && $_REQUEST['act'] == 'recover') {
         SELECT
           m.ID,
           m.Email,
-          m.ipcc,
           i.ResetExpires
         FROM users_main AS m
           INNER JOIN users_info AS i ON i.UserID = m.ID
@@ -283,26 +282,36 @@ else {
                         # todo: Make sure the type is (int)
                         if ($Enabled === '1') {
 
-              // Check if the current login attempt is from a location previously logged in from
+                            // Check if the current login attempt is from a location previously logged in from
                             if (apcu_exists('DBKEY')) {
                                 $DB->query("
-                                SELECT IP
-                                FROM users_history_ips
-                                  WHERE UserID = ?", $UserID);
+                                SELECT
+                                  `IP`
+                                FROM
+                                  `users_history_ips`
+                                WHERE
+                                  `UserID` = '$UserID'
+                                ");
+
                                 $IPs = $DB->to_array(false, MYSQLI_NUM);
                                 $QueryParts = [];
+
                                 foreach ($IPs as $i => $IP) {
                                     $IPs[$i] = Crypto::decrypt($IP[0]);
                                 }
+
                                 $IPs = array_unique($IPs);
                                 if (count($IPs) > 0) { // Always allow first login
                                     foreach ($IPs as $IP) {
                                         $QueryParts[] = "(StartIP<=INET6_ATON('$IP') AND EndIP>=INET6_ATON('$IP'))";
                                     }
+
+                                    /*
                                     $DB->query('SELECT ASN FROM geoip_asn WHERE '.implode(' OR ', $QueryParts));
                                     $PastASNs = array_column($DB->to_array(false, MYSQLI_NUM), 0);
                                     $DB->query("SELECT ASN FROM geoip_asn WHERE StartIP<=INET6_ATON('$_SERVER[REMOTE_ADDR]') AND EndIP>=INET6_ATON('$_SERVER[REMOTE_ADDR]')");
                                     list($CurrentASN) = $DB->next_record();
+                                    */
 
                                     // If FEATURE_ENFORCE_LOCATIONS is enabled, require users to confirm new logins
                                     if (!in_array($CurrentASN, $PastASNs) && $ENV->FEATURE_ENFORCE_LOCATIONS) {
@@ -310,10 +319,14 @@ else {
                                         if ($Cache->get_value('new_location_'.$UserID.'_'.$CurrentASN) !== true) {
                                             $DB->query("
                                             SELECT
-                                              UserName,
-                                              Email
-                                            FROM users_main
-                                              WHERE ID = ?", $UserID);
+                                              `UserName`,
+                                              `Email`
+                                            FROM
+                                              `users_main`
+                                            WHERE
+                                              `ID` = '$UserID'
+                                            ");
+                                            
                                             list($Username, $Email) = $DB->next_record();
                                             Users::auth_location($UserID, $Username, $CurrentASN, Crypto::decrypt($Email));
                                             require('newlocation.php');

sections/register/index.php

@@ -105,11 +105,10 @@ if (!empty($_REQUEST['confirm'])) {
                 $Enabled = '0';
             }
 
-            $IPcc = Tools::geoip($_SERVER['REMOTE_ADDR']);
 
             $DB->query("
         INSERT INTO users_main
-          (Username, Email, PassHash, torrent_pass, IP, PermissionID, Enabled, Invites, FLTokens, Uploaded, ipcc)
+          (Username, Email, PassHash, torrent_pass, IP, PermissionID, Enabled, Invites, FLTokens, Uploaded)
         VALUES
           ('".db_string(trim($_POST['username']))."',
           '".Crypto::encrypt($_POST['email'])."',
@@ -120,8 +119,7 @@ if (!empty($_REQUEST['confirm'])) {
           '$Enabled',
           '".$ENV->STARTING_INVITES."',
           '".$ENV->STARTING_TOKENS."',
-          '".$ENV->STARTING_UPLOAD."',
-          '$IPcc')
+          '".$ENV->STARTING_UPLOAD."')
           ");
 
             $UserID = $DB->inserted_id();

sections/schedule/manually/update_geodist.php

@@ -1,24 +0,0 @@
-<?php
-
-$IPs = [];
-$DB->query("SELECT IP FROM users_main WHERE Enabled = '1'");
-
-while (list($EncIP) = $DB->next_record()) {
-    $IPs[] = Crypto::decrypt($EncIP);
-}
-
-$DB->query("CREATE TEMPORARY TABLE users_ips_decrypted (IP VARCHAR(45) NOT NULL)");
-$DB->query("INSERT INTO users_ips_decrypted (IP) VALUES('".implode("'),('", $IPs)."')");
-$DB->query("TRUNCATE TABLE users_geodistribution");
-
-$DB->query("
-  INSERT INTO users_geodistribution
-    (Code, Users)
-  SELECT g.Code, COUNT(u.IP) AS Users
-  FROM geoip_country AS g
-    JOIN users_ips_decrypted AS u ON INET_ATON(u.IP) BETWEEN g.StartIP AND g.EndIP
-  GROUP BY g.Code
-  ORDER BY Users DESC");
-  
-$DB->query("DROP TABLE users_ips_decrypted");
-$Cache->delete_value('geodistribution');

sections/tools/data/registration_log.php

@@ -1,4 +1,5 @@
 <?php
+#declare(strict_types=1);
 
 if (!check_perms('users_view_ips') || !check_perms('users_view_email')) {
     error(403);
@@ -33,7 +34,6 @@ $RS = "
     SQL_CALC_FOUND_ROWS
     m.ID,
     m.IP,
-    m.ipcc,
     m.Email,
     m.Username,
     m.PermissionID,
@@ -50,7 +50,6 @@ $RS = "
     ) AS Uses,
     im.ID,
     im.IP,
-    im.ipcc,
     im.Email,
     im.Username,
     im.PermissionID,
@@ -115,7 +114,7 @@ if ($DB->has_results()) {
   </tr>
 
   <?php
-  while (list($UserID, $IP, $IPCC, $Email, $Username, $PermissionID, $Uploaded, $Downloaded, $Enabled, $Donor, $Warned, $Joined, $Uses, $InviterID, $InviterIP, $InviterIPCC, $InviterEmail, $InviterUsername, $InviterPermissionID, $InviterUploaded, $InviterDownloaded, $InviterEnabled, $InviterDonor, $InviterWarned, $InviterJoined, $InviterUses) = $DB->next_record()) {
+  while (list($UserID, $IP, $Email, $Username, $PermissionID, $Uploaded, $Downloaded, $Enabled, $Donor, $Warned, $Joined, $Uses, $InviterID, $InviterIP, $InviterEmail, $InviterUsername, $InviterPermissionID, $InviterUploaded, $InviterDownloaded, $InviterEnabled, $InviterDonor, $InviterWarned, $InviterJoined, $InviterUses) = $DB->next_record()) {
       $RowClass = $IP === $InviterIP ? 'warning' : '';
       $Email = apcu_exists('DBKEY') ? Crypto::decrypt($Email) : '[Encrypted]';
       $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
@@ -186,11 +185,6 @@ if ($DB->has_results()) {
       </span><br />
     </td>
 
-    <td>
-      <?=$IPCC?><br />
-      <?=$InviterIPCC?>
-    </td>
-
     <td>
       <?=Tools::get_host_by_ajax($IP)?><br />
       <?=Tools::get_host_by_ajax($InviterIP)?>

sections/tools/development/update_geoip.php

@@ -1,110 +0,0 @@
-<?
-ini_set('memory_limit', '1G');
-set_time_limit(0);
-
-$LIMIT = 1000;
-
-if (!check_perms('site_debug')) {
-  error(403);
-}
-
-View::show_header();
-chdir('/tmp');
-// requires wget, unzip, gunzip commands to be installed
-
-// Country section
-shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip');
-shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoIPv6.csv.gz');
-shell_exec('unzip GeoIPCountryCSV.zip');
-shell_exec('gunzip GeoIPv6.csv.gz');
-shell_exec('cut -d , -f 3-5 GeoIPCountryWhois.csv > GeoIPCountry.csv');
-shell_exec('cut -d , -f 3-5 GeoIPv6.csv | tr -d " " >> GeoIPCountry.csv');
-
-if (($fd = fopen('GeoIPCountry.csv', 'r')) !== false) {
-  $DB->query("TRUNCATE TABLE geoip_country");
-  $Values = [];
-  $Count = 0;
-  while (($Data = fgetcsv($fd)) !== false) {
-    list($StartIP, $EndIP, $CountryID) = $Data;
-    $Values[] = "($StartIP, $EndIP, '$CountryID')";
-    $Count++;
-    if ($Count % $LIMIT == 0) {
-      $DB->query("
-        INSERT INTO geoip_country (StartIP, EndIP, Code)
-        VALUES ".implode(', ', $Values));
-      $Values = [];
-    }
-  }
-  if (count($Values) > 0) {
-    $DB->query("
-      INSERT INTO geoip_country (StartIP, EndIP, Code)
-      VALUES ".implode(', ', $Values));
-  }
-  echo 'GeoIP_Country: There are '.($Count+count($Values)).' entries <br />';
-} else {
-  echo 'Country Error';
-}
-shell_exec('rm GeoIPCountryCSV.zip GeoIPv6.csv.gz GeoIPCountryWhois.csv GeoIPv6.csv GeoIPCountry.csv');
-
-// ASN (v4) section
-shell_exec('wget http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum2.zip');
-shell_exec('unzip GeoIPASNum2.zip');
-
-if (($fd = fopen('GeoIPASNum2.csv', 'r')) !== false) {
-  $DB->query("TRUNCATE TABLE geoip_asn");
-  $Values = [];
-  $Count = 0;
-  while (($Data = fgetcsv($fd)) !== false) {
-    list($StartIP, $EndIP, $ASN) = $Data;
-    $ASN = substr($ASN, 2, strpos($ASN, ' ') ? strpos($ASN, ' ')-2 : strlen($ASN)-2);
-    $Values[] = "(INET6_ATON(INET_NTOA($StartIP)), INET6_ATON(INET_NTOA($EndIP)), $ASN)";
-    $Count++;
-    if ($Count % $LIMIT == 0) {
-      $DB->query("
-        INSERT INTO geoip_asn (StartIP, EndIP, ASN)
-        VALUES ".implode(', ', $Values));
-      $Values = [];
-    }
-  }
-  if (count($Values) > 0) {
-    $DB->query("
-      INSERT INTO geoip_asn (StartIP, EndIP, ASN)
-      VALUES ".implode(', ', $Values));
-  }
-  echo 'GeoIP_ASN (v4): There are '.($Count+count($Values)).' entries <br />';
-} else {
-  echo 'ASNv4 Error';
-}
-shell_exec('rm GeoIPASNum2.zip GeoIPASNum2.csv');
-
-// ASN (v6) section
-shell_exec('wget http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum2v6.zip');
-shell_exec('unzip GeoIPASNum2v6.zip');
-
-if (($fd = fopen('GeoIPASNum2v6.csv', 'r')) !== false) {
-  $Values = [];
-  $Count = 0;
-  while (($Data = fgetcsv($fd)) !== false) {
-    list($ASN, $StartIP, $EndIP) = $Data;
-    $ASN = substr($ASN, 2, strpos($ASN, ' ') ? strpos($ASN, ' ')-2 : strlen($ASN)-2);
-    $Values[] = "(INET6_ATON('$StartIP'), INET6_ATON('$EndIP'), $ASN)";
-    $Count++;
-    if ($Count % $LIMIT == 0) {
-      $DB->query("
-        INSERT INTO geoip_asn (StartIP, EndIP, ASN)
-        VALUES ".implode(', ', $Values));
-      $Values = [];
-    }
-  }
-  if (count($Values) > 0) {
-    $DB->query("
-      INSERT INTO geoip_asn (StartIP, EndIP, ASN)
-      VALUES ".implode(', ', $Values));
-  }
-  echo 'GeoIP_ASN (v6): There are '.($Count+count($Values)).' entries <br />';
-} else {
-  echo 'ASNv6 Error';
-}
-shell_exec('rm GeoIPASNum2v6.zip GeoIPASNum2v6.tmp GeoIPASNum2v6.csv');
-
-View::show_footer();

sections/tools/index.php

@@ -25,12 +25,6 @@ if (!isset($_REQUEST['action'])) {
     #error('Need to set an "action" parameter in sections/tools/tools.php.');
 }
 
-if (substr($_REQUEST['action'], 0, 12) === 'update_geoip' && !isset($argv[1])) {
-    if (!check_perms('site_debug')) {
-        error(403);
-    }
-}
-
 if (substr($_REQUEST['action'], 0, 16) === 'rerender_gallery' && !isset($argv[1])) {
     if (!check_perms('site_debug')) {
         error(403);
@@ -419,10 +413,6 @@ switch ($_REQUEST['action']) {
   // END Data
 
   // Misc
-  case 'update_geoip':
-    include SERVER_ROOT.'/sections/tools/development/update_geoip.php';
-    break;
-
   case 'dupe_ips':
     include SERVER_ROOT.'/sections/tools/misc/dupe_ip.php';
     break;

sections/tools/services/get_cc.php

@@ -1,19 +0,0 @@
-<?php
-
-if (isset($_SERVER['http_if_modified_since'])) {
-    header('Status: 304 Not Modified');
-    error();
-}
-
-header('Expires: '.date('D, d-M-Y H:i:s \U\T\C', time() + 3600 * 24 * 120)); //120 days
-header('Last-Modified: '.date('D, d-M-Y H:i:s \U\T\C', time()));
-
-if (!check_perms('users_view_ips')) {
-    error('Access denied.');
-}
-
-if (empty($_GET['ip'])) {
-    error('Invalid IP address.');
-}
-
-die(Tools::geoip($_GET['ip']));

sections/tools/tools.php

@@ -1,4 +1,5 @@
 <?php
+#declare(strict_types=1);
 
 /***********************************************
  * This file displays the list of available tools in the staff toolbox.
@@ -167,7 +168,6 @@ View::show_header('Staff Tools');
   create_row("Service stats", "tools.php?action=service_stats", check_perms("site_debug"));
   create_row("Miscellaneous values", "tools.php?action=misc_values", check_perms('users_mod'));
   create_row("Tracker info", "tools.php?action=ocelot_info", check_perms("users_mod"));
-  create_row("Update GeoIP", "tools.php?action=update_geoip", check_perms("admin_update_geoip"));
 
   if ($ToolsHTML) {
       ?>
@@ -229,7 +229,7 @@ View::show_header('Staff Tools');
         <tr class="colhead">
           <td>Torrents</td>
         </tr>
-        <?=       $ToolsHTML ?>
+        <?= $ToolsHTML ?>
       </table>
     </div>
     <?php

sections/user/advancedsearch.php

@@ -308,15 +308,6 @@ if (count($_GET)) {
             $Join['la'] .= ' JOIN locked_accounts AS la ON la.UserID = um1.ID ';
         }
 
-
-        if (!empty($_GET['cc'])) {
-            if ($_GET['cc_op'] == 'equal') {
-                $Where[] = "um1.ipcc = '".db_string($_GET['cc'])."'";
-            } else {
-                $Where[] = "um1.ipcc != '".db_string($_GET['cc'])."'";
-            }
-        }
-
         if (!empty($_GET['tracker_ip'])) {
             $Distinct = 'DISTINCT ';
             $Join['xfu'] = ' JOIN xbt_files_users AS xfu ON um1.ID = xfu.uid ';
@@ -1131,7 +1122,7 @@ while (list($UserID, $Username, $Uploaded, $Downloaded, $Snatched, $Invitees, $C
       <td><?=Format::get_ratio_html($Uploaded, $Downloaded)?>
       </td>
       <td style="word-break: break-all;"><?=display_str($IP)?>
-        (<?=Tools::get_country_code_by_ajax($IP)?>)</td>
+      </td>
       <td><?=display_str($Email)?>
       </td>
       <td><?=time_diff($JoinDate)?>
@@ -1170,7 +1161,9 @@ while (list($UserID, $Username, $Uploaded, $Downloaded, $Snatched, $Invitees, $C
 ?>
   </table>
 </div>
+
 <div class="linkbox">
   <?=$Pages?>
 </div>
+
 <?php View::show_footer();

sections/userhistory/email_history.php

@@ -1,4 +1,6 @@
-<?
+<?php
+#declare(strict_types=1);
+
 /************************************************************************
 ||------------|| User email history page ||---------------------------||
 
@@ -10,10 +12,9 @@ user.
 
 ************************************************************************/
 
-
 $UserID = $_GET['userid'];
 if (!is_number($UserID)) {
-  error(404);
+    error(404);
 }
 
 $DB->query("
@@ -25,7 +26,7 @@ $DB->query("
 list($Joined, $Class) = $DB->next_record();
 
 if (!check_perms('users_view_email', $Class)) {
-  error(403);
+    error(403);
 }
 
 $UsersOnly = $_GET['usersonly'];
@@ -38,7 +39,7 @@ list($Username)= $DB->next_record();
 View::show_header("Email history for $Username");
 
 if ($UsersOnly == 1) {
-  $DB->query("
+    $DB->query("
     SELECT
       u.Email,
       NOW() AS Time,
@@ -46,7 +47,6 @@ if ($UsersOnly == 1) {
       c.Code
     FROM users_main AS u
       LEFT JOIN users_main AS u2 ON u2.Email = u.Email AND u2.ID != '$UserID'
-      LEFT JOIN geoip_country AS c ON INET_ATON(u.IP) BETWEEN c.StartIP AND c.EndIP
     WHERE u.ID = '$UserID'
       AND u2.ID > 0
     UNION
@@ -57,20 +57,17 @@ if ($UsersOnly == 1) {
       c.Code
     FROM users_history_emails AS h
       LEFT JOIN users_history_emails AS h2 ON h2.email = h.email and h2.UserID != '$UserID'
-      LEFT JOIN geoip_country AS c ON INET_ATON(h.IP) BETWEEN c.StartIP AND c.EndIP
     WHERE h.UserID = '$UserID'
-      AND h2.UserID > 0"
-      /*AND Time IS NOT NULL*/."
+      AND h2.UserID > 0
     ORDER BY Time DESC");
 } else {
-  $DB->query("
+    $DB->query("
     SELECT
       u.Email,
       NOW() AS Time,
       u.IP,
       c.Code
     FROM users_main AS u
-      LEFT JOIN geoip_country AS c ON INET_ATON(u.IP) BETWEEN c.StartIP AND c.EndIP
     WHERE u.ID = '$UserID'
     UNION
     SELECT
@@ -79,9 +76,7 @@ if ($UsersOnly == 1) {
       h.IP,
       c.Code
     FROM users_history_emails AS h
-      LEFT JOIN geoip_country AS c ON INET_ATON(h.IP) BETWEEN c.StartIP AND c.EndIP
-    WHERE UserID = '$UserID' "
-      /*AND Time IS NOT NULL*/."
+    WHERE UserID = '$UserID'
     ORDER BY Time DESC");
 }
 $History = $DB->to_array();
@@ -93,31 +88,36 @@ $History = $DB->to_array();
   <tr class="colhead">
     <td>Email</td>
     <td>Set</td>
-    <td>IP <a href="userhistory.php?action=ips&amp;userid=<?=$UserID ?>" class="brackets">H</a></td>
-<? if ($UsersOnly == 1) {
-?>
-  <td>User</td>
-<?
+    <td>IP <a
+        href="userhistory.php?action=ips&amp;userid=<?=$UserID ?>"
+        class="brackets">H</a></td>
+    <?php if ($UsersOnly == 1) {
+    ?>
+    <td>User</td>
+    <?php
 }
 ?>
   </tr>
-<?
+  <?php
 foreach ($History as $Key => $Values) {
-  if (isset($History[$Key + 1])) {
-    $Values['Time'] = $History[$Key + 1]['Time'];
-  } else {
-    $Values['Time'] = $Joined;
-  }
+    if (isset($History[$Key + 1])) {
+        $Values['Time'] = $History[$Key + 1]['Time'];
+    } else {
+        $Values['Time'] = $Joined;
+    }
 
-  $ValuesIP = apcu_exists('DBKEY') ? Crypto::decrypt($Values['IP']) : '[Encrypted]';
-?>
+    $ValuesIP = apcu_exists('DBKEY') ? Crypto::decrypt($Values['IP']) : '[Encrypted]'; ?>
   <tr class="row">
-    <td><?=display_str($Values['Email'])?></td>
-    <td><?=time_diff($Values['Time'])?></td>
-    <td><?=display_str($ValuesIP)?> (<?=display_str($Values['Code'])?>) <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($ValuesIP)?>" class="brackets tooltip" title="Search">S</a></td>
-<?
+    <td><?=display_str($Values['Email'])?>
+    </td>
+    <td><?=time_diff($Values['Time'])?>
+    </td>
+    <td><?=display_str($ValuesIP)?> (<?=display_str($Values['Code'])?>) <a
+        href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($ValuesIP)?>"
+        class="brackets tooltip" title="Search">S</a></td>
+    <?php
   if ($UsersOnly == 1) {
-    $ueQuery = $DB->query("
+      $ueQuery = $DB->query("
           SELECT
             ue.UserID,
             um.Username,
@@ -127,28 +127,28 @@ foreach ($History as $Key => $Values) {
           WHERE ue.Email = '".db_string($Values['Email'])."'
             AND ue.UserID != $UserID
             AND um.ID = ue.UserID");
-    while (list($UserID2, $Time, $IP) = $DB->next_record()) {
-      $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
-?>
+      while (list($UserID2, $Time, $IP) = $DB->next_record()) {
+          $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]'; ?>
   </tr>
   <tr>
     <td></td>
-    <td><?=time_diff($Time)?></td>
-    <td><?=display_str($IP)?></td>
-<?
+    <td><?=time_diff($Time)?>
+    </td>
+    <td><?=display_str($IP)?>
+    </td>
+    <?php
       $UserURL = site_url()."user.php?id=$UserID2";
-      $DB->query("
+          $DB->query("
         SELECT Enabled
         FROM users_main
         WHERE ID = $UserID2");
-      list($Enabled) = $DB->next_record();
-      $DB->set_query_id($ueQuery);
-?>
+          list($Enabled) = $DB->next_record();
+          $DB->set_query_id($ueQuery); ?>
     <td><a href="<?=display_str($UserURL)?>"><?=Users::format_username($UserID2, false, false, true)?></a></td>
   </tr>
-<?
-    }
+  <?php
+      }
   }
 } ?>
 </table>
-<? View::show_footer(); ?>
+<?php View::show_footer();

sections/userhistory/email_history2.php

@@ -1,4 +1,6 @@
-<?
+<?php
+#declare(strict_types=1);
+
 /************************************************************************
 ||------------|| User email history page ||---------------------------||
 
@@ -12,7 +14,7 @@ user.
 
 $UserID = $_GET['userid'];
 if (!is_number($UserID)) {
-  error(404);
+    error(404);
 }
 
 $DB->query("
@@ -26,7 +28,7 @@ $DB->query("
 list($Joined, $Class) = $DB->next_record();
 
 if (!check_perms('users_view_email', $Class)) {
-  error(403);
+    error(403);
 }
 
 // todo: Is this even used?
@@ -40,7 +42,8 @@ list($Username) = $DB->next_record();
 View::show_header("Email history for $Username");
 
 // Get current email (and matches)
-$DB->query("
+$DB->query(
+    "
   SELECT
     m.Email,
     NOW() AS Time,
@@ -63,7 +66,8 @@ $DB->query("
 $CurrentEmail = ($DB->to_array())[0]; // Only variables should be passed by reference
 
 // Get historic emails (and matches)
-$DB->query("
+$DB->query(
+    "
   SELECT
     h2.Email,
     h2.Time,
@@ -93,74 +97,73 @@ $Current['IP'] = $History[(count($History) - 1)]['IP'];
 
 // Matches for current email
 if ($CurrentEmail['Usernames'] != '') {
-  $UserIDs = explode('|', $CurrentEmail['UserIDs']);
-  $Usernames = explode('|', $CurrentEmail['Usernames']);
-  $UsersEnabled = explode('|', $CurrentEmail['UsersEnabled']);
-  $UsersDonor = explode('|', $CurrentEmail['UsersDonor']);
-  $UsersWarned = explode('|', $CurrentEmail['UsersWarned']);
-  $UserSetTimes = explode('|', $CurrentEmail['UserSetTimes']);
-  $UserIPs = explode('|', $CurrentEmail['UserIPs']);
+    $UserIDs = explode('|', $CurrentEmail['UserIDs']);
+    $Usernames = explode('|', $CurrentEmail['Usernames']);
+    $UsersEnabled = explode('|', $CurrentEmail['UsersEnabled']);
+    $UsersDonor = explode('|', $CurrentEmail['UsersDonor']);
+    $UsersWarned = explode('|', $CurrentEmail['UsersWarned']);
+    $UserSetTimes = explode('|', $CurrentEmail['UserSetTimes']);
+    $UserIPs = explode('|', $CurrentEmail['UserIPs']);
 
-  foreach ($UserIDs as $Key => $Val) {
-    $CurrentMatches[$Key]['Username'] = '&nbsp;&nbsp;&#187;&nbsp;'.Users::format_username($Val, true, true, true);
-    $CurrentMatches[$Key]['IP'] = $UserIPs[$Key];
-    $CurrentMatches[$Key]['EndTime'] = $UserSetTimes[$Key];
-  }
+    foreach ($UserIDs as $Key => $Val) {
+        $CurrentMatches[$Key]['Username'] = '&nbsp;&nbsp;&#187;&nbsp;'.Users::format_username($Val, true, true, true);
+        $CurrentMatches[$Key]['IP'] = $UserIPs[$Key];
+        $CurrentMatches[$Key]['EndTime'] = $UserSetTimes[$Key];
+    }
 }
 
 // Email history records
 if (count($History) === 1) {
-  $Invite['Email'] = $History[0]['Email'];
-  $Invite['EndTime'] = $Joined;
-  $Invite['AccountAge'] = date(time() + time() - strtotime($Joined)); // Same as EndTime but without ' ago'
-  $Invite['IP'] = $History[0]['IP'];
-  if (!$Current['StartTime']) {
-    $Current['StartTime'] = $Joined;
-  }
-} else {
-  foreach ($History as $Key => $Val) {
-    if (isset($History[$Key + 1]) && !$History[$Key + 1]['Time'] && !$Val['Time']) {
-      // Invited email
-      $Invite['Email'] = $Val['Email'];
-      $Invite['EndTime'] = $Joined;
-      $Invite['AccountAge'] = date(time() + time() - strtotime($Joined)); // Same as EndTime but without ' ago'
-      $Invite['IP'] = $Val['IP'];
-
-    } elseif (isset($History[$Key - 1]) && $History[$Key - 1]['Email'] != $Val['Email'] && $Val['Time']) {
-      // Old email
-      $i = 1;
-      while ($Val['Email'] == $History[$Key + $i]['Email']) {
-        $i++;
-      }
-      $Old[$Key]['StartTime'] = (isset($History[$Key + $i]) && $History[$Key + $i]['Time']) ? $History[$Key + $i]['Time'] : $Joined;
-      $Old[$Key]['EndTime'] = $Val['Time'];
-      $Old[$Key]['IP'] = $Val['IP'];
-      $Old[$Key]['ElapsedTime'] = date(time() + strtotime($Old[$Key]['EndTime']) - strtotime($Old[$Key]['StartTime']));
-      $Old[$Key]['Email'] = $Val['Email'];
+    $Invite['Email'] = $History[0]['Email'];
+    $Invite['EndTime'] = $Joined;
+    $Invite['AccountAge'] = date(time() + time() - strtotime($Joined)); // Same as EndTime but without ' ago'
+    $Invite['IP'] = $History[0]['IP'];
+    if (!$Current['StartTime']) {
+        $Current['StartTime'] = $Joined;
     }
+} else {
+    foreach ($History as $Key => $Val) {
+        if (isset($History[$Key + 1]) && !$History[$Key + 1]['Time'] && !$Val['Time']) {
+            // Invited email
+            $Invite['Email'] = $Val['Email'];
+            $Invite['EndTime'] = $Joined;
+            $Invite['AccountAge'] = date(time() + time() - strtotime($Joined)); // Same as EndTime but without ' ago'
+            $Invite['IP'] = $Val['IP'];
+        } elseif (isset($History[$Key - 1]) && $History[$Key - 1]['Email'] != $Val['Email'] && $Val['Time']) {
+            // Old email
+            $i = 1;
+            while ($Val['Email'] == $History[$Key + $i]['Email']) {
+                $i++;
+            }
+            $Old[$Key]['StartTime'] = (isset($History[$Key + $i]) && $History[$Key + $i]['Time']) ? $History[$Key + $i]['Time'] : $Joined;
+            $Old[$Key]['EndTime'] = $Val['Time'];
+            $Old[$Key]['IP'] = $Val['IP'];
+            $Old[$Key]['ElapsedTime'] = date(time() + strtotime($Old[$Key]['EndTime']) - strtotime($Old[$Key]['StartTime']));
+            $Old[$Key]['Email'] = $Val['Email'];
+        }
 
-    if ($Val['Usernames'] != '') {
-      // Match with old email
-      $OldMatches[$Key]['Email'] = $Val['Email'];
-      $OldMatches[$Key]['Username'] = '&nbsp;&nbsp;&#187;&nbsp;'.Users::format_username($Val['UserIDs'], true, true, true);
-      $OldMatches[$Key]['EndTime'] = $Val['UserSetTimes'];
-      $OldMatches[$Key]['IP'] = $Val['UserIPs'];
+        if ($Val['Usernames'] != '') {
+            // Match with old email
+            $OldMatches[$Key]['Email'] = $Val['Email'];
+            $OldMatches[$Key]['Username'] = '&nbsp;&nbsp;&#187;&nbsp;'.Users::format_username($Val['UserIDs'], true, true, true);
+            $OldMatches[$Key]['EndTime'] = $Val['UserSetTimes'];
+            $OldMatches[$Key]['IP'] = $Val['UserIPs'];
+        }
     }
-  }
 }
 
 // Clean up arrays
 if ($Old ?? false) {
-  $Old = array_reverse(array_reverse($Old));
-  $LastOld = count($Old) - 1;
-  if ($Old[$LastOld]['StartTime'] != $Invite['EndTime']) {
-    // Make sure the timeline is intact (invite email was used as email for the account in the beginning)
-    $Old[$LastOld + 1]['Email'] = $Invite['Email'];
-    $Old[$LastOld + 1]['StartTime'] = $Invite['EndTime'];
-    $Old[$LastOld + 1]['EndTime'] = $Old[$LastOld]['StartTime'];
-    $Old[$LastOld + 1]['ElapsedTime'] = date(time() + strtotime($Old[$LastOld + 1]['EndTime'] ) - strtotime($Old[$LastOld + 1]['StartTime']));
-    $Old[$LastOld + 1]['IP'] = $Invite['IP'];
-  }
+    $Old = array_reverse(array_reverse($Old));
+    $LastOld = count($Old) - 1;
+    if ($Old[$LastOld]['StartTime'] != $Invite['EndTime']) {
+        // Make sure the timeline is intact (invite email was used as email for the account in the beginning)
+        $Old[$LastOld + 1]['Email'] = $Invite['Email'];
+        $Old[$LastOld + 1]['StartTime'] = $Invite['EndTime'];
+        $Old[$LastOld + 1]['EndTime'] = $Old[$LastOld]['StartTime'];
+        $Old[$LastOld + 1]['ElapsedTime'] = date(time() + strtotime($Old[$LastOld + 1]['EndTime']) - strtotime($Old[$LastOld + 1]['StartTime']));
+        $Old[$LastOld + 1]['IP'] = $Invite['IP'];
+    }
 }
 
 // Start page with current email
@@ -169,7 +172,8 @@ if ($Old ?? false) {
   <div class="header">
     <h2>Email history for <a href="user.php?id=<?=$UserID ?>"><?=$Username ?></a></h2>
     <div class="linkbox center">
-      <a href="userhistory.php?action=email&amp;userid=<?=$UserID?>" class="brackets">Old email history</a>
+      <a href="userhistory.php?action=email&amp;userid=<?=$UserID?>"
+        class="brackets">Old email history</a>
     </div>
   </div>
   <br />
@@ -178,61 +182,69 @@ if ($Old ?? false) {
       <td>Current email</td>
       <td>Start</td>
       <td>End</td>
-      <td>Current IP <a href="userhistory.php?action=ips&amp;userid=<?=$UserID ?>" class="brackets">H</a></td>
+      <td>Current IP <a
+          href="userhistory.php?action=ips&amp;userid=<?=$UserID ?>"
+          class="brackets">H</a></td>
       <td>Set from IP</td>
     </tr>
-<?
+    <?php
 $Current['Email'] = apcu_exists('DBKEY') ? Crypto::decrypt($Current['Email']) : '[Encrypted]';
 $Current['CurrentIP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Current['CurrentIP']) : '[Encrypted]';
 $Current['IP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Current['IP']) : '[Encrypted]';
 ?>
     <tr class="row">
-      <td><?=display_str($Current['Email'])?></td>
-      <td><?=time_diff($Current['StartTime'])?></td>
+      <td><?=display_str($Current['Email'])?>
+      </td>
+      <td><?=time_diff($Current['StartTime'])?>
+      </td>
       <td></td>
       <td>
         <?=display_str($Current['CurrentIP'])?>
-        (<?=Tools::get_country_code_by_ajax($Current['CurrentIP'])?>)
-        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Current['CurrentIP'])?>" class="brackets tooltip" title="Search">S</a>
-        <a href="http://whatismyipaddress.com/ip/<?=display_str($Current['CurrentIP'])?>" class="brackets tooltip" title="Search WIMIA.com">WI</a>
+        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Current['CurrentIP'])?>"
+          class="brackets tooltip" title="Search">S</a>
+        <a href="http://whatismyipaddress.com/ip/<?=display_str($Current['CurrentIP'])?>"
+          class="brackets tooltip" title="Search WIMIA.com">WI</a>
         <br />
         <?=Tools::get_host_by_ajax($Current['CurrentIP'])?>
       </td>
       <td>
         <?=display_str($Current['IP'])?>
-        (<?=Tools::get_country_code_by_ajax($Current['IP'])?>)
-        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Current['IP'])?>" class="brackets tooltip" title="Search">S</a>
-        <a href="http://whatismyipaddress.com/ip/<?=display_str($Current['IP'])?>" class="brackets tooltip" title="Search WIMIA.com">WI</a>
+        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Current['IP'])?>"
+          class="brackets tooltip" title="Search">S</a>
+        <a href="http://whatismyipaddress.com/ip/<?=display_str($Current['IP'])?>"
+          class="brackets tooltip" title="Search WIMIA.com">WI</a>
         <br />
         <?=Tools::get_host_by_ajax($Current['IP'])?>
       </td>
     </tr>
-<?
+    <?php
 if ($CurrentMatches ?? false) {
-  // Match on the current email
-  foreach ($CurrentMatches as $Match) {
-    $Match['IP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Match['IP']) : '[Encrypted]';
-?>
+    // Match on the current email
+    foreach ($CurrentMatches as $Match) {
+        $Match['IP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Match['IP']) : '[Encrypted]'; ?>
     <tr class="row">
-      <td><?=$Match['Username']?></td>
+      <td><?=$Match['Username']?>
+      </td>
       <td></td>
-      <td><?=time_diff($Match['EndTime'])?></td>
+      <td><?=time_diff($Match['EndTime'])?>
+      </td>
       <td></td>
       <td>
         <?=display_str($Match['IP'])?>
-        (<?=Tools::get_country_code_by_ajax($Match['IP'])?>)
-        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Match['IP'])?>" class="brackets tooltip" title="Search">S</a>
-        <a href="http://whatismyipaddress.com/ip/<?=display_str($Match['IP'])?>" class="brackets tooltip" title="Search WIMIA.com">WI</a>
+        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Match['IP'])?>"
+          class="brackets tooltip" title="Search">S</a>
+        <a href="http://whatismyipaddress.com/ip/<?=display_str($Match['IP'])?>"
+          class="brackets tooltip" title="Search WIMIA.com">WI</a>
         <br />
         <?=Tools::get_host_by_ajax($Match['IP'])?>
       </td>
     </tr>
-<?
-  }
+    <?php
+    }
 }
 // Old emails
 if ($Old ?? false) {
-?>
+    ?>
     <tr class="colhead">
       <td>Old emails</td>
       <td>Start</td>
@@ -240,71 +252,78 @@ if ($Old ?? false) {
       <td>Elapsed</td>
       <td>Set from IP</td>
     </tr>
-<?
+    <?php
   $j = 0;
-  // Old email
-  foreach ($Old as $Record) {
-    ++$j;
+    // Old email
+    foreach ($Old as $Record) {
+        ++$j;
 
-    // Matches on old email
-    ob_start();
-    $i = 0;
-    if ($OldMatches ?? false) {
-      foreach ($OldMatches as $Match) {
-        if ($Match['Email'] == $Record['Email']) {
-          ++$i;
-          // Email matches
+        // Matches on old email
+        ob_start();
+        $i = 0;
+        if ($OldMatches ?? false) {
+            foreach ($OldMatches as $Match) {
+                if ($Match['Email'] == $Record['Email']) {
+                    ++$i;
+                    // Email matches
   ?>
-      <tr class="row hidden" id="matches_<?=$j?>">
-        <td><?=$Match['Username']?></td>
-        <td></td>
-        <td><?=time_diff($Match['EndTime'])?></td>
-        <td></td>
-        <td>
-          <?=display_str($Match['IP'])?>
-          (<?=Tools::get_country_code_by_ajax($Match['IP'])?>)
-          <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Match['IP'])?>" class="brackets tooltip" title="Search">S</a>
-          <a href="http://whatismyipaddress.com/ip/<?=display_str($Match['IP'])?>" class="brackets tooltip" title="Search WIMIA.com">WI</a>
-          <br />
-          <?=Tools::get_host_by_ajax($Match['IP'])?>
-        </td>
-      </tr>
-  <?
+    <tr class="row hidden" id="matches_<?=$j?>">
+      <td><?=$Match['Username']?>
+      </td>
+      <td></td>
+      <td><?=time_diff($Match['EndTime'])?>
+      </td>
+      <td></td>
+      <td>
+        <?=display_str($Match['IP'])?>
+        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Match['IP'])?>"
+          class="brackets tooltip" title="Search">S</a>
+        <a href="http://whatismyipaddress.com/ip/<?=display_str($Match['IP'])?>"
+          class="brackets tooltip" title="Search WIMIA.com">WI</a>
+        <br />
+        <?=Tools::get_host_by_ajax($Match['IP'])?>
+      </td>
+    </tr>
+    <?php
+                }
+            }
         }
-      }
-    }
 
-    // Save matches to variable
-    $MatchCount = $i;
-    $Matches = ob_get_contents();
-    ob_end_clean();
+        // Save matches to variable
+        $MatchCount = $i;
+        $Matches = ob_get_contents();
+        ob_end_clean();
 
-    $Record['Email'] = apcu_exists('DBKEY') ? Crypto::decrypt($Record['Email']) : '[Encrypted]';
-    $Record['IP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Record['IP']) : '[Encrypted]';
-?>
+        $Record['Email'] = apcu_exists('DBKEY') ? Crypto::decrypt($Record['Email']) : '[Encrypted]';
+        $Record['IP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Record['IP']) : '[Encrypted]'; ?>
     <tr class="row">
-      <td><?=display_str($Record['Email'])?><?=(($MatchCount > 0) ? ' <a data-toggle-target="#matches_'.$j.'">('.$MatchCount.')</a>' : '')?></td>
-      <td><?=time_diff($Record['StartTime'])?></td>
-      <td><?=time_diff($Record['EndTime'])?></td>
-      <td><?=time_diff($Record['ElapsedTime'])?></td>
+      <td><?=display_str($Record['Email'])?><?=(($MatchCount > 0) ? ' <a data-toggle-target="#matches_'.$j.'">('.$MatchCount.')</a>' : '')?>
+      </td>
+      <td><?=time_diff($Record['StartTime'])?>
+      </td>
+      <td><?=time_diff($Record['EndTime'])?>
+      </td>
+      <td><?=time_diff($Record['ElapsedTime'])?>
+      </td>
       <td>
         <?=display_str($Record['IP'])?>
-        (<?=Tools::get_country_code_by_ajax($Record['IP'])?>)
-        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Record['IP'])?>" class="brackets tooltip" title="Search">S</a>
-        <a href="http://whatismyipaddress.com/ip/<?=display_str($Record['IP'])?>" class="brackets tooltip" title="Search WIMIA.com">WI</a>
+        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Record['IP'])?>"
+          class="brackets tooltip" title="Search">S</a>
+        <a href="http://whatismyipaddress.com/ip/<?=display_str($Record['IP'])?>"
+          class="brackets tooltip" title="Search WIMIA.com">WI</a>
         <br />
         <?=Tools::get_host_by_ajax($Record['IP'])?>
       </td>
     </tr>
-<?
+    <?php
     if ($MatchCount > 0) {
-      if (isset($Matches)) {
-        echo $Matches;
-        unset($Matches);
-        unset($MatchCount);
-      }
+        if (isset($Matches)) {
+            echo $Matches;
+            unset($Matches);
+            unset($MatchCount);
+        }
+    }
     }
-  }
 }
 // Invite email (always there)
 ?>
@@ -315,35 +334,37 @@ if ($Old ?? false) {
       <td>Age of account</td>
       <td>Registration IP address</td>
     </tr>
-<?
+    <?php
 // Matches on invite email
 $i = 0;
 ob_start();
 if ($OldMatches ?? false) {
-  foreach ($OldMatches as $Match) {
-    if ($Match['Email'] == $Invite['Email']) {
-      ++$i;
-      // Match email is the same as the invite email
+    foreach ($OldMatches as $Match) {
+        if ($Match['Email'] == $Invite['Email']) {
+            ++$i;
+            // Match email is the same as the invite email
 
-      $Match['IP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Match['IP']) : '[Encrypted]';
-?>
+            $Match['IP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Match['IP']) : '[Encrypted]'; ?>
     <tr class="row hidden" id="matches_invite">
-      <td><?=$Match['Username']?></td>
+      <td><?=$Match['Username']?>
+      </td>
       <td></td>
-      <td><?=time_diff($Match['EndTime'])?></td>
+      <td><?=time_diff($Match['EndTime'])?>
+      </td>
       <td></td>
       <td>
         <?=display_str($Match['IP'])?>
-        (<?=Tools::get_country_code_by_ajax($Match['IP'])?>)
-        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Match['IP'])?>" class="brackets tooltip" title="Search">S</a>
-        <a href="http://whatismyipaddress.com/ip/<?=display_str($Match['IP'])?>" class="brackets tooltip" title="Search WIMIA.com">WI</a>
+        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Match['IP'])?>"
+          class="brackets tooltip" title="Search">S</a>
+        <a href="http://whatismyipaddress.com/ip/<?=display_str($Match['IP'])?>"
+          class="brackets tooltip" title="Search WIMIA.com">WI</a>
         <br />
         <?=Tools::get_host_by_ajax($Match['IP'])?>
       </td>
     </tr>
-<?
+    <?php
+        }
     }
-  }
 }
 $MatchCount = $i;
 $Matches = ob_get_contents();
@@ -353,26 +374,30 @@ $Invite['Email'] = apcu_exists('DBKEY') ? Crypto::decrypt($Invite['Email']) : '[
 $Invite['IP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Invite['IP']) : '[Encrypted]';
 ?>
     <tr class="row">
-      <td><?=display_str($Invite['Email'])?><?=(($MatchCount > 0) ? ' <a data-toggle-target="#matches_invite">('.$MatchCount.')</a>' : '')?></td>
+      <td><?=display_str($Invite['Email'])?><?=(($MatchCount > 0) ? ' <a data-toggle-target="#matches_invite">('.$MatchCount.')</a>' : '')?>
+      </td>
       <td>Never</td>
-      <td><?=time_diff($Invite['EndTime'])?></td>
-      <td><?=time_diff($Invite['AccountAge'])?></td>
+      <td><?=time_diff($Invite['EndTime'])?>
+      </td>
+      <td><?=time_diff($Invite['AccountAge'])?>
+      </td>
       <td>
         <?=display_str($Invite['IP'])?>
-        (<?=Tools::get_country_code_by_ajax($Invite['IP'])?>)
-        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Invite['IP'])?>" class="brackets tooltip" title="Search">S</a>
-        <a href="http://whatismyipaddress.com/ip/<?=display_str($Invite['IP'])?>" class="brackets tooltip" title="Search WIMIA.com">WI</a>
+        <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($Invite['IP'])?>"
+          class="brackets tooltip" title="Search">S</a>
+        <a href="http://whatismyipaddress.com/ip/<?=display_str($Invite['IP'])?>"
+          class="brackets tooltip" title="Search WIMIA.com">WI</a>
         <br />
         <?=Tools::get_host_by_ajax($Invite['IP'])?>
       </td>
     </tr>
-<?
+    <?php
 
 if ($Matches) {
-  echo $Matches;
+    echo $Matches;
 }
 
 ?>
   </table>
 </div>
-<? View::show_footer(); ?>
+<?php View::show_footer();

sections/userhistory/ip_history.php

@@ -1,4 +1,6 @@
 <?php
+#declare(strict_types=1);
+
 /************************************************************************
 ||------------|| User IP history page ||---------------------------||
 
@@ -14,7 +16,7 @@ define('IPS_PER_PAGE', 25);
 
 $UserID = $_GET['userid'];
 if (!is_number($UserID)) {
-  error(404);
+    error(404);
 }
 
 $DB->query("
@@ -27,69 +29,71 @@ $DB->query("
 list($Username, $Class) = $DB->next_record();
 
 if (!check_perms('users_view_ips', $Class)) {
-  error(403);
+    error(403);
 }
 
 $UsersOnly = isset($_GET['usersonly']) ? $_GET['usersonly'] : 0;
 
 if (isset($_POST['ip'])) {
-  $SearchIP = db_string(str_replace("*", "%", trim($_POST['ip'])));
-  $SearchIPQuery = " AND h1.IP LIKE '$SearchIP' ";
+    $SearchIP = db_string(str_replace("*", "%", trim($_POST['ip'])));
+    $SearchIPQuery = " AND h1.IP LIKE '$SearchIP' ";
 } else {
-  $SearchIPQuery = "";
+    $SearchIPQuery = "";
 }
 
 View::show_header("IP address history for $Username");
 ?>
-<script type="text/javascript">//<![CDATA[
-function ShowIPs(rowname) {
-  $('tr[name="' + rowname + '"]').gtoggle();
+<script type="text/javascript">
+  //<![CDATA[
+  function ShowIPs(rowname) {
+    $('tr[name="' + rowname + '"]').gtoggle();
 
-}
-function Ban(ip, id, elemID) {
-  var notes = prompt("Enter notes for this ban");
-  if (notes != null && notes.length > 0) {
-    var xmlhttp;
-    if (window.XMLHttpRequest) {
-      xmlhttp = new XMLHttpRequest();
-    } else {
-      xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-    }
-    xmlhttp.onreadystatechange=function() {
-      if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
-        document.getElementById(elemID).innerHTML = "<strong>[Banned]</strong>";
-      }
-    }
-    xmlhttp.open("GET", "tools.php?action=quick_ban&perform=create&ip=" + ip + "&notes=" + notes, true);
-    xmlhttp.send();
   }
 
-}
-/*
-function UnBan(ip, id, elemID) {
-    var xmlhttp;
-    if (window.XMLHttpRequest) {
-      xmlhttp = new XMLHttpRequest();
-    } else {
-      xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-    }
-    xmlhttp.onreadystatechange = function() {
-      if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
-        document.getElementById(elemID).innerHTML = "Ban";
-        document.getElementById(elemID).onclick = function() { Ban(ip, id, elemID); return false; };
+  function Ban(ip, id, elemID) {
+    var notes = prompt("Enter notes for this ban");
+    if (notes != null && notes.length > 0) {
+      var xmlhttp;
+      if (window.XMLHttpRequest) {
+        xmlhttp = new XMLHttpRequest();
+      } else {
+        xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+      }
+      xmlhttp.onreadystatechange = function() {
+        if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+          document.getElementById(elemID).innerHTML = "<strong>[Banned]</strong>";
+        }
       }
+      xmlhttp.open("GET", "tools.php?action=quick_ban&perform=create&ip=" + ip + "&notes=" + notes, true);
+      xmlhttp.send();
     }
-    xmlhttp.open("GET","tools.php?action=quick_ban&perform=delete&id=" + id + "&ip=" + ip, true);
-    xmlhttp.send();
-}
-*/
-//]]>
+
+  }
+  /*
+  function UnBan(ip, id, elemID) {
+      var xmlhttp;
+      if (window.XMLHttpRequest) {
+        xmlhttp = new XMLHttpRequest();
+      } else {
+        xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+      }
+      xmlhttp.onreadystatechange = function() {
+        if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+          document.getElementById(elemID).innerHTML = "Ban";
+          document.getElementById(elemID).onclick = function() { Ban(ip, id, elemID); return false; };
+        }
+      }
+      xmlhttp.open("GET","tools.php?action=quick_ban&perform=delete&id=" + id + "&ip=" + ip, true);
+      xmlhttp.send();
+  }
+  */
+  //]]>
 </script>
-<?
+<?php
 list($Page, $Limit) = Format::page_limit(IPS_PER_PAGE);
 
 if ($UsersOnly == 1) {
-  $RS = $DB->query("
+    $RS = $DB->query("
     SELECT
       SQL_CALC_FOUND_ROWS
       h1.IP,
@@ -112,7 +116,7 @@ if ($UsersOnly == 1) {
     ORDER BY h1.StartTime DESC
     LIMIT $Limit");
 } else {
-  $RS = $DB->query("
+    $RS = $DB->query("
     SELECT
       SQL_CALC_FOUND_ROWS
       h1.IP,
@@ -143,130 +147,153 @@ $Pages = Format::get_pages($Page, $NumResults, IPS_PER_PAGE, 9);
 ?>
 <div>
   <div class="header">
-    <h2>IP address history for <a href="user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+    <h2>IP address history for <a
+        href="user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
     <div class="linkbox">
-<?php if ($UsersOnly) { ?>
-      <a href="userhistory.php?action=ips&amp;userid=<?=$UserID?>" class="brackets">View all IP addresses</a>
-<?php } else { ?>
-      <a href="userhistory.php?action=ips&amp;userid=<?=$UserID?>&amp;usersonly=1" class="brackets">View IP addresses with users</a>
-<?php } ?>
+      <?php if ($UsersOnly) { ?>
+      <a href="userhistory.php?action=ips&amp;userid=<?=$UserID?>"
+        class="brackets">View all IP addresses</a>
+      <?php } else { ?>
+      <a href="userhistory.php?action=ips&amp;userid=<?=$UserID?>&amp;usersonly=1"
+        class="brackets">View IP addresses with users</a>
+      <?php } ?>
     </div>
-<?php if ($Pages) { ?>
-    <div class="linkbox pager"><?=$Pages?></div>
-<?php } ?>
+    <?php if ($Pages) { ?>
+    <div class="linkbox pager"><?=$Pages?>
+    </div>
+    <?php } ?>
   </div>
   <table>
     <tr class="colhead">
       <td>IP address search</td>
     </tr>
 
-    <tr><td>
-      <form class="search_form" name="ip_log" method="post" action="">
-        <input type="text" name="ip" />
-        <input type="submit" value="Search" />
-        Wildcard (*) search examples: 127.0.* or 1*2.0.*.1 or *.*.*.*
-      </form>
-    </td></tr>
+    <tr>
+      <td>
+        <form class="search_form" name="ip_log" method="post" action="">
+          <input type="text" name="ip" />
+          <input type="submit" value="Search" />
+          Wildcard (*) search examples: 127.0.* or 1*2.0.*.1 or *.*.*.*
+        </form>
+      </td>
+    </tr>
   </table>
 
   <table id="iphistory">
     <tr class="colhead">
       <td>IP address</td>
-      <td>Started <a href="#" onclick="$('#iphistory td:nth-child(2), #iphistory td:nth-child(4)').ghide(); $('#iphistory td:nth-child(3), #iphistory td:nth-child(5)').gshow(); return false;" class="brackets">Toggle</a></td>
-      <td class="hidden">Started <a href="#" onclick="$('#iphistory td:nth-child(2), #iphistory td:nth-child(4)').gshow(); $('#iphistory td:nth-child(3), #iphistory td:nth-child(5)').ghide(); return false;" class="brackets">Toggle</a></td>
+      <td>Started <a href="#"
+          onclick="$('#iphistory td:nth-child(2), #iphistory td:nth-child(4)').ghide(); $('#iphistory td:nth-child(3), #iphistory td:nth-child(5)').gshow(); return false;"
+          class="brackets">Toggle</a></td>
+      <td class="hidden">Started <a href="#"
+          onclick="$('#iphistory td:nth-child(2), #iphistory td:nth-child(4)').gshow(); $('#iphistory td:nth-child(3), #iphistory td:nth-child(5)').ghide(); return false;"
+          class="brackets">Toggle</a></td>
       <td>Ended</td>
       <td class="hidden">Ended</td>
       <td>Elapsed</td>
     </tr>
-<?
+    <?php
 $counter = 0;
 $IPs = [];
 $Results = $DB->to_array();
 $CanManageIPBans = check_perms('admin_manage_ipbans');
 
 foreach ($Results as $Index => $Result) {
-  list($IP, $StartTime, $EndTime, $UserIDs, $UserStartTimes, $UserEndTimes, $Usernames, $UsersEnabled, $UsersDonor, $UsersWarned) = $Result;
+    list($IP, $StartTime, $EndTime, $UserIDs, $UserStartTimes, $UserEndTimes, $Usernames, $UsersEnabled, $UsersDonor, $UsersWarned) = $Result;
 
-  $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
+    $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
 
-  $HasDupe = false;
-  $UserIDs = explode('|', $UserIDs);
-  if (!$EndTime) {
-    $EndTime = sqltime();
-  }
-  if ($UserIDs[0] != 0) {
-    $HasDupe = true;
-    $UserStartTimes = explode('|', $UserStartTimes);
-    $UserEndTimes = explode('|', $UserEndTimes);
-    $Usernames = explode('|', $Usernames);
-    $UsersEnabled = explode('|', $UsersEnabled);
-    $UsersDonor = explode('|', $UsersDonor);
-    $UsersWarned = explode('|', $UsersWarned);
-  }
-?>
+    $HasDupe = false;
+    $UserIDs = explode('|', $UserIDs);
+    if (!$EndTime) {
+        $EndTime = sqltime();
+    }
+    if ($UserIDs[0] != 0) {
+        $HasDupe = true;
+        $UserStartTimes = explode('|', $UserStartTimes);
+        $UserEndTimes = explode('|', $UserEndTimes);
+        $Usernames = explode('|', $Usernames);
+        $UsersEnabled = explode('|', $UsersEnabled);
+        $UsersDonor = explode('|', $UsersDonor);
+        $UsersWarned = explode('|', $UsersWarned);
+    } ?>
     <tr class="row">
       <td>
-        <?=$IP?> (<?=Tools::get_country_code_by_ajax($IP)?>)<?
+        <?=$IP?>
+        <?php
   if ($CanManageIPBans) {
-    if (!isset($IPs[$IP])) {
-      $sql = "
+      if (!isset($IPs[$IP])) {
+          $sql = "
         SELECT ID, FromIP, ToIP
         FROM ip_bans
         WHERE '".Tools::ip_to_unsigned($IP)."' BETWEEN FromIP AND ToIP
         LIMIT 1";
-      $DB->query($sql);
+          $DB->query($sql);
 
-      if ($DB->has_results()) {
-        $IPs[$IP] = true;
-?>
+          if ($DB->has_results()) {
+              $IPs[$IP] = true; ?>
         <strong>[Banned]</strong>
-<?
-      } else {
-        $IPs[$IP] = false;
-?>
-        <a id="<?=$counter?>" href="#" onclick="Ban('<?=$IP?>', '', '<?=$counter?>'); this.onclick = null; return false;" class="brackets">Ban</a>
-<?
+        <?php
+          } else {
+              $IPs[$IP] = false; ?>
+        <a id="<?=$counter?>" href="#"
+          onclick="Ban('<?=$IP?>', '', '<?=$counter?>'); this.onclick = null; return false;"
+          class="brackets">Ban</a>
+        <?php
+          }
+          $counter++;
       }
-      $counter++;
-    }
-  }
-?>
+  } ?>
         <br />
         <?=Tools::get_host_by_ajax($IP)?>
         <?=($HasDupe ? '<a href="#" onclick="ShowIPs('.$Index.'); return false;">('.count($UserIDs).')</a>' : '(0)')?>
       </td>
-      <td><?=time_diff($StartTime)?></td>
-      <td class="hidden"><?=$StartTime?></td>
-      <td><?=time_diff($EndTime)?></td>
-      <td class="hidden"><?=$EndTime?></td>
-      <td><?//time_diff(strtotime($StartTime), strtotime($EndTime)); ?></td>
+      <td><?=time_diff($StartTime)?>
+      </td>
+      <td class="hidden"><?=$StartTime?>
+      </td>
+      <td><?=time_diff($EndTime)?>
+      </td>
+      <td class="hidden"><?=$EndTime?>
+      </td>
+      <td>
+        <?//time_diff(strtotime($StartTime), strtotime($EndTime));?>
+      </td>
     </tr>
-<?
+    <?php
   if ($HasDupe) {
-    $HideMe = (count($UserIDs) > 10);
-    foreach ($UserIDs as $Key => $Val) {
-      if (!$UserEndTimes[$Key]) {
-        $UserEndTimes[$Key] = sqltime();
-      }
-?>
-    <tr class="row<?=($HideMe ? ' hidden' : '')?>" name="<?=$Index?>">
-      <td>&nbsp;&nbsp;&#187;&nbsp;<?=Users::format_username($Val, true, true, true)?></td>
-      <td><?=time_diff($UserStartTimes[$Key])?></td>
-      <td class="hidden"><?=$UserStartTimes[$Key]?></td>
-      <td><?=time_diff($UserEndTimes[$Key])?></td>
-      <td class="hidden"><?=$UserEndTimes[$Key]?></td>
-      <td><?//time_diff(strtotime($UserStartTimes[$Key]), strtotime($UserEndTimes[$Key])); ?></td>
+      $HideMe = (count($UserIDs) > 10);
+      foreach ($UserIDs as $Key => $Val) {
+          if (!$UserEndTimes[$Key]) {
+              $UserEndTimes[$Key] = sqltime();
+          } ?>
+    <tr
+      class="row<?=($HideMe ? ' hidden' : '')?>"
+      name="<?=$Index?>">
+      <td>&nbsp;&nbsp;&#187;&nbsp;<?=Users::format_username($Val, true, true, true)?>
+      </td>
+      <td><?=time_diff($UserStartTimes[$Key])?>
+      </td>
+      <td class="hidden"><?=$UserStartTimes[$Key]?>
+      </td>
+      <td><?=time_diff($UserEndTimes[$Key])?>
+      </td>
+      <td class="hidden"><?=$UserEndTimes[$Key]?>
+      </td>
+      <td>
+        <?//time_diff(strtotime($UserStartTimes[$Key]), strtotime($UserEndTimes[$Key]));?>
+      </td>
     </tr>
-<?
-
-    }
+    <?php
+      }
   }
 }
 ?>
   </table>
+
   <div class="linkbox">
     <?=$Pages?>
   </div>
 </div>
-<?
-View::show_footer();
+
+<?php View::show_footer();

sections/userhistory/ip_tracker_history.php

@@ -1,4 +1,6 @@
 <?php
+#declare(strict_types=1);
+
 /************************************************************************
 ||------------|| User IP history page ||---------------------------||
 
@@ -13,12 +15,12 @@ user.
 define('IPS_PER_PAGE', 25);
 
 if (!check_perms('users_mod')) {
-  error(403);
+    error(403);
 }
 
 $UserID = $_GET['userid'];
 if (!is_number($UserID)) {
-  error(404);
+    error(404);
 }
 
 $DB->query("
@@ -30,7 +32,7 @@ $DB->query("
 list($Username, $Class) = $DB->next_record();
 
 if (!check_perms('users_view_ips', $Class)) {
-  error(403);
+    error(403);
 }
 
 $UsersOnly = $_GET['usersonly'];
@@ -38,15 +40,17 @@ $UsersOnly = $_GET['usersonly'];
 View::show_header("Tracker IP address history for $Username");
 ?>
 <script type="text/javascript">
-function ShowIPs(rowname) {
-  $('tr[name="'+rowname+'"]').gtoggle();
-}
+  function ShowIPs(rowname) {
+    $('tr[name="' + rowname + '"]').gtoggle();
+  }
 </script>
-<?
+<?php
 list($Page, $Limit) = Format::page_limit(IPS_PER_PAGE);
 
 $Perms = get_permissions_for_user($UserID);
-if ($Perms['site_disable_ip_history']) $Limit = 0;
+if ($Perms['site_disable_ip_history']) {
+    $Limit = 0;
+}
 
 $TrackerIps = $DB->query("
   SELECT IP, fid, tstamp
@@ -65,38 +69,38 @@ $Pages = Format::get_pages($Page, $NumResults, IPS_PER_PAGE, 9);
 ?>
 <div>
   <div class="header">
-    <h2>Tracker IP address history for <a href="user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+    <h2>Tracker IP address history for <a
+        href="user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+  </div>
+  <div class="linkbox"><?=$Pages?>
   </div>
-  <div class="linkbox"><?=$Pages?></div>
   <table>
     <tr class="colhead">
       <td>IP address</td>
       <td>Torrent</td>
       <td>Time</td>
     </tr>
-<?
+    <?php
 $Results = $DB->to_array();
 foreach ($Results as $Index => $Result) {
-  list($IP, $TorrentID, $Time) = $Result;
-
-?>
-  <tr class="row">
-    <td>
-      <?=$IP?> (<?=Tools::get_country_code_by_ajax($IP)?>)<br /><?=Tools::get_host_by_ajax($IP)?>
-      <a href="http://whatismyipaddress.com/ip/<?=display_str($IP)?>" class="brackets tooltip" title="Search WIMIA.com">WI</a>
-    </td>
-    <td><a href="torrents.php?torrentid=<?=$TorrentID?>"><?=$TorrentID?></a></td>
-    <td><?=date('Y-m-d g:i:s', $Time)?></td>
-  </tr>
-<?
+    list($IP, $TorrentID, $Time) = $Result; ?>
+    <tr class="row">
+      <td>
+        <?=$IP?><br /><?=Tools::get_host_by_ajax($IP)?>
+        <a href="http://whatismyipaddress.com/ip/<?=display_str($IP)?>"
+          class="brackets tooltip" title="Search WIMIA.com">WI</a>
+      </td>
+      <td><a href="torrents.php?torrentid=<?=$TorrentID?>"><?=$TorrentID?></a></td>
+      <td><?=date('Y-m-d g:i:s', $Time)?>
+      </td>
+    </tr>
+    <?php
 }
 ?>
-</table>
-<div class="linkbox">
-  <?=$Pages?>
-</div>
+  </table>
+  <div class="linkbox">
+    <?=$Pages?>
+  </div>
 </div>
 
-<?
-View::show_footer();
-?>
+<?php View::show_footer();