composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,332 Commits 151 Branches 134 Tags
67fa156c0e5748e20ade36753000c88918af9bd0
Commit Graph

57 Commits

Author SHA1 Message Date
Pierre Goiffon
67fa156c0e Merge remote-tracking branch 'origin/support/2.7' into develop 
# Conflicts:
#	application/dashboard.class.inc.php
#	core/action.class.inc.php
#	datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
#	datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
#	datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
#	datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
#	datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
#	datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
#	datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
#	datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
#	datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
#	datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
#	datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
#	datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
#	datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
#	datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
#	dictionaries/es_cr.dictionary.itop.core.php
#	dictionaries/es_cr.dictionary.itop.ui.php
#	pages/ajax.render.php
#	setup/wizardsteps.class.inc.php
#	synchro/synchro_import.php
 2021-11-19 10:28:46 +01:00
Pierre Goiffon
06985d3cf2 N°4387 synchro_import restore previous set_time_limit call 
Was changed in b1761e04 (iTop 2.7.0) by mistake

Added noinspection as the IDE warning (https://github.com/kalessil/phpinspectionsea/blob/master/docs/control-flow.md#statement-could-be-decoupled-from-foreach) seems to be a false positive ?
 2021-11-08 16:14:19 +01:00
Molkobain
8dd96ea636 Copyright year bump 2021-03-15 09:29:45 +01:00
Eric
291041610b set_time_limit accept only int in PHP7.4 2020-11-12 10:57:13 +01:00
Pierre Goiffon
745e4aa424 Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design 
# Conflicts:
#	webservices/import.php
 2020-09-18 10:48:34 +02:00
Thomas Casteleyn
0542a8e4f8 Synchro cleanup (#157) 
* Cleanup duplicate code
* Document undocumented parameter
* Removed duplicate code for consistency
 2020-09-14 09:53:40 +02:00
rquetiez
f5a3bb2baa N°3251 - Null in data synchro (fixes the regression introduced in a1f5d80) 
- restore the initial behavior, thanks to hipska through PR#166
- refactor so as to make it clear that no SQL injection is possible (and will never be)
- add PHPUnit tests on the data synchronization => up to 20s to execute
- fix utils::ExeciTopScript to alow its usage within the automated test
 2020-09-09 22:41:13 +02:00
Eric
63f8ec594c N°2847 - Refactor Web Pages classes - Add UIBlockManager to the WebPage 2020-09-09 18:10:06 +02:00
rquetiez
a1f5d8041e N°3251 (see also PR#152) - CSV data synchro allows "<NULL>" to be interpreted as "Let the attribute unchanged for the current row" 2020-08-13 21:49:30 +02:00
Pierre Goiffon
b7136c0b7a N°2214 Add PHP check in CLI scripts 
It is quite common that the PHP interpreter that is launched in CLI is different that the one used by the webserver. So iTop code launched by CLI could run in a context that doesn't meet iTop requirements !

This adds in the following scripts the same control that is done on the setup wizard first step :
* cron.php
* backup, check-backup
* export, exportv2
* bulk import
* synchro-exec, synchro-import

If the check throws at least one error then the script is stopped with an appropriate message, and a log is made (IssueLog, Error level, CLI channel)

(cherry picked from commit c768e18e2b : no risk taken for 2.7.1, so cherry picked for 2.8.0)
 2020-06-15 15:20:17 +02:00
Pierre Goiffon
8912618732 Revert "N°2214 Add PHP check in CLI scripts" 
This reverts commit c768e18e2b.
No risk taken for the 2.7.1 : this will be included but for 2.8 !
 2020-06-15 15:18:26 +02:00
Pierre Goiffon
c768e18e2b N°2214 Add PHP check in CLI scripts 
It is quite common that the PHP interpreter that is launched in CLI is different that the one used by the webserver. So iTop code launched by CLI could run in a context that doesn't meet iTop requirements !

This adds in the following scripts the same control that is done on the setup wizard first step :
* cron.php
* backup, check-backup
* export, exportv2
* bulk import
* synchro-exec, synchro-import

If the check throws at least one error then the script is stopped with an appropriate message, and a log is made (IssueLog, Error level, CLI channel)
 2020-06-12 16:46:37 +02:00
Pierre Goiffon
07b8830436 N°2814 Fix cannot authenticate in some HTTP calls 
basic mode was forced in 0dd1f26b
scripts concerned :
* synchro/synchro_import.php
* webservices/cron.php
* webservices/import.php
 2020-03-02 11:56:00 +01:00
bruno DA SILVA
08c1f4f072 autoload rework 
- bootstrap.inc.php is now included by approot.inc.php
 - remove all unescessaries includes of bootstrap.inc.php
 - in bootstrap.inc.php autoload can be bypassed using a feature flag because "why not"
 2019-11-08 16:51:57 +01:00
Eric
0dd1f26b39 N°2311 - Authentication extensibility in iTop 2019-10-08 15:23:24 +02:00
Molkobain
947e26d864 Internal: Change how the bootstrap.inc.php file is included in endpoints (This completes commit ec095896) 2019-08-13 17:38:51 +02:00
Molkobain
ec09589646 N°2439 Add real autoloader for framework files (not modules) 2019-08-13 13:46:19 +02:00
Pierre Goiffon
b1761e04b2 🎨 DataSynchro : remove some warnings, code formating 
(cherry picked with small modifications from commit 26dcaa0ded : it was reverted on master as this branch contains a fix only version, ok to commit it on develop though)
 2019-06-11 17:01:08 +02:00
Pierre Goiffon
2dfad12553 Revert "🎨 DataSynchro : remove some warnings, code formating" 
This reverts commit 26dcaa0ded.
Such modifications does not belong to a fix only branch !!
 2019-05-23 11:58:10 +02:00
Pierre Goiffon
26dcaa0ded 🎨 DataSynchro : remove some warnings, code formating 2019-05-23 10:48:54 +02:00
Pierre Goiffon
b5d3ddb7e3 N°2211 DataSynchro : fix deletion rules regression when using synchro_exec.php 
* fix regression : no update if exec phase only and full load interval <= 0
* fix regression : update if exec phase only and full load interval > 0
* some PHPDoc
* move back \SynchroExecution::$m_oLastFullLoadStartDate init to constructor
* add a boolean member to indicate if LastFullLoadStartDate was passed by caller
* factorize database current datetime retrieval
 2019-05-23 10:48:54 +02:00
Pierre Goiffon
40a4e6d7b0 Fix files using CrLf, convert them to Lf to have the whole repo using Lf 
Warn your git config (core.autocrlf = input or true)
 2018-09-04 17:59:51 +02:00
Romain Quetiez
399662ef99 N.701 (continuation of [r4596] which introduced regressions on the handling of date fields) 
SVN:trunk[4626]
 2017-03-28 14:56:52 +00:00
Romain Quetiez
e41a8833e2 N.701 Data Synchro: dates can be reset by the mean of an empty string (still, integers and enums cannot be reset) 
SVN:trunk[4596]
 2017-03-17 09:14:11 +00:00
Romain Quetiez
6e327e245b N.497 Continuation of the fix done in [r4461], to correctly handle validation patterns containing a slash (AttributeURL in the enhanced customer portal). The initial fix has broken the validation of date (+time) fields because the slash was escaped twice, leading to an invalid regular expression. Requires testing of synchro, CSV import, console, customer portal... 
SVN:trunk[4538]
 2016-12-19 16:04:21 +00:00
Denis Flaven
90cab29a3c Enhancement: 
- Add more debug traces (if 'synchro_trace' == 'save')
- Show debug traces (if any) at the bottom of the status page
- Protect against time differences between the MySQL server and the PHP server, when running 'synchro_import.php'

SVN:trunk[4394]
 2016-09-12 12:47:40 +00:00
Romain Quetiez
3a25916f00 Data synchro: web service synchro_import - usage to expose the real default date format (mySQL datetime format) 
SVN:trunk[4266]
 2016-06-29 13:47:58 +00:00
Denis Flaven
9b774d3f72 - Make sure that the CSV Parser has enough time to run on big amount of data. 
- Speedup the display of the CSV Import interactive wizard by parsing only the needed lines of the CSV data (in the first steps of the wizard).

SVN:trunk[4223]
 2016-06-17 08:41:20 +00:00
Denis Flaven
d88249eabc Trying to protect the Synchro for timeouts, since the synchro may be launched from the web (as a "web service", especially by the "collectors"). To be validated further with large amounts of data. 
SVN:trunk[4210]
 2016-06-14 16:11:28 +00:00
Denis Flaven
54a40c42cd Fix: properly parse dates in synchro import. Thanks to Karl aka karkoff1212 for reporting the issue. 
SVN:trunk[4179]
 2016-06-02 15:12:57 +00:00
Denis Flaven
db010e4ddc Proper validation (and reporting) about date (and time) formats. 
SVN:trunk[4119]
 2016-05-23 16:11:27 +00:00
Denis Flaven
316d1f9b14 Validate date/time fields using their regular expression during an import (or synchro) to avoid passing wrong formats as-is (e.g. 01/02/16 can become 01/02/0016 instead of 01/02/2016 if you use the 4 digits format for years and pass only 2 digits !) 
SVN:trunk[4096]
 2016-05-17 14:51:42 +00:00
Denis Flaven
8eba9ae714 Enhancement: Date and time formats are now configurable in iTop !! (beta version, beware!) 
SVN:trunk[4011]
 2016-04-22 09:26:27 +00:00
Denis Flaven
1aa489890c Make sure that the SQL mutexes are specific to the current iTop instance, but still preserving the capability for the setup to detect an already running cron job with or without a valid config file. 
SVN:trunk[3591]
 2015-06-12 17:00:41 +00:00
Romain Quetiez
a7f7424e54 #1039 Continuation of the fix implemented in [3465] that introduced a stopper regression (Fatal Error) 
SVN:trunk[3472]
 2014-12-16 13:54:40 +00:00
Denis Flaven
3c9ace5b53 #1039: prevent concurrent executions of either synchro_import.php or synchro_exec.php for a given data source, since it would lead to unpredictable results. 
SVN:trunk[3465]
 2014-12-15 15:04:43 +00:00
Romain Quetiez
721faa7e1e Updated copyright (2012) and license (LGPL changed to AGPL) 
SVN:trunk[2333]
 2012-10-23 21:41:36 +00:00
Romain Quetiez
e07912af34 CSV import (both std and related to the data synchro) can be used with a tab (keyword 'tab', case insensitive) 
SVN:trunk[1737]
 2011-12-21 12:51:08 +00:00
Romain Quetiez
9ac4f84e22 #489 Run the synchro with parameter max_chunk_size to split the execution into several processes, each loading at most the given count of replica (note: the master process will continue to run while child processes are being forked one by one) 
SVN:trunk[1732]
 2011-12-20 15:55:07 +00:00
Denis Flaven
18c9852db3 Enhancement: when an (optional) external key cannot be reconciled, log a warning on the replica. the replicas containing a warning are then processed everytime in case the ext key changes 
Also improved the search/display of replicas

SVN:trunk[1675]
 2011-11-18 11:29:04 +00:00
Romain Quetiez
169bf4948b Data sync: fixed issue when a replica left in state 'new' becomes obsolete 
SVN:trunk[1668]
 2011-11-15 09:29:07 +00:00
Denis Flaven
7d8971139b Missing sanitization filter for 1 parameter: fixed ! 
SVN:trunk[1551]
 2011-09-01 11:50:34 +00:00
Denis Flaven
186ba76092 Added a flag to force the import to cinutnue even in case of SQL error... useful for debugging don't use in production ;-) 
SVN:trunk[1521]
 2011-08-25 17:37:56 +00:00
Denis Flaven
b02021a4ff Still fixing regressions caused by Trac#446: XSS vulnerabilities... 
SVN:trunk[1450]
 2011-08-12 10:06:33 +00:00
Denis Flaven
6859326646 Fixed Trac#446: XSS vulnerabilities... to be tested ! 
Also fixed the display/download links on documents that were both doing exactly the same thing !

SVN:trunk[1443]
 2011-08-11 10:17:03 +00:00
Denis Flaven
781ec7e33a In CLI mode, do not depend on the current directory: the script can be run from anywhere. 
SVN:trunk[1414]
 2011-08-01 16:13:37 +00:00
Romain Quetiez
9704dd8e35 Improved import.php and synchro_import.php: added 'date_format' (example: %d/%m/%Y %H:%i:%s) 
SVN:trunk[1272]
 2011-05-23 13:42:33 +00:00
Romain Quetiez
88a29fd8d1 #370 standard argument for CLI/REST services: param_file 
SVN:trunk[1220]
 2011-04-19 15:48:39 +00:00
Denis Flaven
19bbde6144 - Cleanup of the dictionary usage. 
- Improvements to the French translation.

SVN:trunk[1199]
 2011-04-11 09:11:00 +00:00
Romain Quetiez
bddb8b4c92 Data Exchange - Format and save traces (config option: synchro_trace) 
SVN:trunk[1102]
 2011-03-01 16:21:04 +00:00