From fdf49570197da429fd34ba7d2409cf79c0401fdb Mon Sep 17 00:00:00 2001
From: Remdex <remdex@gmail.com>
Date: Wed, 8 Jul 2015 21:12:25 +0200
Subject: [PATCH] Devil is in details, fix #536

---
 .../tpl/lhchat/chatwidget.tpl.php             | 17 +++++++++--------
 .../tpl/lhchat/offline_form.tpl.php           | 18 +++++++++---------
 .../tpl/lhchat/offline_form_startchat.tpl.php | 18 +++++++++---------
 .../section_online_users_row.tpl.php          |  1 -
 .../tpl/lhchat/part/accept_tos.tpl.php        |  4 ++--
 .../lhchat/part/admin_form_variables.tpl.php  |  4 ++--
 .../tpl/lhchat/part/user_variables.tpl.php    |  4 ++--
 .../defaulttheme/tpl/lhchat/startchat.tpl.php | 18 +++++++++---------
 lhc_web/lib/core/lhchat/lhchatvalidator.php   | 19 +++++++++----------
 9 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/chatwidget.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/chatwidget.tpl.php
index 748a1fe39c..816a507263 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/chatwidget.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/chatwidget.tpl.php
@@ -43,8 +43,8 @@
 		<?php if (in_array('username', $input_data->hattr)) : ?>
 			<input type="hidden" name="Username" value="<?php echo htmlspecialchars($input_data->username);?>" />
 		<?php else : ?>
-	    <div class="col-xs-6 form-group">
-	        <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Name');?><?php if (isset($start_data_fields['name_require_option']) && $start_data_fields['name_require_option'] == 'required') : ?>*<?php endif;?></label>
+	    <div class="col-xs-6 form-group<?php if (isset($errors['nick'])) : ?> has-error<?php endif;?>">
+	        <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Name');?><?php if (isset($start_data_fields['name_require_option']) && $start_data_fields['name_require_option'] == 'required') : ?>*<?php endif;?></label>
 	        <input type="text" class="form-control" name="Username" value="<?php echo htmlspecialchars($input_data->username);?>" />
 	    </div>    
 	    <?php endif; ?>    
@@ -60,8 +60,8 @@
 		<?php if (in_array('email', $input_data->hattr)) : ?>
 			<input type="hidden" name="Email" value="<?php echo htmlspecialchars($input_data->email);?>" />
 		<?php else : ?>
-	    <div class="col-xs-6 form-group">
-	        <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','E-mail');?><?php if (isset($start_data_fields['email_require_option']) && $start_data_fields['email_require_option'] == 'required') : ?>*<?php endif;?></label>
+	    <div class="col-xs-6 form-group<?php if (isset($errors['email'])) : ?> has-error<?php endif;?>">
+	        <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','E-mail');?><?php if (isset($start_data_fields['email_require_option']) && $start_data_fields['email_require_option'] == 'required') : ?>*<?php endif;?></label>
 	        <input class="form-control" type="text" name="Email" value="<?php echo htmlspecialchars($input_data->email);?>" />
 	    </div>
 	    <?php endif; ?>
@@ -78,8 +78,8 @@
 		<?php if (in_array('phone', $input_data->hattr)) : ?>
 		<input type="hidden" name="Phone" value="<?php echo htmlspecialchars($input_data->phone);?>" />
 		<?php else : ?>
-		<div class="form-group">
-		  <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Phone');?><?php if (isset($start_data_fields['phone_require_option']) && $start_data_fields['phone_require_option'] == 'required') : ?>*<?php endif;?></label>
+		<div class="form-group<?php if (isset($errors['phone'])) : ?> has-error<?php endif;?>">
+		  <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Phone');?><?php if (isset($start_data_fields['phone_require_option']) && $start_data_fields['phone_require_option'] == 'required') : ?>*<?php endif;?></label>
 		  <input class="form-control" type="text" name="Phone" value="<?php echo htmlspecialchars($input_data->phone);?>" />
 		</div>
 		<?php endif; ?>
@@ -95,9 +95,10 @@
 <?php if (isset($start_data_fields['message_hidden']) && $start_data_fields['message_hidden'] == true) : $hasExtraField = true; ?>
 <textarea class="hide" placeholder="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Enter your message');?>" name="Question"><?php echo htmlspecialchars($input_data->question);?></textarea>
 <?php else : ?>
