Ticket #4948 - Agents: Use separate Comment forms.

install/sql/system.sql

@@ -3731,6 +3731,7 @@ INSERT INTO `sys_objects_form` (`object`, `module`, `title`, `action`, `form_att
 ('sys_confirm_phone', 'system', '_sys_form_confirm_phone', '', '', 'a:2:{i:0;s:9:"do_submit";i:1;s:10:"do_sendsms";}', '', '', '', '', 'a:1:{s:14:"checker_helper";s:31:"BxFormConfirmPhoneCheckerHelper";}', 0, 1, 'BxTemplFormConfirmPhone', ''),
 ('sys_unsubscribe', 'system', '_sys_form_unsubscribe', '', '', 'do_submit', 'sys_accounts', 'id', '', '', '', 0, 1, 'BxTemplFormAccount', ''),
 ('sys_comment', 'system', '_sys_form_comment', 'cmts.php', 'a:3:{s:2:"id";s:20:"cmt-%s-form-%s-%d-%d";s:4:"name";s:20:"cmt-%s-form-%s-%d-%d";s:5:"class";s:14:"cmt-post-reply";}', 'cmt_submit', '', 'cmt_id', '', '', '', 0, 1, 'BxTemplCmtsForm', ''),
+('sys_agents_comment', 'system', '_sys_form_agents_comment', 'cmts.php', 'a:3:{s:2:"id";s:20:"cmt-%s-form-%s-%d-%d";s:4:"name";s:20:"cmt-%s-form-%s-%d-%d";s:5:"class";s:14:"cmt-post-reply";}', 'cmt_submit', '', 'cmt_id', '', '', '', 0, 1, 'BxTemplCmtsForm', ''),
 ('sys_review', 'system', '_sys_form_review', 'cmts.php', 'a:3:{s:2:"id";s:20:"cmt-%s-form-%s-%d-%d";s:4:"name";s:20:"cmt-%s-form-%s-%d-%d";s:5:"class";s:14:"cmt-post-reply";}', 'cmt_submit', '', 'cmt_id', '', '', '', 0, 1, 'BxTemplCmtsReviewsForm', ''),
 ('sys_report', 'system', '_sys_form_report', 'report.php', 'a:3:{s:2:"id";s:0:"";s:4:"name";s:0:"";s:5:"class";s:17:"bx-report-do-form";}', 'submit', '', 'id', '', '', '', 0, 1, '', ''),
 ('sys_favorite', 'system', '_sys_form_favorite', 'favorite.php', 'a:3:{s:2:"id";s:0:"";s:4:"name";s:0:"";s:5:"class";s:19:"bx-favorite-do-form";}', 'submit', '', 'id', '', '', '', 0, 1, '', ''),
@@ -3771,6 +3772,7 @@ INSERT INTO `sys_form_displays` (`display_name`, `module`, `object`, `title`, `v
 ('sys_unsubscribe_news', 'system', 'sys_unsubscribe', '_sys_form_display_unsubscribe_news', 0),
 ('sys_comment_post', 'system', 'sys_comment', '_sys_form_display_comment_post', 0),
 ('sys_comment_edit', 'system', 'sys_comment', '_sys_form_display_comment_edit', 0),
+('sys_agents_comment_post', 'system', 'sys_agents_comment', '_sys_form_display_agents_comment_post', 0),
 ('sys_review_post', 'system', 'sys_review', '_sys_form_review_display_post', 0),
 ('sys_review_edit', 'system', 'sys_review', '_sys_form_review_display_edit', 0),
 ('sys_report_post', 'system', 'sys_report', '_sys_form_display_report_post', 0),
@@ -3889,6 +3891,14 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('sys_comment', 'system', 'cmt_cancel', '_sys_form_comment_input_cancel', '', 0, 'button', '_sys_form_comment_input_caption_system_cmt_cancel', '', '', 0, 0, 0, 'a:1:{s:5:"class";s:22:"bx-def-margin-sec-left";}', '', '', '', '', '', '', '', 0, 0),
 ('sys_comment', 'system', 'cmt_submit', '_sys_form_comment_input_submit', '', 0, 'submit', '_sys_form_comment_input_caption_system_cmt_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 
+('sys_agents_comment', 'system', 'sys', '', '', 0, 'hidden', '_sys_form_agents_comment_input_caption_system_sys', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
+('sys_agents_comment', 'system', 'id', '', '', 0, 'hidden', '_sys_form_agents_comment_input_caption_system_id', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
+('sys_agents_comment', 'system', 'action', '', '', 0, 'hidden', '_sys_form_agents_comment_input_caption_system_action', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
+('sys_agents_comment', 'system', 'cmt_parent_id', '', '', 0, 'hidden', '_sys_form_agents_comment_input_caption_system_cmt_parent_id', '', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('sys_agents_comment', 'system', 'cmt_text', '', '', 0, 'textarea', '_sys_form_agents_comment_input_caption_system_cmt_text', '', '', 0, 0, 3, 'a:1:{s:12:"autocomplete";s:3:"off";}', '', '', '', '', '', 'XssHtml', '', 1, 0),
+('sys_agents_comment', 'system', 'cmt_image', 'a:1:{i:0;s:14:"sys_cmts_html5";}', 'a:1:{s:14:"sys_cmts_html5";s:25:"_sys_uploader_html5_title";}', 0, 'files', '_sys_form_agents_comment_input_caption_system_cmt_image', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
+('sys_agents_comment', 'system', 'cmt_submit', '_sys_form_agents_comment_input_caption_cmt_submit', '', 0, 'submit', '_sys_form_agents_comment_input_caption_system_cmt_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
+
 ('sys_review', 'system', 'sys', '', '', 0, 'hidden', '_sys_form_review_input_caption_system_sys', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('sys_review', 'system', 'id', '', '', 0, 'hidden', '_sys_form_review_input_caption_system_id', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('sys_review', 'system', 'action', '', '', 0, 'hidden', '_sys_form_review_input_caption_system_action', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
@@ -4094,6 +4104,14 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('sys_comment_edit', 'cmt_cancel', 2147483647, 1, 10),
 ('sys_comment_edit', 'cmt_image', 2147483647, 1, 11),
 
+('sys_agents_comment_post', 'sys', 2147483647, 1, 1),
+('sys_agents_comment_post', 'id', 2147483647, 1, 2),
+('sys_agents_comment_post', 'action', 2147483647, 1, 3),
+('sys_agents_comment_post', 'cmt_parent_id', 2147483647, 1, 4),
+('sys_agents_comment_post', 'cmt_text', 2147483647, 1, 5),
+('sys_agents_comment_post', 'cmt_submit', 2147483647, 1, 6),
+('sys_agents_comment_post', 'cmt_image', 2147483647, 0, 7),
+
 ('sys_review_post', 'sys', 2147483647, 1, 1),
 ('sys_review_post', 'id', 2147483647, 1, 2),
 ('sys_review_post', 'action', 2147483647, 1, 3),

modules/boonex/english/data/langs/system/en.xml

@@ -2716,6 +2716,16 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_form_account_input_receive_updates"><![CDATA[Receive Site Updates]]></string>
 	<string name="_sys_form_account_input_submit"><![CDATA[Submit]]></string>
         <string name="_sys_form_account_input_publish"><![CDATA[Create]]></string>
+        <string name="_sys_form_agents_comment"><![CDATA[Agents: Message]]></string>
+        <string name="_sys_form_display_agents_comment_post"><![CDATA[Agents: Message Send]]></string>
+        <string name="_sys_form_agents_comment_input_caption_system_action"><![CDATA[Action]]></string>
+        <string name="_sys_form_agents_comment_input_caption_system_cmt_image"><![CDATA[Image]]></string>
+	<string name="_sys_form_agents_comment_input_caption_system_cmt_parent_id"><![CDATA[Parent ID]]></string>
+	<string name="_sys_form_agents_comment_input_caption_system_cmt_submit"><![CDATA[Send]]></string>
+        <string name="_sys_form_agents_comment_input_caption_cmt_submit"><![CDATA[Send]]></string>
+	<string name="_sys_form_agents_comment_input_caption_system_cmt_text"><![CDATA[Text]]></string>
+        <string name="_sys_form_agents_comment_input_caption_system_id"><![CDATA[Object ID]]></string>
+        <string name="_sys_form_agents_comment_input_caption_system_sys"><![CDATA[Object Type]]></string>
 	<string name="_sys_form_checkbox_value_off"><![CDATA[No]]></string>
 	<string name="_sys_form_checkbox_value_on"><![CDATA[Yes]]></string>
         <string name="_sys_form_input_caption_author"><![CDATA[Author]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -2695,6 +2695,16 @@
 	<string name="_sys_form_account_input_receive_updates"><![CDATA[Получать обновления сайта]]></string>
 	<string name="_sys_form_account_input_submit"><![CDATA[Отправить]]></string>
         <string name="_sys_form_account_input_publish"><![CDATA[Создать]]></string>
+        <string name="_sys_form_agents_comment"><![CDATA[Агенты: Сообщение]]></string>
+        <string name="_sys_form_display_agents_comment_post"><![CDATA[Агенты: Отправить сообщение]]></string>
+        <string name="_sys_form_agents_comment_input_caption_system_action"><![CDATA[Действие]]></string>
+        <string name="_sys_form_agents_comment_input_caption_system_cmt_image"><![CDATA[Изображение]]></string>
+	<string name="_sys_form_agents_comment_input_caption_system_cmt_parent_id"><![CDATA[Родительский ID]]></string>
+	<string name="_sys_form_agents_comment_input_caption_system_cmt_submit"><![CDATA[Отправить]]></string>
+        <string name="_sys_form_agents_comment_input_caption_cmt_submit"><![CDATA[Отправить]]></string>
+	<string name="_sys_form_agents_comment_input_caption_system_cmt_text"><![CDATA[Текст]]></string>
+        <string name="_sys_form_agents_comment_input_caption_system_id"><![CDATA[ID объекта]]></string>
+        <string name="_sys_form_agents_comment_input_caption_system_sys"><![CDATA[Тип объекта]]></string>
 	<string name="_sys_form_checkbox_value_off"><![CDATA[Нет]]></string>
 	<string name="_sys_form_checkbox_value_on"><![CDATA[Да]]></string>
     <string name="_sys_form_input_caption_author"><![CDATA[Автор]]></string>

studio/classes/BxDolStudioAgentsAsstChatsCmts.php

@@ -31,7 +31,11 @@ class BxDolStudioAgentsAsstChatsCmts extends BxTemplCmts
             $this->_oTemplate = $oTemplate;
         else
             $this->_oTemplate = BxDolStudioTemplate::getInstance();
-                
+
+        $this->_sFormObject = 'sys_agents_comment';
+        $this->_sFormDisplayPost = 'sys_agents_comment_post';
+        $this->_sFormDisplayEdit = 'sys_agents_comment_edit';
+
         $this->_sTmplNameItemContent = 'agents_comment_content.html';
         $this->_bLiveUpdates = false;
 
@@ -209,7 +213,7 @@ class BxDolStudioAgentsAsstChatsCmts extends BxTemplCmts
         $oForm->aInputs['cmt_text']['caption'] = '';
         $oForm->aInputs['cmt_text']['db']['pass'] = 'xss';
 
-        if(isset($aDp['mode']) && $aDp['mode'] == 'compact')
+        if(isset($aDp['mode']) && $aDp['mode'] == 'compact' && isset($oForm->aInputs['cmt_submit']))
             $oForm->aInputs['cmt_submit']['value'] = $this->_oTemplate->parseIcon('arrow-right');
 
         return $oForm;

studio/classes/BxDolStudioAgentsAutomatorsCmts.php

@@ -25,6 +25,10 @@ class BxDolStudioAgentsAutomatorsCmts extends BxTemplCmts
             $this->_oTemplate = $oTemplate;
         else
             $this->_oTemplate = BxDolStudioTemplate::getInstance();
+
+        $this->_sFormObject = 'sys_agents_comment';
+        $this->_sFormDisplayPost = 'sys_agents_comment_post';
+        $this->_sFormDisplayEdit = 'sys_agents_comment_edit';
         
         $this->_sTmplNameItemContent = 'agents_comment_content.html';
         $this->_bLiveUpdates = false;

template/scripts/BxBaseCmts.php

@@ -1239,8 +1239,17 @@ class BxBaseCmts extends BxDolCmts
             else
                 $sSubmitName = $oForm->aParams['db']['submit_name'];
 
-            if($sSubmitName && isset($oForm->aInputs[$sSubmitName]))
-                $aValues[$sSubmitName] = $oForm->aInputs[$sSubmitName]['value'];
+            if($sSubmitName) {
+                if(isset($oForm->aInputs[$sSubmitName]))
+                    $aValues[$sSubmitName] = $oForm->aInputs[$sSubmitName]['value'];
+                else if(isset($oForm->aInputs['cmt_controls'])) {
+                    foreach($oForm->aInputs['cmt_controls'] as $mKey => $mValue)
+                        if(is_numeric($mKey) && is_array($mValue) && isset($mValue['name']) && $mValue['name'] == $sSubmitName) {
+                            $aValues[$sSubmitName] = $mValue['value'];
+                            break;
+                        }
+                }
+            }
         }
 
         $oForm->initChecker(array(), $aValues);