GLPI 9.5 compatibility

Added Export (via massive actions) and Import features
Set version to 1.0.3

Author: tomolimo

README.md

@@ -14,5 +14,5 @@ See : https://github.com/tomolimo/formvalidation/wiki
 See wiki pages https://github.com/tomolimo/formvalidation/wiki
 
 ## GLPI compatibility:
-Tested with 0.85, 0.90, 9.1, 9.2, 9.3 and 9.4
+Tested with 0.85, 0.90, 9.1, 9.2, 9.3, 9.4 and 9.5
 

ajax/getFormValidations.php

@@ -44,7 +44,7 @@
 
 $is_createitem = 0; // by default
 
-$obj = getItemForItemtype( $_GET['name'] );
+$obj = getItemForItemtype( $_GET['itemtype'] );
 if ($obj && method_exists($obj, 'getType')) {
    if ($_GET['id'] > 0) {
       $obj->getFromDB( $_GET['id'] );

ajax/getLocales.php

@@ -50,14 +50,10 @@
 }
 
 // JSON encode all strings that are needed in formvalidation.js
-$localization = [
-//   'job' => array( 44 => "LANG['job'][44]" ),
-//                        'common' => array( 17 => "LANG['common'][17]",
-//                                           36 => "LANG['common'][36]")
-                     ];
+$localization = [];
 
 // add plugin own language strings to $localization
 $localization['plugin_formvalidation'] = $LANG['plugin_formvalidation'];
 
-echo json_encode( $localization, JSON_HEX_APOS | JSON_HEX_QUOT );
+echo json_encode($localization, JSON_HEX_APOS | JSON_HEX_QUOT);
 

formvalidation.xml

@@ -24,10 +24,14 @@
       <author>Olivier Moron </author>
    </authors>
    <versions>
-     <version>
-       <num>0.6.8</num>
-       <compatibility>9.4</compatibility>
-     </version>
+      <version>
+         <num>1.0.3</num>
+         <compatibility>9.5</compatibility>
+      </version>
+      <version>
+         <num>0.6.8</num>
+         <compatibility>9.4</compatibility>
+      </version>
       <version>
          <num>0.5.1</num>
          <compatibility>9.3</compatibility>

front/config.form.php

@@ -1,15 +1,13 @@
 <?php
-
-include ("../../../inc/includes.php");
-// No autoload when plugin is not activated
-//require_once('../inc/config.class.php');
-
-$config = new PluginFormvalidationConfig();
-if (isset($_REQUEST["update"])) {
-   $config->check($_REQUEST['id'], UPDATE);
-   $config->update($_REQUEST);
-
-   Html::back();
-}
-Html::redirect($CFG_GLPI["root_doc"]."/front/config.form.php?forcetab=".
-             urlencode('PluginFormvalidationConfig$1'));
+
+include ("../../../inc/includes.php");
+
+$config = new PluginFormvalidationConfig();
+if (isset($_REQUEST["update"])) {
+   $config->check($_REQUEST['id'], UPDATE);
+   $config->update($_REQUEST);
+
+   Html::back();
+}
+Html::redirect($CFG_GLPI["root_doc"]."/front/config.form.php?forcetab=".
+             urlencode('PluginFormvalidationConfig$1'));

front/form.form.php

@@ -48,9 +48,6 @@
    $form->check($_POST["id"], PURGE);
    $form->delete($_POST, 1);
 
-   //Event::log($_POST["id"], "change", 4, "maintain",
-   //           //TRANS: %s is the user login
-   //           sprintf(__('%s purges an item'), $_SESSION["glpiname"]));
    $form->redirectToList();
 
 } else if (isset($_POST["update"])) {
@@ -59,9 +56,6 @@
    $_POST["formula"] = Html::entity_decode_deep( $_POST["formula"] );
 
    $form->update($_POST);
-   //Event::log($_POST["id"], "change", 4, "maintain",
-   //           //TRANS: %s is the user login
-   //           sprintf(__('%s updates an item'), $_SESSION["glpiname"]));
 
    Html::back();
 

front/form.php

@@ -5,7 +5,6 @@
 Html::header(__('Form Validations', 'formvalidation'), $_SERVER['PHP_SELF'], "config", "PluginFormvalidationMenu", "formvalidationform");
 
 if (Session::haveRight('config', READ) || Session::haveRight("config", UPDATE)) {
-   //$process=new PluginFormvalidationForm();
 
    Search::show('PluginFormvalidationForm');
 

front/formvalidation.backup.php

@@ -19,10 +19,10 @@
 switch ($action) {
    case 'export':
       if (isset($_GET['filename'])) {
-         $file = "../../../files/_tmp/".$_GET['filename'];
+         $file = GLPI_TMP_DIR."/".$_GET['filename'];
          if (file_exists($file)) {
             header('Content-type: application/json');
-            header('Content-Disposition: attachment; filename="'.basename($file).'"');
+            header('Content-Disposition: attachment; filename="'.$_GET['filename'].'"');
             readfile($file);
          }
       }

front/itemtype.form.php

@@ -1,5 +1,5 @@
 <?php
 include ('../../../inc/includes.php');
 
-$dropdown = new PluginFormvalidationItemtype();
-include (GLPI_ROOT . "/front/dropdown.common.form.php");
+$dropdown = new PluginFormvalidationItemtype();
+include (GLPI_ROOT . "/front/dropdown.common.form.php");

front/itemtype.php

@@ -1,6 +1,6 @@
 <?php
 
-include ('../../../inc/includes.php');
-
-$dropdown = new PluginFormvalidationItemtype();
+include ('../../../inc/includes.php');
+
+$dropdown = new PluginFormvalidationItemtype();
 include (GLPI_ROOT . "/front/dropdown.common.php");