Merge branch 'release/2.8.6'

Author: btry

CHANGELOG.md

@@ -1,3 +1,20 @@
+<a name="2.8.6"></a>
+## [2.8.6](https://github.com/pluginsglpi/formcreator/compare/v2.8.5...v2.8.6) (2019-11-07)
+
+
+### Bug Fixes
+
+* **form:** deny access if form not enabled ([0290a97](https://github.com/pluginsglpi/formcreator/commit/0290a97))
+* **form:** don't access deleted forms ([6169412](https://github.com/pluginsglpi/formcreator/commit/6169412))
+* **formanswer:** bad sql ([023a60e](https://github.com/pluginsglpi/formcreator/commit/023a60e))
+* loading resources for anonymous forms ([58b7141](https://github.com/pluginsglpi/formcreator/commit/58b7141)), closes [#1535](https://github.com/pluginsglpi/formcreator/issues/1535)
+* **formanswer:** canViewItem with group ([4c22600](https://github.com/pluginsglpi/formcreator/commit/4c22600))
+* unexpected redirection while editing a ticket as post-only + service catalog ([63f3cee](https://github.com/pluginsglpi/formcreator/commit/63f3cee)), closes [#1557](https://github.com/pluginsglpi/formcreator/issues/1557)
+* **question_condition:** better performance ([0fc6aea](https://github.com/pluginsglpi/formcreator/commit/0fc6aea))
+* **targetticket,targetchange:** return value of save() method ([cbc2249](https://github.com/pluginsglpi/formcreator/commit/cbc2249))
+
+
+
 <a name="2.8.5"></a>
 ## [2.8.5](https://github.com/pluginsglpi/formcreator/compare/v2.8.4...v2.8.5) (2019-09-02)
 

ajax/showfields.php

@@ -33,6 +33,11 @@
 
 include ('../../../inc/includes.php');
 
-$visibility = PluginFormcreatorFields::updateVisibility($_POST);
+try {
+    $visibility = PluginFormcreatorFields::updateVisibility($_POST);
+} catch (Exception $e) {
+    http_response_code(500);
+    exit();
+}
 echo json_encode($visibility);
 exit();

front/formdisplay.php

@@ -47,6 +47,9 @@
    && is_numeric($_REQUEST['id'])) {
 
    if ($form->getFromDB((int) $_REQUEST['id'])) {
+      if ($form->fields['is_active'] == '0' || $form->fields['is_deleted'] != '0') {
+         Html::displayNotFoundError();
+      }
       if ($form->fields['access_rights'] != PluginFormcreatorForm::ACCESS_PUBLIC) {
          Session::checkLoginUser();
          if (!$form->checkEntity(true)) {

hook.php

@@ -111,8 +111,12 @@ function plugin_formcreator_getCondition($itemtype) {
          if (count($groups) < 1) {
             $condition .= ")";
          } else {
-            $groups = implode(',', $groups);
-            $condition .= " OR `$table`.`groups_id_validator` IN ($groups) )";
+            $groupIDs = [];
+            foreach ($groups as $group) {
+               $groupIDs[] = $group['id'];
+            }
+            $groupIDs = implode(',', $groupIDs);
+            $condition .= " OR `$table`.`groups_id_validator` IN ($groupIDs) )";
          }
          return $condition;
       }

inc/common.class.php

@@ -165,7 +165,7 @@ public static function prepareBooleanKeywords($keywords) {
       preg_match_all('/"(?:\\\\.|[^\\\\"])*"|\S+/', $keywords, $matches);
       $matches = $matches[0];
       foreach ($matches as &$keyword) {
-         if (strpos($keyword, '"') === 0) {
+         if (strpos($keyword, '"') !== 0) {
             // keyword does not begins with a double quote (assume it does not ends with this char)
             $keyword .= '*';
          }

inc/fields.class.php

@@ -129,22 +129,27 @@ public static function printAllTabFieldsForJS() {
     */
    public static function isVisible($id, $fields) {
       /**
-       * Keep track of questions being evaluated to detect infinite loops
+       * Keep track of questions results and computation status
+       * null = is beinc computed
+       * true or false = result of a previous evaluation
+       * not set = not evaluated yet and not being evaluated
        */
       static $evalQuestion = [];
-      if (isset($evalQuestion[$id])) {
-         // TODO : how to deal a infinite loop while evaluating visibility of question ?
-         return true;
+      if (!isset($evalQuestion[$id])) {
+         $evalQuestion[$id] = null;
+      } else if ($evalQuestion[$id] !== null) {
+         return $evalQuestion[$id];
+      } else {
+         throw new Exception("Infinite loop in show conditions evaluation");
       }
-      $evalQuestion[$id]   = $id;
 
       $question   = new PluginFormcreatorQuestion();
       $question->getFromDB($id);
       $conditions = [];
 
       // If the field is always shown
       if ($question->getField('show_rule') == 'always') {
-         unset($evalQuestion[$id]);
+         $evalQuestion[$id] = true;
          return true;
       }
 
@@ -154,7 +159,7 @@ public static function isVisible($id, $fields) {
       $questionConditions = $question_condition->getConditionsFromQuestion($questionId);
       if (count($questionConditions) < 1) {
          // No condition defined, then always show the question
-         unset($evalQuestion[$id]);
+         $evalQuestion[$id] = true;
          return true;
       }
 
@@ -294,15 +299,15 @@ public static function isVisible($id, $fields) {
          $return = ($return xor $lowPrecedenceReturnPart);
       }
 
-      unset($evalQuestion[$id]);
-
       if ($question->fields['show_rule'] == 'hidden') {
          // If the field is hidden by default, show it if condition is true
-         return $return;
+         $evalQuestion[$id] = $return;
       } else {
          // else show it if condition is false
-         return !$return;
+         $evalQuestion[$id] = !$return;
       }
+
+      return $evalQuestion[$id];
    }
 
    /**

inc/fields/datetimefield.class.php

@@ -121,12 +121,12 @@ public static function getJSFields() {
 
    public function equals($value) {
       if ($this->value === '') {
-         $answer = '0000-00-00 00:00';
+         $answer = '0000-00-00 00:00:00';
       } else {
          $answer = $this->value;
       }
-      $answerDatetime = DateTime::createFromFormat("Y-m-d H:i", $answer);
-      $compareDatetime = DateTime::createFromFormat("Y-m-d H:i", $value);
+      $answerDatetime = DateTime::createFromFormat("Y-m-d H:i:s", $answer);
+      $compareDatetime = DateTime::createFromFormat("Y-m-d H:i:s", $value);
       return $answerDatetime == $compareDatetime;
    }
 
@@ -136,12 +136,12 @@ public function notEquals($value) {
 
    public function greaterThan($value) {
       if (empty($this->value)) {
-         $answer = '0000-00-00 00:00';
+         $answer = '0000-00-00 00:00:00';
       } else {
          $answer = $this->value;
       }
-      $answerDatetime = DateTime::createFromFormat("Y-m-d H:i", $answer);
-      $compareDatetime = DateTime::createFromFormat("Y-m-d H:i", $value);
+      $answerDatetime = DateTime::createFromFormat("Y-m-d H:i:s", $answer);
+      $compareDatetime = DateTime::createFromFormat("Y-m-d H:i:s", $value);
       return $answerDatetime > $compareDatetime;
    }
 
@@ -156,7 +156,7 @@ public function parseAnswerValues($input, $nonDestructive = false) {
       }
 
       if ($input[$key] != ''
-         && DateTime::createFromFormat("Y-m-d H:i", $input[$key]) === false) {
+         && DateTime::createFromFormat("Y-m-d H:i:s", $input[$key]) === false) {
          return false;
       }
 

inc/formanswer.class.php

@@ -111,8 +111,10 @@ public function canViewItem() {
                return true;
             }
          } else {
-            if (in_array($row['items_id'], $groups)) {
-               return true;
+            foreach ($groups as $group) {
+               if ($group['id'] == $row['items_id']) {
+                  return true;
+               }
             }
          }
       }
@@ -1081,7 +1083,7 @@ public function generateTarget() {
          $targetObject = new $target['itemtype'];
          $targetObject->getFromDB($target['items_id']);
          $generatedTarget = $targetObject->save($this);
-         if ($generatedTarget === false) {
+         if ($generatedTarget === null) {
             $success = false;
             break;
          }

inc/targetchange.class.php

@@ -932,7 +932,7 @@ public function prepareInputForUpdate($input) {
     *
     * @param  PluginFormcreatorFormAnswer $formanswer    Answers previously saved
     *
-    * @return Change|false generated change
+    * @return Change|null generated change
     */
    public function save(PluginFormcreatorFormAnswer $formanswer) {
       global $DB;
@@ -1031,7 +1031,7 @@ public function save(PluginFormcreatorFormAnswer $formanswer) {
 
       // Create the target change
       if (!$changeID = $change->add($data)) {
-         return false;
+         return null;
       }
 
       // Add tag if presents

inc/targetticket.class.php

@@ -1046,7 +1046,7 @@ public function pre_deleteItem() {
     *
     * @param  PluginFormcreatorFormAnswer $formanswer    Answers previously saved
     *
-    * @return Ticket|false Generated ticket if success, null otherwise
+    * @return Ticket|null Generated ticket if success, null otherwise
     */
    public function save(PluginFormcreatorFormAnswer $formanswer) {
       global $DB, $CFG_GLPI;