From dfd7af81f93a3ea85ebf618573f1104fb2905ebd Mon Sep 17 00:00:00 2001
From: marcdeb1 <marcdebrouchev@laposte.net>
Date: Wed, 19 Dec 2018 00:53:39 +0100
Subject: [PATCH] Realtme action improvements

---
 src/Controller/MainController.php | 8 ++------
 src/Template/Element/claimbox.ctp | 3 ++-
 src/Template/Main/realtime.ctp    | 6 +++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index cbb5a14..afa7757 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -220,19 +220,15 @@ class MainController extends AppController {
         $this->loadModel('Transactions');
 
         // load 10 blocks and transactions
-        $conn = ConnectionManager::get('default');
         $blocks = $this->Blocks->find()->select(['height', 'block_time', 'transaction_hashes'])->order(['height' => 'desc'])->limit(10)->toArray();
         for ($i = 0; $i < count($blocks); $i++) {
             $tx_hashes = preg_split('#,#', $blocks[$i]->transaction_hashes);
             $blocks[$i]->transaction_count = count($tx_hashes);
         }
 
-        $stmt = $conn->execute('SELECT T.id, T.hash, T.input_count, T.output_count, IFNULL(T.transaction_time, T.created_at) AS TxTime ' .
-                               'FROM  transaction T ORDER BY created_at DESC LIMIT 10');
-        $txs = $stmt->fetchAll(\PDO::FETCH_OBJ);
-
+        $transactions = $this->Transactions->find()->select(['id', 'hash', 'input_count', 'output_count', 'transaction_time', 'created_at'])->order(['created_at' => 'desc'])->limit(10)->toArray();
         $this->set('blocks', $blocks);
-        $this->set('txs', $txs);
+        $this->set('txs', $transactions);
     }
 
     public function find() {
diff --git a/src/Template/Element/claimbox.ctp b/src/Template/Element/claimbox.ctp
index 5e4a677..8013628 100644
--- a/src/Template/Element/claimbox.ctp
+++ b/src/Template/Element/claimbox.ctp
@@ -59,8 +59,9 @@ $ctTag = $claim->getContentTag();
         <div class="label half-width">Author</div>
         <div class="label half-width">License</div>
         
-        <!--
+        
         <div class="value half-width" title="<?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->author)) > 0 ? $claim->author : '<em>Unspecified</em>' ?></div>
+        <!--
         <div class="value half-width" title="<?php echo strlen(trim($claim->license)) > 0 ? $claim->license : '' ?>">
             <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
             <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
diff --git a/src/Template/Main/realtime.ctp b/src/Template/Main/realtime.ctp
index 777855b..31dccd7 100644
--- a/src/Template/Main/realtime.ctp
+++ b/src/Template/Main/realtime.ctp
@@ -153,9 +153,9 @@
 
             <tbody>
                 <?php foreach ($txs as $tx): ?>
-                <tr data-hash="<?php echo $tx->Hash ?>" data-time="<?php echo $tx->TxTime ?>">
-                    <td class="w200"><div><a href="/tx/<?php echo $tx->Hash ?>" target="_blank"><?php echo $tx->Hash ?></a></div></td>
-                    <td><?php echo \Carbon\Carbon::createFromTimestamp($tx->TxTime)->diffForHumans(); ?></td>
+                <tr data-hash="<?php echo $tx->Hash ?>" data-time="<?php echo $tx->transaction_time ?>">
+                    <td class="w200"><div><a href="/tx/<?php echo $tx->hash ?>" target="_blank"><?php echo $tx->hash ?></a></div></td>
+                    <td><?php echo $tx->created_at->diffForHumans(); ?></td>
                     <td class="right"><?php echo $tx->input_count ?></td>
                     <td class="right"><?php echo $tx->output_count ?></td>
                     <td class="right"><?php echo number_format($tx->value(), 8, '.', '') ?> LBC</td>