From ba2bc4b56effeaea4c3b0b5f9d12f94a1f818d6f Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@Gmail.com>
Date: Wed, 7 Jun 2023 14:13:48 +0700
Subject: [PATCH] Revert "Added session_agent in session (#771)"

This reverts commit 1bfda297ad855371541076fd365cebae0728fd0f.
---
 install/sql/mysql.sql        | 1 -
 install/upgrade/changes.txt  | 3 ---
 library/includes/init_bb.php | 5 ++---
 src/Legacy/Common/User.php   | 2 --
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql
index 4f8a13931..e195ab4cb 100644
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@@ -1147,7 +1147,6 @@ CREATE TABLE IF NOT EXISTS `bb_sessions`
   `session_start`     INT(11)              NOT NULL DEFAULT '0',
   `session_time`      INT(11)              NOT NULL DEFAULT '0',
   `session_ip`        VARCHAR(42)          NOT NULL DEFAULT '0',
-  `session_agent`     TEXT                 NOT NULL DEFAULT '',
   `session_logged_in` TINYINT(1)           NOT NULL DEFAULT '0',
   `session_admin`     TINYINT(2)           NOT NULL DEFAULT '0',
   PRIMARY KEY (`session_id`)
diff --git a/install/upgrade/changes.txt b/install/upgrade/changes.txt
index 1d521d16d..a06277502 100644
--- a/install/upgrade/changes.txt
+++ b/install/upgrade/changes.txt
@@ -60,6 +60,3 @@ ALTER TABLE `bb_users` CHANGE `user_newpasswd` `user_newpasswd` VARCHAR(255) NOT
 
 // 2.4.0-alpha3
 INSERT INTO bb_config VALUES ('show_board_start_index', '1');
-
-// 2.4.0-beta1
-ALTER TABLE `bb_sessions` ADD `session_agent` TEXT NOT NULL DEFAULT '';
diff --git a/library/includes/init_bb.php b/library/includes/init_bb.php
index 7617ef321..6905ba11d 100644
--- a/library/includes/init_bb.php
+++ b/library/includes/init_bb.php
@@ -24,9 +24,6 @@ $user_ip = \TorrentPier\Helpers\IPHelper::ip2long($client_ip);
 define('CLIENT_IP', $client_ip);
 define('USER_IP', $user_ip);
 
-// Obtain user agent
-define('USER_AGENT', $_SERVER['HTTP_USER_AGENT'] ?? '');
-
 /**
  * @param $contents
  * @return string
@@ -301,6 +298,8 @@ define('PROFILE_URL', 'profile.php?mode=viewprofile&amp;u=');
 define('BONUS_URL', 'profile.php?mode=bonus');
 define('TOPIC_URL', 'viewtopic.php?t=');
 
+define('USER_AGENT', strtolower($_SERVER['HTTP_USER_AGENT']));
+
 define('HTML_SELECT_MAX_LENGTH', 60);
 define('HTML_WBR_LENGTH', 12);
 
diff --git a/src/Legacy/Common/User.php b/src/Legacy/Common/User.php
index 9ecf464ec..47d76d3b5 100644
--- a/src/Legacy/Common/User.php
+++ b/src/Legacy/Common/User.php
@@ -261,7 +261,6 @@ class User
                 'session_start' => (int)TIMENOW,
                 'session_time' => (int)TIMENOW,
                 'session_ip' => (string)USER_IP,
-                'session_agent' => (string)USER_AGENT,
                 'session_logged_in' => (int)$login,
                 'session_admin' => (int)$mod_admin_session,
             ]);
@@ -312,7 +311,6 @@ class User
         }
         $this->data['session_id'] = $session_id;
         $this->data['session_ip'] = USER_IP;
-        $this->data['session_agent'] = USER_AGENT;
         $this->data['session_user_id'] = $user_id;
         $this->data['session_logged_in'] = $login;
         $this->data['session_start'] = TIMENOW;