File tree Expand file tree Collapse file tree 7 files changed +9
-393
lines changed
Expand file tree Collapse file tree 7 files changed +9
-393
lines changed Original file line number Diff line number Diff line change @@ -13,14 +13,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1313- Escape data when check if already exist
1414- Fix injection of ` values in entity tabs ` when injecting an ` entity `
1515- Fix ` pdffont ` field error for users
16+ - Move ` Notepads ` search options to the Black List option
17+
1618
1719### Added
1820
1921- Add option to ` replace ` (instead of ` append ` ) the value of multiline text fields (e.g. ` comment ` )
2022
21- ### Fixed
2223
23- - Move ` Notepads ` search options to the Black List option
24+ ### Removed
25+
26+ - Integration of the WebService plugin (plugin is no longer maintained)
27+
2428
2529## [ 2.14.1] - 2024-12-27
2630
Original file line number Diff line number Diff line change 2727 * @link https://github.com/pluginsGLPI/datainjection
2828 * -------------------------------------------------------------------------
2929 */
30-
31- function plugin_datainjection_registerMethods ()
32- {
33- /** @var array $WEBSERVICES_METHOD */
34- global $ WEBSERVICES_METHOD ;
35-
36- $ methods = ['getModel ' => 'methodGetModel ' ,
37- 'listModels ' => 'methodListModels ' ,
38- 'inject ' => 'methodInject ' ,
39- 'listItemtypes ' => 'methodListItemtypes '
40- ];
41-
42- foreach ($ methods as $ code => $ method ) {
43- $ WEBSERVICES_METHOD ['datainjection. ' . $ code ] = ['PluginDatainjectionWebservice ' , $ method ];
44- }
45- }
46-
47-
4830function plugin_datainjection_install ()
4931{
5032 /** @var DBmysql $DB */
Original file line number Diff line number Diff line change @@ -1128,21 +1128,7 @@ public function processUploadedFile($options = [])
11281128 $ this ->loadSpecificModel ();
11291129 $ response = $ this ->readUploadedFile ($ options );
11301130 if (!$ this ->injectionData ) {
1131- if (!isset ($ options ['webservice ' ])) {
1132- return false ;
1133- }
1134- if (class_exists ('PluginWebservicesMethodCommon ' )) {
1135- return PluginWebservicesMethodCommon::Error (
1136- $ options ['protocol ' ],
1137- WEBSERVICES_ERROR_FAILED , /** @phpstan-ignore-line */
1138- sprintf (
1139- __ (
1140- 'Not data to import ' ,
1141- 'datainjection '
1142- )
1143- )
1144- );
1145- }
1131+ return false ;
11461132 }
11471133
11481134 if ($ mode == self ::PROCESS ) {
@@ -1154,17 +1140,8 @@ public function processUploadedFile($options = [])
11541140 //There's an error
11551141 if ($ check ['status ' ] != PluginDatainjectionCommonInjectionLib::SUCCESS ) {
11561142 if ($ mode == self ::PROCESS ) {
1157- if (!isset ($ options ['webservice ' ])) {
1158- Session::addMessageAfterRedirect ($ check ['error_message ' ], true , ERROR );
1159- return false ;
1160- }
1161- if (class_exists ('PluginWebservicesMethodCommon ' )) {
1162- return PluginWebservicesMethodCommon::Error (
1163- $ options ['protocol ' ],
1164- WEBSERVICES_ERROR_FAILED , /** @phpstan-ignore-line */
1165- $ check ['error_message ' ]
1166- );
1167- }
1143+ Session::addMessageAfterRedirect ($ check ['error_message ' ], true , ERROR );
1144+ return false ;
11681145 }
11691146 }
11701147
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -10,8 +10,6 @@ parameters:
1010 - inc
1111 - hook.php
1212 - setup.php
13- excludePaths :
14- - inc/webservice.class.php
1513 scanDirectories :
1614 - ../../inc
1715 - ../../src
Original file line number Diff line number Diff line change @@ -83,8 +83,6 @@ function plugin_init_datainjection()
8383 // Javascript file
8484 $ PLUGIN_HOOKS ['add_javascript ' ]['datainjection ' ] = 'js/datainjection.js ' ;
8585
86- // Inbtegration with Webservices plugin
87- $ PLUGIN_HOOKS ['webservices ' ]['datainjection ' ] = 'plugin_datainjection_registerMethods ' ;
8886 $ INJECTABLE_TYPES = [];
8987 }
9088}
You can’t perform that action at this time.
0 commit comments