Rename DBCrypt class to Crypto

classes/autoenable.class.php

@@ -74,7 +74,7 @@ class AutoEnable {
                 INSERT INTO users_enable_requests
                 (UserID, Email, IP, UserAgent, Timestamp)
                 VALUES (?, ?, ?, ?, NOW())",
-                $UserID, DBCrypt::encrypt($Email), DBCrypt::encrypt($IP), $UserAgent);
+                $UserID, Crypto::encrypt($Email), Crypto::encrypt($IP), $UserAgent);
 
             // Cache the number of requests for the modbar
             G::$Cache->increment_value(self::CACHE_KEY_NAME);
@@ -132,7 +132,7 @@ class AutoEnable {
 
             foreach ($Results as $Result) {
                 list($Email, $ID, $UserID) = $Result;
-                $Email = DBCrypt::decrypt($Email);
+                $Email = Crypto::decrypt($Email);
                 $UserInfo[] = array($ID, $UserID);
 
                 if ($Status == self::APPROVED) {
@@ -264,7 +264,7 @@ class AutoEnable {
             } else {
                 // Good request, decrement cache value and enable account
                 G::$Cache->decrement_value(AutoEnable::CACHE_KEY_NAME);
-                $VisibleTrIP = ($Visible && DBCrypt::decrypt($IP) != '127.0.0.1') ? '1' : '0';
+                $VisibleTrIP = ($Visible && Crypto::decrypt($IP) != '127.0.0.1') ? '1' : '0';
                 Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $TorrentPass, 'visible' => $VisibleTrIP));
                 G::$DB->query("UPDATE users_main SET Enabled = '1', can_leech = '1' WHERE ID = '$UserID'");
                 G::$DB->query("UPDATE users_info SET BanReason = '0' WHERE UserID = '$UserID'");

classes/dbcrypt.class.php → classes/crypto.class.php

@@ -1,5 +1,5 @@
 <?
-class DBCrypt {
+class Crypto {
   /**
    * Encrypts input text for use in database
    *
@@ -10,7 +10,7 @@ class DBCrypt {
     if (apcu_exists('DBKEY')) {
       $iv_size = openssl_cipher_iv_length('AES-128-CBC');
       $iv = openssl_random_pseudo_bytes($iv_size);
-      $ret =  base64_encode($iv.openssl_encrypt($plaintext, 'AES-128-CBC', apcu_fetch('DBKEY'), OPENSSL_RAW_DATA, $iv));
+      $ret = base64_encode($iv.openssl_encrypt($plaintext, 'AES-128-CBC', apcu_fetch('DBKEY'), OPENSSL_RAW_DATA, $iv));
       return $ret;
     } else {
       return false;

classes/misc.class.php

@@ -50,7 +50,7 @@ class Misc {
     $UnescapedSubject = $Subject;
     $UnescapedBody = $Body;
     $Subject = db_string($Subject);
-    $Body = DBCrypt::encrypt(substr($Body, 0, 49135)); // 49135 -> encryption -> 65536 (max length in mysql)
+    $Body = Crypto::encrypt(substr($Body, 0, 49135)); // 49135 -> encryption -> 65536 (max length in mysql)
     if ($ToID == 0) {
       // Don't allow users to send messages to the system
       return;

classes/script_start.php

@@ -191,7 +191,7 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
       SET ";
     // Only update IP if we have an encryption key in memory
     if (apcu_exists('DBKEY')) {
-      $SessionQuery .= "IP = '".DBCrypt::encrypt($_SERVER['REMOTE_ADDR'])."', ";
+      $SessionQuery .= "IP = '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."', ";
     }
     $SessionQuery .=
        "Browser = '$Browser',
@@ -206,7 +206,7 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
         'SessionID' => $SessionID,
         'Browser' => $Browser,
         'OperatingSystem' => $OperatingSystem,
-        'IP' => (apcu_exists('DBKEY') ? DBCrypt::encrypt($_SERVER['REMOTE_ADDR']) : $UserSessions[$SessionID]['IP']),
+        'IP' => (apcu_exists('DBKEY') ? Crypto::encrypt($_SERVER['REMOTE_ADDR']) : $UserSessions[$SessionID]['IP']),
         'LastUpdate' => sqltime() );
     $Cache->insert_front($SessionID, $UsersSessionCache);
     $Cache->commit_transaction(0);
@@ -232,7 +232,7 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
 
   // IP changed
 
-  if (apcu_exists('DBKEY') && DBCrypt::decrypt($LoggedUser['IP']) != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) {
+  if (apcu_exists('DBKEY') && Crypto::decrypt($LoggedUser['IP']) != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) {
 
     if (Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) {
       error('Your IP address has been banned.');
@@ -246,7 +246,7 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
       WHERE EndTime IS NULL
         AND UserID = '$LoggedUser[ID]'");
     while (list($EncIP) = $DB->next_record()) {
-      if (DBCrypt::decrypt($EncIP) == $CurIP) {
+      if (Crypto::decrypt($EncIP) == $CurIP) {
         $CurIP = $EncIP;
         // CurIP is now the encrypted IP that was already in the database (for matching)
         break;
@@ -262,15 +262,15 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
       INSERT IGNORE INTO users_history_ips
         (UserID, IP, StartTime)
       VALUES
-        ('$LoggedUser[ID]', '".DBCrypt::encrypt($NewIP)."', NOW())");
+        ('$LoggedUser[ID]', '".Crypto::encrypt($NewIP)."', NOW())");
 
     $ipcc = Tools::geoip($NewIP);
     $DB->query("
       UPDATE users_main
-      SET IP = '".DBCrypt::encrypt($NewIP)."', ipcc = '$ipcc'
+      SET IP = '".Crypto::encrypt($NewIP)."', ipcc = '$ipcc'
       WHERE ID = '$LoggedUser[ID]'");
     $Cache->begin_transaction('user_info_heavy_'.$LoggedUser['ID']);
-    $Cache->update_row(false, array('IP' => DBCrypt::encrypt($_SERVER['REMOTE_ADDR'])));
+    $Cache->update_row(false, array('IP' => Crypto::encrypt($_SERVER['REMOTE_ADDR'])));
     $Cache->commit_transaction(0);
 
 

design/privatefooter.php

@@ -24,7 +24,7 @@
 <?  if (!empty($LastActive)) { ?>
   <p>
     <a href="user.php?action=sessions">
-      <span class="tooltip" title="Manage sessions">Last activity: </span><?=time_diff($LastActive['LastUpdate'])?><span class="tooltip" title="Manage sessions"> from <?=(apcu_exists('DBKEY')?(DBCrypt::decrypt($LastActive['IP'])):'[Encrypted]') ?></span>
+      <span class="tooltip" title="Manage sessions">Last activity: </span><?=time_diff($LastActive['LastUpdate'])?><span class="tooltip" title="Manage sessions"> from <?=(apcu_exists('DBKEY')?(Crypto::decrypt($LastActive['IP'])):'[Encrypted]') ?></span>
     </a>
   </p>
 <?  } ?>

sections/ajax/inbox/viewconv.php

@@ -78,7 +78,7 @@ $DB->query("
 
 $JsonMessages = [];
 while (list($SentDate, $SenderID, $Body, $MessageID) = $DB->next_record()) {
-  $Body = apcu_exists('DBKEY') ? DBCrypt::decrypt($Body) : '[Encrypted]';
+  $Body = apcu_exists('DBKEY') ? Crypto::decrypt($Body) : '[Encrypted]';
   $JsonMessage = array(
     'messageId' => (int)$MessageID,
     'senderId' => (int)$SenderID,

sections/delete/delete_email.php

@@ -24,7 +24,7 @@ View::show_header('Email Expunge Request');
   <table cellspacing="1" cellpadding="3" border="0" class="layout" width="100%">
     <tr>
       <td class="label">Email:</td>
-      <td><input type="text" size="30" value="<?=DBCrypt::decrypt($_GET['emails'][0])?>" disabled /></td>
+      <td><input type="text" size="30" value="<?=Crypto::decrypt($_GET['emails'][0])?>" disabled /></td>
     </tr>
     <tr>
       <td class="label">Reason (Optional):</td>

sections/delete/delete_ip.php

@@ -24,7 +24,7 @@ View::show_header('IP Address Expunge Request');
   <table cellspacing="1" cellpadding="3" border="0" class="layout" width="100%">
     <tr>
       <td class="label">IP:</td>
-      <td><input type="text" size="30" value="<?=DBCrypt::decrypt($_GET['ips'][0])?>" disabled /></td>
+      <td><input type="text" size="30" value="<?=Crypto::decrypt($_GET['ips'][0])?>" disabled /></td>
     </tr>
     <tr>
       <td class="label">Reason (Optional):</td>

sections/delete/take_delete_email.php

@@ -41,9 +41,9 @@ forEach ($EncEmails as $EncEmail) {
   }
 
   list($Curr) = $DB->next_record();
-  $Curr = DBCrypt::decrypt($Curr);
+  $Curr = Crypto::decrypt($Curr);
 
-  if ($Curr == DBCrypt::decrypt($EncEmail)) {
+  if ($Curr == Crypto::decrypt($EncEmail)) {
     error("You can't delete your current email.");
   }
 }

sections/delete/take_delete_ip.php

@@ -41,9 +41,9 @@ forEach ($EncIPs as $EncIP) {
   }
 
   list($Curr) = $DB->next_record();
-  $Curr = DBCrypt::decrypt($Curr);
+  $Curr = Crypto::decrypt($Curr);
 
-  if ($Curr == DBCrypt::decrypt($EncIP)) {
+  if ($Curr == Crypto::decrypt($EncIP)) {
     error("You can't delete your current IP.");
   }
 }

sections/inbox/conversation.php

@@ -83,7 +83,7 @@ $DB->query("
 <?
 
 while (list($SentDate, $SenderID, $Body, $MessageID) = $DB->next_record()) {
-  $Body = apcu_exists('DBKEY') ? DBCrypt::decrypt($Body) : '[Encrypted]';
+  $Body = apcu_exists('DBKEY') ? Crypto::decrypt($Body) : '[Encrypted]';
 ?>
   <div class="box vertical_space">
     <div class="head" style="overflow: hidden;">

sections/inbox/get_post.php

@@ -27,7 +27,7 @@ $DB->query("
   WHERE m.ID = '$PostID'
     AND u.UserID = ".$LoggedUser['ID']);
 list($Body) = $DB->next_record(MYSQLI_NUM);
-$Body = apcu_exists('DBKEY') ? DBCrypt::decrypt($Body) : '[Encrypted]';
+$Body = apcu_exists('DBKEY') ? Crypto::decrypt($Body) : '[Encrypted]';
 
 // This gets sent to the browser, which echoes it wherever
 

sections/login/index.php

@@ -52,7 +52,7 @@ if (isset($_REQUEST['act']) && $_REQUEST['act'] == 'recover') {
       error('Database not fully decrypted. Please wait for staff to fix this and try again later');
     }
 
-    $Email = DBCrypt::decrypt($Email);
+    $Email = Crypto::decrypt($Email);
 
     if ($UserID && strtotime($Expires) > time()) {
       // If the user has requested a password change, and his key has not expired
@@ -80,7 +80,7 @@ if (isset($_REQUEST['act']) && $_REQUEST['act'] == 'recover') {
             INSERT INTO users_history_passwords
               (UserID, ChangerIP, ChangeTime)
             VALUES
-              (?, ?, NOW())", $UserID, DBCrypt::encrypt($_SERVER['REMOTE_ADDR']));
+              (?, ?, NOW())", $UserID, Crypto::encrypt($_SERVER['REMOTE_ADDR']));
           $PassWasReset = true;
           $LoggedUser['ID'] = $UserID; // Set $LoggedUser['ID'] for logout_all_sessions() to work
           logout_all_sessions();
@@ -127,7 +127,7 @@ if (isset($_REQUEST['act']) && $_REQUEST['act'] == 'recover') {
             Email
           FROM users_main");
         while(list($EncEmail) = $DB->next_record()) {
-          if (strtolower($_REQUEST['email']) == strtolower(DBCrypt::decrypt($EncEmail))) {
+          if (strtolower($_REQUEST['email']) == strtolower(Crypto::decrypt($EncEmail))) {
             break; // $EncEmail is now the encrypted form of the given email from the database
           }
         }
@@ -140,7 +140,7 @@ if (isset($_REQUEST['act']) && $_REQUEST['act'] == 'recover') {
           FROM users_main
           WHERE Email = ?", $EncEmail);
         list($UserID, $Username, $Email) = $DB->next_record();
-        $Email = DBCrypt::decrypt($Email);
+        $Email = Crypto::decrypt($Email);
 
         if ($UserID) {
           // Email exists in the database
@@ -264,7 +264,7 @@ else {
                 $IPs = $DB->to_array(false, MYSQLI_NUM);
                 $QueryParts = [];
                 foreach ($IPs as $i => $IP) {
-                  $IPs[$i] = DBCrypt::decrypt($IP[0]);
+                  $IPs[$i] = Crypto::decrypt($IP[0]);
                 }
                 $IPs = array_unique($IPs);
                 if (count($IPs) > 0) { // Always allow first login
@@ -287,7 +287,7 @@ else {
                         FROM users_main
                         WHERE ID = ?", $UserID);
                       list($Username, $Email) = $DB->next_record();
-                      Users::auth_location($UserID, $Username, $CurrentASN, DBCrypt::decrypt($Email));
+                      Users::auth_location($UserID, $Username, $CurrentASN, Crypto::decrypt($Email));
                       require('newlocation.php');
                       die();
                     }
@@ -356,14 +356,14 @@ else {
                   INSERT INTO users_sessions
                     (UserID, SessionID, KeepLogged, Browser, OperatingSystem, IP, LastUpdate, FullUA)
                   VALUES
-                    ('$UserID', '".db_string($SessionID)."', '1', '$Browser', '$OperatingSystem', '".db_string(apcu_exists('DBKEY')?DBCrypt::encrypt($_SERVER['REMOTE_ADDR']):'0.0.0.0')."', NOW(), '".db_string($_SERVER['HTTP_USER_AGENT'])."')");
+                    ('$UserID', '".db_string($SessionID)."', '1', '$Browser', '$OperatingSystem', '".db_string(apcu_exists('DBKEY')?Crypto::encrypt($_SERVER['REMOTE_ADDR']):'0.0.0.0')."', NOW(), '".db_string($_SERVER['HTTP_USER_AGENT'])."')");
 
                 $Cache->begin_transaction("users_sessions_$UserID");
                 $Cache->insert_front($SessionID, [
                   'SessionID' => $SessionID,
                   'Browser' => $Browser,
                   'OperatingSystem' => $OperatingSystem,
-                  'IP' => (apcu_exists('DBKEY')?DBCrypt::encrypt($_SERVER['REMOTE_ADDR']):'0.0.0.0'),
+                  'IP' => (apcu_exists('DBKEY')?Crypto::encrypt($_SERVER['REMOTE_ADDR']):'0.0.0.0'),
                   'LastUpdate' => sqltime()
                 ]);
                 $Cache->commit_transaction(0);

sections/register/index.php

@@ -80,7 +80,7 @@ if (!empty($_REQUEST['confirm'])) {
           $InviterID = 0;
         } else {
           list($InviterID, $InviteEmail, $InviteReason) = $DB->next_record(MYSQLI_NUM, false);
-          $InviteEmail = DBCrypt::decrypt($InviteEmail);
+          $InviteEmail = Crypto::decrypt($InviteEmail);
         }
       } else {
         $InviterID = 0;
@@ -114,7 +114,7 @@ if (!empty($_REQUEST['confirm'])) {
         INSERT INTO users_main
           (Username, Email, PassHash, torrent_pass, IP, PermissionID, Enabled, Invites, Uploaded, ipcc)
         VALUES
-          ('".db_string(trim($_POST['username']))."', '".DBCrypt::encrypt($_POST['email'])."', '".db_string(Users::make_sec_hash($_POST['password']))."', '".db_string($torrent_pass)."', '".DBCrypt::encrypt($_SERVER['REMOTE_ADDR'])."', '$Class', '$Enabled', '".STARTING_INVITES."', '1073741824', '$IPcc')");
+          ('".db_string(trim($_POST['username']))."', '".Crypto::encrypt($_POST['email'])."', '".db_string(Users::make_sec_hash($_POST['password']))."', '".db_string($torrent_pass)."', '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."', '$Class', '$Enabled', '".STARTING_INVITES."', '1073741824', '$IPcc')");
 
       $UserID = $DB->inserted_id();
 
@@ -150,7 +150,7 @@ if (!empty($_REQUEST['confirm'])) {
         INSERT INTO users_history_ips
           (UserID, IP, StartTime)
         VALUES
-          ('$UserID', '".DBCrypt::encrypt($_SERVER['REMOTE_ADDR'])."', NOW())");
+          ('$UserID', '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."', NOW())");
       $DB->query("
         INSERT INTO users_notifications_settings
           (UserID)
@@ -162,14 +162,14 @@ if (!empty($_REQUEST['confirm'])) {
         INSERT INTO users_history_emails
           (UserID, Email, Time, IP)
         VALUES
-          ('$UserID', '".DBCrypt::encrypt($_REQUEST['email'])."', NULL, '".DBCrypt::encrypt($_SERVER['REMOTE_ADDR'])."')");
+          ('$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', '".DBCrypt::encrypt($InviteEmail)."', NOW(), '".DBCrypt::encrypt($_SERVER['REMOTE_ADDR'])."')");
+            ('$UserID', '".Crypto::encrypt($InviteEmail)."', NOW(), '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."')");
       }
 
 

sections/schedule/daily/disable_inactive_users.php

@@ -17,7 +17,7 @@ if (apcu_exists('DBKEY')) {
       AND ul.UserID IS NULL
     GROUP BY um.ID");
   while (list($Username, $Email) = $DB->next_record()) {
-    $Email = DBCrypt::decrypt($Email);
+    $Email = Crypto::decrypt($Email);
     $Body = "Hi $Username,\n\nIt has been almost 4 months since you used your account at ".site_url().". This is an automated email to inform you that your account will be disabled in 10 days if you do not sign in.";
     Misc::send_email($Email, 'Your '.SITE_NAME.' account is about to be disabled', $Body);
   }

sections/schedule/manually/update_geodist.php

@@ -2,7 +2,7 @@
 $IPs = [];
 $DB->query("SELECT IP FROM users_main WHERE Enabled = '1'");
 while(list($EncIP) = $DB->next_record()) {
-  $IPs[] = DBCrypt::decrypt($EncIP);
+  $IPs[] = Crypto::decrypt($EncIP);
 }
 $DB->query("CREATE TEMPORARY TABLE users_ips_decrypted (IP VARCHAR(45) NOT NULL)");
 $DB->query("INSERT INTO users_ips_decrypted (IP) VALUES('".implode("'),('", $IPs)."')");

sections/tools/data/invite_pool.php

@@ -86,8 +86,8 @@ $DB->set_query_id($RS);
     </tr>
 <?
   while (list($UserID, $IP, $InviteKey, $Expires, $Email) = $DB->next_record()) {
-    $IP = apcu_exists('DBKEY') ? DBCrypt::decrypt($IP) : '[Encrypted]';
-    $Email = apcu_exists('DBKEY') ? DBCrypt::decrypt($Email) : '[Encrypted]';
+    $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
+    $Email = apcu_exists('DBKEY') ? Crypto::decrypt($Email) : '[Encrypted]';
 ?>
     <tr class="row">
       <td><?=Users::format_username($UserID, true, true, true, true)?></td>

sections/tools/data/registration_log.php

@@ -109,10 +109,10 @@ if ($DB->has_results()) {
 <?
   while (list($UserID, $IP, $IPCC, $Email, $Username, $PermissionID, $Uploaded, $Downloaded, $Enabled, $Donor, $Warned, $Joined, $Uses, $InviterID, $InviterIP, $InviterIPCC, $InviterEmail, $InviterUsername, $InviterPermissionID, $InviterUploaded, $InviterDownloaded, $InviterEnabled, $InviterDonor, $InviterWarned, $InviterJoined, $InviterUses) = $DB->next_record()) {
   $RowClass = $IP === $InviterIP ? 'warning' : '';
-  $Email = apcu_exists('DBKEY') ? DBCrypt::decrypt($Email) : '[Encrypted]';
-  $IP = apcu_exists('DBKEY') ? DBCrypt::decrypt($IP) : '[Encrypted]';
-  $InviterEmail = apcu_exists('DBKEY') ? DBCrypt::decrypt($InviterEmail) : '[Encrypted]';
-  $InviterIP = apcu_exists('DBKEY') ? DBCrypt::decrypt($InviterIP) : '[Encrypted]';
+  $Email = apcu_exists('DBKEY') ? Crypto::decrypt($Email) : '[Encrypted]';
+  $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
+  $InviterEmail = apcu_exists('DBKEY') ? Crypto::decrypt($InviterEmail) : '[Encrypted]';
+  $InviterIP = apcu_exists('DBKEY') ? Crypto::decrypt($InviterIP) : '[Encrypted]';
 ?>
     <tr class="<?=$RowClass?>">
       <td><?=Users::format_username($UserID, true, true, true, true)?><br /><?=Users::format_username($InviterID, true, true, true, true)?></td>

sections/tools/managers/enable_requests.php

@@ -274,9 +274,9 @@ if ($NumResults > 0) { ?>
 <?          } ?>
             </td>
             <td><?=Users::format_username($UserID)?></td>
-            <td><?=display_str(DBCrypt::decrypt($Email))?></td>
+            <td><?=display_str(Crypto::decrypt($Email))?></td>
 
-            <td><?=display_str(DBCrypt::decrypt($IP))?></td>
+            <td><?=display_str(Crypto::decrypt($IP))?></td>
 
             <td><?=display_str($UserAgent)?></td>
             <td><?=time_diff($Timestamp)?></td>

sections/tools/managers/expunge_requests.php

@@ -46,7 +46,7 @@ if (isset($_GET['deny']) && isset($_GET['type']) && isset($_GET['value'])) {
         WHERE UserID = '$UserID'");
       $ToDelete = [];
       while (list($EncValue) = $DB->next_record()) {
-        if (DBCrypt::decrypt($Value) == DBCrypt::decrypt($EncValue)) {
+        if (Crypto::decrypt($Value) == Crypto::decrypt($EncValue)) {
           $ToDelete[] = $EncValue;
         }
       }
@@ -95,7 +95,7 @@ View::show_header("Expunge Requests");
     <tr>
       <td><?=Users::format_username($Request['UserID'])?></td>
       <td><?=$Request['Type']?></td>
-      <td><?=DBCrypt::decrypt($Request['Value'])?></td>
+      <td><?=Crypto::decrypt($Request['Value'])?></td>
       <td><?=display_str($Request['Reason'])?></td>
       <td><a href="tools.php?action=expunge_requests&auth=<?=$LoggedUser['AuthKey']?>&type=<?=strtolower($Request['Type'])?>&value=<?=urlencode($Request['Value'])?>&userid=<?=$Request['UserID']?>&deny=false" class="brackets">Accept</a></td>
       <td><a href="tools.php?action=expunge_requests&auth=<?=$LoggedUser['AuthKey']?>&type=<?=strtolower($Request['Type'])?>&value=<?=urlencode($Request['Value'])?>&userid=<?=$Request['UserID']?>&deny=true" class="brackets">Deny</a></td>

sections/tools/misc/create_user.php

@@ -28,7 +28,7 @@ if (isset($_POST['Username'])) {
       INSERT INTO users_main
         (Username, Email, PassHash, torrent_pass, Enabled, PermissionID)
       VALUES
-        ('".db_string($Username)."', '".DBCrypt::encrypt($Email)."', '".db_string(Users::make_sec_hash($Password))."', '".db_string($torrent_pass)."', '1', '".USER."')");
+        ('".db_string($Username)."', '".Crypto::encrypt($Email)."', '".db_string(Users::make_sec_hash($Password))."', '".db_string($torrent_pass)."', '1', '".USER."')");
 
     //Increment site user count
     $Cache->increment('stats_user_count');

sections/user/advancedsearch.php

@@ -804,7 +804,7 @@ if ($RunQuery) {
       $DB->query("SELECT ID, IP FROM users_main");
     }
     while(list($ID, $EncIP) = $DB->next_record()) {
-      $IPs[] = $ID.", '".DBCrypt::decrypt($EncIP)."'";
+      $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).")");
@@ -819,7 +819,7 @@ if ($RunQuery) {
       $DB->query("SELECT ID, Email FROM users_main");
     }
     while(list($ID, $EncEmail) = $DB->next_record()) {
-      $Emails[] = $ID.", '".DBCrypt::decrypt($EncEmail)."'";
+      $Emails[] = $ID.", '".Crypto::decrypt($EncEmail)."'";
     }
     $DB->query("CREATE TEMPORARY TABLE users_emails_decrypted (ID INT(10) UNSIGNED NOT NULL, Email VARCHAR(255) NOT NULL, PRIMARY KEY (ID,Email)) ENGINE=MEMORY");
     $DB->query("INSERT IGNORE INTO users_emails_decrypted (ID, Email) VALUES(".implode("),(", $Emails).")");
@@ -866,8 +866,8 @@ echo $Pages;
     </tr>
 <?
 while (list($UserID, $Username, $Uploaded, $Downloaded, $Snatched, $Invitees, $Class, $Email, $Enabled, $IP, $Invites, $DisableInvites, $Warned, $Donor, $JoinDate, $LastAccess) = $DB->next_record()) {
-  $IP = apcu_exists('DBKEY') ? DBCrypt::decrypt($IP) : '[Encrypted]';
-  $Email = apcu_exists('DBKEY') ? DBCrypt::decrypt($Email) : '[Encrypted]';
+  $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
+  $Email = apcu_exists('DBKEY') ? Crypto::decrypt($Email) : '[Encrypted]';
 ?>
     <tr>
       <td><?=Users::format_username($UserID, true, true, true, true)?></td>

sections/user/edit.php

@@ -29,7 +29,7 @@ list($Username, $TwoFactor, $PublicKey, $Email, $IRCKey, $Paranoia, $Info, $Avat
 
 $TwoFA = new TwoFactorAuth();
 
-$Email = apcu_exists('DBKEY') ? DBCrypt::decrypt($Email) : '[Encrypted]';
+$Email = apcu_exists('DBKEY') ? Crypto::decrypt($Email) : '[Encrypted]';
 
 if ($UserID != $LoggedUser['ID'] && !check_perms('users_edit_profiles', $Class)) {
   error(403);

sections/user/invite.php

@@ -190,7 +190,7 @@ if (!empty($Pending)) {
 <?
   foreach ($Pending as $Invite) {
     list($InviteKey, $Email, $Expires) = $Invite;
-    $Email = apcu_exists('DBKEY') ? DBCrypt::decrypt($Email) : '[Encrypted]';
+    $Email = apcu_exists('DBKEY') ? Crypto::decrypt($Email) : '[Encrypted]';
 ?>
       <tr class="row">
         <td><?=display_str($Email)?></td>
@@ -219,7 +219,7 @@ if (!empty($Pending)) {
 <?
   foreach ($Invited as $User) {
     list($ID, $Email, $Uploaded, $Downloaded, $JoinDate, $LastAccess) = $User;
-    $Email = apcu_exists('DBKEY') ? DBCrypt::decrypt($Email) : '[Encrypted]'
+    $Email = apcu_exists('DBKEY') ? Crypto::decrypt($Email) : '[Encrypted]'
 ?>
       <tr class="row">
         <td><?=Users::format_username($ID, true, true, true, true)?></td>

sections/user/sessions.php

@@ -73,7 +73,7 @@ View::show_header($Username.' > Sessions');
 <?
   foreach ($UserSessions as $Session) {
     list($ThisSessionID, $Browser, $OperatingSystem, $IP, $LastUpdate) = array_values($Session);
-    $IP = apcu_exists('DBKEY') ? DBCrypt::decrypt($IP) : '[Encrypted]';
+    $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
 ?>
       <tr class="row">
         <td class="nobr"><?=$IP?></td>

sections/user/take_edit.php

@@ -149,7 +149,7 @@ function require_password($Setting = false) {
 }
 
 // Email change
-$CurEmail = DBCrypt::decrypt($CurEmail);
+$CurEmail = Crypto::decrypt($CurEmail);
 if ($CurEmail != $_POST['email']) {
 
   // Non-admins have to authenticate to change email
@@ -167,7 +167,7 @@ if ($CurEmail != $_POST['email']) {
     INSERT INTO users_history_emails
       (UserID, Email, Time, IP)
     VALUES
-      (?, ?, NULL, ?)", $UserID, DBCrypt::encrypt($_POST['email']), DBCrypt::encrypt($_SERVER['REMOTE_ADDR']));
+      (?, ?, NULL, ?)", $UserID, Crypto::encrypt($_POST['email']), Crypto::encrypt($_SERVER['REMOTE_ADDR']));
 
 }
 
@@ -300,12 +300,12 @@ $SQL = "
     i.Info = '".db_string($_POST['info'])."',
     i.InfoTitle = '".db_string($_POST['profile_title'])."',
     i.UnseededAlerts = '$UnseededAlerts',
-    m.Email = '".DBCrypt::encrypt($_POST['email'])."',
+    m.Email = '".Crypto::encrypt($_POST['email'])."',
     m.IRCKey = '".db_string($_POST['irckey'])."',
     m.Paranoia = '".db_string(json_encode($Paranoia))."'";
 
 if ($ResetPassword) {
-  $ChangerIP = DBCrypt::encrypt($LoggedUser['IP']);
+  $ChangerIP = Crypto::encrypt($LoggedUser['IP']);
   $PassHash = Users::make_sec_hash($_POST['new_pass_1']);
   $SQL.= ",m.PassHash = '".db_string($PassHash)."'";
   $DB->query("
@@ -320,7 +320,7 @@ if (isset($_POST['resetpasskey'])) {
   $UserInfo = Users::user_heavy_info($UserID);
   $OldPassKey = $UserInfo['torrent_pass'];
   $NewPassKey = Users::make_secret();
-  $ChangerIP = DBCrypt::encrypt($LoggedUser['IP']);
+  $ChangerIP = Crypto::encrypt($LoggedUser['IP']);
   $SQL .= ",m.torrent_pass = '$NewPassKey'";
   $DB->query("
     INSERT INTO users_history_passkeys

sections/user/take_invite.php

@@ -70,7 +70,7 @@ foreach ($Emails as $CurEmail) {
     WHERE InviterID = ".$LoggedUser['ID']);
   if ($DB->has_results()) {
     while (list($MaybeEmail) = $DB->next_record()) {
-      if (DBCrypt::decrypt($MaybeEmail) == $CurEmail) {
+      if (Crypto::decrypt($MaybeEmail) == $CurEmail) {
         error('You already have a pending invite to that address!');
         header('Location: user.php?action=invite');
         die();
@@ -103,7 +103,7 @@ EOT;
     INSERT INTO invites
       (InviterID, InviteKey, Email, Expires, Reason)
     VALUES
-      ('$LoggedUser[ID]', '$InviteKey', '".DBCrypt::encrypt($CurEmail)."', '$InviteExpires', '$InviteReason')");
+      ('$LoggedUser[ID]', '$InviteKey', '".Crypto::encrypt($CurEmail)."', '$InviteExpires', '$InviteReason')");
 
   if (!check_perms('site_send_unlimited_invites')) {
     $DB->query("

sections/user/takemoderate.php

@@ -233,7 +233,7 @@ if ($_POST['ResetRatioWatch'] && check_perms('users_edit_reset_keys')) {
 
 if ($_POST['ResetIPHistory'] && check_perms('users_edit_reset_keys')) {
 
-  $GenericIP = DBCrypt::encrypt('127.0.0.1');
+  $GenericIP = Crypto::encrypt('127.0.0.1');
   $DB->query("
     DELETE FROM users_history_ips
     WHERE UserID = '$UserID'");
@@ -268,17 +268,17 @@ if ($_POST['ResetEmailHistory'] && check_perms('users_edit_reset_keys')) {
       INSERT INTO users_history_emails
         (UserID, Email, Time, IP)
       VALUES
-        ('$UserID', '".DBCrypt::encrypt($Username.'@'.SITE_DOMAIN)."', NULL, '".DBCrypt::encrypt('127.0.0.1')."')");
+        ('$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', '".DBCrypt::encrypt($Username.'@'.SITE_DOMAIN)."', NULL, '".$Cur['IP']."')");
+        ('$UserID', '".Crypto::encrypt($Username.'@'.SITE_DOMAIN)."', NULL, '".$Cur['IP']."')");
   }
   $DB->query("
     UPDATE users_main
-    SET Email = '".DBCrypt::encrypt($Username.'@'.SITE_DOMAIN)."'
+    SET Email = '".Crypto::encrypt($Username.'@'.SITE_DOMAIN)."'
     WHERE ID = '$UserID'");
   $EditSummary[] = 'Email history cleared';
 }
@@ -696,7 +696,7 @@ if ($EnableUser != $Cur['Enabled'] && check_perms('users_disable_users')) {
     $TrackerUserUpdates = [];
   } elseif ($EnableUser == '1') {
     $Cache->increment('stats_user_count');
-    $VisibleTrIP = ($Visible && DBCrypt::decrypt($Cur['IP']) != '127.0.0.1') ? '1' : '0';
+    $VisibleTrIP = ($Visible && Crypto::decrypt($Cur['IP']) != '127.0.0.1') ? '1' : '0';
     Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $Cur['torrent_pass'], 'visible' => $VisibleTrIP));
 
     if (($Cur['Downloaded'] == 0) || ($Cur['Uploaded'] / $Cur['Downloaded'] >= $Cur['RequiredRatio'])) {
@@ -734,7 +734,7 @@ if ($ResetPasskey == 1 && check_perms('users_edit_reset_keys')) {
     INSERT INTO users_history_passkeys
       (UserID, OldPassKey, NewPassKey, ChangerIP, ChangeTime)
     VALUES
-      ('$UserID', '".$Cur['torrent_pass']."', '$Passkey', '".DBCrypt::encrypt('0.0.0.0')."', NOW())");
+      ('$UserID', '".$Cur['torrent_pass']."', '$Passkey', '".Crypto::encrypt('0.0.0.0')."', NOW())");
   Tracker::update_tracker('change_passkey', array('oldpasskey' => $Cur['torrent_pass'], 'newpasskey' => $Passkey));
 }
 

sections/user/user.php

@@ -133,7 +133,7 @@ $RequiredRatio, $Enabled, $Paranoia, $Invites, $CustomTitle, $torrent_pass,
 $DisableLeech, $JoinDate, $Info, $Avatar, $FLTokens, $BonusPoints, $IRCLines, $Donor, $Warned,
 $ForumPosts, $InviterID, $DisableInvites, $InviterName, $InfoTitle) = $DB->next_record(MYSQLI_NUM, array(9, 11));
 }
-$Email = apcu_exists('DBKEY') ? DBCrypt::decrypt($Email) : '[Encrypted]';
+$Email = apcu_exists('DBKEY') ? Crypto::decrypt($Email) : '[Encrypted]';
 
 $DB->query("
   SELECT SUM(t.Size)
@@ -589,7 +589,7 @@ if ($ParanoiaLevel == 0) {
 <?  }
 
 if (check_perms('users_view_ips', $Class)) {
-  $IP = apcu_exists('DBKEY') ? DBCrypt::decrypt($IP) : '[Encrypted]';
+  $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
 ?>
         <li>IP: <?=Tools::display_ip($IP)?></li>
         <li>Host: <?=Tools::get_host_by_ajax($IP)?></li>
@@ -1426,8 +1426,8 @@ if (!$DisablePoints) {
 <?
       foreach ($Emails as $Email) {
         list($Address, $IP) = $Email;
-        $IP = apcu_exists('DBKEY') ? DBCrypt::decrypt($IP) : '[Encrypted]';
-        $Address = apcu_exists('DBKEY') ? DBCrypt::decrypt($Address) : '[Encrypted]';
+        $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>
 <?    } ?>

sections/userhistory/email_history.php

@@ -109,7 +109,7 @@ foreach ($History as $Key => $Values) {
     $Values['Time'] = $Joined;
   }
 
-  $ValuesIP = apcu_exists('DBKEY') ? DBCrypt::decrypt($Values['IP']) : '[Encrypted]';
+  $ValuesIP = apcu_exists('DBKEY') ? Crypto::decrypt($Values['IP']) : '[Encrypted]';
 ?>
   <tr class="row">
     <td><?=display_str($Values['Email'])?></td>
@@ -128,7 +128,7 @@ foreach ($History as $Key => $Values) {
             AND ue.UserID != $UserID
             AND um.ID = ue.UserID");
     while (list($UserID2, $Time, $IP) = $DB->next_record()) {
-      $IP = apcu_exists('DBKEY') ? DBCrypt::decrypt($IP) : '[Encrypted]';
+      $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
 ?>
   </tr>
   <tr>

sections/userhistory/email_history2.php

@@ -182,9 +182,9 @@ if ($Old ?? false) {
       <td>Set from IP</td>
     </tr>
 <?
-$Current['Email'] = apcu_exists('DBKEY') ? DBCrypt::decrypt($Current['Email']) : '[Encrypted]';
-$Current['CurrentIP'] = apcu_exists('DBKEY') ? DBCrypt::decrypt($Current['CurrentIP']) : '[Encrypted]';
-$Current['IP'] = apcu_exists('DBKEY') ? DBCrypt::decrypt($Current['IP']) : '[Encrypted]';
+$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>
@@ -211,7 +211,7 @@ $Current['IP'] = apcu_exists('DBKEY') ? DBCrypt::decrypt($Current['IP']) : '[Enc
 if ($CurrentMatches ?? false) {
   // Match on the current email
   foreach ($CurrentMatches as $Match) {
-    $Match['IP'] = apcu_exists('DBKEY') ? DBCrypt::decrypt($Match['IP']) : '[Encrypted]';
+    $Match['IP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Match['IP']) : '[Encrypted]';
 ?>
     <tr class="row">
       <td><?=$Match['Username']?></td>
@@ -279,8 +279,8 @@ if ($Old ?? false) {
     $Matches = ob_get_contents();
     ob_end_clean();
 
-    $Record['Email'] = apcu_exists('DBKEY') ? DBCrypt::decrypt($Record['Email']) : '[Encrypted]';
-    $Record['IP'] = apcu_exists('DBKEY') ? DBCrypt::decrypt($Record['IP']) : '[Encrypted]';
+    $Record['Email'] = apcu_exists('DBKEY') ? Crypto::decrypt($Record['Email']) : '[Encrypted]';
+    $Record['IP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Record['IP']) : '[Encrypted]';
 ?>
     <tr class="row">
       <td><?=display_str($Record['Email'])?><?=(($MatchCount > 0) ? ' <a data-toggle-target="#matches_'.$j.'">('.$MatchCount.')</a>' : '')?></td>
@@ -325,7 +325,7 @@ if ($OldMatches ?? false) {
       ++$i;
       // Match email is the same as the invite email
 
-      $Match['IP'] = apcu_exists('DBKEY') ? DBCrypt::decrypt($Match['IP']) : '[Encrypted]';
+      $Match['IP'] = apcu_exists('DBKEY') ? Crypto::decrypt($Match['IP']) : '[Encrypted]';
 ?>
     <tr class="row hidden" id="matches_invite">
       <td><?=$Match['Username']?></td>
@@ -349,8 +349,8 @@ $MatchCount = $i;
 $Matches = ob_get_contents();
 ob_end_clean();
 
-$Invite['Email'] = apcu_exists('DBKEY') ? DBCrypt::decrypt($Invite['Email']) : '[Encrypted]';
-$Invite['IP'] = apcu_exists('DBKEY') ? DBCrypt::decrypt($Invite['IP']) : '[Encrypted]';
+$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>

sections/userhistory/email_history_userview.php

@@ -23,10 +23,10 @@ $EncEmails = $DB->collect("Email");
 $Emails = [];
 
 foreach ($EncEmails as $Enc) {
-  if (!isset($Emails[DBCrypt::decrypt($Enc)])) {
-    $Emails[DBCrypt::decrypt($Enc)] = [];
+  if (!isset($Emails[Crypto::decrypt($Enc)])) {
+    $Emails[Crypto::decrypt($Enc)] = [];
   }
-  $Emails[DBCrypt::decrypt($Enc)][] = $Enc;
+  $Emails[Crypto::decrypt($Enc)][] = $Enc;
 }
 
 $DB->query("
@@ -35,7 +35,7 @@ $DB->query("
   WHERE ID = '$UserID'");
 
 list($Curr) = $DB->next_record();
-$Curr = DBCrypt::decrypt($Curr);
+$Curr = Crypto::decrypt($Curr);
 
 if (!$Self) {
   $DB->query("SELECT Username FROM users_main WHERE ID = '$UserID'");

sections/userhistory/ip_history.php

@@ -187,7 +187,7 @@ $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') ? DBCrypt::decrypt($IP) : '[Encrypted]';
+  $IP = apcu_exists('DBKEY') ? Crypto::decrypt($IP) : '[Encrypted]';
 
   $HasDupe = false;
   $UserIDs = explode('|', $UserIDs);

sections/userhistory/ip_history_userview.php

@@ -23,10 +23,10 @@ $EncIPs = $DB->collect("IP");
 $IPs = [];
 
 foreach ($EncIPs as $Enc) {
-  if (!isset($IPs[DBCrypt::decrypt($Enc)])) {
-    $IPs[DBCrypt::decrypt($Enc)] = [];
+  if (!isset($IPs[Crypto::decrypt($Enc)])) {
+    $IPs[Crypto::decrypt($Enc)] = [];
   }
-  $IPs[DBCrypt::decrypt($Enc)][] = $Enc;
+  $IPs[Crypto::decrypt($Enc)][] = $Enc;
 }
 
 $DB->query("
@@ -35,7 +35,7 @@ $DB->query("
   WHERE ID = '$UserID'");
 
 list($Curr) = $DB->next_record();
-$Curr = DBCrypt::decrypt($Curr);
+$Curr = Crypto::decrypt($Curr);
 
 if (!$Self) {
   $DB->query("SELECT Username FROM users_main WHERE ID = '$UserID'");

sections/userhistory/password_history.php

@@ -49,7 +49,7 @@ $DB->query("
   </tr>
 <?
 while (list($ChangeTime, $ChangerIP) = $DB->next_record()) {
-  $ChangerIP = (apcu_exists('DBKEY')) ? DBCrypt::decrypt($ChangerIP) : '[Encrypted]';
+  $ChangerIP = (apcu_exists('DBKEY')) ? Crypto::decrypt($ChangerIP) : '[Encrypted]';
 ?>
   <tr class="row">
     <td><?=time_diff($ChangeTime)?></td>