FIX broken feature : send private message by email

htdocs/core/class/html.formticket.class.php

@@ -1345,44 +1345,51 @@ class FormTicket
 
 		$send_email = GETPOST('send_email', 'int') ? GETPOST('send_email', 'int') : 0;
 
-		// Example 1 : Adding jquery code
-		print '<script type="text/javascript">
-		jQuery(document).ready(function() {
-			send_email=' . $send_email.';
-			if (send_email) {
-				if (!jQuery("#send_msg_email").is(":checked")) {
-					jQuery("#send_msg_email").prop("checked", true).trigger("change");
-				}
-				jQuery(".email_line").show();
-			} else {
-				if (!jQuery("#private_message").is(":checked")) {
-					jQuery("#private_message").prop("checked", true).trigger("change");
-				}
-				jQuery(".email_line").hide();
-			}
 
-			jQuery("#send_msg_email").click(function() {
-				if(jQuery(this).is(":checked")) {
-					if (jQuery("#private_message").is(":checked")) {
-						jQuery("#private_message").prop("checked", false).trigger("change");
+			// Example 1 : Adding jquery code
+			print '<script type="text/javascript">
+			jQuery(document).ready(function() {
+				send_email=' . $send_email.';
+				if (send_email) {
+					if (!jQuery("#send_msg_email").is(":checked")) {
+						jQuery("#send_msg_email").prop("checked", true).trigger("change");
 					}
 					jQuery(".email_line").show();
-				}
-				else {
+				} else {
+					if (!jQuery("#private_message").is(":checked")) {
+						jQuery("#private_message").prop("checked", true).trigger("change");
+					}
 					jQuery(".email_line").hide();
-				}
-            });
+				}';
+
+				// If constant set, allow to send private messages as email
+				if (empty($conf->global->TICKET_SEND_PRIVATE_EMAIL)) {
+				print 'jQuery("#send_msg_email").click(function() {
+					if(jQuery(this).is(":checked")) {
+						if (jQuery("#private_message").is(":checked")) {
+							jQuery("#private_message").prop("checked", false).trigger("change");
+						}
+						jQuery(".email_line").show();
+					}
+					else {
+						jQuery(".email_line").hide();
+					}
+				});
 
-            jQuery("#private_message").click(function() {
-				if (jQuery(this).is(":checked")) {
-					if (jQuery("#send_msg_email").is(":checked")) {
-						jQuery("#send_msg_email").prop("checked", false).trigger("change");
+				jQuery("#private_message").click(function() {
+					if (jQuery(this).is(":checked")) {
+						if (jQuery("#send_msg_email").is(":checked")) {
+							jQuery("#send_msg_email").prop("checked", false).trigger("change");
+						}
+						jQuery(".email_line").hide();
 					}
-					jQuery(".email_line").hide();
-				}
-			});';
-		print '});
-		</script>';
+				});';
+			}
+
+			print '});
+			</script>';
+		
+		
 
 		print '<form method="post" name="ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';

htdocs/theme/eldy/timeline.inc.php

@@ -62,7 +62,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	position: relative;
 }
 
-.timeline > li.timeline-code-ticket_msg_private  > .timeline-item {
+.timeline > li.timeline-code-ticket_msg_private  > .timeline-item,
+.timeline > li.timeline-code-ticket_msg_private_sentbymail > .timeline-item {
 		background: #fffbe5;
 		border-color: #d0cfc0;
 }