-<?php if (!isset($start_data_fields['hide_message_label']) || $start_data_fields['hide_message_label'] == false) : ?>
-<label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Your question');?><?php if (isset($start_data_fields['message_require_option']) && $start_data_fields['message_require_option'] == 'required') : ?>*<?php endif;?></label><?php endif;?>
+<div class="<?php if (isset($errors['question'])) : ?> has-error<?php endif;?>">
+<?php if (!isset($start_data_fields['hide_message_label']) || $start_data_fields['hide_message_label'] == false) : ?><label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Your question');?><?php if (isset($start_data_fields['message_require_option']) && $start_data_fields['message_require_option'] == 'required') : ?>*<?php endif;?></label><?php endif;?>
 <textarea class="form-control form-group <?php if ($hasExtraField !== true && $canReopen !== true) : ?>btrad-reset<?php endif;?>" <?php if (isset($start_data_fields['user_msg_height']) && $start_data_fields['user_msg_height'] > 0) : ?>style="height: <?php echo $start_data_fields['user_msg_height']?>px"<?php endif;?> placeholder="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Please enter a message...');?>" id="id_Question" name="Question"><?php echo htmlspecialchars($input_data->question);?></textarea>
+</div>
 <?php endif; ?>
 <?php else : $hasExtraField = true; endif; ?>
 
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/offline_form.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/offline_form.tpl.php
index 8b0c7e930b..4374fe2766 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/offline_form.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/offline_form.tpl.php
@@ -24,8 +24,8 @@
 			<?php if (isset($start_data_fields['offline_name_hidden']) && $start_data_fields['offline_name_hidden'] == true) : ?>
 			<input type="hidden" name="Username" value="<?php echo htmlspecialchars($input_data->username);?>" />
 			<?php else : ?>
-		    <div class="col-xs-6 form-group">
-		        <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Name');?><?php if (isset($start_data_fields['offline_name_require_option']) && $start_data_fields['offline_name_require_option'] == 'required') : ?>*<?php endif;?></label>
+		    <div class="col-xs-6 form-group<?php if (isset($errors['nick'])) : ?> has-error<?php endif;?>">
+		        <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Name');?><?php if (isset($start_data_fields['offline_name_require_option']) && $start_data_fields['offline_name_require_option'] == 'required') : ?>*<?php endif;?></label>
 		        <input class="form-control"  type="text" name="Username" value="<?php echo htmlspecialchars($input_data->username);?>" />
 		    </div>
 		    <?php endif;?>	    
@@ -33,8 +33,8 @@
 	    <?php if (isset($start_data_fields['offline_email_hidden']) && $start_data_fields['offline_email_hidden'] == true) : ?>
 		<input type="hidden" name="Email" value="<?php echo htmlspecialchars($input_data->email);?>" />
 		<?php else : ?>    
-	    <div class="col-xs-6 form-group">
-	        <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','E-mail');?>*</label>
+	    <div class="col-xs-6 form-group<?php if (isset($errors['email'])) : ?> has-error<?php endif;?>">
+	        <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','E-mail');?>*</label>
 	        <input class="form-control" type="text" name="Email" value="<?php echo htmlspecialchars($input_data->email);?>" />
 	    </div>
 	    <?php endif;?>
@@ -44,8 +44,8 @@
 	<?php if (isset($start_data_fields['offline_phone_hidden']) && $start_data_fields['offline_phone_hidden'] == true) : ?>
 	<input type="hidden" name="Phone" value="<?php echo htmlspecialchars($input_data->phone);?>" />
 	<?php else : ?>
-	<div class="form-group">
-	   <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Phone');?><?php if (isset($start_data_fields['offline_phone_require_option']) && $start_data_fields['offline_phone_require_option'] == 'required') : ?>*<?php endif;?></label>
+	<div class="form-group<?php if (isset($errors['phone'])) : ?> has-error<?php endif;?>">
+	   <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Phone');?><?php if (isset($start_data_fields['offline_phone_require_option']) && $start_data_fields['offline_phone_require_option'] == 'required') : ?>*<?php endif;?></label>
 	   <input class="form-control" type="text" name="Phone" value="<?php echo htmlspecialchars($input_data->phone);?>" />
 	</div>
 	<?php endif; ?>
