Skip to content

Commit 932a604

Browse files
tomolimotomolimo
authored
Merge pull request #160 from tomolimo/4.4/bugfixes
* Added postmessage for communication between iframe and iframe parent for cases (CORS issue)
2 parents e92ee90 + eeed2b0 commit 932a604

76 files changed

Lines changed: 4533 additions & 2143 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@ version 3.6.x is compatible with GLPI 9.4 and needs ProcessMaker 3.3.0-RE-1.x (h
1010

1111
version 4.0.x is compatible with GLPI 9.5 and needs ProcessMaker 3.3.0-RE-1.x (https://github.com/tomolimo/processmaker-server/releases/latest)
1212

13+
version 4.3.x is compatible with GLPI 9.5 and needs ProcessMaker 3.3.0-RE-1.13 (https://github.com/tomolimo/processmaker-server/releases/latest)
14+
15+
version 4.4.x is compatible with GLPI 9.5 and needs ProcessMaker 3.3.0-RE-2.0 (https://github.com/tomolimo/processmaker-server/releases/latest)
16+
1317
This plugin can run classic (ProcessMaker server v2) and BPMN (ProcessMaker server v3 and later) processes
1418

‎ajax/asynchronousdatas.php‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
11
<?php
2+
/*
3+
-------------------------------------------------------------------------
4+
ProcessMaker plugin for GLPI
5+
Copyright (C) 2014-2022 by Raynet SAS a company of A.Raymond Network.
6+
7+
https://www.araymond.com/
8+
-------------------------------------------------------------------------
9+
10+
LICENSE
11+
12+
This file is part of ProcessMaker plugin for GLPI.
13+
14+
This file is free software; you can redistribute it and/or modify
15+
it under the terms of the GNU General Public License as published by
16+
the Free Software Foundation; either version 2 of the License, or
17+
(at your option) any later version.
18+
19+
This plugin is distributed in the hope that it will be useful,
20+
but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
GNU General Public License for more details.
23+
24+
You should have received a copy of the GNU General Public License
25+
along with this plugin. If not, see <http://www.gnu.org/licenses/>.
26+
--------------------------------------------------------------------------
27+
*/
28+
229
if (strpos($_SERVER['PHP_SELF'], "asynchronousdatas.php")) {
330
$AJAX_INCLUDE = 1;
431
define('GLPI_ROOT', '../../..');
@@ -27,10 +54,10 @@
2754

2855
$asyncdata = new PluginProcessmakerCrontaskaction;
2956
if (isset($datas['id']) && $asyncdata->getFromDB( $datas['id'] ) && $asyncdata->fields['state'] == PluginProcessmakerCrontaskaction::WAITING_DATA) {
30-
$initialdatas = json_decode($asyncdata->fields['postdata'], true);
57+
$initialdatas = json_decode($asyncdata->fields['formdata'], true);
3158
$initialdatas['form'] = array_merge( $initialdatas['form'], $datas['form'] );
32-
$postdata = json_encode($initialdatas, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_UNESCAPED_UNICODE);
33-
$asyncdata->update( [ 'id' => $datas['id'], 'state' => PluginProcessmakerCrontaskaction::DATA_READY, 'postdata' => $postdata ] );
59+
$formdata = json_encode($initialdatas, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_UNESCAPED_UNICODE);
60+
$asyncdata->update( [ 'id' => $datas['id'], 'state' => PluginProcessmakerCrontaskaction::DATA_READY, 'formdata' => $formdata ] );
3461
$ret = [ 'code' => '0', 'message' => 'Done' ];
3562
} else {
3663
$ret = [ 'code' => '2', 'message' => 'Case is not existing, or state is not WAITING_DATA' ];

‎ajax/dropdownProcesses.php‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
<?php
2+
/*
3+
-------------------------------------------------------------------------
4+
ProcessMaker plugin for GLPI
5+
Copyright (C) 2014-2022 by Raynet SAS a company of A.Raymond Network.
26
7+
https://www.araymond.com/
8+
-------------------------------------------------------------------------
9+
10+
LICENSE
11+
12+
This file is part of ProcessMaker plugin for GLPI.
13+
14+
This file is free software; you can redistribute it and/or modify
15+
it under the terms of the GNU General Public License as published by
16+
the Free Software Foundation; either version 2 of the License, or
17+
(at your option) any later version.
18+
19+
This plugin is distributed in the hope that it will be useful,
20+
but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
GNU General Public License for more details.
23+
24+
You should have received a copy of the GNU General Public License
25+
along with this plugin. If not, see <http://www.gnu.org/licenses/>.
26+
--------------------------------------------------------------------------
27+
*/
328
// ----------------------------------------------------------------------
429
// Original Author of file: Olivier Moron
530
// Purpose of file: to return list of processes which can be started by end-user

‎ajax/dropdownTaskcategories.php‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
<?php
2+
/*
3+
-------------------------------------------------------------------------
4+
ProcessMaker plugin for GLPI
5+
Copyright (C) 2014-2022 by Raynet SAS a company of A.Raymond Network.
26
7+
https://www.araymond.com/
8+
-------------------------------------------------------------------------
9+
10+
LICENSE
11+
12+
This file is part of ProcessMaker plugin for GLPI.
13+
14+
This file is free software; you can redistribute it and/or modify
15+
it under the terms of the GNU General Public License as published by
16+
the Free Software Foundation; either version 2 of the License, or
17+
(at your option) any later version.
18+
19+
This plugin is distributed in the hope that it will be useful,
20+
but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
GNU General Public License for more details.
23+
24+
You should have received a copy of the GNU General Public License
25+
along with this plugin. If not, see <http://www.gnu.org/licenses/>.
26+
--------------------------------------------------------------------------
27+
*/
328
//// ----------------------------------------------------------------------
429
//// Original Author of file: Olivier Moron
530
//// Purpose of file: to return list of processes which can be started by end-user

‎ajax/dropdownTicketCategories.php‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
<?php
2-
/**
2+
/*
3+
-------------------------------------------------------------------------
4+
ProcessMaker plugin for GLPI
5+
Copyright (C) 2014-2022 by Raynet SAS a company of A.Raymond Network.
6+
7+
https://www.araymond.com/
8+
-------------------------------------------------------------------------
9+
10+
LICENSE
11+
12+
This file is part of ProcessMaker plugin for GLPI.
13+
14+
This file is free software; you can redistribute it and/or modify
15+
it under the terms of the GNU General Public License as published by
16+
the Free Software Foundation; either version 2 of the License, or
17+
(at your option) any later version.
18+
19+
This plugin is distributed in the hope that it will be useful,
20+
but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
GNU General Public License for more details.
23+
24+
You should have received a copy of the GNU General Public License
25+
along with this plugin. If not, see <http://www.gnu.org/licenses/>.
26+
--------------------------------------------------------------------------
327
*/
428

529
if (strpos($_SERVER['PHP_SELF'], "dropdownTicketCategories.php")) {

‎ajax/dropdownUsers.php‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,29 @@
11
<?php
22
/*
3+
-------------------------------------------------------------------------
4+
ProcessMaker plugin for GLPI
5+
Copyright (C) 2014-2022 by Raynet SAS a company of A.Raymond Network.
36
7+
https://www.araymond.com/
8+
-------------------------------------------------------------------------
9+
10+
LICENSE
11+
12+
This file is part of ProcessMaker plugin for GLPI.
13+
14+
This file is free software; you can redistribute it and/or modify
15+
it under the terms of the GNU General Public License as published by
16+
the Free Software Foundation; either version 2 of the License, or
17+
(at your option) any later version.
18+
19+
This plugin is distributed in the hope that it will be useful,
20+
but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
GNU General Public License for more details.
23+
24+
You should have received a copy of the GNU General Public License
25+
along with this plugin. If not, see <http://www.gnu.org/licenses/>.
26+
--------------------------------------------------------------------------
427
*/
528

629
// ----------------------------------------------------------------------

‎ajax/selfservicedrafts.php‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,27 @@
11
<?php
2+
/*
3+
-------------------------------------------------------------------------
4+
ProcessMaker plugin for GLPI
5+
Copyright (C) 2014-2022 by Raynet SAS a company of A.Raymond Network.
26
7+
https://www.araymond.com/
8+
-------------------------------------------------------------------------
9+
10+
LICENSE
11+
12+
This file is part of ProcessMaker plugin for GLPI.
13+
14+
This file is free software; you can redistribute it and/or modify
15+
it under the terms of the GNU General Public License as published by
16+
the Free Software Foundation; either version 2 of the License, or
17+
(at your option) any later version.
18+
19+
This plugin is distributed in the hope that it will be useful,
20+
but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
GNU General Public License for more details.
23+
24+
You should have received a copy of the GNU General Public License
25+
along with this plugin. If not, see <http://www.gnu.org/licenses/>.
26+
--------------------------------------------------------------------------
27+
*/

0 commit comments

Comments
 (0)