From 04e6df06a221216c3944b287b4eef5f276812548 Mon Sep 17 00:00:00 2001
From: Thierry Bugier <tbugier@teclib.com>
Date: Fri, 8 Mar 2019 10:18:07 +0100
Subject: [PATCH] fix(targetticket,targetchange): fix misuse of constants

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
---
 inc/targetbase.class.php   | 73 +++++++++++++++++++++-----------------
 inc/targetticket.class.php | 14 ++++----
 2 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/inc/targetbase.class.php b/inc/targetbase.class.php
index cf7400813..9a950fb53 100644
--- a/inc/targetbase.class.php
+++ b/inc/targetbase.class.php
@@ -819,14 +819,15 @@ protected function showCategorySettings(PluginFormcreatorForm $form, $rand) {
       echo '<td width="15%">' . __('Ticket category', 'formcreator') . '</td>';
       echo '<td width="25%">';
       Dropdown::showFromArray(
-            'category_rule',
-            static::getEnumCategoryRule(),
-            [
-               'value'     => $this->fields['category_rule'],
-               'on_change' => 'change_category()',
-               'rand'      => $rand,
-            ]);
-      $script = <<<EOS
+         'category_rule',
+         static::getEnumCategoryRule(),
+         [
+            'value'     => $this->fields['category_rule'],
+            'on_change' => 'change_category()',
+            'rand'      => $rand,
+         ]
+      );
+      $script = <<<SCRIPT
          function change_category() {
             $('#category_specific_title').hide();
             $('#category_specific_value').hide();
@@ -845,7 +846,7 @@ function change_category() {
             }
          }
          change_category();
-EOS;
+SCRIPT;
       echo Html::scriptBlock($script);
       echo '</td>';
       echo '<td width="15%">';
@@ -953,7 +954,11 @@ protected function showPluginTagsSettings(PluginFormcreatorForm $form, $rand) {
             ]
          );
 