@@ -53,7 +53,7 @@
 	
 	<?php if (isset($start_data_fields['offline_file_visible_in_page_widget']) && $start_data_fields['offline_file_visible_in_page_widget'] == true) : ?>
 	<div class="form-group">
-	   <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','File');?></label>
+	   <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','File');?></label>
 	   <input type="file" name="File" value="" />
 	</div>
 	<?php endif; ?>
@@ -62,8 +62,8 @@
 	<?php if (isset($start_data_fields['offline_message_hidden']) && $start_data_fields['offline_message_hidden'] == true) : ?>
 	<textarea class="hide" placeholder="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Enter your message');?>" name="Question"><?php echo htmlspecialchars($input_data->question);?></textarea>
 	<?php else : ?>
-	<div class="form-group">
-	   <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Your question');?><?php if (isset($start_data_fields['offline_message_require_option']) && $start_data_fields['offline_message_require_option'] == 'required') : ?>*<?php endif;?></label>
+	<div class="form-group<?php if (isset($errors['question'])) : ?> has-error<?php endif;?>">
+	   <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Your question');?><?php if (isset($start_data_fields['offline_message_require_option']) && $start_data_fields['offline_message_require_option'] == 'required') : ?>*<?php endif;?></label>
 	   <textarea class="form-control" placeholder="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Enter your message');?>" name="Question"><?php echo htmlspecialchars($input_data->question);?></textarea>
 	</div>
 	<?php endif; ?>
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/offline_form_startchat.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/offline_form_startchat.tpl.php
index 8a09fb0497..de50455dd8 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/offline_form_startchat.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/offline_form_startchat.tpl.php
@@ -11,8 +11,8 @@
 <?php if (isset($start_data_fields['offline_name_hidden']) && $start_data_fields['offline_name_hidden'] == true) : ?>
 <input type="hidden" name="Username" value="<?php echo htmlspecialchars($input_data->username);?>" />
 <?php else : ?>
-<div class="form-group">
-<label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Name');?><?php if (isset($start_data_fields['offline_name_require_option']) && $start_data_fields['offline_name_require_option'] == 'required') : ?>*<?php endif;?></label>
+<div class="form-group<?php if (isset($errors['nick'])) : ?> has-error<?php endif;?>">
+<label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Name');?><?php if (isset($start_data_fields['offline_name_require_option']) && $start_data_fields['offline_name_require_option'] == 'required') : ?>*<?php endif;?></label>
 <input class="form-control" type="text" name="Username" value="<?php echo htmlspecialchars($input_data->username);?>" />
 </div>
 <?php endif; ?>
@@ -21,8 +21,8 @@
 <?php if (isset($start_data_fields['offline_email_hidden']) && $start_data_fields['offline_email_hidden'] == true) : ?>
 <input type="hidden" name="Email" value="<?php echo htmlspecialchars($input_data->email);?>" />
 <?php else : ?>
-<div class="form-group">
-    <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','E-mail');?>*</label>
+<div class="form-group<?php if (isset($errors['email'])) : ?> has-error<?php endif;?>">
+    <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','E-mail');?>*</label>
     <input class="form-control" type="text" name="Email" value="<?php echo htmlspecialchars($input_data->email);?>" />
 </div>
 <?php endif;?>
@@ -31,8 +31,8 @@
 <?php if (isset($start_data_fields['offline_phone_hidden']) && $start_data_fields['offline_phone_hidden'] == true) : ?>
 <input type="hidden" name="Phone" value="<?php echo htmlspecialchars($input_data->phone);?>" />
 <?php else : ?>
-<div class="form-group">
-    <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Phone');?><?php if (isset($start_data_fields['offline_phone_require_option']) && $start_data_fields['offline_phone_require_option'] == 'required') : ?>*<?php endif;?></label>
+<div class="form-group<?php if (isset($errors['phone'])) : ?> has-error<?php endif;?>">
+    <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Phone');?><?php if (isset($start_data_fields['offline_phone_require_option']) && $start_data_fields['offline_phone_require_option'] == 'required') : ?>*<?php endif;?></label>
     <input class="form-control" type="text" name="Phone" value="<?php echo htmlspecialchars($input_data->phone);?>" />
 </div>
 <?php endif;?>
