diff --git a/src/warden-server/contrib/wardenweb/graph_HostnameServiceTypeActivityScale_html.php b/src/warden-server/contrib/wardenweb/graph_HostnameServiceTypeActivityScale_html.php
index ed4c6864e54f24379c40bdcf3ea1e791ec44743d..ca20ed49a3b88045a261faa853bbca30561e3042 100644
--- a/src/warden-server/contrib/wardenweb/graph_HostnameServiceTypeActivityScale_html.php
+++ b/src/warden-server/contrib/wardenweb/graph_HostnameServiceTypeActivityScale_html.php
@@ -10,9 +10,9 @@
function fetchData() {
<? #TODO: fuj
if(!isSet($_GET['where'])) { ?>
- $.getJSON('graph_HostnameServiceTypeActivity.php?per=<? print $_GET['per'];?>', drawChart);
+ $.getJSON('graph_HostnameServiceTypeActivityScale.php?per=<? print $_GET['per'];?>', drawChart);
<? } else { ?>
- $.getJSON('graph_HostnameServiceTypeActivity.php?per=<? print $_GET['per'];?>&where=<?print $_GET['where'];?>', drawChart);
+ $.getJSON('graph_HostnameServiceTypeActivityScale.php?per=<? print $_GET['per'];?>&where=<?print $_GET['where'];?>', drawChart);
<? } ?>
}
@@ -41,7 +41,7 @@
vAxis: { logScale: true, title: "totalScale" },
interpolateNulls: true,
___colors:['#008000','#ff0000','#FFA500','#FA8072','#AFEEEE','#00A5C6','#DEBDDE','#000000'],
- chartArea: {'width': '80%', 'height': '90%'},
+ chartArea: {'width': '80%', 'height': '85%'},
pointSize: 5
};
@@ -51,7 +51,7 @@
</script>
</head>
<body>
- <div id="chart_div" style="width: 100%; height: 95%;"></div>
+ <div id="chart_div" style="width: 100%; height: 100%;"></div>
</body>
</html>
diff --git a/src/warden-server/contrib/wardenweb/graph_HostnameServiceTypeActivity_html.php b/src/warden-server/contrib/wardenweb/graph_HostnameServiceTypeActivity_html.php
index ef24b8da29adb31391461d03d081869f5fa2994d..a7e521576a3f821671b6e96467806ca734be12e0 100644
--- a/src/warden-server/contrib/wardenweb/graph_HostnameServiceTypeActivity_html.php
+++ b/src/warden-server/contrib/wardenweb/graph_HostnameServiceTypeActivity_html.php
@@ -41,7 +41,7 @@
vAxis: { logScale: true, title: "events" },
interpolateNulls: true,
___colors:['#008000','#ff0000','#FFA500','#FA8072','#AFEEEE','#00A5C6','#DEBDDE','#000000'],
- chartArea: {'width': '80%', 'height': '90%'},
+ chartArea: {'width': '80%', 'height': '85%'},
pointSize: 5
};
@@ -51,7 +51,7 @@
</script>
</head>
<body>
- <div id="chart_div" style="width: 100%; height: 95%;"></div>
+ <div id="chart_div" style="width: 100%; height: 100%;"></div>
</body>
</html>
diff --git a/src/warden-server/contrib/wardenweb/show_HostnameServiceTypeActivity.php b/src/warden-server/contrib/wardenweb/show_HostnameServiceTypeActivity.php
index 18c12cb5a341f98865c6f00963f9839ea3104581..080a94fa4c4cc80e426858e4a20f8aed4ade7404 100644
--- a/src/warden-server/contrib/wardenweb/show_HostnameServiceTypeActivity.php
+++ b/src/warden-server/contrib/wardenweb/show_HostnameServiceTypeActivity.php
@@ -82,7 +82,6 @@ $renderer->display();
?>
</td>
-<td width=50%>
<?
if( IsSet($_POST["btnSubmit"])) {
@@ -120,29 +119,50 @@ if( IsSet($_POST["btnSubmit"])) {
}
?>
-
+<td width=50%>
<?
if( IsSet($_POST["btnSubmit"]) and !empty($where)) {
print("<iframe src=\"graph_HostnameServiceTypeActivity_html.php?per=day&where=".base64_encode($where)."\" style=\"width:100%; height:500\"></iframe>");
}
?>
-
</td>
+
</tr>
-</table>
-<hr>
-<?
-
-#TODO: strip vsechny superznaky
+<tr>
+<td>
+<?
if( IsSet($_POST["btnSubmit"]) and !empty($where)) {
- var_dump($_POST);
$q = "SELECT * FROM events WHERE $where ORDER BY detected DESC LIMIT ".$_POST['limit'];
$res = mysql_query($q, $db);
print "Query: ".json_encode($q)."<br>";
print "Found: ".mysql_num_rows($res)."<br>";
+}
+?>
+
+</td>
+
+<td width=50%>
+<?
+ if( IsSet($_POST["btnSubmit"]) and !empty($where)) {
+ print("<iframe src=\"graph_HostnameServiceTypeActivityScale_html.php?per=day&where=".base64_encode($where)."\" style=\"width:100%; height:500\"></iframe>");
+ }
+?>
+</td>
+
+</tr>
+
+
+</table>
+
+<hr>
+<?
+
+#TODO: strip vsechny superznaky
+
+if( $res != FALSE) {
print("<pre>");
while ($tmp = mysql_fetch_assoc($res)) {
#var_dump($tmp);