-         $script = <<<EOS
+         $tagTypeQuestions = self::TAG_TYPE_QUESTIONS;
+         $tagTypeSpecifics = self::TAG_TYPE_SPECIFICS;
+         $tagTypeQuestionAndSpecific = self::TAG_TYPE_QUESTIONS_AND_SPECIFIC;
+         $tagTypeQuestinOrSpecific = self::TAG_TYPE_QUESTIONS_OR_SPECIFIC;
+         $script = <<<SCRIPT
             function change_tag_type() {
                $('#tag_question_title').hide();
                $('#tag_specific_title').hide();
@@ -961,16 +966,16 @@ function change_tag_type() {
                $('#tag_specific_value').hide();
 
                switch($('#dropdown_tag_type$rand').val()) {
-                  case 'questions' :
+                  case $tagTypeQuestions :
                      $('#tag_question_title').show();
                      $('#tag_question_value').show();
                      break;
-                  case 'specifics' :
+                  case $tagTypeSpecifics :
                      $('#tag_specific_title').show();
                      $('#tag_specific_value').show();
                      break;
-                  case 'questions_and_specific' :
-                  case 'questions_or_specific' :
+                  case $tagTypeQuestionAndSpecific :
+                  case $tagTypeQuestinOrSpecific :
                      $('#tag_question_title').show();
                      $('#tag_specific_title').show();
                      $('#tag_question_value').show();
@@ -979,7 +984,7 @@ function change_tag_type() {
                }
             }
             change_tag_type();
-EOS;
+SCRIPT;
 
          echo Html::scriptBlock($script);
          echo '</td>';
@@ -1285,35 +1290,35 @@ protected function showActorsSettings() {
       foreach ($actors['requester'] as $id => $values) {
          echo '<div>';
          switch ($values['actor_type']) {
-            case 'creator' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_CREATOR :
                echo $img_user . ' <b>' . __('Form requester', 'formcreator') . '</b>';
                break;
-            case 'validator' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_VALIDATOR :
                echo $img_user . ' <b>' . __('Form validator', 'formcreator') . '</b>';
                break;
-            case 'person' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_PERSON :
                $user = new User();
                $user->getFromDB($values['actor_value']);
                echo $img_user . ' <b>' . __('User') . ' </b> "' . $user->getName() . '"';
                break;
-            case 'question_person' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_QUESTION_PERSON :
                $question = new PluginFormcreatorQuestion();
                $question->getFromDB($values['actor_value']);
                echo $img_user . ' <b>' . __('Person from the question', 'formcreator')
                . '</b> "' . $question->getName() . '"';
                break;
-            case 'group' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_GROUP :
                $group = new Group();
                $group->getFromDB($values['actor_value']);
                echo $img_user . ' <b>' . __('Group') . ' </b> "' . $group->getName() . '"';
                break;
-            case 'question_group' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_QUESTION_GROUP :
                $question = new PluginFormcreatorQuestion();
                $question->getFromDB($values['actor_value']);
                echo $img_group . ' <b>' . __('Group from the question', 'formcreator')
                . '</b> "' . $question->getName() . '"';
                break;
-            case 'question_actors':
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_QUESTION_ACTORS:
                $question = new PluginFormcreatorQuestion();
                $question->getFromDB($values['actor_value']);
                echo $img_user . ' <b>' . __('Actors from the question', 'formcreator')
@@ -1424,35 +1429,35 @@ protected function showActorsSettings() {
       foreach ($actors['observer'] as $id => $values) {
          echo '<div>';
          switch ($values['actor_type']) {
-            case 'creator' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_CREATOR :
                echo $img_user . ' <b>' . __('Form requester', 'formcreator') . '</b>';
                break;
-            case 'validator' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_VALIDATOR :
                echo $img_user . ' <b>' . __('Form validator', 'formcreator') . '</b>';
                break;
-            case 'person' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_PERSON :
                $user = new User();
                $user->getFromDB($values['actor_value']);
                echo $img_user . ' <b>' . __('User') . ' </b> "' . $user->getName() . '"';
                break;
-            case 'question_person' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_QUESTION_PERSON :
                $question = new PluginFormcreatorQuestion();
                $question->getFromDB($values['actor_value']);
                echo $img_user . ' <b>' . __('Person from the question', 'formcreator')
                . '</b> "' . $question->getName() . '"';
                break;
-            case 'group' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_GROUP :
                $group = new Group();
                $group->getFromDB($values['actor_value']);
                echo $img_user . ' <b>' . __('Group') . ' </b> "' . $group->getName() . '"';
                break;
-            case 'question_group' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_QUESTION_GROUP :
                $question = new PluginFormcreatorQuestion();
                $question->getFromDB($values['actor_value']);
                echo $img_group . ' <b>' . __('Group from the question', 'formcreator')
                . '</b> "' . $question->getName() . '"';
                break;
-            case 'question_actors' :
+            case PluginFormcreatorTarget_Actor::ACTOR_TYPE_QUESTION_ACTORS :
                $question = new PluginFormcreatorQuestion();
                $question->getFromDB($values['actor_value']);
                echo $img_user . ' <b>' . __('Actors from the question', 'formcreator')
@@ -1656,7 +1661,9 @@ protected function showLocationSettings(PluginFormcreatorForm $form, $rand) {
          'on_change'             => 'change_location()',
          'rand'                  => $rand
       ]);
-      $script = <<<JAVASCRIPT
+      $locationRuleAnswer = self::CATEGORY_RULE_ANSWER;
+      $locationRuleSpecific = self::CATEGORY_RULE_SPECIFIC;
+      $script = <<<SCRIPT
          function change_location() {
             $('#location_specific_title').hide();
             $('#location_specific_value').hide();
@@ -1664,18 +1671,18 @@ function change_location() {
             $('#location_question_value').hide();
 
             switch($('#dropdown_location_rule$rand').val()) {
-               case self::LOCATION_RULE_ANSWER :
+               case $locationRuleAnswer :
                   $('#location_question_title').show();
                   $('#location_question_value').show();
                   break;
-               case self::LOCATION_RULE_SPECIFIC:
+               case $locationRuleSpecific :
                   $('#location_specific_title').show();
                   $('#location_specific_value').show();
                   break;
             }
          }
          change_location();
-JAVASCRIPT;
+SCRIPT;
       echo Html::scriptBlock($script);
       echo '</td>';
       echo '<td width="15%">';
diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
index d96992587..c7ec804f8 100644
--- a/inc/targetticket.class.php
+++ b/inc/targetticket.class.php
@@ -243,7 +243,7 @@ protected function showCompositeTicketSettings($rand) {
          'on_change' => 'updateCompositePeerType()',
          'rand'      => $rand,
       ]);
-      $script = <<<EOS
+      $script = <<<SCRIPT
       function updateCompositePeerType() {
          if ($('#dropdown__link_itemtype$rand').val() == 'Ticket') {
             $('#plugin_formcreator_link_ticket').show();
@@ -254,7 +254,7 @@ function updateCompositePeerType() {
          }
       }
       updateCompositePeerType();
-EOS;
+SCRIPT;
       echo Html::scriptBlock($script);
       // get already linked items
       $targetTicketId = $this->getID();
@@ -799,7 +799,9 @@ protected function showAssociateSettings($rand) {
          'on_change'             => 'change_associate()',
          'rand'                  => $rand
       ]);
-      $script = <<<JAVASCRIPT
+      $ruleAnswer = self::ASSOCIATE_RULE_ANSWER;
+      $ruleSpecific = self::ASSOCIATE_RULE_SPECIFIC;
+      $script = <<<SCRIPT
          function change_associate() {
             $('#associate_specific_title').hide();
             $('#associate_specific_value').hide();
@@ -807,18 +809,18 @@ function change_associate() {
             $('#associate_question_value').hide();
 
             switch($('#dropdown_associate_rule$rand').val()) {
-               case self::ASSOCIATE_RULE_ANSWER :
+               case $ruleAnswer:
                   $('#associate_question_title').show();
                   $('#associate_question_value').show();
                   break;
-               case self::ASSOCIATE_RULE_SPECIFIC:
+               case $ruleSpecific:
                   $('#associate_specific_title').show();
                   $('#associate_specific_value').show();
                   break;
             }
          }
          change_associate();
-JAVASCRIPT;
+SCRIPT;
       echo Html::scriptBlock($script);
       echo '</td>';
       echo '<td width="15%">';