yetangitu/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2025-10-05 18:34:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

implemented INI cenversion functionality

Browse source
This commit is contained in:
El RIDO 2017-10-04 21:55:03 +02:00
parent b60d55236e
commit 6e8eafe129
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
3 changed files with 46 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/Configuration.php
View file

@ -101,6 +101,33 @@ class Configuration
{
$config = array();
$configFile = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.php';
$configIni = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini';
// rename INI files to avoid configuration leakage
if (is_readable($configIni)) {
// don't overwrite already converted file
if (!is_file($configFile)) {
$iniUpgradeError = false;
$context = stream_context_create();
$iniHandle = fopen($configIni, 'r', 1, $context);
$written = file_put_contents($configFile, ';<?php /*' . PHP_EOL);
$written = file_put_contents($configFile, $iniHandle, FILE_APPEND);
fclose($iniHandle);
unlink($configIni);
}
// cleanup sample, too
$configSample = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.sample.php';
$configIniSample = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini.sample';
if (is_readable($configIniSample)) {
if (is_readable($configSample)) {
unlink($configIniSample);
} else {
rename($configIniSample, $configSample);
}
}
}
if (is_readable($configFile)) {
$config = parse_ini_file($configFile, true);
foreach (array('main', 'model', 'model_options') as $section) {
@ -109,6 +136,7 @@ class Configuration
}
}
}
$opts = '_options';
foreach (self::getDefaults() as $section => $values) {
// fill missing sections with default values