composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/N941-2'

Browse Source
This commit is contained in:
Eric
2019-02-14 09:48:48 +01:00
parent c6fd381b01 c989e2eda5
commit a613b4b101
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
datamodels/2.x/itop-config/config.php
View File

@@ -74,6 +74,17 @@ function TestConfig($sContents, $oP)
} }
} }
function ConfigCheckDBPassword(iTopWebPage $oP, &$iEditorTopMargin)
{
$bIsWindows = (array_key_exists('WINDIR', $_SERVER) || array_key_exists('windir', $_SERVER));
$sDBPwd = MetaModel::GetConfig()->Get('db_pwd');
if ($bIsWindows && (strpos($sDBPwd, '%') !== false))
{
// Unsupported Password
$iEditorTopMargin += 5;
$oP->add("<div class=\"header_message message_error\">Database password should not contain % character (backups won't work)...</div>");
}
}
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// Main program // Main program
@@ -94,6 +105,7 @@ $oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/ext-searchbox.js');
try try
{ {
$sOperation = utils::ReadParam('operation', ''); $sOperation = utils::ReadParam('operation', '');
$iEditorTopMargin = 0;
$oP->add("<h1>".Dict::S('config-edit-title')."</h1>"); $oP->add("<h1>".Dict::S('config-edit-title')."</h1>");
@@ -104,18 +116,20 @@ try
else if (MetaModel::GetModuleSetting('itop-config', 'config_editor', '') == 'disabled') else if (MetaModel::GetModuleSetting('itop-config', 'config_editor', '') == 'disabled')
{ {
$oP->add("<div class=\"header_message message_info\">iTop interactive edition of the configuration as been disabled. See <tt>'config_editor' => 'disabled'</tt> in the configuration file.</div>"); $oP->add("<div class=\"header_message message_info\">iTop interactive edition of the configuration as been disabled. See <tt>'config_editor' => 'disabled'</tt> in the configuration file.</div>");
ConfigCheckDBPassword($oP, $iEditorTopMargin);
} }
else else
{ {
ConfigCheckDBPassword($oP, $iEditorTopMargin);
$sConfigFile = APPROOT.'conf/'.utils::GetCurrentEnvironment().'/config-itop.php'; $sConfigFile = APPROOT.'conf/'.utils::GetCurrentEnvironment().'/config-itop.php';
$iEditorTopMargin = 9; $iEditorTopMargin += 9;
$sConfig = str_replace("\r\n", "\n", file_get_contents($sConfigFile)); $sConfig = str_replace("\r\n", "\n", file_get_contents($sConfigFile));
$sOrginalConfig = $sConfig; $sOrginalConfig = $sConfig;
if (!empty($sOperation)) if (!empty($sOperation))
{ {
$iEditorTopMargin = 14; $iEditorTopMargin += 5;
$sConfig = utils::ReadParam('new_config', '', false, 'raw_data'); $sConfig = utils::ReadParam('new_config', '', false, 'raw_data');
$sOrginalConfig = utils::ReadParam('prev_config', '', false, 'raw_data'); $sOrginalConfig = utils::ReadParam('prev_config', '', false, 'raw_data');
} }