Delete table users_history_ips, etc.

classes/loginwatch.class.php

@@ -68,44 +68,6 @@ class LoginWatch
         return ($this->watchId = G::$DB->inserted_id());
     }
 
-    /**
-     * Record another failure attempt on this watch. If the user has not
-     * logged in recently from this IP address then subsequent logins
-     * will be blocked for increasingly longer times, otherwise 1 minute.
-     *
-     * @param int $userId The ID of the user
-     * @param string $ipaddr The IP the user is coming from
-     * @param string $capture The username captured on the form
-     * @return int 1 if the watch was updated
-     */
-    public function increment(int $userId, string $ipaddr, ?string $capture): int
-    {
-        $seen = G::$DB->query("
-        SELECT
-          1
-        FROM
-          `users_history_ips`
-        WHERE
-          (
-            `EndTime` IS NULL
-            OR `EndTime` > NOW() - INTERVAL 1 WEEK
-          )
-          AND `UserID` = '$userId'
-          AND `IP` = '$ipaddr'
-        ");
-
-        $delay = $seen ? 60 : LOGIN_ATTEMPT_BACKOFF[min($this->nrAttempts(), count(LOGIN_ATTEMPT_BACKOFF)-1)];
-        G::$DB->prepare_query("
-            UPDATE `login_attempts` SET
-                `Attempts` = `Attempts` + 1,
-                `LastAttempt` = now(),
-                `BannedUntil` = now() + INTERVAL '$delay' SECOND,
-                `UserID` = '$userId',
-                `Capture` ='$capture' 
-            WHERE `ID` = '$this->watchId' 
-            ");
-        return G::$DB->affected_rows();
-    }
 
     /**
      * Ban subsequent attempts to login from this watched IP address for 6 hours

classes/permissions_form.php

@@ -39,7 +39,6 @@ $PermissionsArray = array(
   'site_recommend_own' => 'Can recommend own torrents.',
   'site_manage_recommendations' => 'Recommendations management access.',
   'site_delete_tag' => 'Can delete tags.',
-  'site_disable_ip_history' => 'Disable IP history.',
   'zip_downloader' => 'Download multiple torrents at once.',
   'site_debug' => 'Developer access.',
   'site_proxy_images' => 'Image proxy & anti-canary.',
@@ -154,7 +153,6 @@ HTML;
     display_perm('site_recommend_own', 'Can add own torrents to recommendations list.');
     display_perm('site_manage_recommendations', 'Can edit recommendations list.');
     display_perm('site_delete_tag', 'Can delete tags.');
-    display_perm('site_disable_ip_history', 'Disable IP history.');
     display_perm('zip_downloader', 'Download multiple torrents at once.');
     display_perm('site_debug', 'View site debug tables.');
     display_perm('site_proxy_images', 'Proxy images through the server.');

classes/script_start.php

@@ -319,11 +319,6 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
     // Change necessary triggers in external components
     $Cache->CanClear = check_perms('admin_clear_cache');
 
-    // Because we <3 our staff
-    if (check_perms('site_disable_ip_history')) {
-        $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
-    }
-
     // Update LastUpdate every 10 minutes
     if (strtotime($UserSessions[$SessionID]['LastUpdate']) + 600 < time()) {
         $DB->query("
@@ -383,39 +378,13 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
     }
 
     // IP changed
-    if (apcu_exists('DBKEY') && Crypto::decrypt($LoggedUser['IP']) != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) {
+    if (apcu_exists('DBKEY') && Crypto::decrypt($LoggedUser['IP']) != $_SERVER['REMOTE_ADDR']) {
         if (Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) {
             error('Your IP address has been banned.');
         }
 
         $CurIP = db_string($LoggedUser['IP']);
         $NewIP = db_string($_SERVER['REMOTE_ADDR']);
-        $DB->query("
-        SELECT IP
-        FROM users_history_ips
-          WHERE EndTime IS NULL
-          AND UserID = '$LoggedUser[ID]'");
-
-        while (list($EncIP) = $DB->next_record()) {
-            if (Crypto::decrypt($EncIP) == $CurIP) {
-                $CurIP = $EncIP;
-                // CurIP is now the encrypted IP that was already in the database (for matching)
-                break;
-            }
-        }
-
-        $DB->query("
-        UPDATE users_history_ips
-        SET EndTime = NOW()
-          WHERE EndTime IS NULL
-          AND UserID = '$LoggedUser[ID]'
-          AND IP = '$CurIP'");
-
-        $DB->query("
-        INSERT IGNORE INTO users_history_ips
-          (UserID, IP, StartTime)
-        VALUES
-          ('$LoggedUser[ID]', '".Crypto::encrypt($NewIP)."', NOW())");
 
         $Cache->begin_transaction('user_info_heavy_'.$LoggedUser['ID']);
         $Cache->update_row(false, array('IP' => Crypto::encrypt($_SERVER['REMOTE_ADDR'])));

classes/tools.class.php

@@ -122,18 +122,7 @@ class Tools
         return trim($Output[4]);
     }
 
-    /**
-     * Format an IP address with links to IP history.
-     *
-     * @param string IP
-     * @return string The HTML
-     */
-    public static function display_ip($IP)
-    {
-        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>';
-    }
-
-
+    
     /**
      * Disable an array of users.
      *

gazelle.sql

@@ -1409,19 +1409,6 @@ CREATE TABLE `users_freeleeches` (
 ) ENGINE=InnoDB CHARSET=utf8mb4;
 
 
-CREATE TABLE `users_history_ips` (
-  `UserID` int NOT NULL,
-  `IP` varchar(90) NOT NULL DEFAULT '0.0.0.0',
-  `StartTime` datetime,
-  `EndTime` datetime DEFAULT NULL,
-  PRIMARY KEY (`UserID`,`IP`,`StartTime`),
-  KEY `UserID` (`UserID`),
-  KEY `IP` (`IP`),
-  KEY `StartTime` (`StartTime`),
-  KEY `EndTime` (`EndTime`)
-) ENGINE=InnoDB CHARSET=utf8mb4;
-
-
 CREATE TABLE `users_history_passkeys` (
   `UserID` int NOT NULL,
   `OldPassKey` varchar(32) DEFAULT NULL,

sections/login/index.php

@@ -286,58 +286,6 @@ 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
-                            if (apcu_exists('DBKEY')) {
-                                $DB->query("
-                                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) {
-                                        // Never logged in from this location before
-                                        if ($Cache->get_value('new_location_'.$UserID.'_'.$CurrentASN) !== true) {
-                                            $DB->query("
-                                            SELECT
-                                              `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');
-                                            error();
-                                        }
-                                    }
-                                }
-                            }
-
                             $U2FRegs = [];
                             $DB->query("
                             SELECT KeyHandle, PublicKey, Certificate, Counter, Valid
@@ -392,15 +340,6 @@ else {
                                 setcookie('session', $SessionID, (time()+60*60*24*365), '/', '', true, true);
                                 setcookie('userid', $UserID, (time()+60*60*24*365), '/', '', true, true);
 
-                                // Because we <3 our staff
-                                $Permissions = Permissions::get_permissions($PermissionID);
-                                $CustomPermissions = unserialize($CustomPermissions);
-                                if (isset($Permissions['Permissions']['site_disable_ip_history'])
-                                 || isset($CustomPermissions['site_disable_ip_history'])
-                ) {
-                                    $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
-                                }
-
                                 $DB->query("
                                 INSERT INTO users_sessions
                                   (UserID, SessionID, KeepLogged, Browser, OperatingSystem, IP, LastUpdate, FullUA)

sections/login/newlocation.php

@@ -1,25 +0,0 @@
-<?
-if (!empty($LoggedUser['ID'])) {
-  header('Location: login.php');
-  error();
-}
-
-View::show_header('Authorize Location');
-
-if (isset($_REQUEST['act'])) {
-?>
-
-Your location is now authorized to access this account.<br><br>
-Click <a href="login.php">here</a> to login again.
-
-<? } else { ?>
-
-This appears to be the first time you've logged in from this location.<br><br>
-
-As a security measure to ensure that you are really the owner of this account,<br>
-an email has been sent to the address in your profile settings. Please<br>
-click the link contained in that email to allow access from<br>
-your location, and then log in again.
-
-<? }
-View::show_footer(); ?>

sections/register/index.php

@@ -153,11 +153,6 @@ if (!empty($_REQUEST['confirm'])) {
         VALUES
           ('$UserID', '$StyleID', '".db_string($AuthKey)."', '$InviterID', NOW(), '$InviteReason')");
 
-            $DB->query("
-        INSERT INTO users_history_ips
-          (UserID, IP, StartTime)
-        VALUES
-          ('$UserID', '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."', NOW())");
             $DB->query("
         INSERT INTO users_notifications_settings
           (UserID)

sections/tools/data/invite_pool.php

@@ -116,7 +116,7 @@ $DB->set_query_id($RS);
     </td>
 
     <td>
-      <?=Tools::display_ip($IP)?>
+      <?=display_str($IP)?>
     </td>
 
     <td>

sections/tools/data/registration_log.php

@@ -43,11 +43,6 @@ $RS = "
     i.Donor,
     i.Warned,
     i.JoinDate,
-    (
-      SELECT COUNT(h1.UserID)
-      FROM users_history_ips AS h1
-      WHERE h1.IP = m.IP
-    ) AS Uses,
     im.ID,
     im.IP,
     im.Email,
@@ -59,11 +54,6 @@ $RS = "
     ii.Donor,
     ii.Warned,
     ii.JoinDate,
-    (
-      SELECT COUNT(h2.UserID)
-      FROM users_history_ips AS h2
-      WHERE h2.IP = im.IP
-    ) AS InviterUses
   FROM users_main AS m
     LEFT JOIN users_info AS i ON i.UserID = m.ID
     LEFT JOIN users_main AS im ON i.Inviter = im.ID
@@ -114,7 +104,7 @@ if ($DB->has_results()) {
   </tr>
 
   <?php
-  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()) {
+  while (list($UserID, $IP, $Email, $Username, $PermissionID, $Uploaded, $Downloaded, $Enabled, $Donor, $Warned, $Joined, $InviterID, $InviterIP, $InviterEmail, $InviterUsername, $InviterPermissionID, $InviterUploaded, $InviterDownloaded, $InviterEnabled, $InviterDonor, $InviterWarned, $InviterJoined) = $DB->next_record()) {
       $RowClass = $IP === $InviterIP ? 'warning' : '';
       $Email = apcu_exists('DBKEY') ? Crypto::decrypt($Email) : '[Encrypted]';
       $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
@@ -148,29 +138,9 @@ if ($DB->has_results()) {
         <?=display_str($IP)?>
       </span>
 
-      <span class="float_right">
-        <?=display_str($Uses)?>
-        <a href="userhistory.php?action=ips&amp;userid=<?=$UserID?>"
-          title="History" class="brackets tooltip">H</a>
-        <a href="/user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($IP)?>"
-          title="Search" class="brackets tooltip">S</a>
-        <a href="http://whatismyipaddress.com/ip/<?=display_str($IP)?>"
-          title="WI" class="brackets tooltip">WI</a>
-      </span><br />
-
       <span class="float_left">
         <?=display_str($InviterIP)?>
       </span>
-
-      <span class="float_right">
-        <?=display_str($InviterUses)?>
-        <a href="userhistory.php?action=ips&amp;userid=<?=$InviterID?>"
-          title="History" class="brackets tooltip">H</a>
-        <a href="/user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($InviterIP)?>"
-          title="Search" class="brackets tooltip">S</a>
-        <a href="http://whatismyipaddress.com/ip/<?=display_str($InviterIP)?>"
-          title="WI" class="brackets tooltip">WI</a>
-      </span><br />
     </td>
 
     <td>

sections/tools/index.php

@@ -413,10 +413,6 @@ switch ($_REQUEST['action']) {
   // END Data
 
   // Misc
-  case 'dupe_ips':
-    include SERVER_ROOT.'/sections/tools/misc/dupe_ip.php';
-    break;
-
   case 'clear_cache':
     include SERVER_ROOT.'/sections/tools/development/clear_cache.php';
     break;

sections/tools/managers/enable_requests.php

@@ -47,8 +47,6 @@ switch ($_GET['view']) {
     case 'perfect':
         $Where[] = "um.`Email` = uer.`Email`";
         $Joins[] = "JOIN `users_main` um ON um.`ID` = uer.`UserID`";
-        $Where[] = "uer.`IP` = (SELECT `IP` FROM `users_history_ips` uhi1 WHERE uhi1.`StartTime` = (SELECT MAX(`StartTime`) FROM `users_history_ips` uhi2 WHERE uhi2.`UserID` = uer.`UserID` ORDER BY `StartTime` DESC LIMIT 1))";
-        $Where[] = "(SELECT 1 FROM `users_history_ips` uhi WHERE uhi.`IP` = uer.`IP` AND uhi.`UserID` != uer.`UserID`) IS NULL";
         $Where[] = "ui.`BanReason` = '3'";
         break;
 
@@ -63,10 +61,6 @@ switch ($_GET['view']) {
         $Where[] = "um.`Email` != uer.`Email`";
         break;
 
-    case 'ip_overlap':
-        $Joins[] = "JOIN `users_history_ips` uhi ON uhi.`IP` = uer.`IP` AND uhi.`UserID` != uer.`UserID`";
-        break;
-
     case 'manual_disable':
         $Where[] = "ui.`BanReason` != '3'";
         break;

sections/tools/misc/dupe_ip.php

@@ -1,81 +0,0 @@
-<?php
-if (!check_perms('users_view_ips')) {
-  error(403);
-}
-View::show_header('Dupe IPs');
-define('USERS_PER_PAGE', 50);
-define('IP_OVERLAPS', 2);
-list($Page, $Limit) = Format::page_limit(USERS_PER_PAGE);
-
-
-$RS = $DB->query("
-    SELECT
-      SQL_CALC_FOUND_ROWS
-      m.ID,
-      m.IP,
-      m.Username,
-      m.PermissionID,
-      m.Enabled,
-      i.Donor,
-      i.Warned,
-      i.JoinDate,
-      (
-        SELECT COUNT(DISTINCT h.UserID)
-        FROM users_history_ips AS h
-        WHERE h.IP = m.IP
-      ) AS Uses
-    FROM users_main AS m
-      LEFT JOIN users_info AS i ON i.UserID = m.ID
-    WHERE
-      (
-        SELECT COUNT(DISTINCT h.UserID)
-        FROM users_history_ips AS h
-        WHERE h.IP = m.IP
-      ) >= ".IP_OVERLAPS."
-      AND m.Enabled = '1'
-      AND m.IP != '127.0.0.1'
-    ORDER BY Uses DESC
-    LIMIT $Limit");
-$DB->query('SELECT FOUND_ROWS()');
-list($Results) = $DB->next_record();
-$DB->set_query_id($RS);
-
-if ($DB->has_results()) {
-?>
-  <div class="linkbox">
-<?
-  $Pages = Format::get_pages($Page, $Results, USERS_PER_PAGE, 11);
-  echo $Pages;
-?>
-  </div>
-  <table width="100%">
-    <tr class="colhead">
-      <td>User</td>
-      <td>IP address</td>
-      <td>Dupes</td>
-      <td>Registered</td>
-    </tr>
-<?
-  $Row = 'b';
-  while (list($UserID, $IP, $Username, $PermissionID, $Enabled, $Donor, $Warned, $Joined, $Uses) = $DB->next_record()) {
-  $Row = $Row === 'b' ? 'a' : 'b';
-?>
-    <tr class="row<?=$Row?>">
-      <td><?=Users::format_username($UserID, true, true, true, true)?></td>
-      <td>
-        <span class="float_left"><?=Tools::get_host_by_ajax($IP)." ($IP)"?></span><span class="float_right"><a href="userhistory.php?action=ips&amp;userid=<?=$UserID?>" title="History" class="brackets tooltip">H</a> <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($IP)?>" title="Search" class="brackets tooltip">S</a></span>
-      </td>
-      <td><?=display_str($Uses)?></td>
-      <td><?=time_diff($Joined)?></td>
-    </tr>
-<?php } ?>
-  </table>
-  <div class="linkbox">
-<?= $Pages; ?>
-  </div>
-<?php } else { ?>
-  <h2>There are currently no users with more than <?=IP_OVERLAPS?> IP overlaps.</h2>
-<?
-  }
-View::show_footer();
-?>

sections/tools/tools.php

@@ -144,7 +144,6 @@ View::show_header('Staff Tools');
   $ToolsHTML = "";
   create_row("Email blacklist", "tools.php?action=email_blacklist", check_perms("users_view_email"));
   create_row("IP address bans", "tools.php?action=ip_ban", check_perms("admin_manage_ipbans"));
-  create_row("Duplicate IP addresses", "tools.php?action=dupe_ips", check_perms("users_view_ips"));
   create_row("Manipulate invite tree", "tools.php?action=manipulate_tree", check_perms("users_mod"));
 
   if ($ToolsHTML) {

sections/user/advancedsearch.php

@@ -262,9 +262,6 @@ if (count($_GET)) {
         }
 
         if (!empty($_GET['ip'])) {
-            if (isset($_GET['ip_history'])) {
-                $Distinct = 'DISTINCT ';
-            }
             $Join['tip'] = ' JOIN users_ips_decrypted AS tip ON tip.ID = um1.ID ';
             $Where[] = ' tip.IP '.$Match.wrap($_GET['ip'], '', true);
         }
@@ -386,15 +383,7 @@ if (count($_GET)) {
 
         if ($_GET['disabled_ip']) {
             $Distinct = 'DISTINCT ';
-            if ($_GET['ip_history']) {
-                if (!isset($Join['tip'])) {
-                    $Join['tip'] = ' JOIN users_ips_decrypted AS tip ON tip.ID = um1.ID ';
-                }
-                $Join['tip2'] = ' JOIN users_ips_decrypted2 AS tip2 ON tip2.IP = tip.IP ';
-                $Join['um2'] = ' JOIN users_main AS um2 ON um2.ID = tip2.ID AND um2.Enabled = \'2\' ';
-            } else {
                 $Join['um2'] = ' JOIN users_main AS um2 ON um2.IP = um1.IP AND um2.Enabled = \'2\' ';
-            }
         }
 
         if (!empty($_GET['passkey'])) {
@@ -619,17 +608,6 @@ View::show_header('User search');
         </td>
       </tr>
       <tr>
-        <td class="label nobr">Extra:</td>
-        <td>
-          <ul class="options_list nobullet">
-            <li>
-              <input type="checkbox" name="ip_history" id="ip_history" <?php if ($_GET['ip_history']) {
-      echo ' checked="checked"' ;
-  } ?> />
-              <label for="ip_history">IP history</label>
-            </li>
-          </ul>
-        </td>
         <td class="label nobr">Ratio:</td>
         <td width="30%">
           <select name="ratio">
@@ -1013,19 +991,12 @@ View::show_header('User search');
 <?php
 if ($RunQuery) {
                 if (!empty($_GET['ip'])) {
-                    if (isset($_GET['ip_history'])) {
-                        $DB->query("SELECT UserID, IP FROM users_history_ips");
-                    } else {
                         $DB->query("SELECT ID, IP FROM users_main");
-                    }
                     while (list($ID, $EncIP) = $DB->next_record()) {
                         $IPs[] = $ID.", '".Crypto::decrypt($EncIP)."'";
                     }
                     $DB->query("CREATE TEMPORARY TABLE users_ips_decrypted (ID INT(10) UNSIGNED NOT NULL, IP VARCHAR(45) NOT NULL, PRIMARY KEY (ID,IP)) ENGINE=MEMORY");
                     $DB->query("INSERT IGNORE INTO users_ips_decrypted (ID, IP) VALUES(".implode("),(", $IPs).")");
-                    if ($_GET['disabled_ip'] && $_GET['ip_history']) {
-                        $DB->query("CREATE TEMPORARY TABLE users_ips_decrypted2 SELECT * FROM users_ips_decrypted");
-                    }
                 }
                 if (!empty($_GET['email'])) {
                         $DB->query("SELECT ID, Email FROM users_main");

sections/user/takemoderate.php

@@ -237,38 +237,6 @@ if ($_POST['ResetRatioWatch'] && check_perms('users_edit_reset_keys')) {
     $EditSummary[] = 'RatioWatch history reset';
 }
 
-if ($_POST['ResetIPHistory'] && check_perms('users_edit_reset_keys')) {
-    $GenericIP = Crypto::encrypt('127.0.0.1');
-    $DB->query("
-      DELETE FROM users_history_ips
-      WHERE UserID = '$UserID'");
-
-    $DB->query("
-      UPDATE users_main
-      SET IP = '$GenericIP'
-      WHERE ID = '$UserID'");
-
-    $DB->query("
-      UPDATE xbt_snatched
-      SET IP = ''
-      WHERE uid = '$UserID'");
-
-    $DB->query("
-      UPDATE users_history_passwords
-      SET ChangerIP = ''
-      WHERE UserID = $UserID");
-
-    $DB->query("
-      UPDATE users_history_passkeys
-      SET ChangerIP = ''
-      WHERE UserID = $UserID");
-
-    $DB->query("
-      UPDATE users_sessions
-      SET IP = '$GenericIP'
-      WHERE UserID = $UserID");
-}
-
 if ($_POST['ResetSnatchList'] && check_perms('users_edit_reset_keys')) {
     $DB->query("
       DELETE FROM xbt_snatched

sections/user/user.php

@@ -273,12 +273,6 @@ if (check_perms('users_edit_profiles', $Class) || $LoggedUser['ID'] == $UserID)
       class="brackets">Settings</a>
     <?php
 }
-if ($LoggedUser['ID'] == $UserID) {
-    ?>
-    <a href="userhistory.php?action=userip&userid=<?=$UserID?>"
-      class="brackets">IP History</a>
-    <?php
-}
 if (check_perms('users_view_invites', $Class)) {
     ?>
     <a href="user.php?action=invite&amp;userid=<?=$UserID?>"
@@ -579,11 +573,6 @@ $OverallRank = UserRank::overall_score($UploadedRank, $DownloadedRank, $UploadsR
       if (check_perms('users_view_ips', $Class)) {
           $DB->query("
         SELECT COUNT(DISTINCT IP)
-        FROM users_history_ips
-        WHERE UserID = '$UserID'");
-          list($IPChanges) = $DB->next_record();
-          $DB->query("
-        SELECT COUNT(DISTINCT IP)
         FROM xbt_snatched
         WHERE uid = '$UserID'
           AND IP != ''");
@@ -596,11 +585,6 @@ $OverallRank = UserRank::overall_score($UploadedRank, $DownloadedRank, $UploadsR
         <?php
       if (check_perms('users_view_ips', $Class)) {
           ?>
-        <li>IPs: <?=number_format($IPChanges)?> <a
-            href="userhistory.php?action=ips&amp;userid=<?=$UserID?>"
-            class="brackets">View</a>&nbsp;<a
-            href="userhistory.php?action=ips&amp;userid=<?=$UserID?>&amp;usersonly=1"
-            class="brackets">View users</a></li>
         <?php if (check_perms('users_view_ips', $Class) && check_perms('users_mod', $Class)) { ?>
         <li>Tracker IPs: <?=number_format($TrackerIPs)?> <a
             href="userhistory.php?action=tracker_ips&amp;userid=<?=$UserID?>"
@@ -673,7 +657,7 @@ if ($ParanoiaLevel == 0) {
 
 if (check_perms('users_view_ips', $Class)) {
     $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]'; ?>
-        <li>IP: <?=Tools::display_ip($IP)?>
+        <li>IP: <?=display_str($IP)?>
         </li>
         <li>Host: <?=Tools::get_host_by_ajax($IP)?>
         </li>
@@ -1442,8 +1426,6 @@ if (!$DisablePoints) {
             watch</label> |
           <input type="checkbox" name="ResetPasskey" id="ResetPasskey" /> <label for="ResetPasskey">Passkey</label> |
           <input type="checkbox" name="ResetAuthkey" id="ResetAuthkey" /> <label for="ResetAuthkey">Authkey</label> |
-          <input type="checkbox" name="ResetIPHistory" id="ResetIPHistory" /> <label for="ResetIPHistory">IP
-            history</label> |
           <br />
           <input type="checkbox" name="ResetSnatchList" id="ResetSnatchList" /> <label for="ResetSnatchList">Snatch
             list</label> |

sections/userhistory/index.php

@@ -9,29 +9,10 @@ enforce_login();
 
 if ($_GET['action']) {
     switch ($_GET['action']) {
-    case 'ips':
-      //Load IP history page
-      include('ip_history.php');
-      break;
-
     case 'tracker_ips':
       include('ip_tracker_history.php');
       break;
 
-    case 'passwords':
-      //Load Password history page
-      include('password_history.php');
-      break;
-
-    case 'userip':
-      include('ip_history_userview.php');
-      break;
-
-    case 'passkeys':
-      //Load passkey history page
-      include('passkey_history.php');
-      break;
-
     case 'posts':
       //Load ratio history page
       include('post_history.php');

sections/userhistory/ip_history.php

@@ -1,299 +0,0 @@
-<?php
-#declare(strict_types=1);
-
-/************************************************************************
-||------------|| User IP history page ||---------------------------||
-
-This page lists previous IPs a user has connected to the site with. It
-gets called if $_GET['action'] == 'ips'.
-
-It also requires $_GET['userid'] in order to get the data for the correct
-user.
-
-************************************************************************/
-
-define('IPS_PER_PAGE', 25);
-
-$UserID = $_GET['userid'];
-if (!is_number($UserID)) {
-    error(404);
-}
-
-$DB->query("
-  SELECT
-    um.Username,
-    p.Level AS Class
-  FROM users_main AS um
-    LEFT JOIN permissions AS p ON p.ID = um.PermissionID
-  WHERE um.ID = $UserID");
-list($Username, $Class) = $DB->next_record();
-
-if (!check_perms('users_view_ips', $Class)) {
-    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' ";
-} else {
-    $SearchIPQuery = "";
-}
-
-View::show_header("IP address history for $Username");
-?>
-<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; };
-        }
-      }
-      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("
-    SELECT
-      SQL_CALC_FOUND_ROWS
-      h1.IP,
-      h1.StartTime,
-      h1.EndTime,
-      GROUP_CONCAT(h2.UserID SEPARATOR '|'),
-      GROUP_CONCAT(h2.StartTime SEPARATOR '|'),
-      GROUP_CONCAT(IFNULL(h2.EndTime,0) SEPARATOR '|'),
-      GROUP_CONCAT(um2.Username SEPARATOR '|'),
-      GROUP_CONCAT(um2.Enabled SEPARATOR '|'),
-      GROUP_CONCAT(ui2.Donor SEPARATOR '|'),
-      GROUP_CONCAT(ui2.Warned SEPARATOR '|')
-    FROM users_history_ips AS h1
-      LEFT JOIN users_history_ips AS h2 ON h2.IP = h1.IP AND h2.UserID != $UserID
-      LEFT JOIN users_main AS um2 ON um2.ID = h2.UserID
-      LEFT JOIN users_info AS ui2 ON ui2.UserID = h2.UserID
-    WHERE h1.UserID = '$UserID'
-      AND h2.UserID > 0 $SearchIPQuery
-    GROUP BY h1.IP, h1.StartTime
-    ORDER BY h1.StartTime DESC
-    LIMIT $Limit");
-} else {
-    $RS = $DB->query("
-    SELECT
-      SQL_CALC_FOUND_ROWS
-      h1.IP,
-      h1.StartTime,
-      h1.EndTime,
-      GROUP_CONCAT(h2.UserID SEPARATOR '|'),
-      GROUP_CONCAT(h2.StartTime SEPARATOR '|'),
-      GROUP_CONCAT(IFNULL(h2.EndTime,0) SEPARATOR '|'),
-      GROUP_CONCAT(um2.Username SEPARATOR '|'),
-      GROUP_CONCAT(um2.Enabled SEPARATOR '|'),
-      GROUP_CONCAT(ui2.Donor SEPARATOR '|'),
-      GROUP_CONCAT(ui2.Warned SEPARATOR '|')
-    FROM users_history_ips AS h1
-      LEFT JOIN users_history_ips AS h2 ON h2.IP = h1.IP AND h2.UserID != $UserID
-      LEFT JOIN users_main AS um2 ON um2.ID = h2.UserID
-      LEFT JOIN users_info AS ui2 ON ui2.UserID = h2.UserID
-    WHERE h1.UserID = '$UserID' $SearchIPQuery
-    GROUP BY h1.IP, h1.StartTime
-    ORDER BY h1.StartTime DESC
-    LIMIT $Limit");
-}
-$DB->query('SELECT FOUND_ROWS()');
-list($NumResults) = $DB->next_record();
-$DB->set_query_id($RS);
-
-$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>
-    <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 } ?>
-    </div>
-    <?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>
-  </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>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;
-
-    $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);
-    } ?>
-    <tr class="row">
-      <td>
-        <?=$IP?>
-        <?php
-  if ($CanManageIPBans) {
-      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);
-
-          if ($DB->has_results()) {
-              $IPs[$IP] = true; ?>
-        <strong>[Banned]</strong>
-        <?php
-          } else {
-              $IPs[$IP] = false; ?>
-        <a id="<?=$counter?>" href="#"
-          onclick="Ban('<?=$IP?>', '', '<?=$counter?>'); this.onclick = null; return false;"
-          class="brackets">Ban</a>
-        <?php
-          }
-          $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>
-    </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>
-    </tr>
-    <?php
-      }
-  }
-}
-?>
-  </table>
-
-  <div class="linkbox">
-    <?=$Pages?>
-  </div>
-</div>
-
-<?php View::show_footer();

