diff --git a/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php
index 1daf5fa01..ee3034ecc 100644
--- a/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php
@@ -76,7 +76,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php
index 70ecb0aa4..ab703a9ab 100644
--- a/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php
@@ -76,7 +76,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php
index 72ad62598..7f801244b 100644
--- a/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php
@@ -76,7 +76,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'Anwendungsupgrade nicht möglich: %1$s',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Einige angepasste Dateien wurden erkannt, eine Teil-Update kann nicht ausgeführt werden.
Befolgen Sie das Verfahren, um Ihr iTop manuell zu aktualisieren. Sie müssen das Setup benutzen, um Ihre Applikation zu aktualisieren.
',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Einige neue Module wurden erkannt, eine Teil-Update kann nicht ausgeführt werden.
Befolgen Sie das Verfahren, um Ihr iTop manuell zu aktualisieren. Sie müssen das Setup benutzen, um Ihre Applikation zu aktualisieren.
',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/en.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/en.dict.itop-core-update.php
index d68e136a3..4cc013a27 100644
--- a/datamodels/2.x/itop-core-update/en.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/en.dict.itop-core-update.php
@@ -76,7 +76,6 @@ Dict::Add('EN US', 'English', 'English', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php
index 546ef11ef..5ffe65d8d 100644
--- a/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php
@@ -77,7 +77,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'La aplicación no puede ser actualizada: %1$s',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Advertencia: la actualización de la aplicación puede fallar: %1$s',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php
index 6618a4537..fb80f2644 100644
--- a/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php
@@ -76,7 +76,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'L\'application ne peut pas être mise à jour : %1$s',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Attention : la mise à jour de l\'application peut échouer : %1$s',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Des fichiers modifiés ont été détectés, une mise à jour partielle ne peut pas être effectuée.
Suivez la procedure pour mettre à jour manuellement votre iTop. Vous devez utiliser la page d\'installation pour mettre à jour l\'application.',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'De nouveaux modules ont été détectés, une mise à jour partielle ne peut pas être effectuée.
Suivez la procedure pour mettre à jour manuellement votre iTop. Vous devez utiliser la page d\'installation pour mettre à jour l\'application.',
'iTopUpdate:UI:CheckInProgress'=>'Veuillez patienter pendant la vérification d\'intégrité',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php
index 67583ef4a..bf5ac0674 100644
--- a/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php
@@ -76,7 +76,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php
index ae86afa1e..e7fb3489d 100644
--- a/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php
@@ -76,7 +76,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php
index aad058424..865cfb513 100644
--- a/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php
@@ -76,7 +76,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php
index a5e396f95..4e15021e2 100644
--- a/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php
@@ -78,7 +78,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'Updaten van de toepassing is niet mogelijk: %1$s',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
index 5c1538739..1d6ead8f8 100644
--- a/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
@@ -76,7 +76,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php
index 0909f2b95..c93bd7d25 100644
--- a/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php
@@ -64,7 +64,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'Приложение не может быть обновлено: %1$s',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php
index e3ee182fe..25677f807 100644
--- a/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php
@@ -76,7 +76,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/src/Service/CoreUpdater.php b/datamodels/2.x/itop-core-update/src/Service/CoreUpdater.php
index fdb98922b..32e6925c2 100644
--- a/datamodels/2.x/itop-core-update/src/Service/CoreUpdater.php
+++ b/datamodels/2.x/itop-core-update/src/Service/CoreUpdater.php
@@ -9,7 +9,6 @@
namespace Combodo\iTop\CoreUpdate\Service;
-use Combodo\iTop\FilesInformation\Service\FileIntegrityException;
use Combodo\iTop\FilesInformation\Service\FilesIntegrity;
use DBBackup;
use Dict;
@@ -539,9 +538,6 @@ final class CoreUpdater
$sRootPath = self::UPDATE_DIR.'web/';
FilesIntegrity::CheckInstallationIntegrity($sRootPath);
- ///Check new modules
- self::CheckNewModules($sRootPath);
-
SetupLog::Info('itop-core-update: Files integrity OK');
} catch (Exception $e)
{
@@ -609,38 +605,4 @@ final class CoreUpdater
throw $e;
}
}
-
- /**
- * Check if new modules (not already installed) are present, and throw an exception if that is the case as core update doesn't know how to install them automatically for know
- *
- * @param string $sRootPath
- *
- * @throws \ApplicationException
- * @since 2.7.7 3.0.1
- */
- private static function CheckNewModules($sRootPath)
- {
- $aFilesInfo = FilesIntegrity::GetInstalledFiles($sRootPath.'manifest.xml');
-
- if ($aFilesInfo === false) {
- throw new FileIntegrityException(Dict::Format('FilesInformation:Error:MissingFile', 'manifest.xml'));
- }
-
- @clearstatcache();
- $sSourceDir = MetaModel::GetConfig()->Get('source_dir');
- foreach ($aFilesInfo as $aFileInfo) {
- if (strpos($aFileInfo['path'], $sSourceDir) === 0) {
- $aFilePath = explode('/', $aFileInfo['path']);
- $sFolderPath = $aFilePath[0].'/'.$aFilePath[1].'/'.$aFilePath[2];
- //if module don't already exist in itop and if module listed in manifest.xml is included in zip
- if (!is_dir(APPROOT.'/'.$sFolderPath) && !is_file(APPROOT.'/'.$sFolderPath)
- && is_dir($sRootPath.'/'.$sFolderPath)) {
- $sLink = utils::GetAbsoluteUrlAppRoot().'setup/';
- $sLinkManualUpdate = 'https://www.itophub.io/wiki/page?id='.utils::GetItopVersionWikiSyntax().'%3Ainstall%3Aupgrading_itop#manually';
- throw new FileIntegrityException(Dict::Format('iTopUpdate:UI:CannotUpdateNewModules' , $sLink, $sLinkManualUpdate));
- }
- }
- // Packed with missing files...
- }
- }
}
diff --git a/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php
index a69c8f7df..041679a47 100644
--- a/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php
@@ -76,7 +76,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~',
'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
- 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~',
'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~',
// Setup Messages
diff --git a/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig b/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
index 1d1a458d6..1cf402bc7 100644
--- a/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
+++ b/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
@@ -64,7 +64,7 @@