yetangitu/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2025-10-03 09:49:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

removed support for privatebin_data, privatebin_db & zerobin_db model class configurations

Browse source 
kudos @Ribas160 for suggesting this
This commit is contained in:
El RIDO 2025-07-05 17:45:02 +02:00
parent 9eabc7e84e
commit 8668e7b366
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
3 changed files with 7 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -5,6 +5,7 @@
* CHANGED: Removed page template (#265) * CHANGED: Removed page template (#265)
* CHANGED: Removed support for ZeroBin & v1 pastes - since release 1.3 the v2 format is used (#551) * CHANGED: Removed support for ZeroBin & v1 pastes - since release 1.3 the v2 format is used (#551)
* CHANGED: Removed use of base64 & rawinflate libraries (#551) * CHANGED: Removed use of base64 & rawinflate libraries (#551)
* CHANGED: Removed support for `privatebin_data`, `privatebin_db` & `zerobin_db` model class configurations, must be replaced with `Filesystem` or `Database` in `cfg/conf.php`, if still present
* FIXED: Name mismatches in attached files (#1584) * FIXED: Name mismatches in attached files (#1584)
* FIXED: Unable to paste attachments from clipboard (#1589) * FIXED: Unable to paste attachments from clipboard (#1589)

30
lib/Configuration.php
View file

@ -162,10 +162,8 @@ class Configuration
} }
// provide different defaults for database model // provide different defaults for database model
elseif ( elseif (
$section == 'model_options' && in_array( $section == 'model_options' &&
$this->_configuration['model']['class'], $this->_configuration['model']['class'] === 'Database'
array('Database', 'privatebin_db', 'zerobin_db')
)
) { ) {
$values = array( $values = array(
'dsn' => 'sqlite:' . PATH . 'data' . DIRECTORY_SEPARATOR . 'db.sq3', 'dsn' => 'sqlite:' . PATH . 'data' . DIRECTORY_SEPARATOR . 'db.sq3',
@ -175,10 +173,8 @@ class Configuration
'opt' => array(), 'opt' => array(),
); );
} elseif ( } elseif (
$section == 'model_options' && in_array( $section == 'model_options' &&
$this->_configuration['model']['class'], $this->_configuration['model']['class'] === 'GoogleCloudStorage'
array('GoogleCloudStorage')
)
) { ) {
$values = array( $values = array(
'bucket' => getenv('PRIVATEBIN_GCS_BUCKET') ? getenv('PRIVATEBIN_GCS_BUCKET') : null, 'bucket' => getenv('PRIVATEBIN_GCS_BUCKET') ? getenv('PRIVATEBIN_GCS_BUCKET') : null,
@ -186,10 +182,8 @@ class Configuration
'uniformacl' => false, 'uniformacl' => false,
); );
} elseif ( } elseif (
$section == 'model_options' && in_array( $section == 'model_options' &&
$this->_configuration['model']['class'], $this->_configuration['model']['class'] === 'S3Storage'
array('S3Storage')
)
) { ) {
$values = array( $values = array(
'region' => null, 'region' => null,
@ -250,18 +244,6 @@ class Configuration
} }
} }
// support for old config file format, before the fork was renamed and PSR-4 introduced
$this->_configuration['model']['class'] = str_replace(
'zerobin_', 'privatebin_',
$this->_configuration['model']['class']
);
$this->_configuration['model']['class'] = str_replace(
array('privatebin_data', 'privatebin_db'),
array('Filesystem', 'Database'),
$this->_configuration['model']['class']
);
// ensure a valid expire default key is set // ensure a valid expire default key is set
if (!array_key_exists($this->_configuration['expire']['default'], $this->_configuration['expire_options'])) { if (!array_key_exists($this->_configuration['expire']['default'], $this->_configuration['expire_options'])) {
$this->_configuration['expire']['default'] = key($this->_configuration['expire_options']); $this->_configuration['expire']['default'] = key($this->_configuration['expire_options']);

14
tst/ConfigurationTest.php
View file

@ -132,20 +132,6 @@ class ConfigurationTest extends TestCase
$this->assertEquals($options, $conf->get(), 'not overriding "missing" subkeys'); $this->assertEquals($options, $conf->get(), 'not overriding "missing" subkeys');
} }
public function testHandlePreRenameConfig()
{
$options = $this->_options;
$options['model']['class'] = 'zerobin_data';
Helper::createIniFile(CONF, $options);
$conf = new Configuration;
$this->assertEquals('Filesystem', $conf->getKey('class', 'model'), 'old data class gets renamed');
$options['model']['class'] = 'zerobin_db';
Helper::createIniFile(CONF, $options);
$conf = new Configuration;
$this->assertEquals('Database', $conf->getKey('class', 'model'), 'old db class gets renamed');
}
public function testConfigPath() public function testConfigPath()
{ {
// setup // setup