Mirrors/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2026-01-23 02:35:23 +00:00
Code Issues Projects Releases Wiki Activity

remove more v1 remnants

Browse source 
kudos @Ribas160
This commit is contained in:
El RIDO 2025-07-19 20:09:37 +02:00
parent 410cc909ce
commit c99e6895dd
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
4 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/Data/AbstractData.php
View file

@ -171,23 +171,28 @@ abstract class AbstractData
abstract public function getAllPastes();
/**
* Get next free slot for comment from postdate.
* Get next free slot for comment from the creation timestamp
*
* The creation timestamp is usually a unix timestamp in seconds, but if a
* comment already exists at that timestamp, a number, separated by a dot is
* appended to it and incremented, then the function recurses until a free
* slot is found.
*
* @access protected
* @param array $comments
* @param int|string $postdate
* @param int|string $created
* @return int|string
*/
protected function getOpenSlot(array &$comments, $postdate)
protected function getOpenSlot(array &$comments, $created)
{
if (array_key_exists($postdate, $comments)) {
$parts = explode('.', (string) $postdate, 2);
if (array_key_exists($created, $comments)) {
$parts = explode('.', (string) $created, 2);
if (!array_key_exists(1, $parts)) {
$parts[1] = 0;
}
++$parts[1];
return $this->getOpenSlot($comments, implode('.', $parts));
}
return $postdate;
return $created;
}
}

4
lib/Data/Filesystem.php
View file

@ -229,9 +229,7 @@ class Filesystem extends AbstractData
// Store in array
$key = $this->getOpenSlot(
$comments,
(int) array_key_exists('created', $comment['meta']) ?
$comment['meta']['created'] : // v2 comments
$comment['meta']['postdate'] // v1 comments
$comment['meta']['created']
);
$comments[$key] = $comment;
}