Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit e0d5f9c

Browse files
author
Charles Marion
committed
ENH: All the config files are now saved in the core configs folder
1 parent 97c47c2 commit e0d5f9c

File tree

7 files changed

+13
-48
lines changed

7 files changed

+13
-48
lines changed

core/configs/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*.local.ini
2-
*.local.ini.old
2+
*.local.ini.old
3+
*.local.ini.test

core/configs/database.local.mysql.ini

Lines changed: 0 additions & 36 deletions
This file was deleted.

core/controllers/AdminController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function indexAction()
7474
unlink(BASE_PATH.'/core/configs/application.local.ini.old');
7575
}
7676

77-
$moduleConfigLocalFile = BASE_PATH."/modules/".$moduleName."/configs/module.local.ini";
77+
$moduleConfigLocalFile = BASE_PATH."/core/configs/".$moduleName.".local.ini";
7878
$moduleConfigFile = BASE_PATH."/modules/".$moduleName."/configs/module.ini";
7979
if(!file_exists($moduleConfigLocalFile))
8080
{

core/controllers/InstallController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ function step3Action()
251251
$allModules = $this->Component->Utility->getAllModules();
252252
foreach($allModules as $key => $module)
253253
{
254-
$configLocal = BASE_PATH."/modules/".$key."/configs/module.local.ini";
254+
$configLocal = BASE_PATH."/core/configs/".$key.".local.ini";
255255
if(file_exists($configLocal))
256256
{
257257
unlink($configLocal);

core/controllers/components/UpgradeComponent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public function upgrade($currentVersion = null, $testing = false)
184184
}
185185
else
186186
{
187-
$path = BASE_PATH.'/modules/'.$this->module.'/configs/module.local.ini';
187+
$path = BASE_PATH."/core/configs/".$this->module.".local.ini";
188188
$data = parse_ini_file($path, true);
189189
if(file_exists($path.'.old'))
190190
{

library/MIDAS/controller/GlobalController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ public function preDispatch()
5050
foreach($modulesEnable as $module)
5151
{
5252
$translaters[$module] = new Zend_Translate('csv', BASE_PATH."/modules/".$module."/translation/fr-main.csv", "en");
53-
if(file_exists(BASE_PATH."/modules/".$module."/configs/module.local.ini"))
53+
if(file_exists(BASE_PATH."/core/configs/".$module.".local.ini"))
5454
{
55-
$configs[$module] = new Zend_Config_Ini(BASE_PATH."/modules/".$module."/configs/module.local.ini", 'global');
55+
$configs[$module] = new Zend_Config_Ini(BASE_PATH."/core/configs/".$module.".local.ini", 'global');
5656
}
5757
else
5858
{

modules/ldap/controllers/ConfigController.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ function indexAction()
1212
throw new Zend_Exception("You should be an administrator");
1313
}
1414

15-
if(file_exists(BASE_PATH.'/modules/ldap/configs/module.local.ini'))
15+
if(file_exists(BASE_PATH."/core/configs/ldap.local.ini"))
1616
{
17-
$applicationConfig = parse_ini_file(BASE_PATH.'/modules/ldap/configs/module.local.ini', true);
17+
$applicationConfig = parse_ini_file(BASE_PATH."/core/configs/ldap.local.ini", true);
1818
}
1919
else
2020
{
@@ -40,13 +40,13 @@ function indexAction()
4040
$submitConfig = $this->_getParam('submitConfig');
4141
if(isset($submitConfig))
4242
{
43-
if(file_exists(BASE_PATH.'/modules/ldap/configs/module.local.ini.old'))
43+
if(file_exists(BASE_PATH."/core/configs/ldap.local.ini.old"))
4444
{
4545
unlink(BASE_PATH.'/modules/ldap/configs/module.local.ini.old');
4646
}
47-
if(file_exists(BASE_PATH.'/modules/ldap/configs/module.local.ini'))
47+
if(file_exists(BASE_PATH."/core/configs/ldap.local.ini"))
4848
{
49-
rename(BASE_PATH.'/modules/ldap/configs/module.local.ini', BASE_PATH.'/modules/ldap/configs/module.local.ini.old');
49+
rename(BASE_PATH."/core/configs/ldap.local.ini", BASE_PATH.'/modules/ldap/configs/module.local.ini.old');
5050
}
5151
$applicationConfig['global']['ldap.hostname'] = $this->_getParam('hostname');
5252
$applicationConfig['global']['ldap.basedn'] = '"'.$this->_getParam('basedn').'"';
@@ -55,7 +55,7 @@ function indexAction()
5555
$applicationConfig['global']['ldap.proxyBasedn'] = $this->_getParam('proxyBasedn');
5656
$applicationConfig['global']['ldap.autoAddUnknownUser'] = $this->_getParam('autoAddUnknownUser');
5757
$applicationConfig['global']['ldap.useActiveDirectory'] = $this->_getParam('useActiveDirectory');
58-
$this->Component->Utility->createInitFile(BASE_PATH.'/modules/ldap/configs/module.local.ini', $applicationConfig);
58+
$this->Component->Utility->createInitFile(BASE_PATH."/core/configs/ldap.local.ini", $applicationConfig);
5959
echo JsonComponent::encode(array(true, 'Changed saved'));
6060
}
6161
}

0 commit comments

Comments
 (0)