From a0fa2e684afbd00e4abd847cf350738e06577829 Mon Sep 17 00:00:00 2001
From: cmaffio <cmaffioletti@esseweb.eu>
Date: Thu, 24 Mar 2016 12:16:46 +0100
Subject: [PATCH] Aggiunta grafico orario

---
 proxy/.lista.php.swp | Bin 16384 -> 0 bytes
 proxy/graph.php      |   6 ++++++
 proxy/ip.php         |   1 +
 proxy/lista.php      |   1 +
 4 files changed, 8 insertions(+)
 delete mode 100644 proxy/.lista.php.swp

diff --git a/proxy/.lista.php.swp b/proxy/.lista.php.swp
deleted file mode 100644
index 7cc91c925c093d421f4f6f36bd375c942a51257d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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

diff --git a/proxy/graph.php b/proxy/graph.php
index 4769774..fdb9415 100644
--- a/proxy/graph.php
+++ b/proxy/graph.php
@@ -15,6 +15,12 @@ if (isset ($_GET['tempo'])) 	$tempo = $_GET['tempo'];
 
 
 switch ($tempo) {
+	case 'HOUR':
+		$gruppo = "MINUTE";
+		$format1 = "%d%H%i";
+		$format2 = "%i";
+		$limit = 59;
+		break;
 	case 'DAY':
 		$gruppo = "HOUR";
 		$format1 = "%m%d%H";
diff --git a/proxy/ip.php b/proxy/ip.php
index 8004894..a5087ff 100755
--- a/proxy/ip.php
+++ b/proxy/ip.php
@@ -23,6 +23,7 @@ if (isset($_POST['tempo'])) {
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td colspan="2">
 			<select name="tempo" onchange="this.form.submit()">
+				<option value="HOUR" <?php if ($tempo == "HOUR") {print "selected=\"selected\""; } ?>>Ultima Ora</option>
 				<option value="DAY" <?php if ($tempo == "DAY") {print "selected=\"selected\""; } ?>>Ultimo Giorno</option>
 				<option value="WEEK" <?php if ($tempo == "WEEK") {print "selected=\"selected\""; } ?>>Ultima Settimana</option>
 				<option value="MONTH" <?php if ($tempo == "MONTH") {print "selected=\"selected\""; } ?>>Ultimo Mese</option>
diff --git a/proxy/lista.php b/proxy/lista.php
index d5ec872..ad712db 100755
--- a/proxy/lista.php
+++ b/proxy/lista.php
@@ -17,6 +17,7 @@ if (isset($_POST['tempo'])) {
 		<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
 		<td colspan="2">
 			<select name="tempo" onchange="this.form.submit()">
+				<option value="HOUR" <?php if ($tempo == "HOUR") {print "selected=\"selected\""; } ?>>Ultima Ora</option>
 				<option value="DAY" <?php if ($tempo == "DAY") {print "selected=\"selected\""; } ?>>Ultimo Giorno</option>
 				<option value="WEEK" <?php if ($tempo == "WEEK") {print "selected=\"selected\""; } ?>>Ultima Settimana</option>
 				<option value="MONTH" <?php if ($tempo == "MONTH") {print "selected=\"selected\""; } ?>>Ultimo Mese</option>