george/PrivateBin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renaming config file to make updates easier, resolving #50

Browse Source
This commit is contained in:
El RIDO
2015-10-22 21:13:15 +02:00
parent 5a9879623f
commit 176dff3b70
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/configuration.php
View File

@@ -84,10 +84,15 @@ class configuration
*/
public function __construct()
{
$config = parse_ini_file(PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini', true);
foreach (array('main', 'model') as $section) {
if (!array_key_exists($section, $config)) {
throw new Exception(i18n::_('ZeroBin requires configuration section [%s] to be present in configuration file.', $section), 2);
$config = array();
$configFile = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini';
if (is_readable($configFile))
{
$config = parse_ini_file($configFile, true);
foreach (array('main', 'model') as $section) {
if (!array_key_exists($section, $config)) {
throw new Exception(i18n::_('ZeroBin requires configuration section [%s] to be present in configuration file.', $section), 2);
}
}
}
foreach ($this->_defaults as $section => $values)