@@ -40,7 +40,7 @@
 
 <?php if (isset($start_data_fields['offline_file_visible_in_popup']) && $start_data_fields['offline_file_visible_in_popup'] == true) : ?>
 <div class="form-group">
-    <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','File');?></label>
+    <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','File');?></label>
     <input type="file" name="File" value="" />
 </div>
 <?php endif; ?>
@@ -49,8 +49,8 @@
 <?php if (isset($start_data_fields['offline_message_hidden']) && $start_data_fields['offline_message_hidden'] == true) : ?>
 <textarea class="hide" placeholder="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Enter your message');?>" name="Question"><?php echo htmlspecialchars($input_data->question);?></textarea>
 <?php else : ?>
-<div class="form-group">
-    <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Your question');?><?php if (isset($start_data_fields['offline_message_require_option']) && $start_data_fields['offline_message_require_option'] == 'required') : ?>*<?php endif;?></label>
+<div class="form-group<?php if (isset($errors['question'])) : ?> has-error<?php endif;?>">
+    <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Your question');?><?php if (isset($start_data_fields['offline_message_require_option']) && $start_data_fields['offline_message_require_option'] == 'required') : ?>*<?php endif;?></label>
     <textarea class="form-control" placeholder="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Enter your message');?>" name="Question"><?php echo htmlspecialchars($input_data->question);?></textarea>
 </div>
 <?php endif;?>
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/onlineusers/section_online_users_row.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/onlineusers/section_online_users_row.tpl.php
index a81dc48bfe..67edec9ef1 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/onlineusers/section_online_users_row.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/onlineusers/section_online_users_row.tpl.php
@@ -24,7 +24,6 @@
     	   </ul>    	
     	</div>
     	        	 
-    	        	 
     	<div class="page-url"><span><a target="_blank" href="{{ou.current_page}}" title="{{ou.current_page}}">{{ou.page_title || ou.current_page}}</a></span></div></td>
         <td><div class="page-url"><span><a target="_blank" href="http:{{ou.referrer}}">{{ou.referrer}}</a></span></div></td>                
         <td>
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/part/accept_tos.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/part/accept_tos.tpl.php
index 32d73e8da7..f1558e5a8c 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/part/accept_tos.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/part/accept_tos.tpl.php
@@ -1,5 +1,5 @@
 <?php if (isset($start_data_fields[$tosVariable]) && $start_data_fields[$tosVariable] == true) : $hasExtraField = true;?>
-<div class="form-group">
-    <label><input type="checkbox" <?php echo $input_data->accept_tos == true || ((!isset($_POST) || empty($_POST)) && isset($start_data_fields[$tosCheckedVariable]) && $start_data_fields[$tosCheckedVariable] == true) ? 'checked="checked"' : '';?> name="AcceptTOS" value="on">&nbsp;<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','I accept my personal data will be handled according to');?>&nbsp;<a target="_blank" href="<?php echo erLhcoreClassModelChatConfig::fetch('accept_tos_link')->current_value?>"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','our terms and to the Law');?></a></label>
+<div class="form-group<?php if (isset($errors['accept_tos'])) : ?> has-error<?php endif;?>">
+    <label class="control-label"><input type="checkbox" <?php echo $input_data->accept_tos == true || ((!isset($_POST) || empty($_POST)) && isset($start_data_fields[$tosCheckedVariable]) && $start_data_fields[$tosCheckedVariable] == true) ? 'checked="checked"' : '';?> name="AcceptTOS" value="on">&nbsp;<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','I accept my personal data will be handled according to');?>&nbsp;<a target="_blank" href="<?php echo erLhcoreClassModelChatConfig::fetch('accept_tos_link')->current_value?>"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','our terms and to the Law');?></a></label>
 </div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/part/admin_form_variables.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/part/admin_form_variables.tpl.php
index 679df6c99a..cf260acef6 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/part/admin_form_variables.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/part/admin_form_variables.tpl.php
@@ -7,8 +7,8 @@
             <input class="form-control" type="hidden" name="value_items_admin[<?php echo $key?>]" value="<?php isset($input_data->value_items_admin[$key]) ? print htmlspecialchars($input_data->value_items_admin[$key]) : print htmlspecialchars($adminField['defaultvalue'])?>" />
         <?php else : $hasExtraField = true; ?>        
         <div class="col-xs-<?php echo htmlspecialchars($adminField['size'])?>">
