composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 16:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Eric
2019-02-15 17:44:59 +01:00
parent 084d12bb45 7bb49893ee
commit acf80b4b92
5 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
datamodels/2.x/itop-backup/datamodel.itop-backup.xml
View File

@@ -5,8 +5,7 @@
<rank>15</rank>
<parent>AdminTools</parent>
<url>status.php</url>
<enable_class>ResourceAdminMenu</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action>
<enable_admin_only>1</enable_admin_only>
</menu>
</menus>
</itop_design>

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

@@ -84,10 +84,10 @@ function CheckDBPasswordInNewConfig($sSafeContent)
{
$bIsWindows = (array_key_exists('WINDIR', $_SERVER) || array_key_exists('windir', $_SERVER));
if ($bIsWindows && (preg_match("@'db_pwd' => '[^%']+',@", $sSafeContent) === 0))
if ($bIsWindows && (preg_match("@'db_pwd' => '[^%!\"]+',@U", $sSafeContent) === 0))
{
// Unsupported Password
throw new Exception("Database password should not contain % character (backups won't work)...");
throw new Exception("On Windows, database password must not contain %, ! or \" character (backups won't work)...");
}
}

3
datamodels/2.x/itop-config/datamodel.itop-config.xml
View File

@@ -5,8 +5,7 @@
<rank>50</rank>
<parent>AdminTools</parent>
<url>config.php</url>
<enable_class>ResourceAdminMenu</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action>
<enable_admin_only>1</enable_admin_only>
</menu>
</menus>
</itop_design>