cmaffio/pannello
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix DB e visualizzazione nomi hosts

Browse Source
This commit is contained in:
cmaffio
2016-07-14 14:42:40 +02:00
parent e130116fa8
commit 0d49ff50c2
5 changed files with 138 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
proxy/pool_lista.php
View File

@@ -47,7 +47,25 @@ if (isset($_POST['ordina'])) {
</tr>
<?php
$tabella->riga();
$query = "SELECT GREATEST (sum(inviati), sum(ricevuti)) AS max from proxy_dati WHERE data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo) GROUP BY ip";
$query = " SELECT
GREATEST (sum(inviati), sum(ricevuti)) AS max
FROM
proxy_dati
WHERE
data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
GROUP BY
ip
UNION
SELECT
GREATEST (sum(inviati), sum(ricevuti)) AS max
FROM
proxy_dati_storico
WHERE
data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
GROUP BY
ip
";
$res = mysql_query( $query, $DB_ID );
$max = 0;
while ($valori = mysql_fetch_array ( $res )) {
@@ -60,17 +78,43 @@ $query = " SELECT
proxy_pool.id,
proxy_pool.nome,
proxy_pool.attivo,
proxy_dati.ip,
MIN(proxy_dati.data_destroy) AS first,
MAX(proxy_dati.data_destroy) AS last,
SUM(proxy_dati.inviati) AS inviati,
SUM(proxy_dati.ricevuti) AS ricevuti
FROM
proxy_dati
querytot.ip,
MIN(querytot.minimo) AS first,
MAX(querytot.massimo) AS last,
SUM(querytot.recv) AS inviati,
SUM(querytot.send) AS ricevuti
FROM (
SELECT
ip,
data_destroy,
MIN(data_destroy) AS minimo,
MAX(data_destroy) AS massimo,
SUM(inviati) AS recv,
SUM(ricevuti) AS send
FROM
proxy_dati
WHERE
data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
GROUP BY
ip
UNION SELECT
ip,
data_destroy,
MIN(data_destroy) AS minimo,
MAX(data_destroy) AS massimo,
SUM(inviati) AS recv,
SUM(ricevuti) AS send
FROM
proxy_dati_storico
WHERE
data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
GROUP BY
ip
) querytot
JOIN
proxy_pool
ON
proxy_dati.ip = proxy_pool.ip
querytot.ip = proxy_pool.ip
WHERE
data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
GROUP BY
@@ -87,7 +131,19 @@ $query = " SELECT
FROM
proxy_pool
WHERE
proxy_pool.ip NOT IN (SELECT ip FROM proxy_dati WHERE data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo))
proxy_pool.ip NOT IN ( SELECT
ip
FROM
proxy_dati
WHERE
data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
UNION SELECT
ip
FROM
proxy_dati_storico
WHERE
data_destroy >= DATE_SUB(NOW(), INTERVAL 1 $tempo)
)
ORDER BY
$ordina
";
@@ -107,7 +163,7 @@ while ($dato = mysql_fetch_array ( $res )) {
<td rowspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
<td rowspan=2 class="spazioh"><a href="pool_acl.php?id=<?php print $dato['id'] ?>"><img src="<?php print $CONF['base_url'] ?>/img/edit-regole.gif" ALT="ACL" TITLE="ACL"></a></td>
<td rowspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
<td <?php if ($dato['nome'] == "") print "rowspan=2" ?> class="colip"><?php print $dato['ip'] ?></td>
<td class="colip"><?php print $dato['ip'] ?></td>
<td rowspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
<td class="colip"><?php print $dato['first'] ?></td>
<td rowspan=2 class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>
@@ -119,9 +175,7 @@ while ($dato = mysql_fetch_array ( $res )) {
</td>
</tr>
<tr>
<?php if ($dato['nome'] != "") { ?>
<td class="colip"><?php print $dato['nome'] ?></td>
<?php } ?>
<td class="colip"><?php if ($dato['nome'] != "") { print $dato['nome']; } else { $host = gethostbyaddr ($dato['ip']); print substr($host, 0, strpos($host, ".")); } ?></td>
<td class="colip"><?php print $dato['last'] ?></td>
<td class="descrizione">Ricevuti</td>
<td class="spazioh"><img src="<?php print $CONF['base_url'] ?>/img/spazio.gif"></td>