-            <div class="form-group">
-                <label><?php echo htmlspecialchars($adminField['fieldname'])?>&nbsp;<?php $adminField['isrequired'] == 'true' ? print '*' : ''?></label>
+            <div class="form-group<?php if (isset($errors['additional_admin_'.$key])) : ?> has-error<?php endif;?>">
+                <label class="control-label"><?php echo htmlspecialchars($adminField['fieldname'])?>&nbsp;<?php $adminField['isrequired'] == 'true' ? print '*' : ''?></label>
                 <input class="form-control" type="text" name="value_items_admin[<?php echo $key?>]" value="<?php isset($input_data->value_items_admin[$key]) ? print htmlspecialchars($input_data->value_items_admin[$key]) : print htmlspecialchars($adminField['defaultvalue'])?>" />
             </div>
         </div>
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/part/user_variables.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/part/user_variables.tpl.php
index e58edb739a..c7f93263ef 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/part/user_variables.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/part/user_variables.tpl.php
@@ -39,11 +39,11 @@
 $showField = ($input_data->value_show[$key] == $modeUserVariables || $input_data->value_show[$key] == 'b');
 
 $visibleItem = (isset($input_data->value_types[$key]) && $input_data->value_types[$key] == 'text' && isset($input_data->name_items[$key])); ?>
+
 <?php if ($visibleItem == true && $showField == true) : ?>
-<div class="form-group col-xs-<?php isset($input_data->value_sizes[$key]) ? print (int)$input_data->value_sizes[$key] : print 6?>"><label><?php echo htmlspecialchars($input_data->name_items[$key])?><?php isset($input_data->values_req[$key]) && $input_data->values_req[$key] == 't' ? print '*' : ''?></label>
+<div class="form-group col-xs-<?php isset($input_data->value_sizes[$key]) ? print (int)$input_data->value_sizes[$key] : print 6?><?php if (isset($errors['additional_'.$key])) : ?> has-error<?php endif;?>"><label class="control-label"><?php echo htmlspecialchars($input_data->name_items[$key])?><?php isset($input_data->values_req[$key]) && $input_data->values_req[$key] == 't' ? print '*' : ''?></label>
 <?php endif;?>
 
-
 <input class="form-control" type="<?php isset($input_data->value_types[$key]) && $showField == true ? print htmlspecialchars($input_data->value_types[$key]) : print 'hidden' ?>" name="value_items[]" value="<?php echo htmlspecialchars($item)?>" />
 
 
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/startchat.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/startchat.tpl.php
index 11c1c984cb..2cce630753 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/startchat.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/startchat.tpl.php
@@ -25,10 +25,10 @@
 	<input type="hidden" name="Username" value="<?php echo htmlspecialchars($input_data->username);?>" />
 	<?php else : ?>
 		<?php if (in_array('username', $input_data->hattr)) : ?>
-			<input class="form-control" type="hidden" name="Username" value="<?php echo htmlspecialchars($input_data->username);?>" />
+			<input class="form-control<?php if (isset($errors['nick'])) : ?> has-error<?php endif;?>" type="hidden" name="Username" value="<?php echo htmlspecialchars($input_data->username);?>" />
 		<?php else : ?>
-		<div class="form-group">
-			<label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Name');?><?php if (isset($start_data_fields['name_require_option']) && $start_data_fields['name_require_option'] == 'required') : ?>*<?php endif;?></label>
+		<div class="form-group<?php if (isset($errors['nick'])) : ?> has-error<?php endif;?>">
+			<label class="control-label" ><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Name');?><?php if (isset($start_data_fields['name_require_option']) && $start_data_fields['name_require_option'] == 'required') : ?>*<?php endif;?></label>
 			<input class="form-control" type="text" name="Username" value="<?php echo htmlspecialchars($input_data->username);?>" />
 		</div>
 		<?php endif; ?>
@@ -42,8 +42,8 @@
 		<?php if (in_array('email', $input_data->hattr)) : ?>
 			<input class="form-control" type="hidden" name="Email" value="<?php echo htmlspecialchars($input_data->email);?>" />
 		<?php else : ?>
