github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-21 05:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge commit from fork

Browse source
This commit is contained in:
Roman Kelesidis 2024-07-13 19:26:57 +07:00 • committed by GitHub
commit ed37e6e522
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/includes/functions.php
View file

@ -40,8 +40,6 @@ function delete_avatar($user_id, $avatar_ext_id)
function get_tracks($type) function get_tracks($type)
{ {
static $pattern = '#^a:\d+:{[i:;\d]+}$#';
switch ($type) { switch ($type) {
case 'topic': case 'topic':
$c_name = COOKIE_TOPIC; $c_name = COOKIE_TOPIC;
@ -55,7 +53,7 @@ function get_tracks($type)
default: default:
trigger_error(__FUNCTION__ . ": invalid type '$type'", E_USER_ERROR); trigger_error(__FUNCTION__ . ": invalid type '$type'", E_USER_ERROR);
} }
$tracks = !empty($_COOKIE[$c_name]) ? @unserialize($_COOKIE[$c_name]) : false; $tracks = !empty($_COOKIE[$c_name]) ? json_decode($_COOKIE[$c_name], true) : false;
return $tracks ?: []; return $tracks ?: [];
} }
@ -113,7 +111,7 @@ function set_tracks($cookie_name, &$tracking_ary, $tracks = null, $val = TIMENOW
} }
if (array_diff($tracking_ary, $prev_tracking_ary)) { if (array_diff($tracking_ary, $prev_tracking_ary)) {
bb_setcookie($cookie_name, serialize($tracking_ary)); bb_setcookie($cookie_name, json_encode($tracking_ary));
} }
} }

4
src/Legacy/Common/User.php
View file

@ -453,7 +453,7 @@ class User
*/ */
public function get_sessiondata() public function get_sessiondata()
{ {
$sd_resv = !empty($_COOKIE[COOKIE_DATA]) ? unserialize($_COOKIE[COOKIE_DATA], ['allowed_classes' => false]) : []; $sd_resv = !empty($_COOKIE[COOKIE_DATA]) ? json_decode($_COOKIE[COOKIE_DATA], true) : [];
// autologin_id // autologin_id
if (!empty($sd_resv['uk']) && verify_id($sd_resv['uk'], LOGIN_KEY_LENGTH)) { if (!empty($sd_resv['uk']) && verify_id($sd_resv['uk'], LOGIN_KEY_LENGTH)) {
@ -486,7 +486,7 @@ class User
} }
} else { } else {
$c_sdata_resv = !empty($_COOKIE[COOKIE_DATA]) ? $_COOKIE[COOKIE_DATA] : null; $c_sdata_resv = !empty($_COOKIE[COOKIE_DATA]) ? $_COOKIE[COOKIE_DATA] : null;
$c_sdata_curr = ($this->sessiondata) ? serialize($this->sessiondata) : ''; $c_sdata_curr = ($this->sessiondata) ? json_encode($this->sessiondata) : '';
if ($c_sdata_curr !== $c_sdata_resv) { if ($c_sdata_curr !== $c_sdata_resv) {
bb_setcookie(COOKIE_DATA, $c_sdata_curr, httponly: true); bb_setcookie(COOKIE_DATA, $c_sdata_curr, httponly: true);