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

Reintegrated a number of fixes from trunk:

Browse Source 
#672 and #673 Physical interfaces
#683 DB name can have numbers + hyphen
#664 Could not logon after an upgrade of 1.x
#686 Issue with default values on upgrade
#657 Quotes not allowed in synchro name/desc
#659 Error report not displayed during the setup
#660 Issue with ZendServer
#661 and #662 Issues with autocompletes
#666 Import: reconciliation of Software CIs
#668 Management IP not visible anywhere
#675 Drill-down on graph failing
#679 Setup: dependency between modules
#680 Setup: missing php-xml (module "dom")


SVN:2.0[2643]
This commit is contained in:
Romain Quetiez
2013-03-20 09:15:11 +00:00
parent d2f9458516
commit be4a2e52bc
14 changed files with 177 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup/setuputils.class.inc.php
View File

@@ -535,6 +535,10 @@ class SetupUtils
{
if (function_exists('symlink'))
{
if (file_exists($sDest.'/'.$sFile))
{
unlink($sDest.'/'.$sFile);
}
symlink($sSource.'/'.$sFile, $sDest.'/'.$sFile);
}
else
@@ -544,6 +548,10 @@ class SetupUtils
}
else
{
if (is_link($sDest.'/'.$sFile))
{
unlink($sDest.'/'.$sFile);
}
copy($sSource.'/'.$sFile, $sDest.'/'.$sFile);
}
}
@@ -738,7 +746,7 @@ function ValidateField(sFieldId, bUsed)
{
if (sValue != "")
{
if (sValue.match(/^[A-Za-z][A-Za-z0-9_]*$/))
if (sValue.match(/^[A-Za-z0-9_]*$/))
{
var bCollision = false;
if (sFieldId == 'db_new_name')