-		<div class="form-group">
-			<label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','E-mail');?><?php if (isset($start_data_fields['email_require_option']) && $start_data_fields['email_require_option'] == 'required') : ?>*<?php endif;?></label>
+		<div class="form-group<?php if (isset($errors['email'])) : ?> has-error<?php endif;?>">
+			<label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','E-mail');?><?php if (isset($start_data_fields['email_require_option']) && $start_data_fields['email_require_option'] == 'required') : ?>*<?php endif;?></label>
 			<input class="form-control" type="text" name="Email" value="<?php echo htmlspecialchars($input_data->email);?>" />
 		</div>
 		<?php endif; ?>
@@ -58,8 +58,8 @@
 		<?php if (in_array('phone', $input_data->hattr)) : ?>
 			<input class="form-control" type="hidden" name="Phone" value="<?php echo htmlspecialchars($input_data->phone);?>" />
 		<?php else : ?>
-		<div class="form-group">
-			<label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Phone');?><?php if (isset($start_data_fields['phone_require_option']) && $start_data_fields['phone_require_option'] == 'required') : ?>*<?php endif;?></label>
+		<div class="form-group<?php if (isset($errors['phone'])) : ?> has-error<?php endif;?>">
+			<label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Phone');?><?php if (isset($start_data_fields['phone_require_option']) && $start_data_fields['phone_require_option'] == 'required') : ?>*<?php endif;?></label>
 			<input class="form-control" type="text" name="Phone" value="<?php echo htmlspecialchars($input_data->phone);?>" />
 		</div>
 		<?php endif; ?>
@@ -74,8 +74,8 @@
 	<?php if (isset($start_data_fields['message_hidden']) && $start_data_fields['message_hidden'] == true) : ?>
 	<textarea class="hide" placeholder="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Enter your message');?>" name="Question"><?php echo htmlspecialchars($input_data->question);?></textarea>
 	<?php else : ?>
-	<div class="form-group">
-	   <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Your question');?><?php if (isset($start_data_fields['message_require_option']) && $start_data_fields['message_require_option'] == 'required') : ?>*<?php endif;?></label>
+	<div class="form-group<?php if (isset($errors['question'])) : ?> has-error<?php endif;?>">
+	   <label class="control-label"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Your question');?><?php if (isset($start_data_fields['message_require_option']) && $start_data_fields['message_require_option'] == 'required') : ?>*<?php endif;?></label>
 	   <textarea class="form-control" placeholder="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Enter your message');?>" name="Question"><?php echo htmlspecialchars($input_data->question);?></textarea>
 	</div>
 	<?php endif; ?>
