Delete table users_history_emails and related features

delete.php

@@ -1,4 +0,0 @@
-<?php
-declare(strict_types=1);
-
-require_once 'classes/script_start.php';

gazelle.sql

@@ -1409,15 +1409,6 @@ CREATE TABLE `users_freeleeches` (
 ) ENGINE=InnoDB CHARSET=utf8mb4;
 
 
-CREATE TABLE `users_history_emails` (
-  `UserID` int NOT NULL,
-  `Email` varchar(255) DEFAULT NULL,
-  `Time` datetime DEFAULT NULL,
-  `IP` varchar(90) DEFAULT NULL,
-  KEY `UserID` (`UserID`)
-) ENGINE=InnoDB CHARSET=utf8mb4;
-
-
 CREATE TABLE `users_history_ips` (
   `UserID` int NOT NULL,
   `IP` varchar(90) NOT NULL DEFAULT '0.0.0.0',

sections/delete/delete_email.php

@@ -1,55 +0,0 @@
-<?php
-#declare(strict_types=1);
-
-if (!isset($_POST['emails']) || !is_array($_POST['emails'])) {
-    error('No email requested');
-}
-
-if (!apcu_exists('DBKEY')) {
-    error(403);
-}
-
-View::show_header('Email Expunge Request');
-?>
-
-<div class="header">
-  <h2>Email Expunge Request</h2>
-</div>
-
-<form class="create_form box pad" name="emaildelete" action="delete.php" method="post">
-  <input type="hidden" name="auth"
-    value="<?=$LoggedUser['AuthKey']?>" />
-
-  <?php foreach ($_POST['emails'] as $email) { ?>
-  <input type="hidden" name="emails[]" value="<?=$email?>" />
-  <?php } ?>
-
-  <input type="hidden" name="action" value="takeemail" />
-
-  <table cellspacing="1" cellpadding="3" border="0" class="layout" width="100%">
-    <tr>
-      <td class="label">Email:</td>
-      <td>
-        <input type="text" size="30"
-          value="<?=Crypto::decrypt($_POST['emails'][0])?>"
-          disabled />
-      </td>
-    </tr>
-
-    <tr>
-      <td class="label">Reason (Optional):</td>
-      <td>
-        <textarea name="reason" rows="10"></textarea>
-      </td>
-    </tr>
-
-    <tr>
-      <td></td>
-      <td>
-        <input type="submit" value="Submit" />
-      </td>
-    </tr>
-  </table>
-</form>
-<?php
-View::show_footer();

sections/delete/delete_ip.php

@@ -1,54 +0,0 @@
-<?php
-#declare(strict_types=1);
-
-if (!isset($_POST['ips']) || !is_array($_POST['ips'])) {
-    error('No IP requested');
-}
-
-if (!apcu_exists('DBKEY')) {
-    error(403);
-}
-
-View::show_header('IP Address Expunge Request');
-?>
-
-<div class="header">
-  <h2>IP Address Expunge Request</h2>
-</div>
-
-<form class="create_form box pad" name="ipdelete" action="delete.php" method="post">
-  <input type="hidden" name="auth"
-    value="<?=$LoggedUser['AuthKey']?>" />
-
-  <?php foreach ($_POST['ips'] as $ip) { ?>
-  <input type="hidden" name="ips[]" value="<?=$ip?>" />
-  <?php } ?>
-
-  <input type="hidden" name="action" value="takeip" />
-  <table cellspacing="1" cellpadding="3" border="0" class="layout" width="100%">
-    <tr>
-      <td class="label">IP:</td>
-      <td>
-        <input type="text" size="30"
-          value="<?=Crypto::decrypt($_POST['ips'][0])?>"
-          disabled />
-      </td>
-    </tr>
-
-    <tr>
-      <td class="label">Reason (Optional):</td>
-      <td>
-        <textarea name="reason" rows="10"></textarea>
-      </td>
-    </tr>
-
-    <tr>
-      <td></td>
-      <td>
-        <input type="submit" value="Submit" />
-      </td>
-    </tr>
-  </table>
-</form>
-<?php
-View::show_footer();

sections/delete/index.php

@@ -1,29 +0,0 @@
-<?php
-#declare(strict_types=1);
-
-enforce_login();
-
-if ($_REQUEST['action']) {
-    switch ($_REQUEST['action']) {
-    case 'email':
-        include 'delete_email.php';
-        break;
-        
-    case 'takeemail':
-        include 'take_delete_email.php';
-        break;
-
-    case 'ip':
-        include 'delete_ip.php';
-        break;
-
-    case 'takeip':
-        include 'take_delete_ip.php';
-        break;
-
-    default:
-        header('Location: index.php');
-  }
-} else {
-    header('Location: index.php');
-}

sections/delete/take_delete_email.php

@@ -1,97 +0,0 @@
-<?php
-#declare(strict_types=1);
-
-enforce_login();
-authorize();
-
-if (!isset($_POST['emails']) || !is_array($_POST['emails'])) {
-    error('Stop that.');
-}
-
-if (!apcu_exists('DBKEY')) {
-    error(403);
-}
-
-$EncEmails = $_POST['emails'];
-$Reason = $_POST['reason'] ?? '';
-
-foreach ($EncEmails as $EncEmail) {
-    $DB->query("
-    SELECT
-      `UserID`
-    FROM
-      `users_history_emails`
-    WHERE
-      `Email` = '".db_string($EncEmail)."'
-    ");
-
-    if (!$DB->has_results()) {
-        error('Email not found');
-    }
-    list($UserID) = $DB->next_record();
-
-    if (!check_perms('users_mod') && ($UserID !== $LoggedUser['ID'])) {
-        error(403);
-    }
-
-    $DB->query("
-    SELECT
-      `Email`
-    FROM
-      `users_main`
-    WHERE
-      `ID` = '$UserID'
-    ");
-
-    if (!$DB->has_results()) {
-        error(404);
-    }
-
-    list($Curr) = $DB->next_record();
-    $Curr = Crypto::decrypt($Curr);
-
-    if ($Curr === Crypto::decrypt($EncEmail)) {
-        error("You can't delete your current email.");
-    }
-}
-
-// Okay I think everything checks out.
-$DB->query("
-INSERT INTO `deletion_requests`(
-  `UserID`,
-  `Type`,
-  `Value`,
-  `Reason`,
-  `Time`
-)
-VALUES(
-  '$UserID',
-  'Email',
-  '".db_string($EncEmails[0])."',
-  '".db_string($Reason)."',
-  NOW())
-");
-
-$Cache->delete_value('num_deletion_requests');
-View::show_header('Email Deletion Request');
-?>
-
-<div>
-  <h2>Email Deletion Request</h2>
-  <div class="box">
-    <p>
-      Your request has been sent.
-      Please wait for it to be acknowledged.
-    </p>
-
-    <p>
-      After it's accepted or denied by staff, you will receive a PM response.
-    </p>
-
-    <p>
-      <a href="/index.php">Return</a>
-    </p>
-  </div>
-</div>
-<?php
-View::show_footer();

sections/delete/take_delete_ip.php

@@ -1,98 +0,0 @@
-<?php
-#declare(strict_types=1);
-
-enforce_login();
-authorize();
-
-if (!isset($_POST['ips']) || !is_array($_POST['ips'])) {
-    error('Stop that.');
-}
-
-if (!apcu_exists('DBKEY')) {
-    error(403);
-}
-
-$EncIPs = $_POST['ips'];
-$Reason = $_POST['reason'] ?? '';
-
-foreach ($EncIPs as $EncIP) {
-    $DB->query("
-    SELECT
-      `UserID`
-    FROM
-      `users_history_ips`
-    WHERE
-      `IP` = '".db_string($EncIP)."'
-    ");
-
-    if (!$DB->has_results()) {
-        error('IP not found');
-    }
-    list($UserID) = $DB->next_record();
-
-    if (!check_perms('users_mod') && ($UserID !== $LoggedUser['ID'])) {
-        error(403);
-    }
-
-    $DB->query("
-    SELECT
-      `IP`
-    FROM
-      `users_main`
-    WHERE
-      `ID` = '$UserID'
-    ");
-
-    if (!$DB->has_results()) {
-        error(404);
-    }
-
-    list($Curr) = $DB->next_record();
-    $Curr = Crypto::decrypt($Curr);
-
-    if ($Curr === Crypto::decrypt($EncIP)) {
-        error("You can't delete your current IP.");
-    }
-}
-
-// Okay I think everything checks out.
-
-$DB->query("
-INSERT INTO `deletion_requests`(
-  `UserID`,
-  `Type`,
-  `Value`,
-  `Reason`,
-  `Time`
-)
-VALUES(
-  '$UserID',
-  'IP',
-  '".db_string($EncIPs[0])."',
-  '".db_string($Reason)."',
-  NOW())
-");
-
-$Cache->delete_value('num_deletion_requests');
-View::show_header('IP Address Deletion Request');
-?>
-
-<div>
-  <h2>IP Address Deletion Request</h2>
-  <div class="box">
-    <p>
-      Your request has been sent.
-      Please wait for it to be acknowledged.
-    </p>
-
-    <p>
-      After it's accepted or denied by staff, you will receive a PM response.
-    </p>
-
-    <p>
-      <a href="/index.php">Return</a>
-    </p>
-  </div>
-</div>
-<?php
-View::show_footer();

sections/register/index.php

@@ -164,20 +164,6 @@ if (!empty($_REQUEST['confirm'])) {
         VALUES
           ('$UserID')");
 
-            $DB->query("
-        INSERT INTO users_history_emails
-          (UserID, Email, Time, IP)
-        VALUES
-          ('$UserID', '".Crypto::encrypt($_REQUEST['email'])."', NULL, '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."')");
-
-            if ($_REQUEST['email'] != $InviteEmail) {
-                $DB->query("
-          INSERT INTO users_history_emails
-            (UserID, Email, Time, IP)
-          VALUES
-            ('$UserID', '".Crypto::encrypt($InviteEmail)."', NOW(), '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."')");
-            }
-
             // Manage invite trees, delete invite
             if ($InviterID !== null && $InviterID !== 0) {
                 $DB->query("

sections/tools/data/registration_log.php

@@ -136,23 +136,11 @@ if ($DB->has_results()) {
       <span class="float_left">
         <?=display_str($Email)?>
       </span>
-      <span class="float_right">
-        <a href="userhistory.php?action=email&amp;userid=<?=$UserID?>"
-          title="History" class="brackets tooltip">H</a>
-        <a href="/user.php?action=search&amp;email_history=on&amp;email=<?=display_str($Email)?>"
-          title="Search" class="brackets tooltip">S</a>
-      </span><br />
 
       <span class="float_left">
         <?=display_str($InviterEmail)?>
       </span>
 
-      <span class="float_right">
-        <a href="userhistory.php?action=email&amp;userid=<?=$InviterID?>"
-          title="History" class="brackets tooltip">H</a>
-        <a href="/user.php?action=search&amp;email_history=on&amp;email=<?=display_str($InviterEmail)?>"
-          title="Search" class="brackets tooltip">S</a>
-      </span><br />
     </td>
 
     <td>

sections/user/advancedsearch.php

@@ -257,37 +257,10 @@ if (count($_GET)) {
         }
 
         if (!empty($_GET['email'])) {
-            if (isset($_GET['email_history'])) {
-                $Distinct = 'DISTINCT ';
-            }
             $Join['the'] = ' JOIN users_emails_decrypted AS he ON he.ID = um1.ID ';
             $Where[] = ' he.Email '.$Match.wrap($_GET['email']);
         }
 
-        if (!empty($_GET['email_cnt']) && is_number($_GET['email_cnt'])) {
-            $Query = "
-        SELECT UserID
-        FROM users_history_emails
-        GROUP BY UserID
-        HAVING COUNT(DISTINCT Email) ";
-            if ($_GET['emails_opt'] === 'equal') {
-                $operator = '=';
-            }
-            if ($_GET['emails_opt'] === 'above') {
-                $operator = '>';
-            }
-            if ($_GET['emails_opt'] === 'below') {
-                $operator = '<';
-            }
-            $Query .= $operator.' '.$_GET['email_cnt'];
-            $DB->query($Query);
-            $Users = implode(',', $DB->collect('UserID'));
-            if (!empty($Users)) {
-                $Where[] = "um1.ID IN ($Users)";
-            }
-        }
-
-
         if (!empty($_GET['ip'])) {
             if (isset($_GET['ip_history'])) {
                 $Distinct = 'DISTINCT ';
@@ -655,12 +628,6 @@ View::show_header('User search');
   } ?> />
               <label for="ip_history">IP history</label>
             </li>
-            <li>
-              <input type="checkbox" name="email_history" id="email_history" <?php if ($_GET['email_history']) {
-      echo ' checked="checked"' ;
-  } ?> />
-              <label for="email_history">Email history</label>
-            </li>
           </ul>
         </td>
         <td class="label nobr">Ratio:</td>
@@ -1061,11 +1028,7 @@ if ($RunQuery) {
                     }
                 }
                 if (!empty($_GET['email'])) {
-                    if (isset($_GET['email_history'])) {
-                        $DB->query("SELECT UserID, Email FROM users_history_emails");
-                    } else {
                         $DB->query("SELECT ID, Email FROM users_main");
-                    }
                     while (list($ID, $EncEmail) = $DB->next_record()) {
                         $Emails[] = $ID.", '".Crypto::decrypt($EncEmail)."'";
                     }

sections/user/take_edit.php

@@ -172,19 +172,6 @@ if ($CurEmail !== $_POST['email']) {
     if (!check_perms('users_edit_profiles')) {
         require_password("Change Email");
     }
-
-    // Update the time of their last email change to the current time *not* the current change.
-    $DB->query("
-      UPDATE users_history_emails
-      SET Time = NOW()
-      WHERE UserID = ?
-        AND Time IS NULL", $UserID);
-
-    $DB->query("
-      INSERT INTO users_history_emails
-        (UserID, Email, Time, IP)
-      VALUES
-        (?, ?, NULL, ?)", $UserID, Crypto::encrypt($_POST['email']), Crypto::encrypt($_SERVER['REMOTE_ADDR']));
 }
 
 if (!empty($_POST['new_pass_1']) && !empty($_POST['new_pass_2'])) {

sections/user/takemoderate.php

@@ -269,32 +269,6 @@ if ($_POST['ResetIPHistory'] && check_perms('users_edit_reset_keys')) {
       WHERE UserID = $UserID");
 }
 
-if ($_POST['ResetEmailHistory'] && check_perms('users_edit_reset_keys')) {
-    $DB->query("
-      DELETE FROM users_history_emails
-      WHERE UserID = '$UserID'");
-
-    if ($_POST['ResetIPHistory']) {
-        $DB->query("
-          INSERT INTO users_history_emails
-            (UserID, Email, Time, IP)
-          VALUES
-        ('$UserID', '".Crypto::encrypt($Username.'@'.SITE_DOMAIN)."', NULL, '".Crypto::encrypt('127.0.0.1')."')");
-    } else {
-        $DB->query("
-          INSERT INTO users_history_emails
-            (UserID, Email, Time, IP)
-          VALUES
-            ('$UserID', '".Crypto::encrypt($Username.'@'.SITE_DOMAIN)."', NULL, '".$Cur['IP']."')");
-    }
-
-    $DB->query("
-      UPDATE users_main
-      SET Email = '".Crypto::encrypt($Username.'@'.SITE_DOMAIN)."'
-      WHERE ID = '$UserID'");
-    $EditSummary[] = 'Email history cleared';
-}
-
 if ($_POST['ResetSnatchList'] && check_perms('users_edit_reset_keys')) {
     $DB->query("
       DELETE FROM xbt_snatched

sections/user/user.php

@@ -275,8 +275,6 @@ if (check_perms('users_edit_profiles', $Class) || $LoggedUser['ID'] == $UserID)
 }
 if ($LoggedUser['ID'] == $UserID) {
     ?>
-    <a href="userhistory.php?action=useremail&userid=<?=$UserID?>"
-      class="brackets">Email History</a>
     <a href="userhistory.php?action=userip&userid=<?=$UserID?>"
       class="brackets">IP History</a>
     <?php
@@ -591,24 +589,11 @@ $OverallRank = UserRank::overall_score($UploadedRank, $DownloadedRank, $UploadsR
           AND IP != ''");
           list($TrackerIPs) = $DB->next_record();
       }
-      if (check_perms('users_view_email', $Class)) {
-          $DB->query("
-        SELECT COUNT(*)
-        FROM users_history_emails
-        WHERE UserID = '$UserID'");
-          list($EmailChanges) = $DB->next_record();
-      } ?>
+      ?>
     <div class="box box_info box_userinfo_history">
       <div class="head colhead_dark">History</div>
       <ul class="stats nobullet">
-        <?php if (check_perms('users_view_email', $Class)) { ?>
-        <li>Emails: <?=number_format($EmailChanges)?> <a
-            href="userhistory.php?action=email2&amp;userid=<?=$UserID?>"
-            class="brackets">View</a>&nbsp;<a
-            href="userhistory.php?action=email&amp;userid=<?=$UserID?>"
-            class="brackets">Legacy view</a></li>
         <?php
-    }
       if (check_perms('users_view_ips', $Class)) {
           ?>
         <li>IPs: <?=number_format($IPChanges)?> <a
@@ -683,10 +668,6 @@ if ($ParanoiaLevel == 0) {
             title="<?=$ParanoiaLevel?>"><?=$ParanoiaLevelText?></span></li>
         <?php if (check_perms('users_view_email', $Class) || $OwnProfile) { ?>
         <li>Email: <a href="mailto:<?=display_str($Email)?>"><?=display_str($Email)?></a>
-          <?php if (check_perms('users_view_email', $Class)) { ?>
-          <a href="user.php?action=search&amp;email_history=on&amp;email=<?=display_str($Email)?>"
-            title="Search" class="brackets tooltip">S</a>
-          <?php } ?>
         </li>
         <?php }
 
@@ -1463,8 +1444,6 @@ if (!$DisablePoints) {
           <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> |
-          <input type="checkbox" name="ResetEmailHistory" id="ResetEmailHistory" /> <label for="ResetEmailHistory">Email
-            history</label>
           <br />
           <input type="checkbox" name="ResetSnatchList" id="ResetSnatchList" /> <label for="ResetSnatchList">Snatch
             list</label> |
@@ -1610,12 +1589,7 @@ if (!$DisablePoints) {
         </td>
       </tr>
       <?php if (check_perms('users_disable_posts') || check_perms('users_disable_any')) {
-        $DB->query("
-      SELECT DISTINCT Email, IP, Time
-      FROM users_history_emails
-      WHERE UserID = $UserID
-      ORDER BY Time ASC");
-        $Emails = $DB->to_array(); ?>
+       ?>
       <tr>
         <td class="label">Disable:</td>
         <td>
@@ -1669,19 +1643,8 @@ if (!$DisablePoints) {
       <tr>
         <td class="label">Hacked:</td>
         <td>
-          <input type="checkbox" name="SendHackedMail" id="SendHackedMail" /> <label for="SendHackedMail">Send hacked
-            account email</label> to
-          <select name="HackedEmail">
-            <?php
-      foreach ($Emails as $Email) {
-          list($Address, $IP) = $Email;
-          $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
-          $Address = apcu_exists('DBKEY') ? Crypto::decrypt($Address) : '[Encrypted]'; ?>
-            <option value="<?=display_str($Address)?>"><?=display_str($Address)?> - <?=display_str($IP)?>
-            </option>
-            <?php
-      } ?>
-          </select>
+          <input type="checkbox" name="SendHackedMail" id="SendHackedMail" />
+          <label for="SendHackedMail">Send hacked account email</label>
         </td>
       </tr>
 

sections/userhistory/email_history.php

@@ -1,154 +0,0 @@
-<?php
-#declare(strict_types=1);
-
-/************************************************************************
-||------------|| User email history page ||---------------------------||
-
-This page lists previous email addresses a user has used on the site. It
-gets called if $_GET['action'] == 'email'.
-
-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 ui.JoinDate, p.Level AS Class
-  FROM users_main AS um
-    JOIN users_info AS ui ON um.ID = ui.UserID
-    JOIN permissions AS p ON p.ID = um.PermissionID
-  WHERE um.ID = $UserID");
-list($Joined, $Class) = $DB->next_record();
-
-if (!check_perms('users_view_email', $Class)) {
-    error(403);
-}
-
-$UsersOnly = $_GET['usersonly'];
-
-$DB->query("
-  SELECT Username
-  FROM users_main
-  WHERE ID = $UserID");
-list($Username)= $DB->next_record();
-View::show_header("Email history for $Username");
-
-if ($UsersOnly == 1) {
-    $DB->query("
-    SELECT
-      u.Email,
-      NOW() AS Time,
-      u.IP,
-      c.Code
-    FROM users_main AS u
-      LEFT JOIN users_main AS u2 ON u2.Email = u.Email AND u2.ID != '$UserID'
-    WHERE u.ID = '$UserID'
-      AND u2.ID > 0
-    UNION
-    SELECT
-      h.Email,
-      h.Time,
-      h.IP,
-      c.Code
-    FROM users_history_emails AS h
-      LEFT JOIN users_history_emails AS h2 ON h2.email = h.email and h2.UserID != '$UserID'
-    WHERE h.UserID = '$UserID'
-      AND h2.UserID > 0
-    ORDER BY Time DESC");
-} else {
-    $DB->query("
-    SELECT
-      u.Email,
-      NOW() AS Time,
-      u.IP,
-      c.Code
-    FROM users_main AS u
-    WHERE u.ID = '$UserID'
-    UNION
-    SELECT
-      h.Email,
-      h.Time,
-      h.IP,
-      c.Code
-    FROM users_history_emails AS h
-    WHERE UserID = '$UserID'
-    ORDER BY Time DESC");
-}
-$History = $DB->to_array();
-?>
-<div class="header">
-  <h2>Email history for <a href="user.php?id=<?=$UserID ?>"><?=$Username ?></a></h2>
-</div>
-<table width="100%">
-  <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>
-    <?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;
-    }
-
-    $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>
-    <?php
-  if ($UsersOnly == 1) {
-      $ueQuery = $DB->query("
-          SELECT
-            ue.UserID,
-            um.Username,
-            ue.Time,
-            ue.IP
-          FROM users_history_emails AS ue, users_main AS um
-          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]'; ?>
-  </tr>
-  <tr>
-    <td></td>
-    <td><?=time_diff($Time)?>
-    </td>
-    <td><?=display_str($IP)?>
-    </td>
-    <?php
-      $UserURL = site_url()."user.php?id=$UserID2";
-          $DB->query("
-        SELECT Enabled
-        FROM users_main
-        WHERE ID = $UserID2");
-          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>
-<?php View::show_footer();

sections/userhistory/email_history2.php

@@ -1,403 +0,0 @@
-<?php
-#declare(strict_types=1);
-
-/************************************************************************
-||------------|| User email history page ||---------------------------||
-
-This page lists previous email addresses a user has used on the site. It
-gets called if $_GET['action'] == 'email'.
-
-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
-    ui.JoinDate,
-    p.Level AS Class
-  FROM users_main AS um
-    JOIN users_info AS ui ON um.ID = ui.UserID
-    JOIN permissions AS p ON p.ID = um.PermissionID
-  WHERE um.ID = $UserID");
-list($Joined, $Class) = $DB->next_record();
-
-if (!check_perms('users_view_email', $Class)) {
-    error(403);
-}
-
-// todo: Is this even used?
-$UsersOnly = $_GET['usersonly'] ?? false;
-
-$DB->query("
-  SELECT Username
-  FROM users_main
-  WHERE ID = $UserID");
-list($Username) = $DB->next_record();
-View::show_header("Email history for $Username");
-
-// Get current email (and matches)
-$DB->query(
-    "
-  SELECT
-    m.Email,
-    NOW() AS Time,
-    m.IP,
-    GROUP_CONCAT(h.UserID SEPARATOR '|') AS UserIDs,
-    GROUP_CONCAT(h.Time SEPARATOR '|') AS UserSetTimes,
-    GROUP_CONCAT(h.IP SEPARATOR '|') AS UserIPs,
-    GROUP_CONCAT(m2.Username SEPARATOR '|') AS Usernames,
-    GROUP_CONCAT(m2.Enabled SEPARATOR '|') AS UsersEnabled,
-    GROUP_CONCAT(i.Donor SEPARATOR '|') AS UsersDonor,
-    GROUP_CONCAT(i.Warned SEPARATOR '|') AS UsersWarned
-  FROM users_main AS m
-    LEFT JOIN users_history_emails AS h ON h.Email = m.Email
-        AND h.UserID != m.ID
-    LEFT JOIN users_main AS m2 ON m2.ID = h.UserID
-    LEFT JOIN users_info AS i ON i.UserID = h.UserID
-  WHERE m.ID = '$UserID'"
-);
-//$CurrentEmail = array_shift($DB->to_array());
-$CurrentEmail = ($DB->to_array())[0]; // Only variables should be passed by reference
-
-// Get historic emails (and matches)
-$DB->query(
-    "
-  SELECT
-    h2.Email,
-    h2.Time,
-    h2.IP,
-    h3.UserID AS UserIDs,
-    h3.Time AS UserSetTimes,
-    h3.IP AS UserIPs,
-    m3.Username AS Usernames,
-    m3.Enabled AS UsersEnabled,
-    i2.Donor AS UsersDonor,
-    i2.Warned AS UsersWarned
-  FROM users_history_emails AS h2
-    LEFT JOIN users_history_emails AS h3 ON h3.Email = h2.Email
-        AND h3.UserID != h2.UserID
-    LEFT JOIN users_main AS m3 ON m3.ID = h3.UserID
-    LEFT JOIN users_info AS i2 ON i2.UserID = h3.UserID
-  WHERE h2.UserID = '$UserID'
-  ORDER BY Time DESC"
-);
-$History = $DB->to_array();
-
-// Current email
-$Current['Email'] = $CurrentEmail['Email'];
-$Current['StartTime'] = $History[0]['Time'];
-$Current['CurrentIP'] = $CurrentEmail['IP'];
-$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']);
-
-    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'];
-        }
-
-        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'];
-    }
-}
-
-// Start page with current email
-?>
-<div>
-  <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>
-    </div>
-  </div>
-  <br />
-  <table width="100%">
-    <tr class="colhead">
-      <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>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></td>
-      <td>
-        <?=display_str($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>
-        <br />
-        <?=Tools::get_host_by_ajax($Current['CurrentIP'])?>
-      </td>
-      <td>
-        <?=display_str($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>
-        <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]'; ?>
-    <tr class="row">
-      <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
-    }
-}
-// Old emails
-if ($Old ?? false) {
-    ?>
-    <tr class="colhead">
-      <td>Old emails</td>
-      <td>Start</td>
-      <td>End</td>
-      <td>Elapsed</td>
-      <td>Set from IP</td>
-    </tr>
-    <?php
-  $j = 0;
-    // 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
-  ?>
-    <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();
-
-        $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['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>
-        <br />
-        <?=Tools::get_host_by_ajax($Record['IP'])?>
-      </td>
-    </tr>
-    <?php
-    if ($MatchCount > 0) {
-        if (isset($Matches)) {
-            echo $Matches;
-            unset($Matches);
-            unset($MatchCount);
-        }
-    }
-    }
-}
-// Invite email (always there)
-?>
-    <tr class="colhead">
-      <td>Invite email</td>
-      <td>Start</td>
-      <td>End</td>
-      <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
-
-            $Match['IP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Match['IP']) : '[Encrypted]'; ?>
-    <tr class="row hidden" id="matches_invite">
-      <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
-        }
-    }
-}
-$MatchCount = $i;
-$Matches = ob_get_contents();
-ob_end_clean();
-
-$Invite['Email'] = apcu_exists('DBKEY') ? Crypto::decrypt($Invite['Email']) : '[Encrypted]';
-$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>Never</td>
-      <td><?=time_diff($Invite['EndTime'])?>
-      </td>
-      <td><?=time_diff($Invite['AccountAge'])?>
-      </td>
-      <td>
-        <?=display_str($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>
-        <br />
-        <?=Tools::get_host_by_ajax($Invite['IP'])?>
-      </td>
-    </tr>
-    <?php
-
-if ($Matches) {
-    echo $Matches;
-}
-
-?>
-  </table>
-</div>
-<?php View::show_footer();

sections/userhistory/email_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 DISTINCT Email
-  FROM users_history_emails
-  WHERE UserID = '$UserID'");
-
-$EncEmails = $DB->collect("Email");
-$Emails = [];
-
-foreach ($EncEmails as $Enc) {
-  if (!isset($Emails[Crypto::decrypt($Enc)])) {
-    $Emails[Crypto::decrypt($Enc)] = [];
-  }
-  $Emails[Crypto::decrypt($Enc)][] = $Enc;
-}
-
-$DB->query("
-  SELECT Email
-  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("Email history for $Username");
-} else {
-  View::show_header("Your email history");
-}
-
-?>
-
-<div class="header">
-<? if ($Self) { ?>
-  <h2>Your email history</h2>
-<? } else { ?>
-  <h2>Email history for <a href="user.php?id=<?=$UserID ?>"><?=$Username ?></a></h2>
-<? } ?>
-</div>
-<table class="alternate_rows" width="100%">
-  <tr class="colhead">
-    <td>Email</td>
-    <td>Expunge</td>
-  </tr>
-<? foreach ($Emails as $Email => $Encs) { ?>
-  <tr class="row">
-    <td><?=display_str($Email)?></td>
-    <td>
-    <? if ($Email != $Curr) { ?>
-      <form action="delete.php" method="post">
-        <input type="hidden" name="action" value="email">
-        <? foreach ($Encs as $Enc) { ?>
-        <input type="hidden" name="emails[]" value="<?=$Enc?>">
-        <? } ?>
-        <input type="submit" value="X">
-      </form>
-    <? } ?>
-    </td>
-  </tr>
-<? } ?>
-</table>
-<? View::show_footer(); ?>

sections/userhistory/index.php

@@ -1,126 +1,81 @@
-<?
-/*****************************************************************
-User history switch center
+<?php
+#declare(strict_types = 1);
 
+/**
+ * User history switch center
+ */
 
-This page acts as a switch that includes the real user history pages (to keep
-the root less cluttered).
-
-enforce_login() is run here - the entire user history pages are off limits for
-non members.
-*****************************************************************/
-
-//Include all the basic stuff...
 enforce_login();
 
 if ($_GET['action']) {
-  switch ($_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 'email':
-      //Load email history page
-      include('email_history.php');
-      break;
-    case 'email2':
-      //Load email history page
-      include('email_history2.php');
-      break;
-    case 'useremail':
-      include('email_history_userview.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');
       break;
+
     case 'subscriptions':
       // View subscriptions
       require('subscriptions.php');
       break;
+
     case 'thread_subscribe':
       require('thread_subscribe.php');
       break;
+
     case 'comments_subscribe':
       require('comments_subscribe.php');
       break;
+
     case 'catchup':
       require('catchup.php');
       break;
+
     case 'collage_subscribe':
       require('collage_subscribe.php');
       break;
+
     case 'subscribed_collages':
       require('subscribed_collages.php');
       break;
+
     case 'catchup_collages':
       require('catchup_collages.php');
       break;
+
     case 'token_history':
       require('token_history.php');
       break;
+
     case 'quote_notifications':
       require('quote_notifications.php');
       break;
+
     default:
       //You trying to mess with me query string? To the home page with you!
       header('Location: index.php');
   }
 }
-
-/* Database Information Regarding This Page
-
-users_history_ips:
-  id (auto_increment, index)
-  userid (index)
-  ip (stored using ip2long())
-  timestamp
-
-users_history_passwd:
-  id (auto_increment, index)
-  userid (index)
-  changed_by (index)
-  old_pass
-  new_pass
-  timestamp
-
-users_history_email:
-  id (auto_increment, index)
-  userid (index)
-  changed_by (index)
-  old_email
-  new_email
-  timestamp
-
-users_history_passkey:
-  id (auto_increment, index)
-  userid (index)
-  changed_by (index)
-  old_passkey
-  new_passkey
-  timestamp
-
-users_history_stats:
-  id (auto_increment, index)
-  userid (index)
-  uploaded
-  downloaded
-  ratio
-  timestamp
-
-*/
-?>

templates/admin/advanced-user-search.twig

@@ -83,10 +83,6 @@
                 <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>
-            <li>
-                <input type="checkbox" name="email_history" id="email_history"{{ checked(check_email_history) }} />
-                <label title="Also search the email addresses the member used in the past" for="email_history">Email history</label>
-            </li>
         </ul>
         </tr>
     </table></td>

templates/admin/registration.twig

@@ -72,15 +72,6 @@
                 <br />
                 {{- user.inviter.email -}}
             </td>
-            <td style="vertical-align: top">
-                <a href="userhistory.php?action=email&amp;userid={{ user.id }}" title="Email History" class="brackets tooltip">H</a>
-                <a href="/user.php?action=search&amp;email_history=on&amp;email={{ user.email }}" title="Email Search" class="brackets tooltip">S</a>
-        {%- if user.inviter -%}
-                <br />
-                <a href="userhistory.php?action=email&amp;userid={{ user.inviter.id }}" title="Email History" class="brackets tooltip">H</a>
-                <a href="/user.php?action=search&amp;email_history=on&amp;email={{ user.inviter.email }}" title="Email Search" class="brackets tooltip">S</a>
-        {%- endif -%}
-            </td>
             <td style="vertical-align: top">
                 <span style="float: left">
                 {{- user.ipaddr -}}

templates/admin/user-info-email.twig

@@ -1,16 +0,0 @@
-<tr><th colspan="3">Email History</th></tr>
-<tr>
-    <th>Address</th>
-    <th>Registered since</th>
-    <th>Registered from</th>
-</tr>
-{% for i in info %}
-<tr class="row{{ cycle(['a', 'b'], loop.index0) }}">
-    <td>{{ i.0 }}</td>
-    <td>{{ i.1 }}</td>
-    <td>{{ i.2 }}
-        <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>
-</tr>
-{% endfor %}

templates/user/edit-reset.twig

@@ -9,8 +9,6 @@
         <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="ResetEmailHistory" id="ResetEmailHistory" />
-        <label for="ResetEmailHistory">Email 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/email-history.twig

@@ -1,59 +0,0 @@
-<div class="thin">
-<div class="header">
-    <h2><a href="user.php?id={{ user.id }}">{{ user.username }}</a> &rsaquo; Email history</h2>
-</div>
-<table>
-    <tr><th colspan="3">Email History</th></tr>
-    <tr>
-        <th>Address</th>
-        <th>Registered since</th>
-        <th>Registered from</th>
-    </tr>
-{% for i in user.emailHistory  %}
-    <tr class="row{{ cycle(['a', 'b'], loop.index0) }}">
-        <td>{{ i.0 }}</td>
-        <td>{{ i.1 }}</td>
-        <td>{{ i.2 }}
-            <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>
-    </tr>
-{% endfor %}
-</table>
-
-{% for r in user.emailDuplicateHistory %}
-{% if loop.first %}
-<br />
-<div class="header">
-<h3>Duplicate email addresses used</h3>
-</div>
-<table>
-    <tr>
-        <th>Username</th>
-        <th>Email</th>
-        <th>Registered since</th>
-        <th>Registered from</th>
-        <th>Enabled</th>
-        <th>Donor</th>
-        <th>Warned until</th>
-    </tr>
-{% endif %}
-    <tr class="row{{ cycle(['a', 'b'], loop.index0) }}">
-        <td><a href="userhistory.php?action=email&userid={{ r.user_id }}">{{ r.user.username }}</a></td>
-        <td>{{ r.user.email }}</td>
-        <td>{{ r.created }}</td>
-        <td>{{ r.ipv4 }}
-            <a href="user.php?action=search&amp;ip_history=on&amp;ip={{ r.ipv4 }}" class="brackets tooltip" title="Shared with other users?">S</a>
-            <a href="https://whatismyipaddress.com/ip/{{ r.ipv4 }}" class="brackets tooltip" title="Search WIMIA.com">WI</a>
-        </td>
-        <td>{{ r.user.isEnabled ? 'yes' : 'no' }}</td>
-        <td>{{ r.user.isDonor ? 'yes' : 'no' }}</td>
-        <td>{{ r.user.isWarned ? r.user.endWarningDate(0) : 'no' }}</td>
-    </tr>
-{% if loop.last %}
-</table>
-<br />
-{% endif %}
-{% endfor %}
-<br />
-</div>