Version 0.4.4 for GLPI 9.2

Author: tomolimo

ajax/getFormValidations.php

@@ -37,7 +37,7 @@
 
 $config = PluginFormvalidationConfig::getInstance();
 
-$validations = array( 'config' => $config->fields, 'pages_id' => 0, 'forms' => array( ) ); // by default
+$validations = [ 'config' => $config->fields, 'pages_id' => 0, 'forms' => [ ] ]; // by default
 
 // from user session
 $validations['config']['editmode']=$_SESSION['glpiformvalidationeditmode'];
@@ -70,7 +70,7 @@
 
       foreach ($DB->request( $query ) as $form) {
          $validations['forms'][$form['id']]= Toolbox::stripslashes_deep( $form );
-         $validations['forms'][$form['id']]['fields'] = array(); // needed in case this form has no fields
+         $validations['forms'][$form['id']]['fields'] = []; // needed in case this form has no fields
 
          $query = "SELECT * FROM glpi_plugin_formvalidation_fields WHERE forms_id = ".$form['id'];
          foreach ($DB->request( $query ) as $field) {

ajax/getLocales.php

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

ajax/setUnsetField.php

@@ -56,7 +56,7 @@
                // extract default form name from form_css_selector
                $name = '';
                $action = '';
-               $matches = array();
+               $matches = [];
                $regex = "/form(\\[name=\\\"(?'name'\\w*)\\\"])?\\[action=\\\"(?'action'[\\w\\/\\.]*)\\\"]/";
                if (preg_match( $regex, str_replace("\\", "", html_entity_decode($_REQUEST['form_css_selector'])), $matches )) {
                   if (isset($matches['name'] )) {
@@ -81,12 +81,12 @@
 
             if ($DB->query( $query )) {
                $_REQUEST['fieldindex'] = $DB->insert_id();
-               $ret = array( 'forms' => array( ) ); // by default
+               $ret = [ 'forms' => [ ] ]; // by default
                $query = "SELECT * FROM glpi_plugin_formvalidation_forms WHERE id = ".$_REQUEST['formindex'];
                foreach ($DB->request( $query ) as $form) {
                   $ret['forms_id'] = $form['id'];
                   $ret['forms'][$form['id']]=Toolbox::stripslashes_deep( $form );
-                  $ret['forms'][$form['id']]['fields'] = array(); // needed in case this form has no fields
+                  $ret['forms'][$form['id']]['fields'] = []; // needed in case this form has no fields
                   $query = "SELECT * FROM glpi_plugin_formvalidation_fields WHERE id = ".$_REQUEST['fieldindex'];
                   foreach ($DB->request( $query ) as $field) {
                      $ret['fields_id']=$field['id'];

css/formvalidation.css

@@ -0,0 +1,2 @@
+.fv-alert { z-index: 2000 !important ;}
+.fv-editmodeinfo { z-index: 10000 !important ;}

formvalidation.xml

@@ -7,25 +7,25 @@
    <description>
       <short>
 	 <cs><![CDATA[Poskytuje ověřování formuláře při vyplňování přímo v prohlížeči.]]></cs>
+         <fr><![CDATA[Permet la validation des formulaires pendant la saisie directement dans le navigateur.]]></fr>
          <en><![CDATA[Provides form validation during input directly in browser.]]></en>
-	 <fr><![CDATA[Permet la validation des formulaires pendant la saisie directement dans le navigateur.]]></fr>
       </short>
       <long>
 	 <cs><![CDATA[Poskytuje grafické rozhraní pro výběr kolonek, jehož obsah je třeba ověřovat.]]></cs>
-	 <en><![CDATA[Provides a graphical interface to select fields that need to be validated.]]></en>
          <fr><![CDATA[Fournit une interface graphique permettant de selectionner les champs qui seront à valider.]]></fr>
+         <en><![CDATA[Provides a graphical interface to select fields that need to be validated.]]></en>
       </long>
    </description>
    <homepage>https://github.com/tomolimo/formvalidation</homepage>
    <download>https://github.com/tomolimo/formvalidation/releases</download>
    <issues>https://github.com/tomolimo/formvalidation/issues</issues>
    <readme>https://github.com/tomolimo/formvalidation/wiki</readme>
    <authors>
-      <author>Olivier Moron</author>
+      <author>Olivier Moron </author>
    </authors>
    <versions>
       <version>
-         <num>0.2.3</num>
+         <num>0.4.4</num>
          <compatibility>9.2</compatibility>
       </version>
       <version>
@@ -54,17 +54,17 @@
             <tag>Ověřování</tag>
             <tag>Ověřování formuláře</tag>
          </cs>
-	 <en>
-            <tag>Helpdesk</tag>
-			<tag>Form</tag>
-			<tag>Validation</tag>
-			<tag>Form Validation</tag>
-         </en>
          <fr>
             <tag>Helpdesk</tag>
 			<tag>Formulaire</tag>
 			<tag>Validation</tag>
 			<tag>Validation Formulaire</tag>
          </fr>
+         <en>
+            <tag>Helpdesk</tag>
+			<tag>Form</tag>
+			<tag>Validation</tag>
+			<tag>Form Validation</tag>
+         </en>
    </tags>
 </root>

front/field.form.php

@@ -55,7 +55,7 @@
    if (!isset( $_POST['id'] )) {
       // then we have an array of input to update
       foreach ($_POST as $key => $val) {
-         $match = array();
+         $match = [];
          if (preg_match( "/^formula_(\\d+)$/", $key, $match )) {
             $ID = $match[1];
             $field->check($ID, UPDATE);
@@ -64,7 +64,7 @@
             $formula = ($formula===''?'NULL':$formula);
 
             $_POST["show_mandatory_if_$ID"] = Html::entity_decode_deep( $_POST["show_mandatory_if_$ID"] );
-            $post = array( 'id' => $ID, 'formula' => $formula, 'is_active' => $_POST["is_active_$ID"], 'show_mandatory' => $_POST["show_mandatory_$ID"], 'show_mandatory_if' => $_POST["show_mandatory_if_$ID"] );
+            $post = [ 'id' => $ID, 'formula' => $formula, 'is_active' => $_POST["is_active_$ID"], 'show_mandatory' => $_POST["show_mandatory_$ID"], 'show_mandatory_if' => $_POST["show_mandatory_if_$ID"] ];
             $field->update($post);
          }
       }

hook.php

@@ -26,53 +26,37 @@
 --------------------------------------------------------------------------
  */
 
-if (!function_exists('arTableExists')) {
-   function arTableExists($table) {
-      global $DB;
-      if (method_exists( $DB, 'tableExists')) {
-         return $DB->tableExists($table);
-      } else {
-         return TableExists($table);
-      }
-   }
-}
-
-if (!function_exists('arFieldExists')) {
-   function arFieldExists($table, $field, $usecache = true) {
-      global $DB;
-      if (method_exists( $DB, 'fieldExists')) {
-         return $DB->fieldExists($table, $field, $usecache);
-      } else {
-         return FieldExists($table, $field, $usecache);
-      }
-   }
-}
-
 /**
  * Summary of plugin_formvalidation_install
  * @return boolean
  */
 function plugin_formvalidation_install() {
    global $DB;
+   $dbu = new DbUtils();
 
-   if (!arTableExists("glpi_plugin_formvalidation_configs")) {
-        $query = "CREATE TABLE `glpi_plugin_formvalidation_configs` (
+   if (!$DB->tableExists("glpi_plugin_formvalidation_configs")) {
+      $query = "CREATE TABLE `glpi_plugin_formvalidation_configs` (
 	                  `id` INT(11) NOT NULL AUTO_INCREMENT,
 	                  `css_mandatory` VARCHAR(200) NOT NULL DEFAULT '{\"background-color\":\"lightgrey\", \"font-weight\":\"bold\"}',
-                     `css_error` VARCHAR(200) NOT NULL DEFAULT '{\"background-color\": \"red\"}',
+                     `css_error` VARCHAR(200) NOT NULL DEFAULT '{\"background-color\": \"red\"}',                     
                   PRIMARY KEY (`id`)
                   )
                   ENGINE=InnoDB
                   ;
 			";
 
-        $DB->query($query) or die("Error creating glpi_plugin_formvalidation_configs " . $DB->error());
-
-      $query = "INSERT INTO `glpi_plugin_formvalidation_configs` (`id`) VALUES (1);";
-      $DB->query($query) or die("Error inserting default config into glpi_plugin_formvalidation_configs " . $DB->error());
+      $DB->query($query) or die("Error creating glpi_plugin_formvalidation_configs " . $DB->error());
+      $DB->insertOrDie(
+         'glpi_plugin_formvalidation_configs', [
+            'id'      => '1',            
+         ],
+         "Error inserting default config into glpi_plugin_formvalidation_configs "
+      );
+//      $query = "INSERT INTO `glpi_plugin_formvalidation_configs` (`id`) VALUES (1);";
+//      $DB->query($query) or die("Error inserting default config into glpi_plugin_formvalidation_configs " . $DB->error());
    }
 
-   if (!arTableExists("glpi_plugin_formvalidation_itemtypes")) {
+   if (!$DB->tableExists("glpi_plugin_formvalidation_itemtypes")) {
         $query = "CREATE TABLE `glpi_plugin_formvalidation_itemtypes` (
 	                  `id` INT(11) NOT NULL AUTO_INCREMENT,
 	                  `name` VARCHAR(255) NOT NULL,
@@ -123,7 +107,7 @@ function plugin_formvalidation_install() {
 
    }
 
-   if (!arTableExists("glpi_plugin_formvalidation_pages")) {
+   if (!$DB->tableExists("glpi_plugin_formvalidation_pages")) {
         $query = "CREATE TABLE `glpi_plugin_formvalidation_pages` (
 	                  `id` INT(11) NOT NULL AUTO_INCREMENT,
 	                  `name` VARCHAR(200) NULL DEFAULT NULL,
@@ -153,7 +137,7 @@ function plugin_formvalidation_install() {
       $DB->query($query) or die("Error inserting default pages into glpi_plugin_formvalidation_pages " . $DB->error());
 
    } else {
-      if (!arFieldExists('glpi_plugin_formvalidation_pages', 'itemtypes_id')) {
+      if (!$DB->fieldExists('glpi_plugin_formvalidation_pages', 'itemtypes_id')) {
          $query = "ALTER TABLE `glpi_plugin_formvalidation_pages`
 	                  ADD COLUMN `itemtypes_id` INT(11) NOT NULL DEFAULT '0' AFTER `itemtype`,
                      ADD INDEX `itemtypes_id` (`itemtypes_id`);
@@ -162,7 +146,7 @@ function plugin_formvalidation_install() {
       }
 
       // check if migration is neccessary
-      $pages = getAllDatasFromTable('glpi_plugin_formvalidation_pages', 'itemtypes_id = 0');
+      $pages = $dbu->getAllDataFromTable('glpi_plugin_formvalidation_pages', ['itemtypes_id' => '0']);
       if (count($pages)) {
          // migration of itemtype into itemtypes_id
          $query = "UPDATE glpi_plugin_formvalidation_pages AS gpfp, glpi_plugin_formvalidation_itemtypes AS gpfi
@@ -171,15 +155,15 @@ function plugin_formvalidation_install() {
          $DB->query($query) or die("Error migrating itemtype into itemtypes_id field in glpi_plugin_formvalidation_pages " . $DB->error());
 
          // check if all pages have been migrated
-         $pages = getAllDatasFromTable('glpi_plugin_formvalidation_pages', 'itemtypes_id = 0');
+         $pages = $dbu->getAllDataFromTable('glpi_plugin_formvalidation_pages', ['itemtypes_id' => '0']);
          if (count($pages)) {
             die("Error some itemtype can't be migrated into itemtypes_id field from glpi_plugin_formvalidation_pages, </br>
                  please check the list of itemtype in glpi_plugin_formvalidation_pages and in glpi_plugin_formvalidation_itemtypes,</br>
                  fix the issue and restart install of the plugin.");
          }
       }
 
-      if (arFieldExists('glpi_plugin_formvalidation_pages', 'itemtype') && !count($pages)) {
+      if ($DB->fieldExists('glpi_plugin_formvalidation_pages', 'itemtype') && !count($pages)) {
          // delete itemtype field after migration is done
          $query = "ALTER TABLE `glpi_plugin_formvalidation_pages`
                    DROP COLUMN `itemtype`,
@@ -195,7 +179,7 @@ function plugin_formvalidation_install() {
       }
    }
 
-   if (!arTableExists("glpi_plugin_formvalidation_forms")) {
+   if (!$DB->tableExists("glpi_plugin_formvalidation_forms")) {
         $query = "CREATE TABLE `glpi_plugin_formvalidation_forms` (
 	                  `id` INT(11) NOT NULL AUTO_INCREMENT,
 	                  `name` VARCHAR(200) NULL DEFAULT NULL,
@@ -230,15 +214,15 @@ function plugin_formvalidation_install() {
       $DB->query($query) or die("Error inserting default data into glpi_plugin_formvalidation_forms " . $DB->error());
 
    } else {
-      if (!arFieldExists('glpi_plugin_formvalidation_forms', 'use_for_massiveaction')) {
+      if (!$DB->fieldExists('glpi_plugin_formvalidation_forms', 'use_for_massiveaction')) {
          $query = "ALTER TABLE `glpi_plugin_formvalidation_forms`
 	                  ADD COLUMN `use_for_massiveaction` TINYINT(1) NOT NULL DEFAULT '0' AFTER `is_active`;
                   ";
          $DB->query($query) or die("Error inserting use_for_massiveaction field into glpi_plugin_formvalidation_forms " . $DB->error());
       }
    }
 
-   if (!arTableExists("glpi_plugin_formvalidation_fields")) {
+   if (!$DB->tableExists("glpi_plugin_formvalidation_fields")) {
         $query = "CREATE TABLE `glpi_plugin_formvalidation_fields` (
 	                  `id` INT(11) NOT NULL AUTO_INCREMENT,
 	                  `name` VARCHAR(200) NULL DEFAULT NULL,

inc/config.class.php

@@ -28,7 +28,7 @@
 
 class PluginFormvalidationConfig extends CommonDBTM {
 
-   static private $_instance = NULL;
+   static private $_instance = null;
 
    /**
     * Singleton for the unique config record