diff --git a/lhc_web/lib/core/lhchat/lhchatvalidator.php b/lhc_web/lib/core/lhchat/lhchatvalidator.php
index 7c67a5f77e..2f3db6ea11 100644
--- a/lhc_web/lib/core/lhchat/lhchatvalidator.php
+++ b/lhc_web/lib/core/lhchat/lhchatvalidator.php
@@ -206,20 +206,20 @@ public static function validateStartChat(& $inputForm, & $start_data_fields, & $
 
             if ( !$form->hasValidData( 'Username' ) || ($form->Username == '' && (($start_data_fields['name_require_option'] == 'required' && !isset($additionalParams['offline'])) || (isset($additionalParams['offline']) && isset($start_data_fields['offline_name_require_option']) && $start_data_fields['offline_name_require_option'] == 'required' )))  )
             {
-                $Errors[] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Please enter your name');
+                $Errors['nick'] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Please enter your name');
             } elseif ($form->hasValidData( 'Username' )) {
                 $chat->nick = $inputForm->username = $form->Username;
             }
 
             if ($form->hasValidData( 'Username' ) && $form->Username != '' && strlen($form->Username) > 50)
             {
-                $Errors[] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Maximum 50 characters');
+                $Errors['nick'] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Maximum 50 characters');
             }
         }
 
         if ( isset($validationFields['Email']) ) {
             if ( (!$form->hasValidData( 'Email' ) && $start_data_fields['email_require_option'] == 'required') || (!$form->hasValidData( 'Email' ) && isset($additionalParams['offline'])) ) {
-                $Errors[] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Please enter a valid email address');
+                $Errors['email'] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Please enter a valid email address');
             } elseif ( $form->hasValidData( 'Email' ) ) {
                 $chat->email = $inputForm->email = $form->Email;
             } else {
@@ -231,20 +231,20 @@ public static function validateStartChat(& $inputForm, & $start_data_fields, & $
         if (isset($validationFields['Question'])) {
 
             if ( !$form->hasValidData( 'Question' ) || (trim($form->Question) == '' && (($start_data_fields['message_require_option'] == 'required' && !isset($additionalParams['offline'])) || (isset($additionalParams['offline']) && isset($start_data_fields['offline_message_require_option']) && $start_data_fields['offline_message_require_option'] == 'required')))) {
-                $Errors[] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Please enter your message');
+                $Errors['question'] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Please enter your message');
             } elseif ($form->hasValidData( 'Question' )) {
                 $inputForm->question = trim($form->Question);
             }
 
             if ($form->hasValidData( 'Question' ) && trim($form->Question) != '' && strlen($form->Question) > (int)erLhcoreClassModelChatConfig::fetch('max_message_length')->current_value)
             {
-                $Errors[] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Maximum').' '.(int)erLhcoreClassModelChatConfig::fetch('max_message_length')->current_value.' '.erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','characters for a message');
+                $Errors['question'] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Maximum').' '.(int)erLhcoreClassModelChatConfig::fetch('max_message_length')->current_value.' '.erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','characters for a message');
             }
         }
        
         if (isset($validationFields['AcceptTOS'])) {
         	if ( !$form->hasValidData( 'AcceptTOS' ) || $form->AcceptTOS == false) {
-        		$Errors[] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','You have to accept our Terms Of Service');
+        		$Errors['accept_tos'] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','You have to accept our Terms Of Service');
         	} else {
         		$inputForm->accept_tos = true;
         	}
@@ -262,7 +262,7 @@ public static function validateStartChat(& $inputForm, & $start_data_fields, & $
 
             if ($form->hasValidData( 'Phone' ) && $form->Phone != '' && strlen($form->Phone) > 100)
             {
-                $Errors[] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Maximum 100 characters for phone');
+                $Errors['phone'] = erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Maximum 100 characters for phone');
             }
         }
         
@@ -395,7 +395,7 @@ public static function validateStartChat(& $inputForm, & $start_data_fields, & $
         	
         	foreach ($form->name_items as $key => $name_item) {    
         		if (isset($inputForm->values_req[$key]) && $inputForm->values_req[$key] == 't' && ($inputForm->value_show[$key] == 'b' || $inputForm->value_show[$key] == (isset($additionalParams['offline']) ? 'off' : 'on')) && (!isset($valuesArray[$key]) || trim($valuesArray[$key]) == '')) {
-        			$Errors[] = trim($name_item).' : '.erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','is required');
+        			$Errors['additional_'.$key] = trim($name_item).' : '.erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','is required');
         		}
         		$stringParts[] = array('key' => $name_item,'value' => (isset($valuesArray[$key]) ? trim($valuesArray[$key]) : ''));
         	}        	
@@ -416,7 +416,7 @@ public static function validateStartChat(& $inputForm, & $start_data_fields, & $
                 foreach ($customAdminfields as $key => $adminField) {
             
                     if (isset($inputForm->value_items_admin[$key]) && isset($adminField['isrequired']) && $adminField['isrequired'] == 'true' && ($adminField['visibility'] == 'all' || $adminField['visibility'] == (isset($additionalParams['offline']) ? 'off' : 'on')) && (!isset($valuesArray[$key]) || trim($valuesArray[$key]) == '')) {
-            			$Errors[] = trim($adminField['fieldname']).': '.erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','is required');
+            			$Errors['additional_admin_'.$key] = trim($adminField['fieldname']).': '.erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','is required');
             		}
             		
             		if (isset($valuesArray[$key]) && $valuesArray[$key] != '') {
@@ -429,7 +429,6 @@ public static function validateStartChat(& $inputForm, & $start_data_fields, & $
         if (!empty($stringParts)) {
             $chat->additional_data = json_encode($stringParts);
         }
-        
 
         erLhcoreClassChatEventDispatcher::getInstance()->dispatch('chat.validate_start_chat',array('errors' => & $Errors, 'input_form' => & $inputForm, 'start_data_fields' => & $start_data_fields, 'chat' => & $chat,'additional_params' => & $additionalParams));