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

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	core/config.class.inc.php
This commit is contained in:
Molkobain
2022-01-12 15:54:18 +01:00
parent c17ceb1702 31e7a5383c
commit 812606db78
93 changed files with 4027 additions and 3667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,7 +254,7 @@ class DBBackup
return $aRet;
}
protected static function EscapeShellArg($sValue)
public static function EscapeShellArg($sValue)
{
// Note: See comment from the 23-Apr-2004 03:30 in the PHP documentation
// It suggests to rely on pctnl_* function instead of using escapeshellargs
@@ -461,13 +461,15 @@ EOF;
/**
* @see https://dev.mysql.com/doc/refman/5.6/en/encrypted-connection-options.html
*
* @param Config $oConfig
*
* @return string TLS arguments for CLI programs such as mysqldump. Empty string if the config does not use TLS.
*
* @since 2.5.0
* @uses \CMDBSource::GetDBVendor() so needs a connection opened !
* @uses \CMDBSource::GetDBVersion() so needs a connection opened !
*
* @since 2.5.0 N°1260
* @link https://dev.mysql.com/doc/refman/5.6/en/connection-options.html#encrypted-connection-options "Command Options for Encrypted Connections"
*/
public static function GetMysqlCliTlsOptions($oConfig)
{

12
setup/itopdesignformat.class.inc.php
View File

@@ -25,7 +25,7 @@
* To test migration methods check {@link \Combodo\iTop\Test\UnitTest\Setup\TestForITopDesignFormatClass}
*
* Usage:
*
*
* $oDocument = new DOMDocument();
* $oDocument->load($sXMLFile);
* $oFormat = new iTopDesignFormat($oDocument);
@@ -59,31 +59,31 @@ class iTopDesignFormat
'next' => '1.3',
'go_to_next' => 'From12To13',
),
'1.3' => array(
'1.3' => array( // iTop >= 2.2.0
'previous' => '1.2',
'go_to_previous' => 'From13To12',
'next' => '1.4',
'go_to_next' => 'From13To14',
),
'1.4' => array(
'1.4' => array( // iTop >= 2.4.0
'previous' => '1.3',
'go_to_previous' => 'From14To13',
'next' => '1.5',
'go_to_next' => 'From14To15',
),
'1.5' => array(
'1.5' => array( // iTop >= 2.5.0
'previous' => '1.4',
'go_to_previous' => 'From15To14',
'next' => '1.6',
'go_to_next' => 'From15To16',
),
'1.6' => array(
'1.6' => array( // iTop >= 2.6.0
'previous' => '1.5',
'go_to_previous' => 'From16To15',
'next' => '1.7',
'go_to_next' => 'From16To17',
),
'1.7' => array(
'1.7' => array( // iTop >= 2.7.0
'previous' => '1.6',
'go_to_previous' => 'From17To16',
'next' => '3.0',