Merge branch 'release/4.4.0'

Author: cedric-anne

.travis.yml

@@ -1,35 +1,14 @@
 language: php
 php:
-  - 5.6
-  - 7.0
-  - 7.1
   - 7.2
-  - nightly
-
-env:
-#  global:
-#  matrix:
-#    - GLPI_BRANCH=9.2.1
-#    - GLPI_BRANCH=9.2/bugfixes
-#    - GLPI_BRANCH=master
-
-matrix:
-  allow_failures:
-    - php: nightly
+  - 7.4
 
 before_script:
-#  - mysql -u root -e 'create database glpitest;'
-#  - git clone --depth=1 $GLPI_SOURCE -b $GLPI_BRANCH ../glpi && cd ../glpi
-#  - mv ../formcreator plugins/formcreator
-#  - composer install --no-dev
-#  - if [ -e scripts/cliinstall.php ] ; then php scripts/cliinstall.php --db=glpitest --user=root --tests ; fi
-#  - if [ -e tools/cliinstall.php ] ; then php tools/cliinstall.php --db=glpitest --user=root --tests ; fi
-#  - cd plugins/formcreator
   - composer self-update
-  - composer install
+  - composer install --optimize-autoloader --prefer-dist --no-interaction --no-progress --no-suggest
 
 script:
-  - vendor/bin/robo --no-interaction code:cs
+  - vendor/bin/robo --no-interaction code:cs --strict
 
 cache:
   directories:

ajax/ajax.php

@@ -31,6 +31,8 @@
 
    $output = "";
 
+   $web_dir = Plugin::getWebDir('mantis');
+
    switch ($_POST['action']) {
 
       // TEST CONNECTION TO MANTIS
@@ -43,12 +45,12 @@
                                          $_POST['login'],
                                          $_POST['pwd']);
             if ($res) {
-               echo "<img src='" . $CFG_GLPI['root_doc'] . "/plugins/mantis/pics/check24.png'/>";
+               echo "<img src='" . $web_dir . "/pics/check24.png'/>";
             } else {
-               echo "<img src='" . $CFG_GLPI['root_doc'] . "/plugins/mantis/pics/cross24.png'/>Access denied";
+               echo "<img src='" . $web_dir . "/pics/cross24.png'/>Access denied";
             }
          } catch (Exception $e) {
-            echo "<img src='" . $CFG_GLPI['root_doc'] . "/plugins/mantis/pics/cross24.png'/>Error IP or Path";
+            echo "<img src='" . $web_dir . "/pics/cross24.png'/>Error IP or Path";
          }
          break;
 
@@ -58,9 +60,9 @@
          $ws->initializeConnection();
          $res = $ws->existIssueWithId($_POST['id']);
          if ($res) {
-            echo "<img src='" . $CFG_GLPI['root_doc'] . "/plugins/mantis/pics/check24.png' />";
+            echo "<img src='" . $web_dir . "/pics/check24.png' />";
          } else {
-            echo "<img src='" . $CFG_GLPI['root_doc'] . "/plugins/mantis/pics/cross24.png'/>";
+            echo "<img src='" . $web_dir . "/pics/cross24.png'/>";
          }
          break;
 
@@ -70,9 +72,9 @@
          $ws->initializeConnection();
          $res = $ws->existProjectWithName($_POST['name']);
          if ($res) {
-            echo "<img id='resultImg' src='" . $CFG_GLPI['root_doc'] . "/plugins/mantis/pics/check24.png' />";
+            echo "<img id='resultImg' src='" . $web_dir . "/pics/check24.png' />";
          } else {
-            echo "<img id='resultImg' src='" . $CFG_GLPI['root_doc'] . "/plugins/mantis/pics/cross24.png'/>";
+            echo "<img id='resultImg' src='" . $web_dir . "/pics/cross24.png'/>";
          }
          break;
 
@@ -83,7 +85,7 @@
          $ws->getConnexion($_POST['host'],
                            $_POST['url'],
                            $_POST['login'],
-                           Toolbox::decrypt($_POST['pwd'], GLPIKEY));
+                           Toolbox::sodiumDecrypt($_POST['pwd']));
          $result = $ws->getStateMantis();
 
          if (! $result) {
@@ -168,7 +170,7 @@
             $mantis = new PluginMantisMantis();
             // verify if a link already exists
             if ($mantis->IfExistLink($idItem, $id_mantis_issue, $itemType)) {
-               echo "<img src='" . $CFG_GLPI['root_doc'] . "/plugins/mantis/pics/warning24.png'/>"
+               echo "<img src='" . $web_dir . "/pics/warning24.png'/>"
                   ."ERROR :". __("This GLPi object is already linked to the selected MantisBT issue", "mantis");
             } else {
                $result = $ws->getIssueById($id_mantis_issue);
@@ -209,7 +211,7 @@
             $mantis = new PluginMantisMantis();
             // on verifie si un lien est deja creé
             if ($mantis->IfExistLink($id_ticket, $id_mantis_issue, $itemType)) {
-               echo "<img src='" . $CFG_GLPI['root_doc'] . "/plugins/mantis/pics/warning24.png'/>"
+               echo "<img src='" . $web_dir . "/pics/warning24.png'/>"
                   . __("This GLPi object is already linked to the selected MantisBT issue", "mantis");
             } else {
 

composer.json

@@ -1,13 +1,15 @@
 {
     "require": {
-        "php": ">= 5.6.0"
+        "php": "^7.2"
     },
     "require-dev": {
         "glpi-project/tools": "^0.1"
     },
     "config": {
+        "optimize-autoloader": true,
         "platform": {
-            "php": "5.6"
-        }
+            "php": "7.2.0"
+        },
+        "sort-packages": true
     }
 }