sections/userhistory/ip_history_userview.php

@@ -1,80 +0,0 @@
-<?
-$UserID = $_GET['userid'];
-if (!is_number($UserID)) {
-  error(404);
-}
-
-$Self = ($UserID == $LoggedUser['ID']);
-
-if (!check_perms('users_mod') && !$Self) {
-  error(403);
-}
-
-if (!apcu_exists('DBKEY')) {
-  error('The site is currently running with partial database access. Please wait for staff to fully decrypt it');
-}
-
-$DB->query("
-  SELECT IP
-  FROM users_history_ips
-  WHERE UserID = '$UserID'");
-
-$EncIPs = $DB->collect("IP");
-$IPs = [];
-
-foreach ($EncIPs as $Enc) {
-  if (!isset($IPs[Crypto::decrypt($Enc)])) {
-    $IPs[Crypto::decrypt($Enc)] = [];
-  }
-  $IPs[Crypto::decrypt($Enc)][] = $Enc;
-}
-
-$DB->query("
-  SELECT IP
-  FROM users_main
-  WHERE ID = '$UserID'");
-
-list($Curr) = $DB->next_record();
-$Curr = Crypto::decrypt($Curr);
-
-if (!$Self) {
-  $DB->query("SELECT Username FROM users_main WHERE ID = '$UserID'");
-  list($Username) = $DB->next_record();
-
-  View::show_header("IP history for $Username");
-} else {
-  View::show_header("Your IP history");
-}
-
-?>
-
-<div class="header">
-<? if ($Self) { ?>
-  <h2>Your IP history</h2>
-<? } else { ?>
-  <h2>IP history for <a href="user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
-<? } ?>
-</div>
-<table class="alternate_rows" width="100%">
-  <tr class="colhead">
-    <td>IP</td>
-    <td>Expunge</td>
-  </tr>
-<? foreach ($IPs as $IP => $Encs) { ?>
-  <tr class="row">
-    <td><?=display_str($IP)?></td>
-    <td>
-    <? if ($IP != $Curr) { ?>
-      <form action="delete.php" method="post">
-        <input type="hidden" name="action" value="ip">
-        <? foreach ($Encs as $Enc) { ?>
-        <input type="hidden" name="ips[]" value="<?=$Enc?>">
-        <? } ?>
-        <input type="submit" value="X">
-      </form>
-    <? } ?>
-    </td>
-  </tr>
-<? } ?>
-</table>
-<? View::show_footer(); ?>

sections/userhistory/passkey_history.php

@@ -1,63 +0,0 @@
-<?
-/************************************************************************
-||------------|| User passkey history page ||--------------------------||
-
-This page lists previous passkeys a user has used on the site. It gets
-called if $_GET['action'] == 'passkey'.
-
-It also requires $_GET['userid'] in order to get the data for the correct
-user.
-
-************************************************************************/
-
-$UserID = $_GET['userid'];
-if (!is_number($UserID)) {
-  error(404);
-}
-
-$DB->query("
-  SELECT
-    um.Username,
-    p.Level AS Class
-  FROM users_main AS um
-    LEFT JOIN permissions AS p ON p.ID = um.PermissionID
-  WHERE um.ID = $UserID");
-list($Username, $Class) = $DB->next_record();
-
-if (!check_perms('users_view_keys', $Class)) {
-  error(403);
-}
-
-View::show_header("Passkey history for $Username");
-
-$DB->query("
-  SELECT
-    OldPassKey,
-    NewPassKey,
-    ChangeTime,
-    ChangerIP
-  FROM users_history_passkeys
-  WHERE UserID = $UserID
-  ORDER BY ChangeTime DESC");
-
-?>
-<div class="header">
-  <h2>Passkey history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
-</div>
-<table width="100%">
-  <tr class="colhead">
-    <td>Old</td>
-    <td>New</td>
-    <td>Changed</td>
-    <td>IP <a href="/userhistory.php?action=ips&amp;userid=<?=$UserID?>" class="brackets">H</a></td>
-  </tr>
-<? while (list($OldPassKey, $NewPassKey, $ChangeTime, $ChangerIP) = $DB->next_record()) { ?>
-  <tr class="row">
-    <td><?=display_str($OldPassKey)?></td>
-    <td><?=display_str($NewPassKey)?></td>
-    <td><?=time_diff($ChangeTime)?></td>
-    <td><?=display_str($ChangerIP)?> <a href="user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($ChangerIP)?>" class="brackets tooltip" title="Search">S</a><br /><?=display_str(Tools::get_host_by_ip($ChangerIP))?></td>
-  </tr>
-<? } ?>
-</table>
-<? View::show_footer(); ?>

sections/userhistory/password_history.php

@@ -1,60 +0,0 @@
-<?
-/************************************************************************
-||------------|| Password reset history page ||------------------------||
-
-This page lists password reset IP and Times a user has made on the site.
-It gets called if $_GET['action'] == 'password'.
-
-It also requires $_GET['userid'] in order to get the data for the correct
-user.
-
-************************************************************************/
-
-$UserID = $_GET['userid'];
-if (!is_number($UserID)) {
-  error(404);
-}
-
-$DB->query("
-  SELECT
-    um.Username,
-    p.Level AS Class
-  FROM users_main AS um
-    LEFT JOIN permissions AS p ON p.ID = um.PermissionID
-  WHERE um.ID = $UserID");
-list($Username, $Class) = $DB->next_record();
-
-if (!check_perms('users_view_keys', $Class)) {
-  error(403);
-}
-
-View::show_header("Password reset history for $Username");
-
-$DB->query("
-  SELECT
-    ChangeTime,
-    ChangerIP
-  FROM users_history_passwords
-  WHERE UserID = $UserID
-  ORDER BY ChangeTime DESC");
-
-?>
-<div class="header">
-  <h2>Password reset history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
-</div>
-<table width="100%">
-  <tr class="colhead">
-    <td>Changed</td>
-    <td>IP <a href="/userhistory.php?action=ips&amp;userid=<?=$UserID?>" class="brackets">H</a></td>
-  </tr>
-<?
-while (list($ChangeTime, $ChangerIP) = $DB->next_record()) {
-  $ChangerIP = (apcu_exists('DBKEY')) ? Crypto::decrypt($ChangerIP) : '[Encrypted]';
-?>
-  <tr class="row">
-    <td><?=time_diff($ChangeTime)?></td>
-    <td><?=display_str($ChangerIP)?> <a href="/user.php?action=search&amp;ip_history=on&amp;ip=<?=display_str($ChangerIP)?>" class="brackets tooltip" title="Search">S</a><br /><?=Tools::get_host_by_ajax($ChangerIP)?></td>
-  </tr>
-<? } ?>
-</table>
-<? View::show_footer(); ?>

templates/admin/advanced-user-search.twig

@@ -70,21 +70,6 @@
             <input type="text" name="lastfm" size="20" value="{{ lastfm }}" />
         </td>
         </tr>
-
-        <tr>
-        <td class="nobr" colspan="2">
-        <h4>Extra</h4>
-        <ul class="options_list nobullet">
-            <li title="Only display users that have a disabled account linked by IP address">
-                <input type="checkbox" name="disabled_ip" id="disabled_ip"{{ checked(check_disabled_ip) }} />
-                <label for="disabled_ip">Disabled accounts linked by IP</label>
-            </li>
-            <li>
-                <input type="checkbox" name="ip_history" id="ip_history"{{ checked(check_ip_history) }} />
-                <label title="Disabled accounts linked by IP must also be checked" for="ip_history">IP history</label>
-            </li>
-        </ul>
-        </tr>
     </table></td>
 
 {# new column #}

templates/admin/announcekey-history.twig

@@ -6,15 +6,14 @@
         <td>Old</td>
         <td>New</td>
         <td>Changed</td>
-        <td>IP <a href="/userhistory.php?action=ips&amp;userid={{ user.id }}" class="brackets">H</a></td>
+        <td>IP</td>
     </tr>
 {% for change in user.announceKeyHistory %}
     <tr class="row{{ cycle(['a', 'b'], loop.index0) }}">
         <td>{{ change.old }}</td>
         <td>{{ change.new }}</td>
         <td>{{ change.date|time_diff }}</td>
-        <td>{{ change.ipaddr }} <a href="user.php?action=search&amp;ip_history=on&amp;ip={{
-            change.ipaddr }}" class="brackets tooltip" title="Search">S</a><br />{{ resolveIpv4(change.ipaddr) }}</td>
+        <td>{{ change.ipaddr }}</td>
     </tr>
 {% endfor %}
 </table>

templates/admin/privilege-list.twig

@@ -32,7 +32,6 @@
                     {{ privilege(default, user, 'site_view_full_log') }}
                     {{ privilege(default, user, 'site_view_torrent_snatchlist') }}
                     {{ privilege(default, user, 'site_delete_tag') }}
-                    {{ privilege(default, user, 'site_disable_ip_history') }}
                     {{ privilege(default, user, 'zip_downloader') }}
                     {{ privilege(default, user, 'site_debug') }}
                     {{ privilege(default, user, 'site_analysis') }}

templates/admin/registration.twig

@@ -101,13 +101,9 @@
         {% endif %}
             </td>
             <td style="vertical-align: top">
-                <a href="userhistory.php?action=ips&amp;userid{{ user.id }}" title="IP History" class="brackets tooltip">H</a>
-                <a href="/user.php?action=search&amp;ip_history=on&amp;ip={{ user.ipaddr }}" title="IP Search" class="brackets tooltip">S</a>
                 <a href="http://whatismyipaddress.com/ip/{{ user.ipaddr }}" title="whatismyipaddress.com" class="brackets tooltip">WI</a>
         {% if user.inviter.id and user.inviter.ipaddr != user.ipaddr %}
                 <br />
-                <a href="userhistory.php?action=ips&amp;userid={{ user.inviter.id }}" title="IP History" class="brackets tooltip">H</a>
-                <a href="/user.php?action=search&amp;ip_history=on&amp;ip={{ user.inviter.ipaddr }}" title="IP Search" class="brackets tooltip">S</a>
                 <a href="http://whatismyipaddress.com/ip/{{ user.inviter.ipaddr }}" title="WI" class="brackets tooltip">WI</a>
         {% endif %}
             </td>

templates/admin/user-info-ipv4.twig

@@ -7,7 +7,6 @@
 {% for i in info %}
 <tr class="row{{ cycle(['a', 'b'], loop.index0) }}">
     <td>{{ i.0 }}
-        <a href="user.php?action=search&amp;ip_history=on&amp;ip={{ i.0 }}" class="brackets tooltip" title="Shared with other users?">S</a>
         <a href="https://whatismyipaddress.com/ip/{{ i.0 }}" class="brackets tooltip" title="Search WIMIA.com">WI</a>
     </td>
     <td>{{ i.1 }}</td>

templates/user/edit-reset.twig

@@ -7,8 +7,6 @@
         <label for="ResetPasskey">Passkey</label></span>
         <span style="white-space: nowrap; padding-right: 15px"><input type="checkbox" name="ResetAuthkey" id="ResetAuthkey" />
         <label for="ResetAuthkey">Authkey</label></span>
-        <span style="white-space: nowrap; padding-right: 15px"><input type="checkbox" name="ResetIPHistory" id="ResetIPHistory" />
-        <label for="ResetIPHistory">IP history</label></span>
         <span style="white-space: nowrap; padding-right: 15px"><input type="checkbox" name="ResetSnatchList" id="ResetSnatchList" />
         <label for="ResetSnatchList">Snatch list</label></span>
         <span style="white-space: nowrap; padding-right: 15px"><input type="checkbox" name="ResetDownloadList" id="ResetDownloadList" />

templates/user/password-history.twig

@@ -1,16 +0,0 @@
-<div class="header">
-    <h2><a href="/user.php?id={{ user.id  }}">{{ user.username }}</a> &rsaquo; Password reset history</h2>
-</div>
-<table width="100%">
-    <tr class="colhead">
-        <td>Changed</td>
-        <td>IP <a href="/userhistory.php?action=ips&amp;userid={{ user.id }}" class="brackets">H</a></td>
-    </tr>
-{% for change in list %}
-    <tr class="row{{ cycle(['a', 'b'], loop.index0) }}">
-        <td>{{ change.date|time_diff }}</td>
-        <td>{{ change.ipaddr }} <a href="/user.php?action=search&amp;ip_history=on&amp;ip={{ change.ipaddr }}" class="brackets tooltip" title="Search">S</a><br />{{ resolveIpv4(change.ipaddr)  }}</td>
-    </tr>
-{% endfor %}
-</table>
-<?php