diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php index 50bee123d..9d7a3c3f6 100644 --- a/setup/setuputils.class.inc.php +++ b/setup/setuputils.class.inc.php @@ -923,8 +923,8 @@ class SetupUtils $oPage, $bIsItopInstall, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $bTlsEnabled, $sTlsCA, $sNewDBName = '' ) { - $sWikiVersion = utils::GetItopVersionWikiSyntax(); //eg : '2_7_0'; - $sMysqlTlsWikiPageUrl = 'https://wiki.openitop.org/doku.php?id='.$sWikiVersion.':install:php_and_mysql_tls'; + $sWikiVersion = utils::GetItopVersionWikiSyntax(); //eg : '2_7_0'; + $sMysqlTlsWikiPageUrl = 'https://www.itophub.io/wiki/page?id='.$sWikiVersion.':install:php_and_mysql_tls'; $oPage->add(''); $oPage->add('
Database Server Connection'); @@ -933,13 +933,15 @@ class SetupUtils //-- DB connection params $oPage->add(''); $oPage->add('Server Name:E.g. "localhost", "dbserver.mycompany.com" or "192.142.10.23"'); - $oPage->add('Login:The account must have the following privileges on the database: SELECT, INSERT, UPDATE, DELETE, DROP, CREATE, ALTER, CREATE VIEW, SHOW VIEW, LOCK TABLE, SUPER, TRIGGER'); + $oPage->add('Login:The account must have the following privileges on the database: SELECT, INSERT, UPDATE, DELETE, DROP, CREATE, ALTER, CREATE VIEW, SHOW VIEW, LOCK TABLE, SUPER, TRIGGER'); $oPage->add('Password:'); $oPage->add(''); //-- TLS params (N°1260) $sTlsEnabledChecked = $bTlsEnabled ? ' checked' : ''; - $sTlsCaDisabled = $bTlsEnabled ? '' : ' disabled'; + $sTlsCaDisabled = $bTlsEnabled ? '' : ' disabled'; $oPage->add(''); $oPage->add(''); $oPage->add('Before configuring MySQL with TLS encryption, read the documentation on Combodo\'s Wiki'); @@ -1198,7 +1200,8 @@ EOF $aResult['checks'][] = new CheckResult(CheckResult::INFO, "MySQL server's max_allowed_packet ($sMaxAllowedPacketFriendly) is big enough compared to upload_max_filesize ($sMaxUploadSizeFriendly)."); } else if ($iMaxAllowedPacket < $iMaxUploadSize) { $sWikiVersion = utils::GetItopVersionWikiSyntax(); //eg : '2_7_0'; - $sAttachmentsVarsWikiPageUrl = 'https://wiki.openitop.org/doku.php?id='.$sWikiVersion.':install:php_and_mysql_configuration#attachments_upload'; + $sAttachmentsVarsWikiPageUrl = 'https://www.itophub.io/wiki/page?id='.$sWikiVersion + .':install:php_and_mysql_configuration#attachments_upload'; $aResult['checks'][] = new CheckResult(CheckResult::WARNING, "MySQL server's max_allowed_packet ($sMaxAllowedPacketFriendly) is not big enough compared to upload_max_filesize ($sMaxUploadSizeFriendly), whereas it should has a greater value. Consider increasing its value of at least 500KB. See the documentation for details.");