156 Commits

Author	SHA1	Message	Date
odain	2b1ecf15b4	Merge branch 'support/3.2.1' into support/3.2	2025-11-14 10:39:04 +01:00
odain	890a2568c8	N°8796 - Add PHP code style validation in iTop and extensions - format whole code base	2025-11-07 15:39:53 +01:00
Eric Espie	031305cfbf	Add stack trace to SQL errors ... Reload object on modify error to display the real unmodified object	2025-07-07 13:44:45 +02:00
Timothee	644da707d2	Fix merge conflit resolution d3b9965283	2024-07-03 17:13:47 +02:00
Timothee	2a3516d593	Reapply "Merge remote-tracking branch 'origin/support/3.1' into support/3.2" ... This reverts commit 3233b9776f.	2024-06-19 09:47:48 +02:00
Timothee	3233b9776f	Revert "Merge remote-tracking branch 'origin/support/3.1' into support/3.2" ... This reverts commit 905bbf9118, reversing changes made to 1c00461f4d.	2024-06-17 18:03:12 +02:00
Timothee	905bbf9118	Merge remote-tracking branch 'origin/support/3.1' into support/3.2	2024-06-17 17:04:05 +02:00
Eric Espie	f96d28a0a8	Merge remote-tracking branch 'origin/support/3.0' into support/3.1	2024-06-12 16:48:39 +02:00
Eric Espie	d3b9965283	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # core/cmdbsource.class.inc.php	2024-06-12 16:48:06 +02:00
Eric Espie	f03d731b1d	N°7533 - Prevent installation of iTop on Galera clusters	2024-06-12 16:14:23 +02:00
Molkobain	ad36066126	📝 Copyright year bump	2024-05-06 18:35:31 +02:00
Pierre Goiffon	c1efad7556	Merge remote-tracking branch 'origin/support/3.0' into support/3.1	2024-03-07 11:11:34 +01:00
Pierre Goiffon	f78b57521a	Merge remote-tracking branch 'origin/support/2.7' into support/3.0	2024-03-07 11:11:19 +01:00
Pierre Goiffon	da490739be	💡 Fix \CMDBSource::Query phpdoc block	2024-03-07 11:10:53 +01:00
Pierre Goiffon	379062f1f7	Merge remote-tracking branch 'origin/support/3.0' into support/3.1 ... Most of the conflicts are caused by HU translations (N°7077 / #584) # Conflicts: # css/setup.css # datamodels/2.x/authent-cas/dictionaries/hu.dict.authent-cas.php # datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php # datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php # datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/hu.dict.combodo-backoffice-darkmoon-theme.php # datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php # datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php # datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php # datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php # datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php # datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php # datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php # datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php # datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php # datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php # datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php # datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php # datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-oauth-client/hu.dict.itop-oauth-client.php # datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php # datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php # datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php # datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php # datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php # datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php # datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php # datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php # datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php # dictionaries/hu.dictionary.itop.core.php # dictionaries/hu.dictionary.itop.ui.php # dictionaries/ui/components/breadcrumbs/hu.dictionary.itop.breadcrumbs.php # dictionaries/ui/components/datatable/hu.dictionary.itop.datatable.php # dictionaries/ui/components/field/hu.dictionary.itop.field.php # dictionaries/ui/components/global-search/hu.dictionary.itop.global-search.php # dictionaries/ui/components/input/hu.dictionary.itop.input.php # dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php # dictionaries/ui/layouts/activity-panel/hu.dictionary.itop.activity-panel.php # dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php # dictionaries/ui/layouts/object-details/hu.dictionary.itop.object-details.php # dictionaries/ui/layouts/page-content/hu.dictionary.itop.page-content.php # dictionaries/ui/layouts/tab-container/hu.dictionary.itop.tab-container.php # dictionaries/ui/pages/errorpage/hu.dictionary.itop.errorpage.php # dictionaries/ui/pages/preferences/hu.dictionary.itop.preferences.php # tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php	2024-01-03 17:30:57 +01:00
Pierre Goiffon	6042e7f74d	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # tests/php-unit-tests/post-build-integration-tests/SetupCssIntegrityChecklistTest.php # tests/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php	2024-01-03 10:43:41 +01:00
Pierre Goiffon	6995a3c641	N°6889 backup mysqldump call : restore possibility to connect using socket protocol (#591) ... With previous fix (N°6123) we forced to use the tcp protocol each time. This was blocking for users wanting to connect using the socket protocol on localhost. Now for localhost we will : - send both port and protocol arguments if the `db_host` config parameter does contain a port - don't send any of the port or protocol arguments if `db_host` doesn't contain a port	2023-12-20 15:19:50 +01:00
odain-cbd	9a59bc7890	N°6901 - Enable tracking of iTop active sessions (monitoring) (#568) ... Co-authored-by: Molkobain <lajarige.guillaume@free.fr> Co-authored-by: Romain Quetiez <romain.quetiez@combodo.com>	2023-11-22 17:46:00 +01:00
Molkobain	f238593966	Merge remote-tracking branch 'origin/support/3.0' into support/3.1 ... # Conflicts: # tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php # tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php	2023-08-11 09:19:49 +02:00
Molkobain	ccceb870e3	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php # tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php	2023-08-10 15:53:05 +02:00
Molkobain	aef3c2e609	N°6097 - Fix \CMDBSource::DropDB() not resetting cache like \CMDBSource::DropTable() which can lead to errors when trying to re-create it afterwards	2023-08-10 15:45:39 +02:00
Pierre Goiffon	5212e15cc4	Merge remote-tracking branch 'origin/support/3.0' into support/3.1	2023-08-10 14:41:05 +02:00
Pierre Goiffon	f04fc546b5	N°6643 Fix TypeError in \CMDBSource::LogDeadLock	2023-08-10 14:34:09 +02:00
Eric Espie	9c37d5c23e	Merge remote-tracking branch 'origin/support/3.0' into support/3.1 ... # Conflicts: # application/applicationextension.inc.php # application/cmdbabstract.class.inc.php # core/dbobject.class.php # core/kpi.class.inc.php # core/metamodel.class.php # lib/composer/autoload_classmap.php # lib/composer/autoload_static.php # tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php	2023-07-19 09:26:46 +02:00
Eric Espie	6432678de9	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # application/cmdbabstract.class.inc.php # application/utils.inc.php # bootstrap.inc.php # composer.json # core/MyHelpers.class.inc.php # core/cmdbsource.class.inc.php # core/config.class.inc.php # core/dbobject.class.php # core/kpi.class.inc.php # core/metamodel.class.php # lib/composer/autoload_classmap.php # lib/composer/autoload_real.php # lib/composer/autoload_static.php	2023-07-18 14:36:58 +02:00
Stephen Abello	2b5973ec67	N°6436 - Integrate Performance Audit pre requisite in iTop Pro 2.7.9	2023-07-18 09:15:37 +02:00
Molkobain	c767ebe989	📝 Copyright year bump	2023-03-17 18:28:47 +01:00
Lars Kaltefleiter	b354058eb5	N°5622 Fix backup cannot be done if TLS enabled with no CA (#354)	2023-01-10 12:13:33 +01:00
Pierre Goiffon	88d743b1cc	✅ N°5538 Make PHPUnit test fail if transaction opened but not closed	2022-09-21 14:05:27 +02:00
Molkobain	04dbaef257	N°4517 - PHP 8.1: Fix deprecated usages of MySQLi ... * init() method should not be called in OOP * real_connect() "flags" param should not be null to match its type (int)	2022-06-28 16:34:12 +02:00
Molkobain	020937d4f6	Merge remote-tracking branch 'origin/support/3.0' into develop	2022-05-16 16:22:53 +02:00
acognet	2165bfe8c2	Fix "undefined offset" error during "Anonymize" action	2022-05-12 14:45:18 +02:00
Thomas Casteleyn	e4a04de9f4	N°5066 - Clean CMDBSource methods (#229) ... * Improve function calls * Deprecate CMDBSource::GetServerInfo * Improve documentation * Update core/cmdbsource.class.inc.php Co-authored-by: Pierre Goiffon <pierre.goiffon@combodo.com> * Single quotes * Apply suggestion, so method still returns empty string instead of null Co-authored-by: Pierre Goiffon <pierre.goiffon@combodo.com>	2022-04-12 17:10:41 +02:00
Pierre Goiffon	b55ba2ac7f	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # core/cmdbsource.class.inc.php # core/log.class.inc.php # test/setup/iTopDesignFormat/iTopDesignFormatTest.php	2022-01-12 09:56:16 +01:00
Pierre Goiffon	a663e9fded	✅ Fix DBBackupTest ... DB connection dependency was added in a222ead4 (N°2336) in \DBBackup::GetMysqlCliTlsOptions but test wasn't updated accordingly :/^ The test wasn't ran on Jenkins until b11bf308, so we saw the regression only yesterday :( This is now fixed ! 🥳	2022-01-12 09:00:26 +01:00
Pierre Goiffon	92b61c7491	N°4558 Rename \LogChannels::CMDBSOURCE to CMDB_SOURCE to match existing constant in support/3.0 branch	2022-01-10 17:09:43 +01:00
Pierre Goiffon	8578d18e7f	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # core/cmdbsource.class.inc.php # core/config.class.inc.php # core/displayablegraph.class.inc.php # core/log.class.inc.php # datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php # datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php # datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php # datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php # dictionaries/tr.dictionary.itop.core.php # dictionaries/tr.dictionary.itop.ui.php # pages/UI.php # setup/itopdesignformat.class.inc.php # test/core/LogAPITest.php # test/integration/iTopModulesPhpVersionChecklistTest.php # test/postbuild_integration/SetupCssIntegrityChecklistTest.php # test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php # test/status/StatusTest.php	2022-01-10 16:15:00 +01:00
Pierre Goiffon	25e560fdaa	N°4558 Fix possible PHP notice in \CMDBSource::StartTransaction	2021-12-31 16:34:19 +01:00
Pierre Goiffon	9c6d8253f4	✅ Fix \Combodo\iTop\Test\UnitTest\Core\CMDBSourceTest::testIsOpenedDbConnectionUsingTls	2021-09-30 10:49:11 +02:00
Pierre Goiffon	8fa6ae6703	Merge remote-tracking branch 'origin/support/2.7' into develop ... # Conflicts: # core/cmdbsource.class.inc.php	2021-09-30 09:51:13 +02:00
Pierre Goiffon	3ff117596d	💡 N°4325 add phpdoc	2021-09-24 17:16:59 +02:00
Pierre Goiffon	4cf4c0e4c3	♻️ N°4325 refactor CMDBSource mysqli attributes to a separate wrapper class (#237) ... In 2.7.5 with N°3513 we added a second mysqli attribute in CMDBSource, so that we can test transactions (see TransactionsTest). But this wasn't documented, and was really causing confusion ! This refactor wraps both attributes in a dedicated object so that the logic is clearer.	2021-09-24 11:45:39 +02:00
Pierre Goiffon	ec1dcc8df6	💡 N°3513 PHPDoc	2021-09-23 14:42:16 +02:00
Pierre Goiffon	47ed863da9	N°4215 N°3513 Fix DB errors fetch from the wrong object n°2	2021-09-23 14:32:43 +02:00
Pierre Goiffon	88290f9e91	N°4215 N°3513 Fix DB errors fetch from the wrong object	2021-09-23 13:55:23 +02:00
Molkobain	3a05e9159d	PHPDoc	2021-09-23 12:29:34 +02:00
Pierre Goiffon	cfdbc8ae62	N°4215 When checking for TLS cnx, don't set anymore CMDBSource mysql attributes !	2021-09-23 11:59:44 +02:00
Pierre Goiffon	aaa8f6d311	N°4215 Fix call to a function on null error when setting TLS connection in the setup ... Regression introduced by b1ca1f2630 / N°3513	2021-09-22 15:59:39 +02:00
Eric	3359609349	Allow mode selection for queries	2021-07-31 15:23:19 +02:00
Eric	a117906ff6	🎨 Add constant for cmdbsource log channel	2021-07-02 17:01:46 +02:00