From 5d955d1af61beb6435e35e228d37e6ea2088668a Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@gmail.com>
Date: Wed, 5 Apr 2023 23:40:56 +0700
Subject: [PATCH] Minor fixes (#674)

---
 install/sql/mysql.sql                | 12 ++++++------
 install/upgrade/changes.txt          |  8 ++++++++
 library/includes/ucp/viewprofile.php |  4 ++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql
index 463d793a8..bf57ce974 100644
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@@ -1109,7 +1109,7 @@ CREATE TABLE IF NOT EXISTS `bb_search_rebuild`
 DROP TABLE IF EXISTS `bb_search_results`;
 CREATE TABLE IF NOT EXISTS `bb_search_results`
 (
-  `session_id`      CHAR(20)
+  `session_id`      CHAR(255)
                       CHARACTER SET utf8
                         COLLATE utf8_bin NOT NULL DEFAULT '',
   `search_type`     TINYINT(4)           NOT NULL DEFAULT '0',
@@ -1134,7 +1134,7 @@ CREATE TABLE IF NOT EXISTS `bb_search_results`
 DROP TABLE IF EXISTS `bb_sessions`;
 CREATE TABLE IF NOT EXISTS `bb_sessions`
 (
-  `session_id`        CHAR(20)
+  `session_id`        CHAR(255)
                         CHARACTER SET utf8
                           COLLATE utf8_bin NOT NULL DEFAULT '',
   `session_user_id`   MEDIUMINT(8)         NOT NULL DEFAULT '0',
@@ -1320,8 +1320,8 @@ CREATE TABLE IF NOT EXISTS `bb_users`
 (
   `user_id`             MEDIUMINT(8)          NOT NULL AUTO_INCREMENT,
   `user_active`         TINYINT(1)            NOT NULL DEFAULT '1',
-  `username`            VARCHAR(25)           NOT NULL DEFAULT '',
-  `user_password`       VARCHAR(32)
+  `username`            VARCHAR(255)          NOT NULL DEFAULT '',
+  `user_password`       VARCHAR(255)
                           CHARACTER SET utf8
                             COLLATE utf8_bin  NOT NULL DEFAULT '',
   `user_session_time`   INT(11)               NOT NULL DEFAULT '0',
@@ -1350,8 +1350,8 @@ CREATE TABLE IF NOT EXISTS `bb_users`
   `user_sig`            TEXT                  NOT NULL DEFAULT '',
   `user_occ`            VARCHAR(100)          NOT NULL DEFAULT '',
   `user_interests`      VARCHAR(255)          NOT NULL DEFAULT '',
-  `user_actkey`         VARCHAR(32)           NOT NULL DEFAULT '',
-  `user_newpasswd`      VARCHAR(32)           NOT NULL DEFAULT '',
+  `user_actkey`         VARCHAR(255)          NOT NULL DEFAULT '',
+  `user_newpasswd`      VARCHAR(255)          NOT NULL DEFAULT '',
   `autologin_id`        VARCHAR(255)
                           CHARACTER SET utf8
                             COLLATE utf8_bin  NOT NULL DEFAULT '',
diff --git a/install/upgrade/changes.txt b/install/upgrade/changes.txt
index a9c49b64a..178dee654 100644
--- a/install/upgrade/changes.txt
+++ b/install/upgrade/changes.txt
@@ -49,3 +49,11 @@ UPDATE `bb_smilies` SET `code` = ':cd:', `smile_url` = 'cd.gif', `emoticon` = 'c
 ALTER TABLE `bb_search_results` CHANGE `search_id` `search_id` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
 ALTER TABLE `bb_users` CHANGE `autologin_id` `autologin_id` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
 DELETE FROM `bb_config` WHERE `config_name` = 'cron_enabled';
+
+// 2.4.0
+ALTER TABLE `bb_search_results` CHANGE `session_id` `session_id` CHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
+ALTER TABLE `bb_sessions` CHANGE `session_id` `session_id` CHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
+ALTER TABLE `bb_users` CHANGE `username` `username` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `bb_users` CHANGE `user_password` `user_password` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
+ALTER TABLE `bb_users` CHANGE `user_actkey` `user_actkey` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `bb_users` CHANGE `user_newpasswd` `user_newpasswd` VARCHAR(255) NOT NULL DEFAULT '';
diff --git a/library/includes/ucp/viewprofile.php b/library/includes/ucp/viewprofile.php
index 820ac5ca9..15c540085 100644
--- a/library/includes/ucp/viewprofile.php
+++ b/library/includes/ucp/viewprofile.php
@@ -87,8 +87,8 @@ $template->assign_vars(array(
     'EMAIL' => $email,
     'WWW' => $profiledata['user_website'],
     'ICQ' => $profiledata['user_icq'],
-    'LAST_VISIT_TIME' => ($profiledata['user_lastvisit']) ? (bf($profiledata['user_opt'], 'user_opt', 'user_viewonline') && !IS_ADMIN) ? $lang['HIDDEN_USER'] : bb_date($profiledata['user_lastvisit'], 'Y-m-d H:i', false) : $lang['NEVER'],
-    'LAST_ACTIVITY_TIME' => ($profiledata['user_session_time']) ? (bf($profiledata['user_opt'], 'user_opt', 'user_viewonline') && !IS_ADMIN) ? $lang['HIDDEN_USER'] : bb_date($profiledata['user_session_time'], 'Y-m-d H:i', false) : $lang['NEVER'],
+    'LAST_VISIT_TIME' => ($profiledata['user_lastvisit']) ? (!$profile_user_id && bf($profiledata['user_opt'], 'user_opt', 'user_viewonline') && !IS_ADMIN) ? $lang['HIDDEN_USER'] : bb_date($profiledata['user_lastvisit'], 'Y-m-d H:i', false) : $lang['NEVER'],
+    'LAST_ACTIVITY_TIME' => ($profiledata['user_session_time']) ? (!$profile_user_id && bf($profiledata['user_opt'], 'user_opt', 'user_viewonline') && !IS_ADMIN) ? $lang['HIDDEN_USER'] : bb_date($profiledata['user_session_time'], 'Y-m-d H:i', false) : $lang['NEVER'],
 
     'USER_ACTIVE' => $profiledata['user_active'],
     'LOCATION' => $profiledata['user_from'],