raw variables support

LiveHelperChat · Jun 21, 2021 · 69b047d · 69b047d
1 parent a266c89
commit 69b047d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lhc_web/design/defaulttheme/tpl/lhabstract/parts/abstract_edit_title.tpl.php b/lhc_web/design/defaulttheme/tpl/lhabstract/parts/abstract_edit_title.tpl.php
@@ -1 +1 @@
-<h1><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('system/buttons','Edit');?> - <?php echo htmlspecialchars($object_trans['name'])?></h1>
+<h1 ng-non-bindable><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('system/buttons','Edit');?> - <?php echo htmlspecialchars($object_trans['name'])?></h1>
diff --git a/lhc_web/lib/core/lhgenericbot/actionTypes/lhgenericbotactionrestapi.php b/lhc_web/lib/core/lhgenericbot/actionTypes/lhgenericbotactionrestapi.php
@@ -483,8 +483,8 @@ public static function makeRequest($host, $methodSettings, $paramsCustomer)
         } elseif (isset($methodSettings['body_request_type']) && $methodSettings['body_request_type'] == 'raw') {
 
             $rawReplaceArray = array();
-            foreach ($replaceVariablesJSON as $keyVariable) {
-                $rawReplaceArray['raw_'.$keyVariable] = trim($replaceVariablesJSON[$keyVariable],"\"");
+            foreach ($replaceVariablesJSON as $keyVariable => $keyValue) {
+                $rawReplaceArray['raw_'.$keyVariable] = trim($keyValue,"\"");
             }
 
             $bodyPOST = str_replace(array_keys($rawReplaceArray), array_values($rawReplaceArray), $file_api === true ? $methodSettings['body_raw_file'] : $methodSettings['body_raw']);

diff --git a/lhc_web/lib/core/lhgenericbot/lhgenericbotworkflow.php b/lhc_web/lib/core/lhgenericbot/lhgenericbotworkflow.php
@@ -224,7 +224,7 @@ public static function userMessageAdded(& $chat, $msg) {
             }
 
             if ($event instanceof erLhcoreClassModelGenericBotTriggerEvent) {
-                $responseTrigger = self::processTrigger($chat, $event->trigger, false, array('args' => array('msg' => $msg)));
+                $responseTrigger = self::processTrigger($chat, $event->trigger, false, array('args' => array('chat' => $chat, 'msg' => $msg)));
                 if (!is_array($responseTrigger) || !isset($responseTrigger['ignore_trigger']) || $responseTrigger['ignore_trigger'] === false) {
                     return;
                 }
@@ -314,7 +314,7 @@ public static function sendDefault(& $chat, $botId, $msg = null)
         }
 
         if ($trigger instanceof erLhcoreClassModelGenericBotTrigger) {
-            $message = erLhcoreClassGenericBotWorkflow::processTrigger($chat, $trigger, false, array('args' => array('msg' => $msg)));
+            $message = erLhcoreClassGenericBotWorkflow::processTrigger($chat, $trigger, false, array('args' => array('chat' => $chat, 'msg' => $msg)));
 
             if (isset($message) && $message instanceof erLhcoreClassModelmsg) {
                 self::setLastMessageId($chat, $message->id, true);
@@ -349,7 +349,7 @@ public static function sendAlwaysDefault(& $chat, $botId, $msg = null)
 
             if ($event instanceof erLhcoreClassModelGenericBotTriggerEvent) {
 
-                self::processTrigger($chat, $event->trigger, true, array('args' => array('msg' => $msg)));
+                self::processTrigger($chat, $event->trigger, true, array('args' => array('chat' => $chat, 'msg' => $msg)));
 
                 self::$currentAlwaysEvent = $event;
 
@@ -1820,7 +1820,7 @@ public static function processTriggerClick($chat, $messageContext, $payload, $pa
                             $message = self::sendAsUser($chat, $messageClick);
                         }
 
-                        $messageTrigger = self::processTrigger($chat, $trigger);
+                        $messageTrigger = self::processTrigger($chat, $trigger, false,array('args' => array('msg' => $messageClick, 'chat' => $chat)));
 
                         if ($messageTrigger instanceof erLhcoreClassModelmsg)
                         {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<h1><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('system/buttons','Edit');?> - <?php echo htmlspecialchars($object_trans['name'])?></h1>
		<h1 ng-non-bindable><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('system/buttons','Edit');?> - <?php echo htmlspecialchars($object_trans['name'])?></h1>