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 legacy

Browse source 
- document removed unused columns in database schema of tables `paste` & `comment`
- amended misleading comments
- nickname is part of the encrypted payload in v2 comments and therefore there is nothing to store separately
This commit is contained in:
El RIDO 2025-07-05 18:19:38 +02:00
parent e2859e9a35
commit b79ae4e929
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
5 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/Data/Database.php
View file

@ -256,22 +256,18 @@ class Database extends AbstractData
return false;
}
$meta = $comment['meta'];
unset($comment['meta']);
foreach (array('nickname', 'icon') as $key) {
if (!array_key_exists($key, $meta)) {
$meta[$key] = null;
}
if (!array_key_exists('icon', $meta)) {
$meta['icon'] = null;
}
try {
return $this->_exec(
'INSERT INTO "' . $this->_sanitizeIdentifier('comment') .
'" VALUES(?,?,?,?,?,?,?)',
'" VALUES(?,?,?,?,?,?)',
array(
$commentid,
$pasteid,
$parentid,
$data,
$meta['nickname'],
$meta['icon'],
$meta['created'],
)
@ -304,10 +300,8 @@ class Database extends AbstractData
$comments[$i]['id'] = $row['dataid'];
$comments[$i]['parentid'] = $row['parentid'];
$comments[$i]['meta'] = array('created' => (int) $row['postdate']);
foreach (array('nickname' => 'nickname', 'vizhash' => 'icon') as $rowKey => $commentKey) {
if (array_key_exists($rowKey, $row) && !empty($row[$rowKey])) {
$comments[$i]['meta'][$commentKey] = $row[$rowKey];
}
if (array_key_exists('vizhash', $row) && !empty($row['vizhash'])) {
$comments[$i]['meta']['icon'] = $row['vizhash'];
}
}
ksort($comments);
@ -677,7 +671,6 @@ class Database extends AbstractData
'"pasteid" CHAR(16), ' .
'"parentid" CHAR(16), ' .
"\"data\" $dataType, " .
"\"nickname\" $dataType, " .
"\"vizhash\" $dataType, " .
"\"postdate\" INT$after_key )"
);
@ -872,6 +865,10 @@ class Database extends AbstractData
'ALTER TABLE "' . $this->_sanitizeIdentifier('paste') .
'" DROP COLUMN "attachmentname"'
);
$this->_db->exec(
'ALTER TABLE "' . $this->_sanitizeIdentifier('comment') .
'" DROP COLUMN "nickname"'
);
}
}
$this->_exec(