From d3ed46fdcff8f1dbb535e040a4fd355910a4162c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20C=2E979?=
 <34628915+sc979@users.noreply.github.com>
Date: Fri, 15 Feb 2019 16:30:17 +0100
Subject: [PATCH] fix(UI): correct comments date in host and svc detail pages
 (#7194)

---
 www/include/monitoring/objectDetails/hostDetails.php        | 6 +++---
 www/include/monitoring/objectDetails/serviceDetails.php     | 6 +++---
 .../monitoring/objectDetails/template/hostDetails.ihtml     | 4 ++--
 .../monitoring/objectDetails/template/serviceDetails.ihtml  | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/www/include/monitoring/objectDetails/hostDetails.php b/www/include/monitoring/objectDetails/hostDetails.php
index 345bc68efbe..ec49902b055 100644
--- a/www/include/monitoring/objectDetails/hostDetails.php
+++ b/www/include/monitoring/objectDetails/hostDetails.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Copyright 2005-2015 Centreon
- * Centreon is developped by : Julien Mathis and Romain Le Merlus under
+ * Copyright 2005-2019 Centreon
+ * Centreon is developed by : Julien Mathis and Romain Le Merlus under
  * GPL Licence 2.0.
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -352,7 +352,7 @@
          * Get comments for hosts
          */
         $tabCommentHosts = array();
-        $rq2 = " SELECT FROM_UNIXTIME(cmt.entry_time) as comment_time, cmt.comment_id, cmt.author AS author_name,
+        $rq2 = " SELECT cmt.entry_time as comment_time, cmt.comment_id, cmt.author AS author_name,
          cmt.data AS comment_data, cmt.persistent AS is_persistent, h.name AS host_name " .
             " FROM comments cmt, hosts h " .
             " WHERE cmt.host_id = '" . $host_id . "' 
diff --git a/www/include/monitoring/objectDetails/serviceDetails.php b/www/include/monitoring/objectDetails/serviceDetails.php
index e911fd74e10..d1b9da310b0 100644
--- a/www/include/monitoring/objectDetails/serviceDetails.php
+++ b/www/include/monitoring/objectDetails/serviceDetails.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Copyright 2005-2015 Centreon
- * Centreon is developped by : Julien Mathis and Romain Le Merlus under
+ * Copyright 2005-2019 Centreon
+ * Centreon is developed by : Julien Mathis and Romain Le Merlus under
  * GPL Licence 2.0.
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -291,7 +291,7 @@
          */
         $tabCommentServices = array();
         if (isset($host_id) && isset($service_id)) {
-            $rq2 = " SELECT DISTINCT FROM_UNIXTIME(cmt.entry_time) as entry_time, cmt.comment_id, " .
+            $rq2 = " SELECT DISTINCT cmt.entry_time as entry_time, cmt.comment_id, " .
                 "cmt.author AS author_name, cmt.data AS comment_data, cmt.persistent AS is_persistent, " .
                 "h.name AS host_name, s.description AS service_description " .
                 " FROM comments cmt, hosts h, services s " .
diff --git a/www/include/monitoring/objectDetails/template/hostDetails.ihtml b/www/include/monitoring/objectDetails/template/hostDetails.ihtml
index 8236208ab95..5b520596b80 100644
--- a/www/include/monitoring/objectDetails/template/hostDetails.ihtml
+++ b/www/include/monitoring/objectDetails/template/hostDetails.ihtml
@@ -322,7 +322,7 @@
                             <table class="ListTable">
                                 <tr class='list_lvl_1'>
                                     <td class="ListColHeaderCenter FormHeader">{$cmt_host_name}</td>
-                                    <td class="ListColHeaderCenter FormHeader" width="120">{$cmt_entry_time}</td>
+                                    <td class="ListColHeaderCenter FormHeader" width="180">{$cmt_entry_time}</td>
                                     <td class="ListColHeaderCenter FormHeader" width="120">{$cmt_author}</td>
                                     <td class="ListColHeaderCenter FormHeader">{$cmt_comment}</td>
                                     <td class="ListColHeaderCenter FormHeader" width="50">{$cmt_persistent}</td>
@@ -330,7 +330,7 @@
                                 {foreach item=tch from=$tab_comments_host}
                                 <tr class={cycle values="list_two, list_one"}>
                                     <td class="ListColLeft">{$tch.host_name}</td>
-                                    <td class="ListColRight">{$tch.comment_time}</td>
+                                    <td class="ListColRight isTimestamp">{$tch.comment_time}</td>
                                     <td class="ListColCenter">{$tch.author_name}</td>
                                     <td class="ListColLeft containsURI">{$tch.comment_data}</td>
                                     <td class="ListColCenter">{$tch.is_persistent}</td>
diff --git a/www/include/monitoring/objectDetails/template/serviceDetails.ihtml b/www/include/monitoring/objectDetails/template/serviceDetails.ihtml
index 6caaf458121..594ec026fd7 100644
--- a/www/include/monitoring/objectDetails/template/serviceDetails.ihtml
+++ b/www/include/monitoring/objectDetails/template/serviceDetails.ihtml
@@ -620,7 +620,7 @@
     <tr class={cycle values="list_two, list_one"}>
         <td class="ListColLeft ColPopup" width="120">{$tcs.host_name}</td>
         <td class="ListColLeft ColPopup" width="120">{$tcs.service_description}</td>
-        <td class="ListColRight" width="150" style="white-space:nowrap;">{$tcs.entry_time}</td>
+        <td class="ListColRight isTimestamp" width="150" style="white-space:nowrap;">{$tcs.entry_time}</td>
         <td class="ListColCenter" width="100">{$tcs.author_name}</td>
         <td class="ListColNoWrap containsURI">{$tcs.comment_data}</td>
         <td class="ListColCenter" width="50">{$tcs.is_persistent}</td>