From 86abd7d1c483c8ee778de74af786e2d0cb8a0883 Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT <guillaume.le.vaillant@openmailbox.org>
Date: Mon, 28 Apr 2014 15:40:43 +0200
Subject: [PATCH] Several fixes (layout, stats, transaction view).

---
 index.php                 | 17 ++++++++---------
 src/PPC_daemon.php        |  2 +-
 src/PPC_layout.php        |  5 ++++-
 src/stats_controller.php  | 14 +++++++++++---
 src/views/site_header.php | 15 +++++----------
 5 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/index.php b/index.php
index f17f2b3..9dffad0 100644
--- a/index.php
+++ b/index.php
@@ -49,13 +49,12 @@
 
 
 		$net_speed = getnetworkhashps ();
-	}
 ?>
 <div id="site_menu">
 	<p class="center"></p>
 	<center>Explore the Peercoin blockchain by looking for a Block Number (Index), Block Hash, or Transaction ID.</center>
 	<div class="menu_item">
-		<form action="<?php $_SERVER["PHP_SELF"]; ?>" method="post">
+		<form action="index.php" method="post">
 			<label for="block_height" class="menu_desc">Enter a Block Number</label><br>
 			<input class="form-control" type="text" name="block_height" id="block_height">
 			<input class="btn btn-success" type="submit" name="submit" value="Jump To Block">
@@ -63,7 +62,7 @@
 	</div>
 
 	<div class="menu_item">
-		<form action="/index.php" method="post">
+		<form action="index.php" method="post">
 			<label for="block_hash" class="menu_desc">Enter a Block Hash</label><br>
 			<input class="form-control" type="text" name="block_hash" id="block_hash">
 			<input class="btn btn-success" type="submit" name="submit" value="Jump To Block">
@@ -71,7 +70,7 @@
 	</div>
 
 	<div class="menu_item">
-		<form action="/index.php" method="post">
+		<form action="index.php" method="post">
 			<label for="transaction" class="menu_desc">Enter a Transaction ID</label><br>
 			<input class="form-control" type="text" name="transaction" id="transaction">
 			<input class="btn btn-success" type="submit" name="submit" value="Jump To TX">
@@ -100,7 +99,7 @@
 	$totalblocks = intval($network_info["blocks"]);
 
 	// POS:POW Ratio
-	$ratio1 = ratio($POS1, $POW1); 
+	$ratio1 = ratio($POS1, $POW1);
 	$ratio24 = ratio($POS24, $POW24);
 ?>
 
@@ -111,10 +110,11 @@
                 <dd>
                 <?php
                 if (intval($net_speed) < 1024) {
-                echo "".number_format($net_speed,2)." MH/s";
+                echo "".number_format($net_speed,2)." GH/s";
                 } else {
                 $net_speed = number_format(($net_speed / 1024),2);
-                echo "".$net_speed." GH/s";
+                echo "".$net_speed." TH/s";
+                }
                 ?>
                 </dd>
         </dl>
@@ -156,7 +156,7 @@
 	</dl>
 	<dl>
 		<dt>Total Blocks:</dt>
-		<dd><?php echo number_format($totalblocks, 0 , '.' , ','); ?>Blocks</dd>
+		<dd><?php echo number_format($totalblocks, 0 , '.' , ','); ?></dd>
 	</dl>
 	<dl>
 		<dt>PoS Blocks (last 1h/24h):</dt>
@@ -183,7 +183,6 @@
 
 	
 <?php
-
 	}
 
 	site_footer ();
diff --git a/src/PPC_daemon.php b/src/PPC_daemon.php
index da61527..89cbacb 100644
--- a/src/PPC_daemon.php
+++ b/src/PPC_daemon.php
@@ -120,7 +120,7 @@ function getnetworkhashps ()
 
         //      This function returns a string containing the calculated
         //      network hash rate for the latest block
-                return ($info["netmhashps"]);
+                return ($info["networkghps"]);
         }
 
 	/**
diff --git a/src/PPC_layout.php b/src/PPC_layout.php
index 0339e37..fc24d3d 100644
--- a/src/PPC_layout.php
+++ b/src/PPC_layout.php
@@ -1,5 +1,7 @@
 <?php
 
+date_default_timezone_set("UTC");
+
 /**
 * Output the site header HTML
 *
@@ -114,7 +116,8 @@ function tx_detail ($tx_id)
 	
 		detail_display ("TX Type", $txout["scriptPubKey"]["type"]);
 	
-		detail_display ("Required Sigs", $txout["scriptPubKey"]["reqSigs"]);
+                if (isset ($txout["scriptPubKey"]["reqSigs"]))
+                        detail_display ("Required Sigs", $txout["scriptPubKey"]["reqSigs"]);
 	
 		detail_display ("Script Pub Key (ASM)", $txout["scriptPubKey"]["asm"], 50);
 	
diff --git a/src/stats_controller.php b/src/stats_controller.php
index ed5967e..d841ce8 100644
--- a/src/stats_controller.php
+++ b/src/stats_controller.php
@@ -65,22 +65,30 @@ function get_num_pos($hours)
 		$POScoins = 0;
 		$POWcoins = 0;
 		$POS = 0;
+                $POW = 0;
+                $avgPOScoins = 0;
+                $avgPOWcoins = 0;
 		while ($iblock != intval($currentblock))
 		{
 			$flag = block_flag($iblock);
 			$coins = block_mint($iblock);
-			if ($flag == "proof-of-stake")
+			if (strpos($flag ,"proof-of-stake") !== false)
 			{
 				$POS++;
 				$POScoins += $coins;
 			}
 			else {
+                                $POW++;
 				$POWcoins += $coins;
 			}
 			$iblock++;
 		}
-		return array($POS, $POScoins , $POWcoins);
-		
+                if ($POS > 0)
+                    $avgPOScoins = $POScoins / $POS;
+                if ($POW > 0)
+                    $avgPOWcoins = $POWcoins / $POW;
+
+                return array($POS, $POW, $POScoins, $POWcoins, $avgPOScoins, $avgPOWcoins);
 	}
 	
 	//Find the flag for a block
diff --git a/src/views/site_header.php b/src/views/site_header.php
index b88f16b..7fa2db3 100644
--- a/src/views/site_header.php
+++ b/src/views/site_header.php
@@ -10,16 +10,11 @@
 
 		function startRefresh() {
 		    setTimeout(startRefresh, 10000);
-		    var turl = 'https://btc-e.com/api/2/ppc_usd/ticker';
-			var murl = 'http://coinmarketcap.northpole.ro/api/usd/ppc.json';
-		    $.getJSON('http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20json%20where%20url%3D%22' + encodeURIComponent(turl) + '%22&format=json', function (data) {
-			    jQuery('#ticker').html('$');
-			    jQuery('#ticker').append(data['query'].results.ticker.last);
-			    jQuery('#ticker').append(' PPC/USD');
-			});
-			$.getJSON('http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20json%20where%20url%3D%22' + encodeURIComponent(murl) + '%22&format=json&callback=?', function(data) {
-			    jQuery('#marketcap').html('$');
-			    jQuery('#marketcap').append(data.query.results.json.marketCap);
+                    var murl = 'http://coinmarketcap.northpole.ro/api/usd/ppc.json';
+                    $.getJSON('http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20json%20where%20url%3D%22' + encodeURIComponent(murl) + '%22&format=json&callback=?', function(data) {
+			    jQuery('#ticker').html(data.query.results.json.price);
+			    jQuery('#ticker').append(' USD');
+			    jQuery('#marketcap').html(data.query.results.json.marketCap);
 			    jQuery('#marketcap').append(' USD');
 		    });
 		}