mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-28 08:14:38 +02:00
Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta
This commit is contained in:
Daniel Barbero Martin
commit
f7233604fe
@ -88,7 +88,7 @@ public class PandoraWebView extends Activity {
|
|||||||
//Check the first load the page for to hide a toast with the
|
//Check the first load the page for to hide a toast with the
|
||||||
//connection message
|
//connection message
|
||||||
|
|
||||||
//Close the CustomToast (I love this hack, fuck javalovers and yours patterns.).
|
//Close the CustomToast.
|
||||||
if (ConnectionCustomToast.activity != null)
|
if (ConnectionCustomToast.activity != null)
|
||||||
ConnectionCustomToast.activity.finish();
|
ConnectionCustomToast.activity.finish();
|
||||||
}
|
}
|
||||||
|
|||||||
903
extras/cats.html
903
extras/cats.html
@ -1,428 +1,479 @@
|
|||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>gatete</title>
|
<title>gatete</title>
|
||||||
<script type="text/javascript" src="http://code.jquery.com/jquery-2.2.0.min.js"></script>
|
<script
|
||||||
<script type="text/javascript" src="http://d3js.org/d3.v3.min.js"></script>
|
type="text/javascript"
|
||||||
</head>
|
src="http://code.jquery.com/jquery-2.2.0.min.js"
|
||||||
<body>
|
></script>
|
||||||
<script>
|
<script type="text/javascript" src="http://d3js.org/d3.v3.min.js"></script>
|
||||||
|
</head>
|
||||||
var svg = d3.select("#test svg");
|
<body>
|
||||||
</script>
|
<script>
|
||||||
|
var svg = d3.select("#test svg");
|
||||||
<div id="test">
|
</script>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1000px" height="1000px" style="background: black;">
|
|
||||||
<image id="cat_piano" x="400" y="-100" width="50%" height="50%" xlink:href="https://media.giphy.com/media/ymckEpq27dQ9W/giphy.gif" />
|
<div id="test">
|
||||||
<g id="zoom" transform="translate(-10 20) scale (1)">
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
<g
|
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
transform="translate(100, 300) scale(0.50)"
|
width="1000px"
|
||||||
id="cat1">
|
height="1000px"
|
||||||
<path
|
style="background: black;"
|
||||||
id="path8068"
|
>
|
||||||
d="m 80,286.64792 28.57143,-31.42857 94.28571,60 5.71429,122.85714 L 200,472.3622 l 82.85714,-54.28571 194.28572,8.57143 191.42857,31.42857 48.57143,40 -11.42857,-65.71429 -48.57143,-94.28571 31.42857,-51.42857 14.28571,-88.57143 62.85715,74.28571 65.71428,0 31.42857,-82.85714 42.85715,94.28572 L 920,340.93363 897.14286,423.79078 868.57143,515.21935 800,663.79078 814.28571,795.21935 760,855.21935 734.28571,649.50506 691.42857,672.3622 714.28571,883.79078 640,895.21935 l -8.57143,-208.57143 -85.71428,71.42857 -160,-14.28571 L 317.14286,695.21935 360,838.07649 l -22.85714,65.71429 -74.28572,-200 -11.42857,162.85714 -74.28571,-17.14286 40,-217.14286 -42.85715,-17.14285 5.71429,-85.71429 -5.71429,-54.28571 -2.85714,-108.57143 -20,-42.85714 z"
|
<image
|
||||||
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
id="cat_piano"
|
||||||
</g>
|
x="400"
|
||||||
|
y="-100"
|
||||||
<g
|
width="50%"
|
||||||
transform="translate(700, 500) scale(0.25)"
|
height="50%"
|
||||||
id="cat2">
|
xlink:href="https://media.giphy.com/media/ymckEpq27dQ9W/giphy.gif"
|
||||||
<path
|
/>
|
||||||
id="path8068"
|
<g id="zoom" transform="translate(-10 20) scale (1)">
|
||||||
d="m 80,286.64792 28.57143,-31.42857 94.28571,60 5.71429,122.85714 L 200,472.3622 l 82.85714,-54.28571 194.28572,8.57143 191.42857,31.42857 48.57143,40 -11.42857,-65.71429 -48.57143,-94.28571 31.42857,-51.42857 14.28571,-88.57143 62.85715,74.28571 65.71428,0 31.42857,-82.85714 42.85715,94.28572 L 920,340.93363 897.14286,423.79078 868.57143,515.21935 800,663.79078 814.28571,795.21935 760,855.21935 734.28571,649.50506 691.42857,672.3622 714.28571,883.79078 640,895.21935 l -8.57143,-208.57143 -85.71428,71.42857 -160,-14.28571 L 317.14286,695.21935 360,838.07649 l -22.85714,65.71429 -74.28572,-200 -11.42857,162.85714 -74.28571,-17.14286 40,-217.14286 -42.85715,-17.14285 5.71429,-85.71429 -5.71429,-54.28571 -2.85714,-108.57143 -20,-42.85714 z"
|
<g transform="translate(100, 300) scale(0.50)" id="cat1">
|
||||||
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
<path
|
||||||
</g>
|
id="path8068"
|
||||||
|
d="m 80,286.64792 28.57143,-31.42857 94.28571,60 5.71429,122.85714 L 200,472.3622 l 82.85714,-54.28571 194.28572,8.57143 191.42857,31.42857 48.57143,40 -11.42857,-65.71429 -48.57143,-94.28571 31.42857,-51.42857 14.28571,-88.57143 62.85715,74.28571 65.71428,0 31.42857,-82.85714 42.85715,94.28572 L 920,340.93363 897.14286,423.79078 868.57143,515.21935 800,663.79078 814.28571,795.21935 760,855.21935 734.28571,649.50506 691.42857,672.3622 714.28571,883.79078 640,895.21935 l -8.57143,-208.57143 -85.71428,71.42857 -160,-14.28571 L 317.14286,695.21935 360,838.07649 l -22.85714,65.71429 -74.28572,-200 -11.42857,162.85714 -74.28571,-17.14286 40,-217.14286 -42.85715,-17.14285 5.71429,-85.71429 -5.71429,-54.28571 -2.85714,-108.57143 -20,-42.85714 z"
|
||||||
<g
|
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
transform="translate(200, 0) scale(0.25)"
|
/>
|
||||||
id="cat3">
|
</g>
|
||||||
<path
|
|
||||||
id="path8068"
|
<g transform="translate(700, 500) scale(0.25)" id="cat2">
|
||||||
d="m 80,286.64792 28.57143,-31.42857 94.28571,60 5.71429,122.85714 L 200,472.3622 l 82.85714,-54.28571 194.28572,8.57143 191.42857,31.42857 48.57143,40 -11.42857,-65.71429 -48.57143,-94.28571 31.42857,-51.42857 14.28571,-88.57143 62.85715,74.28571 65.71428,0 31.42857,-82.85714 42.85715,94.28572 L 920,340.93363 897.14286,423.79078 868.57143,515.21935 800,663.79078 814.28571,795.21935 760,855.21935 734.28571,649.50506 691.42857,672.3622 714.28571,883.79078 640,895.21935 l -8.57143,-208.57143 -85.71428,71.42857 -160,-14.28571 L 317.14286,695.21935 360,838.07649 l -22.85714,65.71429 -74.28572,-200 -11.42857,162.85714 -74.28571,-17.14286 40,-217.14286 -42.85715,-17.14285 5.71429,-85.71429 -5.71429,-54.28571 -2.85714,-108.57143 -20,-42.85714 z"
|
<path
|
||||||
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
id="path8068"
|
||||||
</g>
|
d="m 80,286.64792 28.57143,-31.42857 94.28571,60 5.71429,122.85714 L 200,472.3622 l 82.85714,-54.28571 194.28572,8.57143 191.42857,31.42857 48.57143,40 -11.42857,-65.71429 -48.57143,-94.28571 31.42857,-51.42857 14.28571,-88.57143 62.85715,74.28571 65.71428,0 31.42857,-82.85714 42.85715,94.28572 L 920,340.93363 897.14286,423.79078 868.57143,515.21935 800,663.79078 814.28571,795.21935 760,855.21935 734.28571,649.50506 691.42857,672.3622 714.28571,883.79078 640,895.21935 l -8.57143,-208.57143 -85.71428,71.42857 -160,-14.28571 L 317.14286,695.21935 360,838.07649 l -22.85714,65.71429 -74.28572,-200 -11.42857,162.85714 -74.28571,-17.14286 40,-217.14286 -42.85715,-17.14285 5.71429,-85.71429 -5.71429,-54.28571 -2.85714,-108.57143 -20,-42.85714 z"
|
||||||
|
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
<g
|
/>
|
||||||
transform="translate(600, 0) scale(0.25)"
|
</g>
|
||||||
id="cat4">
|
|
||||||
<path
|
<g transform="translate(200, 0) scale(0.25)" id="cat3">
|
||||||
id="path8068"
|
<path
|
||||||
d="m 80,286.64792 28.57143,-31.42857 94.28571,60 5.71429,122.85714 L 200,472.3622 l 82.85714,-54.28571 194.28572,8.57143 191.42857,31.42857 48.57143,40 -11.42857,-65.71429 -48.57143,-94.28571 31.42857,-51.42857 14.28571,-88.57143 62.85715,74.28571 65.71428,0 31.42857,-82.85714 42.85715,94.28572 L 920,340.93363 897.14286,423.79078 868.57143,515.21935 800,663.79078 814.28571,795.21935 760,855.21935 734.28571,649.50506 691.42857,672.3622 714.28571,883.79078 640,895.21935 l -8.57143,-208.57143 -85.71428,71.42857 -160,-14.28571 L 317.14286,695.21935 360,838.07649 l -22.85714,65.71429 -74.28572,-200 -11.42857,162.85714 -74.28571,-17.14286 40,-217.14286 -42.85715,-17.14285 5.71429,-85.71429 -5.71429,-54.28571 -2.85714,-108.57143 -20,-42.85714 z"
|
id="path8068"
|
||||||
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
d="m 80,286.64792 28.57143,-31.42857 94.28571,60 5.71429,122.85714 L 200,472.3622 l 82.85714,-54.28571 194.28572,8.57143 191.42857,31.42857 48.57143,40 -11.42857,-65.71429 -48.57143,-94.28571 31.42857,-51.42857 14.28571,-88.57143 62.85715,74.28571 65.71428,0 31.42857,-82.85714 42.85715,94.28572 L 920,340.93363 897.14286,423.79078 868.57143,515.21935 800,663.79078 814.28571,795.21935 760,855.21935 734.28571,649.50506 691.42857,672.3622 714.28571,883.79078 640,895.21935 l -8.57143,-208.57143 -85.71428,71.42857 -160,-14.28571 L 317.14286,695.21935 360,838.07649 l -22.85714,65.71429 -74.28572,-200 -11.42857,162.85714 -74.28571,-17.14286 40,-217.14286 -42.85715,-17.14285 5.71429,-85.71429 -5.71429,-54.28571 -2.85714,-108.57143 -20,-42.85714 z"
|
||||||
</g>
|
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
</g>
|
/>
|
||||||
</svg>
|
</g>
|
||||||
</div>
|
|
||||||
<script type="text/javascript">
|
<g transform="translate(600, 0) scale(0.25)" id="cat4">
|
||||||
var svg = d3.select("svg #zoom");
|
<path
|
||||||
|
id="path8068"
|
||||||
|
d="m 80,286.64792 28.57143,-31.42857 94.28571,60 5.71429,122.85714 L 200,472.3622 l 82.85714,-54.28571 194.28572,8.57143 191.42857,31.42857 48.57143,40 -11.42857,-65.71429 -48.57143,-94.28571 31.42857,-51.42857 14.28571,-88.57143 62.85715,74.28571 65.71428,0 31.42857,-82.85714 42.85715,94.28572 L 920,340.93363 897.14286,423.79078 868.57143,515.21935 800,663.79078 814.28571,795.21935 760,855.21935 734.28571,649.50506 691.42857,672.3622 714.28571,883.79078 640,895.21935 l -8.57143,-208.57143 -85.71428,71.42857 -160,-14.28571 L 317.14286,695.21935 360,838.07649 l -22.85714,65.71429 -74.28572,-200 -11.42857,162.85714 -74.28571,-17.14286 40,-217.14286 -42.85715,-17.14285 5.71429,-85.71429 -5.71429,-54.28571 -2.85714,-108.57143 -20,-42.85714 z"
|
||||||
|
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
svg.append("g")
|
/>
|
||||||
.attr("id", "circulo")
|
</g>
|
||||||
.attr("transform",
|
</g>
|
||||||
function(d) {
|
</svg>
|
||||||
return "translate(" + get_center_element("#cat1")[0] + " " + get_center_element("#cat1")[1] + ")";})
|
</div>
|
||||||
.append("circle")
|
<script type="text/javascript">
|
||||||
.attr("style", "fill: rgb(0, 255, 0);")
|
var svg = d3.select("svg #zoom");
|
||||||
.attr("cx", 0)
|
|
||||||
.attr("cy", 0)
|
svg
|
||||||
.attr("r", 20);
|
.append("g")
|
||||||
|
.attr("id", "circulo")
|
||||||
svg.append("g")
|
.attr("transform", function(d) {
|
||||||
.attr("transform",
|
return (
|
||||||
function(d) { return "translate(" + get_pos_element("#cat1")[0] + " " + get_pos_element("#cat1")[1] + ") scale(" + get_scale_element("#cat1") + ")";})
|
"translate(" +
|
||||||
.append("rect")
|
get_center_element("#cat1")[0] +
|
||||||
.attr("style", "fill:none; stroke:#ffff00;stroke-width:5")
|
" " +
|
||||||
.attr("width", function(d) { return get_size_element("#cat1")[0];})
|
get_center_element("#cat1")[1] +
|
||||||
.attr("height", function(d) { return get_size_element("#cat1")[1];});
|
")"
|
||||||
|
);
|
||||||
svg.append("g")
|
})
|
||||||
.attr("transform",
|
.append("circle")
|
||||||
function(d) {
|
.attr("style", "fill: rgb(0, 255, 0);")
|
||||||
return "translate(" + get_center_element("#cat1")[0] + " " + get_center_element("#cat1")[1] + ") scale(" + get_scale_element("#cat1") + ")";})
|
.attr("cx", 0)
|
||||||
.append("circle")
|
.attr("cy", 0)
|
||||||
.attr("style", "fill: none; stroke-width: 5; stroke: rgb(0, 0, 255);")
|
.attr("r", 20);
|
||||||
.attr("cx", 0)
|
|
||||||
.attr("cy", 0)
|
svg
|
||||||
.attr("r", get_radius_element("#cat1"));
|
.append("g")
|
||||||
|
.attr("transform", function(d) {
|
||||||
svg.append("g")
|
return (
|
||||||
.attr("id", "circulo")
|
"translate(" +
|
||||||
.attr("transform",
|
get_pos_element("#cat1")[0] +
|
||||||
function(d) {
|
" " +
|
||||||
return "translate(" + get_center_element("#cat3")[0] + " " + get_center_element("#cat3")[1] + ")";})
|
get_pos_element("#cat1")[1] +
|
||||||
.append("circle")
|
") scale(" +
|
||||||
.attr("style", "fill: rgb(0, 255, 0);")
|
get_scale_element("#cat1") +
|
||||||
.attr("cx", 0)
|
")"
|
||||||
.attr("cy", 0)
|
);
|
||||||
.attr("r", 20);
|
})
|
||||||
|
.append("rect")
|
||||||
svg.append("g")
|
.attr("style", "fill:none; stroke:#ffff00;stroke-width:5")
|
||||||
.attr("transform",
|
.attr("width", function(d) {
|
||||||
function(d) { return "translate(" + get_pos_element("#cat3")[0] + " " + get_pos_element("#cat3")[1] + ") scale(" + get_scale_element("#cat3") + ")";})
|
return get_size_element("#cat1")[0];
|
||||||
.append("rect")
|
})
|
||||||
.attr("style", "fill:none; stroke:#ffff00;stroke-width:5")
|
.attr("height", function(d) {
|
||||||
.attr("width", function(d) { return get_size_element("#cat3")[0];})
|
return get_size_element("#cat1")[1];
|
||||||
.attr("height", function(d) { return get_size_element("#cat3")[1];});
|
});
|
||||||
|
|
||||||
svg.append("g")
|
svg
|
||||||
.attr("transform",
|
.append("g")
|
||||||
function(d) {
|
.attr("transform", function(d) {
|
||||||
return "translate(" + get_center_element("#cat3")[0] + " " + get_center_element("#cat3")[1] + ") scale(" + get_scale_element("#cat3") + ")";})
|
return (
|
||||||
.append("circle")
|
"translate(" +
|
||||||
.attr("style", "fill: none; stroke-width: 5; stroke: rgb(0, 0, 255);")
|
get_center_element("#cat1")[0] +
|
||||||
.attr("cx", 0)
|
" " +
|
||||||
.attr("cy", 0)
|
get_center_element("#cat1")[1] +
|
||||||
.attr("r", get_radius_element("#cat3"));
|
") scale(" +
|
||||||
|
get_scale_element("#cat1") +
|
||||||
|
")"
|
||||||
|
);
|
||||||
|
})
|
||||||
arrow_by_pieces2("gatete_flecha", "cat1", "cat2");
|
.append("circle")
|
||||||
arrow_by_pieces2("gatete_flecha2", "cat1", "cat4");
|
.attr("style", "fill: none; stroke-width: 5; stroke: rgb(0, 0, 255);")
|
||||||
arrow_by_pieces2("gatete_flecha3", "cat3", "cat4");
|
.attr("cx", 0)
|
||||||
|
.attr("cy", 0)
|
||||||
|
.attr("r", get_radius_element("#cat1"));
|
||||||
|
|
||||||
//~ arrow_by_pieces("gatete_flecha", "cat1", "cat2");
|
svg
|
||||||
//~ arrow_by_pieces("gatete_flecha", "cat3", "cat4");
|
.append("g")
|
||||||
|
.attr("id", "circulo")
|
||||||
/**
|
.attr("transform", function(d) {
|
||||||
* Function get_radius_element
|
return (
|
||||||
* Return float
|
"translate(" +
|
||||||
* This method get the element radius
|
get_center_element("#cat3")[0] +
|
||||||
*/
|
" " +
|
||||||
function get_radius_element(element) {
|
get_center_element("#cat3")[1] +
|
||||||
var size = get_size_element(element);
|
")"
|
||||||
|
);
|
||||||
return Math.sqrt(
|
})
|
||||||
Math.pow(size[0] / 2, 2) + Math.pow(size[1] / 2, 2));
|
.append("circle")
|
||||||
}
|
.attr("style", "fill: rgb(0, 255, 0);")
|
||||||
|
.attr("cx", 0)
|
||||||
/**
|
.attr("cy", 0)
|
||||||
* Function get_scale_element
|
.attr("r", 20);
|
||||||
* Return float
|
|
||||||
* This method get the element escale
|
svg
|
||||||
*/
|
.append("g")
|
||||||
function get_scale_element(element) {
|
.attr("transform", function(d) {
|
||||||
var element_t = d3.transform(d3.select(element).attr("transform"));
|
return (
|
||||||
var element_t_scale = parseFloat(element_t['scale']);
|
"translate(" +
|
||||||
|
get_pos_element("#cat3")[0] +
|
||||||
return element_t_scale;
|
" " +
|
||||||
}
|
get_pos_element("#cat3")[1] +
|
||||||
|
") scale(" +
|
||||||
/**
|
get_scale_element("#cat3") +
|
||||||
* Function get_size_element
|
")"
|
||||||
* Return array[2]
|
);
|
||||||
* This method get the element size [width, height]
|
})
|
||||||
*/
|
.append("rect")
|
||||||
function get_size_element(element) {
|
.attr("style", "fill:none; stroke:#ffff00;stroke-width:5")
|
||||||
var element_b = d3.select(element).node().getBBox();
|
.attr("width", function(d) {
|
||||||
|
return get_size_element("#cat3")[0];
|
||||||
return [element_b['width'], element_b['height']];
|
})
|
||||||
}
|
.attr("height", function(d) {
|
||||||
|
return get_size_element("#cat3")[1];
|
||||||
/**
|
});
|
||||||
* Function get_pos_element
|
|
||||||
* Return array[2]
|
svg
|
||||||
* This method get the element position [x, y]
|
.append("g")
|
||||||
*/
|
.attr("transform", function(d) {
|
||||||
function get_pos_element(element) {
|
return (
|
||||||
var element_t = d3.transform(d3.select(element).attr("transform"));
|
"translate(" +
|
||||||
var element_t_scale = parseFloat(element_t['scale']);
|
get_center_element("#cat3")[0] +
|
||||||
var element_b = d3.select(element).node().getBBox();
|
" " +
|
||||||
|
get_center_element("#cat3")[1] +
|
||||||
var box_x = parseFloat(element_t.translate[0]) +
|
") scale(" +
|
||||||
parseFloat(element_b['x']) * element_t_scale;
|
get_scale_element("#cat3") +
|
||||||
var box_y = parseFloat(element_t.translate[1]) +
|
")"
|
||||||
parseFloat(element_b['y']) * element_t_scale;
|
);
|
||||||
|
})
|
||||||
return [box_x, box_y];
|
.append("circle")
|
||||||
}
|
.attr("style", "fill: none; stroke-width: 5; stroke: rgb(0, 0, 255);")
|
||||||
|
.attr("cx", 0)
|
||||||
/**
|
.attr("cy", 0)
|
||||||
* Function get_center_element
|
.attr("r", get_radius_element("#cat3"));
|
||||||
* Return array[2]
|
|
||||||
* This method ge2t the element center point [x, y]
|
arrow_by_pieces2("gatete_flecha", "cat1", "cat2");
|
||||||
*/
|
arrow_by_pieces2("gatete_flecha2", "cat1", "cat4");
|
||||||
function get_center_element(element) {
|
arrow_by_pieces2("gatete_flecha3", "cat3", "cat4");
|
||||||
var element_t = d3.transform(d3.select(element).attr("transform"));
|
|
||||||
var element_t_scale = parseFloat(element_t['scale']);
|
//~ arrow_by_pieces("gatete_flecha", "cat1", "cat2");
|
||||||
var element_b = d3.select(element).node().getBBox();
|
//~ arrow_by_pieces("gatete_flecha", "cat3", "cat4");
|
||||||
|
|
||||||
var box_x = parseFloat(element_t.translate[0]) +
|
/**
|
||||||
parseFloat(element_b['x']) * element_t_scale;
|
* Function get_radius_element
|
||||||
var box_y = parseFloat(element_t.translate[1]) +
|
* Return float
|
||||||
parseFloat(element_b['y']) * element_t_scale;
|
* This method get the element radius
|
||||||
|
*/
|
||||||
var width = (element_t_scale * element_b['width']);
|
function get_radius_element(element) {
|
||||||
var height = (element_t_scale * element_b['height']);
|
var size = get_size_element(element);
|
||||||
|
|
||||||
var c_x = box_x + (width / 2);
|
return Math.sqrt(Math.pow(size[0] / 2, 2) + Math.pow(size[1] / 2, 2));
|
||||||
var c_y = box_y + (height / 2);
|
}
|
||||||
|
|
||||||
return [c_x, c_y];
|
/**
|
||||||
}
|
* Function get_scale_element
|
||||||
|
* Return float
|
||||||
/**
|
* This method get the element escale
|
||||||
* Function get_distance_between_point
|
*/
|
||||||
* Return float
|
function get_scale_element(element) {
|
||||||
* This method get the distance betweeen two points
|
var element_t = d3.transform(d3.select(element).attr("transform"));
|
||||||
*/
|
var element_t_scale = parseFloat(element_t["scale"]);
|
||||||
function get_distance_between_point(point1, point2) {
|
|
||||||
delta_x = Math.abs(point1[0] - point2[0]);
|
return element_t_scale;
|
||||||
delta_y = Math.abs(point1[1] - point1[1]);
|
}
|
||||||
|
|
||||||
return Math.sqrt(
|
/**
|
||||||
Math.pow(delta_x, 2) + Math.pow(delta_y, 2));
|
* Function get_size_element
|
||||||
}
|
* Return array[2]
|
||||||
|
* This method get the element size [width, height]
|
||||||
|
*/
|
||||||
|
function get_size_element(element) {
|
||||||
/**
|
var element_b = d3
|
||||||
* Function get_angle_of_line
|
.select(element)
|
||||||
* Return float
|
.node()
|
||||||
* This method get the angle of line and x axe
|
.getBBox();
|
||||||
*/
|
|
||||||
function get_angle_of_line(point1, point2) {
|
return [element_b["width"], element_b["height"]];
|
||||||
return Math.atan2(point2[1] - point1[1], point2[0] - point1[0]) * 180 / Math.PI;
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
|
* Function get_pos_element
|
||||||
|
* Return array[2]
|
||||||
//~ function wait_for_preload_symbol(symbol) {
|
* This method get the element position [x, y]
|
||||||
//~ preload_symbol(symbol);
|
*/
|
||||||
//~
|
function get_pos_element(element) {
|
||||||
//~ while (!is_preload_symbol(symbol)) {
|
var element_t = d3.transform(d3.select(element).attr("transform"));
|
||||||
//~ sleep(1000);
|
var element_t_scale = parseFloat(element_t["scale"]);
|
||||||
//~ }
|
var element_b = d3
|
||||||
//~ }
|
.select(element)
|
||||||
//~
|
.node()
|
||||||
//~ function arrow_by_pieces(id_arrow, element1, element2, step) {
|
.getBBox();
|
||||||
//~
|
|
||||||
//~ wait_for_preload_symbol('pedo');
|
var box_x =
|
||||||
//~ wait_for_preload_symbol('caca');
|
parseFloat(element_t.translate[0]) +
|
||||||
//~ ...
|
parseFloat(element_b["x"]) * element_t_scale;
|
||||||
//~ }
|
var box_y =
|
||||||
|
parseFloat(element_t.translate[1]) +
|
||||||
|
parseFloat(element_b["y"]) * element_t_scale;
|
||||||
|
|
||||||
function arrow_by_pieces2(id_arrow, element1, element2, step) {
|
return [box_x, box_y];
|
||||||
if (typeof(step) === "undefined")
|
}
|
||||||
step = 0;
|
|
||||||
|
/**
|
||||||
step++;
|
* Function get_center_element
|
||||||
|
* Return array[2]
|
||||||
switch (step) {
|
* This method ge2t the element center point [x, y]
|
||||||
case 1:
|
*/
|
||||||
wait_for_preload_symbols(
|
function get_center_element(element) {
|
||||||
["body_arrow.svg#body_arrow",
|
var element_t = d3.transform(d3.select(element).attr("transform"));
|
||||||
"head_arrow.svg#head_arrow"],
|
var element_t_scale = parseFloat(element_t["scale"]);
|
||||||
function() {
|
var element_b = d3
|
||||||
arrow_by_pieces2(id_arrow, element1, element2, step)
|
.select(element)
|
||||||
});
|
.node()
|
||||||
break;
|
.getBBox();
|
||||||
case 2:
|
|
||||||
|
var box_x =
|
||||||
var arrow = svg.append("g")
|
parseFloat(element_t.translate[0]) +
|
||||||
.attr("id", id_arrow)
|
parseFloat(element_b["x"]) * element_t_scale;
|
||||||
.attr("style", "opacity: 0");
|
var box_y =
|
||||||
|
parseFloat(element_t.translate[1]) +
|
||||||
arrow.append("g")
|
parseFloat(element_b["y"]) * element_t_scale;
|
||||||
.attr("id", "body")
|
|
||||||
.append("use")
|
var width = element_t_scale * element_b["width"];
|
||||||
.attr("xlink:href", "body_arrow.svg#body_arrow");
|
var height = element_t_scale * element_b["height"];
|
||||||
|
|
||||||
arrow.append("g")
|
var c_x = box_x + width / 2;
|
||||||
.attr("id", "head")
|
var c_y = box_y + height / 2;
|
||||||
.append("use")
|
|
||||||
.attr("xlink:href", "head_arrow.svg#head_arrow");
|
return [c_x, c_y];
|
||||||
|
}
|
||||||
|
|
||||||
var c_elem1 = get_center_element("#" + element1);
|
/**
|
||||||
var c_elem2 = get_center_element("#" + element2);
|
* Function get_distance_between_point
|
||||||
var distance = get_distance_between_point(c_elem1, c_elem2);
|
* Return float
|
||||||
|
* This method get the distance betweeen two points
|
||||||
var transform = d3.transform();
|
*/
|
||||||
|
function get_distance_between_point(point1, point2) {
|
||||||
/*---------------------------------------------*/
|
delta_x = Math.abs(point1[0] - point2[0]);
|
||||||
/*--- Position of layer arrow (body + head) ---*/
|
delta_y = Math.abs(point1[1] - point1[1]);
|
||||||
/*---------------------------------------------*/
|
|
||||||
var arrow = d3.select("#" + id_arrow);
|
return Math.sqrt(Math.pow(delta_x, 2) + Math.pow(delta_y, 2));
|
||||||
|
}
|
||||||
var arrow_body = d3.select("#" + id_arrow + " #body");
|
|
||||||
var arrow_body_b = arrow_body.node().getBBox();
|
/**
|
||||||
|
* Function get_angle_of_line
|
||||||
transform.translate[0] = c_elem1[0];
|
* Return float
|
||||||
transform.translate[1] = c_elem1[1] - arrow_body_b['height'] / 2;
|
* This method get the angle of line and x axe
|
||||||
transform.rotate = get_angle_of_line(c_elem1, c_elem2);
|
*/
|
||||||
|
function get_angle_of_line(point1, point2) {
|
||||||
arrow.attr("transform", transform.toString());
|
return (
|
||||||
|
(Math.atan2(point2[1] - point1[1], point2[0] - point1[0]) * 180) /
|
||||||
/*---------------------------------------------*/
|
Math.PI
|
||||||
/*-------- Resize the body arrow width --------*/
|
);
|
||||||
/*---------------------------------------------*/
|
}
|
||||||
var arrow_body = d3.select("#" + id_arrow + " #body");
|
|
||||||
var arrow_body_b = arrow_body.node().getBBox();
|
function arrow_by_pieces2(id_arrow, element1, element2, step) {
|
||||||
var arrow_head = d3.select("#" + id_arrow + " #head");
|
if (typeof step === "undefined") step = 0;
|
||||||
var arrow_head_b = arrow_head.node().getBBox();
|
|
||||||
|
step++;
|
||||||
var body_width = distance - arrow_head_b['width'];
|
|
||||||
|
switch (step) {
|
||||||
transform = d3.transform();
|
case 1:
|
||||||
transform.scale[0] = body_width / arrow_body_b['width'];
|
wait_for_preload_symbols(
|
||||||
arrow_body.attr("transform", transform.toString());
|
["body_arrow.svg#body_arrow", "head_arrow.svg#head_arrow"],
|
||||||
|
function() {
|
||||||
/*---------------------------------------------*/
|
arrow_by_pieces2(id_arrow, element1, element2, step);
|
||||||
/*---------- Position of head arrow -----------*/
|
}
|
||||||
/*---------------------------------------------*/
|
);
|
||||||
transform = d3.transform();
|
break;
|
||||||
|
case 2:
|
||||||
var arrow_body_t = d3.transform(arrow_body.attr("transform"));
|
var arrow = svg
|
||||||
|
.append("g")
|
||||||
var scale = arrow_body_t.scale[0];
|
.attr("id", id_arrow)
|
||||||
var x = 0 + arrow_body_b['width'] * scale;
|
.attr("style", "opacity: 0");
|
||||||
var y = 0 + (arrow_body_b['height'] / 2 - arrow_head_b['height'] / 2);
|
|
||||||
|
arrow
|
||||||
transform.translate[0] = x;
|
.append("g")
|
||||||
transform.translate[1] = y;
|
.attr("id", "body")
|
||||||
|
.append("use")
|
||||||
arrow_head.attr("transform", transform.toString());
|
.attr("xlink:href", "body_arrow.svg#body_arrow");
|
||||||
|
|
||||||
/*---------------------------------------------*/
|
arrow
|
||||||
/*------- Show the result in one time ---------*/
|
.append("g")
|
||||||
/*---------------------------------------------*/
|
.attr("id", "head")
|
||||||
arrow.attr("style", "opacity: 1");
|
.append("use")
|
||||||
break;
|
.attr("xlink:href", "head_arrow.svg#head_arrow");
|
||||||
}
|
|
||||||
}
|
var c_elem1 = get_center_element("#" + element1);
|
||||||
|
var c_elem2 = get_center_element("#" + element2);
|
||||||
function wait_for_preload_symbols(symbols, callback) {
|
var distance = get_distance_between_point(c_elem1, c_elem2);
|
||||||
var count_symbols = symbols.length;
|
|
||||||
|
var transform = d3.transform();
|
||||||
function wait(symbol, callback) {
|
|
||||||
switch (is_preload_symbol(symbol)) {
|
/*---------------------------------------------*/
|
||||||
case -1:
|
/*--- Position of layer arrow (body + head) ---*/
|
||||||
preload_symbol(symbol);
|
/*---------------------------------------------*/
|
||||||
|
var arrow = d3.select("#" + id_arrow);
|
||||||
setTimeout(function() {
|
|
||||||
wait(symbol,
|
var arrow_body = d3.select("#" + id_arrow + " #body");
|
||||||
callback);
|
var arrow_body_b = arrow_body.node().getBBox();
|
||||||
}, 100);
|
|
||||||
break;
|
transform.translate[0] = c_elem1[0];
|
||||||
case 0:
|
transform.translate[1] = c_elem1[1] - arrow_body_b["height"] / 2;
|
||||||
// Wait
|
transform.rotate = get_angle_of_line(c_elem1, c_elem2);
|
||||||
setTimeout(function() {
|
|
||||||
wait(symbol,
|
arrow.attr("transform", transform.toString());
|
||||||
callback);
|
|
||||||
}, 100);
|
/*---------------------------------------------*/
|
||||||
break;
|
/*-------- Resize the body arrow width --------*/
|
||||||
case 1:
|
/*---------------------------------------------*/
|
||||||
count_symbols--;
|
var arrow_body = d3.select("#" + id_arrow + " #body");
|
||||||
break;
|
var arrow_body_b = arrow_body.node().getBBox();
|
||||||
}
|
var arrow_head = d3.select("#" + id_arrow + " #head");
|
||||||
|
var arrow_head_b = arrow_head.node().getBBox();
|
||||||
if (count_symbols == 0) {
|
|
||||||
//~ setTimeout(function() {
|
var body_width = distance - arrow_head_b["width"];
|
||||||
//~ callback();
|
|
||||||
//~ }, 1000);
|
transform = d3.transform();
|
||||||
callback();
|
transform.scale[0] = body_width / arrow_body_b["width"];
|
||||||
}
|
arrow_body.attr("transform", transform.toString());
|
||||||
}
|
|
||||||
|
/*---------------------------------------------*/
|
||||||
for (var i in symbols) {
|
/*---------- Position of head arrow -----------*/
|
||||||
wait(symbols[i], callback);
|
/*---------------------------------------------*/
|
||||||
}
|
transform = d3.transform();
|
||||||
}
|
|
||||||
|
var arrow_body_t = d3.transform(arrow_body.attr("transform"));
|
||||||
|
|
||||||
function preload_symbol(symbol, param_step) {
|
var scale = arrow_body_t.scale[0];
|
||||||
var step;
|
var x = 0 + arrow_body_b["width"] * scale;
|
||||||
|
var y =
|
||||||
|
0 + (arrow_body_b["height"] / 2 - arrow_head_b["height"] / 2);
|
||||||
if (typeof(param_step) == "undefined") {
|
|
||||||
step = 1;
|
transform.translate[0] = x;
|
||||||
param_step = 1;
|
transform.translate[1] = y;
|
||||||
}
|
|
||||||
else {
|
arrow_head.attr("transform", transform.toString());
|
||||||
step = param_step;
|
|
||||||
}
|
/*---------------------------------------------*/
|
||||||
|
/*------- Show the result in one time ---------*/
|
||||||
|
/*---------------------------------------------*/
|
||||||
step++;
|
arrow.attr("style", "opacity: 1");
|
||||||
|
break;
|
||||||
var base64symbol = btoa(symbol).replace(/=/g, "");
|
}
|
||||||
|
}
|
||||||
var callback = function (e) {
|
|
||||||
preload_symbol(symbol, step);
|
function wait_for_preload_symbols(symbols, callback) {
|
||||||
}
|
var count_symbols = symbols.length;
|
||||||
|
|
||||||
switch (param_step) {
|
function wait(symbol, callback) {
|
||||||
case 1:
|
switch (is_preload_symbol(symbol)) {
|
||||||
d3.select("svg").append("g")
|
case -1:
|
||||||
.attr("id", base64symbol)
|
preload_symbol(symbol);
|
||||||
.attr("data-loaded", 0)
|
|
||||||
.style("opacity", 0)
|
setTimeout(function() {
|
||||||
.append("use")
|
wait(symbol, callback);
|
||||||
.attr("xlink:href", symbol)
|
}, 100);
|
||||||
.on("load", callback);
|
break;
|
||||||
break;
|
case 0:
|
||||||
case 2:
|
// Wait
|
||||||
d3.select("#" + base64symbol).attr("data-loaded", 1);
|
setTimeout(function() {
|
||||||
|
wait(symbol, callback);
|
||||||
break;
|
}, 100);
|
||||||
}
|
break;
|
||||||
}
|
case 1:
|
||||||
|
count_symbols--;
|
||||||
function is_preload_symbol(symbol) {
|
break;
|
||||||
var base64symbol = btoa(symbol).replace(/=/g, "");
|
}
|
||||||
|
|
||||||
if (d3.select("#" + base64symbol).node() === null)
|
if (count_symbols == 0) {
|
||||||
return -1;
|
//~ setTimeout(function() {
|
||||||
|
//~ callback();
|
||||||
return parseInt(d3.select("#" + base64symbol).attr("data-loaded"));
|
//~ }, 1000);
|
||||||
}
|
callback();
|
||||||
</script>
|
}
|
||||||
</body>
|
}
|
||||||
|
|
||||||
|
for (var i in symbols) {
|
||||||
|
wait(symbols[i], callback);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function preload_symbol(symbol, param_step) {
|
||||||
|
var step;
|
||||||
|
|
||||||
|
if (typeof param_step == "undefined") {
|
||||||
|
step = 1;
|
||||||
|
param_step = 1;
|
||||||
|
} else {
|
||||||
|
step = param_step;
|
||||||
|
}
|
||||||
|
|
||||||
|
step++;
|
||||||
|
|
||||||
|
var base64symbol = btoa(symbol).replace(/=/g, "");
|
||||||
|
|
||||||
|
var callback = function(e) {
|
||||||
|
preload_symbol(symbol, step);
|
||||||
|
};
|
||||||
|
|
||||||
|
switch (param_step) {
|
||||||
|
case 1:
|
||||||
|
d3.select("svg")
|
||||||
|
.append("g")
|
||||||
|
.attr("id", base64symbol)
|
||||||
|
.attr("data-loaded", 0)
|
||||||
|
.style("opacity", 0)
|
||||||
|
.append("use")
|
||||||
|
.attr("xlink:href", symbol)
|
||||||
|
.on("load", callback);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
d3.select("#" + base64symbol).attr("data-loaded", 1);
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function is_preload_symbol(symbol) {
|
||||||
|
var base64symbol = btoa(symbol).replace(/=/g, "");
|
||||||
|
|
||||||
|
if (d3.select("#" + base64symbol).node() === null) return -1;
|
||||||
|
|
||||||
|
return parseInt(d3.select("#" + base64symbol).attr("data-loaded"));
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
package: pandorafms-agent-unix
|
package: pandorafms-agent-unix
|
||||||
Version: 7.0NG.758.1-211124
|
Version: 7.0NG.758.1-211125
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Section: admin
|
Section: admin
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
pandora_version="7.0NG.758.1-211124"
|
pandora_version="7.0NG.758.1-211125"
|
||||||
|
|
||||||
echo "Test if you has the tools for to make the packages."
|
echo "Test if you has the tools for to make the packages."
|
||||||
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
|
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
|
||||||
|
|||||||
@ -1015,7 +1015,7 @@ my $Sem = undef;
|
|||||||
my $ThreadSem = undef;
|
my $ThreadSem = undef;
|
||||||
|
|
||||||
use constant AGENT_VERSION => '7.0NG.758.1';
|
use constant AGENT_VERSION => '7.0NG.758.1';
|
||||||
use constant AGENT_BUILD => '211124';
|
use constant AGENT_BUILD => '211125';
|
||||||
|
|
||||||
# Agent log default file size maximum and instances
|
# Agent log default file size maximum and instances
|
||||||
use constant DEFAULT_MAX_LOG_SIZE => 600000;
|
use constant DEFAULT_MAX_LOG_SIZE => 600000;
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_agent_unix
|
%define name pandorafms_agent_unix
|
||||||
%define version 7.0NG.758.1
|
%define version 7.0NG.758.1
|
||||||
%define release 211124
|
%define release 211125
|
||||||
|
|
||||||
Summary: Pandora FMS Linux agent, PERL version
|
Summary: Pandora FMS Linux agent, PERL version
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_agent_unix
|
%define name pandorafms_agent_unix
|
||||||
%define version 7.0NG.758.1
|
%define version 7.0NG.758.1
|
||||||
%define release 211124
|
%define release 211125
|
||||||
|
|
||||||
Summary: Pandora FMS Linux agent, PERL version
|
Summary: Pandora FMS Linux agent, PERL version
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
# **********************************************************************
|
# **********************************************************************
|
||||||
|
|
||||||
PI_VERSION="7.0NG.758.1"
|
PI_VERSION="7.0NG.758.1"
|
||||||
PI_BUILD="211124"
|
PI_BUILD="211125"
|
||||||
OS_NAME=`uname -s`
|
OS_NAME=`uname -s`
|
||||||
|
|
||||||
FORCE=0
|
FORCE=0
|
||||||
|
|||||||
@ -186,7 +186,7 @@ UpgradeApplicationID
|
|||||||
{}
|
{}
|
||||||
|
|
||||||
Version
|
Version
|
||||||
{211124}
|
{211125}
|
||||||
|
|
||||||
ViewReadme
|
ViewReadme
|
||||||
{Yes}
|
{Yes}
|
||||||
|
|||||||
@ -30,7 +30,7 @@ using namespace Pandora;
|
|||||||
using namespace Pandora_Strutils;
|
using namespace Pandora_Strutils;
|
||||||
|
|
||||||
#define PATH_SIZE _MAX_PATH+1
|
#define PATH_SIZE _MAX_PATH+1
|
||||||
#define PANDORA_VERSION ("7.0NG.758.1 Build 211124")
|
#define PANDORA_VERSION ("7.0NG.758.1 Build 211125")
|
||||||
|
|
||||||
string pandora_path;
|
string pandora_path;
|
||||||
string pandora_dir;
|
string pandora_dir;
|
||||||
|
|||||||
@ -11,7 +11,7 @@ BEGIN
|
|||||||
VALUE "LegalCopyright", "Artica ST"
|
VALUE "LegalCopyright", "Artica ST"
|
||||||
VALUE "OriginalFilename", "PandoraAgent.exe"
|
VALUE "OriginalFilename", "PandoraAgent.exe"
|
||||||
VALUE "ProductName", "Pandora FMS Windows Agent"
|
VALUE "ProductName", "Pandora FMS Windows Agent"
|
||||||
VALUE "ProductVersion", "(7.0NG.758.1(Build 211124))"
|
VALUE "ProductVersion", "(7.0NG.758.1(Build 211125))"
|
||||||
VALUE "FileVersion", "1.0.0.0"
|
VALUE "FileVersion", "1.0.0.0"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
package: pandorafms-console
|
package: pandorafms-console
|
||||||
Version: 7.0NG.758.1-211124
|
Version: 7.0NG.758.1-211125
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Section: admin
|
Section: admin
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
pandora_version="7.0NG.758.1-211124"
|
pandora_version="7.0NG.758.1-211125"
|
||||||
|
|
||||||
package_pear=0
|
package_pear=0
|
||||||
package_pandora=1
|
package_pandora=1
|
||||||
|
|||||||
@ -688,7 +688,7 @@ foreach ($simple_alerts as $alert) {
|
|||||||
$data[3] .= '</tr>';
|
$data[3] .= '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$data[3] .= '<div id="update_action-div" class="invisible">';
|
$data[3] .= '<div id="update_action-div-'.$alert['id'].'" class="invisible">';
|
||||||
$data[3] .= '</div>';
|
$data[3] .= '</div>';
|
||||||
$data[3] .= '</table>';
|
$data[3] .= '</table>';
|
||||||
// Is possible manage actions if have LW permissions in the agent group of the alert module
|
// Is possible manage actions if have LW permissions in the agent group of the alert module
|
||||||
@ -706,9 +706,9 @@ foreach ($simple_alerts as $alert) {
|
|||||||
$actions = alerts_get_alert_actions_filter(true, 'id_group IN ('.$filter_groups.')');
|
$actions = alerts_get_alert_actions_filter(true, 'id_group IN ('.$filter_groups.')');
|
||||||
}
|
}
|
||||||
|
|
||||||
$data[3] .= '<div id="add_action-div-'.$alert['id'].'" class="invisible left">';
|
$data[3] .= '<div id="add_action-div-'.$alert['id'].'" class="invisible">';
|
||||||
$data[3] .= '<form id="add_action_form-'.$alert['id'].'" method="post">';
|
$data[3] .= '<form id="add_action_form-'.$alert['id'].'" method="post" style="height:85%;">';
|
||||||
$data[3] .= '<table class="databox_color w100p bg_color222">';
|
$data[3] .= '<table class="databox_color w100p bg_color222" style="height:100%;">';
|
||||||
$data[3] .= html_print_input_hidden('add_action', 1, true);
|
$data[3] .= html_print_input_hidden('add_action', 1, true);
|
||||||
$data[3] .= html_print_input_hidden('id_alert_module', $alert['id'], true);
|
$data[3] .= html_print_input_hidden('id_alert_module', $alert['id'], true);
|
||||||
|
|
||||||
@ -1127,13 +1127,14 @@ function show_add_action(id_alert) {
|
|||||||
background: "black"
|
background: "black"
|
||||||
},
|
},
|
||||||
open: function() {
|
open: function() {
|
||||||
|
$(`#add_action-div-${id_alert}`).css('overflow', 'hidden');
|
||||||
$("#action_select, #action_select").select2({
|
$("#action_select, #action_select").select2({
|
||||||
tags: true,
|
tags: true,
|
||||||
dropdownParent: $("#add_action-div-" + id_alert)
|
dropdownParent: $("#add_action-div-" + id_alert)
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
width: 500,
|
width: 455,
|
||||||
height: 300
|
height: 500
|
||||||
})
|
})
|
||||||
.show ();
|
.show ();
|
||||||
}
|
}
|
||||||
@ -1151,8 +1152,8 @@ function show_display_update_action(id_module_action, alert_id, alert_id_agent_m
|
|||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: action="<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
|
url: action="<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
$("#update_action-div").html (data);
|
$(`#update_action-div-${alert_id}`).html (data);
|
||||||
$("#update_action-div").hide ()
|
$(`#update_action-div-${alert_id}`).hide ()
|
||||||
.dialog ({
|
.dialog ({
|
||||||
resizable: true,
|
resizable: true,
|
||||||
draggable: true,
|
draggable: true,
|
||||||
@ -1163,14 +1164,14 @@ function show_display_update_action(id_module_action, alert_id, alert_id_agent_m
|
|||||||
background: "black"
|
background: "black"
|
||||||
},
|
},
|
||||||
open: function() {
|
open: function() {
|
||||||
$('#update_action-div').css('overflow', 'hidden');
|
$(`#update_action-div-${alert_id}`).css('overflow', 'hidden');
|
||||||
$("#action_select, #action_select_ajax").select2({
|
$(`#action_select_ajax-${alert_id}`).select2({
|
||||||
tags: true,
|
tags: true,
|
||||||
dropdownParent: $('#update_action-')
|
dropdownParent: $(`#update_action-div-${alert_id}`)
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
width: 455,
|
width: 455,
|
||||||
height: 370
|
height: 500
|
||||||
})
|
})
|
||||||
.show ();
|
.show ();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -270,7 +270,8 @@ if ($add_action) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($update_action) {
|
if ($update_action) {
|
||||||
$id_action = (int) get_parameter('action_select_ajax');
|
$alert_id = (int) get_parameter('alert_id');
|
||||||
|
$id_action = (int) get_parameter('action_select_ajax-'.$alert_id);
|
||||||
$id_module_action = (int) get_parameter('id_module_action_ajax');
|
$id_module_action = (int) get_parameter('id_module_action_ajax');
|
||||||
$fires_min = (int) get_parameter('fires_min_ajax');
|
$fires_min = (int) get_parameter('fires_min_ajax');
|
||||||
$fires_max = (int) get_parameter('fires_max_ajax');
|
$fires_max = (int) get_parameter('fires_max_ajax');
|
||||||
|
|||||||
@ -118,8 +118,8 @@ class ClientTest extends \PHPUnit\Framework\TestCase
|
|||||||
|
|
||||||
system('echo "file3" > '.$path.'3');
|
system('echo "file3" > '.$path.'3');
|
||||||
file_put_contents($path.'extras/delete_files/delete_files.txt', "1\n");
|
file_put_contents($path.'extras/delete_files/delete_files.txt', "1\n");
|
||||||
system('echo -e "create table teta (id int);\n" >'.$path.'extras/mr/2.sql');
|
system('echo -e "create table toum1 (id int);\n" >'.$path.'extras/mr/2.sql');
|
||||||
system('echo -e "create table teto (id int);\n" >>'.$path.'extras/mr/2.sql');
|
system('echo -e "create table toum2 (id int);\n" >>'.$path.'extras/mr/2.sql');
|
||||||
system('cd '.$path.' && zip '.$target.'/test_3.zip -r * >/dev/null');
|
system('cd '.$path.' && zip '.$target.'/test_3.zip -r * >/dev/null');
|
||||||
system('mv '.$target.'/test_3.zip '.$target.'/test_3.oum');
|
system('mv '.$target.'/test_3.zip '.$target.'/test_3.oum');
|
||||||
|
|
||||||
@ -142,7 +142,7 @@ class ClientTest extends \PHPUnit\Framework\TestCase
|
|||||||
|
|
||||||
system('echo "file4" > '.$path.'4');
|
system('echo "file4" > '.$path.'4');
|
||||||
file_put_contents($path.'extras/delete_files/delete_files.txt', "1\n");
|
file_put_contents($path.'extras/delete_files/delete_files.txt', "1\n");
|
||||||
system('echo -e "drop table teta;\n" >'.$path.'extras/mr/3.sql');
|
system('echo -e "drop table toum1;\n" >'.$path.'extras/mr/3.sql');
|
||||||
system('cd '.$path.' && zip '.$target.'/test_4.zip -r * >/dev/null');
|
system('cd '.$path.' && zip '.$target.'/test_4.zip -r * >/dev/null');
|
||||||
system('mv '.$target.'/test_4.zip '.$target.'/test_4.oum');
|
system('mv '.$target.'/test_4.zip '.$target.'/test_4.oum');
|
||||||
|
|
||||||
|
|||||||
@ -422,13 +422,18 @@ if ($show_update_action_menu) {
|
|||||||
$id_action
|
$id_action
|
||||||
);
|
);
|
||||||
|
|
||||||
$data .= '<form id="update_action-'.$alert['id'].'" method="post" style="height:85%;">';
|
$data .= '<form id="update_action-'.$id_alert.'" method="post" style="height:85%;">';
|
||||||
$data .= '<table class="databox_color w100p bg_color222" style="height:100%;">';
|
$data .= '<table class="databox_color w100p bg_color222" style="height:100%;">';
|
||||||
$data .= html_print_input_hidden(
|
$data .= html_print_input_hidden(
|
||||||
'update_action',
|
'update_action',
|
||||||
1,
|
1,
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
|
$data .= html_print_input_hidden(
|
||||||
|
'alert_id',
|
||||||
|
$id_alert,
|
||||||
|
true
|
||||||
|
);
|
||||||
$data .= html_print_input_hidden(
|
$data .= html_print_input_hidden(
|
||||||
'id_module_action_ajax',
|
'id_module_action_ajax',
|
||||||
$id_action,
|
$id_action,
|
||||||
@ -478,7 +483,7 @@ if ($show_update_action_menu) {
|
|||||||
$data .= '<td class="datos2">';
|
$data .= '<td class="datos2">';
|
||||||
$data .= html_print_select(
|
$data .= html_print_select(
|
||||||
$actions,
|
$actions,
|
||||||
'action_select_ajax',
|
'action_select_ajax-'.$id_alert,
|
||||||
$action_option['id_alert_action'],
|
$action_option['id_alert_action'],
|
||||||
'',
|
'',
|
||||||
false,
|
false,
|
||||||
|
|||||||
@ -92,7 +92,7 @@ class ModuleTemplates extends HTML
|
|||||||
private $validPen;
|
private $validPen;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Complete list of PENes.
|
* Complete list of PENs.
|
||||||
*
|
*
|
||||||
* @var array.
|
* @var array.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
/**
|
/**
|
||||||
* Pandora build version and version
|
* Pandora build version and version
|
||||||
*/
|
*/
|
||||||
$build_version = 'PC211124';
|
$build_version = 'PC211125';
|
||||||
$pandora_version = 'v7.0NG.758.1';
|
$pandora_version = 'v7.0NG.758.1';
|
||||||
|
|
||||||
// Do not overwrite default timezone set if defined.
|
// Do not overwrite default timezone set if defined.
|
||||||
|
|||||||
@ -1574,7 +1574,9 @@ function graphic_combined_module(
|
|||||||
$date_array['final_date'] = $params['date'];
|
$date_array['final_date'] = $params['date'];
|
||||||
$date_array['start_date'] = ($params['date'] - $params['period']);
|
$date_array['start_date'] = ($params['date'] - $params['period']);
|
||||||
|
|
||||||
$server_name = metaconsole_get_server_by_id($modules[0]['server']);
|
if (is_metaconsole()) {
|
||||||
|
$server_name = metaconsole_get_server_by_id($modules[0]['server']);
|
||||||
|
}
|
||||||
|
|
||||||
if ($params_combined['projection']) {
|
if ($params_combined['projection']) {
|
||||||
$output_projection = forecast_projection_graph(
|
$output_projection = forecast_projection_graph(
|
||||||
|
|||||||
@ -3279,13 +3279,6 @@ td.empty_field {
|
|||||||
width: 96%;
|
width: 96%;
|
||||||
}
|
}
|
||||||
|
|
||||||
#update_action-
|
|
||||||
> .select2-container--default
|
|
||||||
.select2-results
|
|
||||||
> .select2-results__options {
|
|
||||||
max-height: 125px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Policies styles */
|
/* Policies styles */
|
||||||
|
|
||||||
table#policy_modules td * {
|
table#policy_modules td * {
|
||||||
|
|||||||
@ -129,7 +129,7 @@
|
|||||||
<div style='height: 10px'>
|
<div style='height: 10px'>
|
||||||
<?php
|
<?php
|
||||||
$version = '7.0NG.758.1';
|
$version = '7.0NG.758.1';
|
||||||
$build = '211124';
|
$build = '211125';
|
||||||
$banner = "v$version Build $build";
|
$banner = "v$version Build $build";
|
||||||
|
|
||||||
error_reporting(0);
|
error_reporting(0);
|
||||||
|
|||||||
@ -108,7 +108,7 @@ class ModuleGraph
|
|||||||
|
|
||||||
$this->height -= 80;
|
$this->height -= 80;
|
||||||
// Correct the height
|
// Correct the height
|
||||||
// For to avoid fucking IPHONES when they are in horizontal.
|
// For to avoid IPHONES when they are in horizontal.
|
||||||
if ($this->height < 140) {
|
if ($this->height < 140) {
|
||||||
$this->height = 140;
|
$this->height = 140;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -261,23 +261,22 @@ foreach ($result as $row) {
|
|||||||
$data[] = $attr[1] ($row[$attr[0]]);
|
$data[] = $attr[1] ($row[$attr[0]]);
|
||||||
} else if (($config['command_snapshot']) && (preg_match("/[\n]+/i", $row[$attr[0]]))) {
|
} else if (($config['command_snapshot']) && (preg_match("/[\n]+/i", $row[$attr[0]]))) {
|
||||||
// Its a single-data, multiline data (data snapshot) ?
|
// Its a single-data, multiline data (data snapshot) ?
|
||||||
// Detect string data with \n and convert to <br>'s
|
// Detect string data with \n and convert to <br>'s.
|
||||||
$datos = preg_replace('/\n/i', '<br>', $row[$attr[0]]);
|
$datos = preg_replace('/\n/i', '<br>', $row[$attr[0]]);
|
||||||
$datos = preg_replace('/\s/i', ' ', $datos);
|
$datos = preg_replace('/\s/i', ' ', $datos);
|
||||||
|
|
||||||
// Because this *SHIT* of print_table monster, I cannot format properly this cells
|
// Because this print_table monster, I cannot format properly this cells.
|
||||||
// so, eat this, motherfucker :))
|
|
||||||
$datos = "<span class='mono'>".$datos.'</span>';
|
$datos = "<span class='mono'>".$datos.'</span>';
|
||||||
|
|
||||||
// I dont why, but using index (value) method, data is automatically converted to html entities ¿?
|
// I dont why, but using index (value) method, data is automatically converted to html entities ¿?
|
||||||
$data[$attr[1]] = $datos;
|
$data[$attr[1]] = $datos;
|
||||||
} else if ($is_web_content_string) {
|
} else if ($is_web_content_string) {
|
||||||
// Fixed the goliat sends the strings from web
|
// Fixed the goliat sends the strings from web
|
||||||
// without HTML entities
|
// without HTML entities.
|
||||||
$data[$attr[1]] = io_safe_input($row[$attr[0]]);
|
$data[$attr[1]] = io_safe_input($row[$attr[0]]);
|
||||||
} else {
|
} else {
|
||||||
// Just a string of alphanumerical data... just do print
|
// Just a string of alphanumerical data... just do print
|
||||||
// Fixed the data from Selenium Plugin
|
// Fixed the data from Selenium Plugin.
|
||||||
if ($row[$attr[0]] != strip_tags($row[$attr[0]])) {
|
if ($row[$attr[0]] != strip_tags($row[$attr[0]])) {
|
||||||
$data[$attr[1]] = io_safe_input($row[$attr[0]]);
|
$data[$attr[1]] = io_safe_input($row[$attr[0]]);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -78,6 +78,10 @@ $integria_types_csv = integria_api_call(null, null, null, null, 'get_types');
|
|||||||
|
|
||||||
get_array_from_csv_data_pair($integria_types_csv, $integria_types_values);
|
get_array_from_csv_data_pair($integria_types_csv, $integria_types_values);
|
||||||
|
|
||||||
|
$integria_resolution_csv = integria_api_call(null, null, null, null, 'get_incidents_resolutions');
|
||||||
|
|
||||||
|
get_array_from_csv_data_pair($integria_resolution_csv, $integria_resolution_values);
|
||||||
|
|
||||||
$event_id = (int) get_parameter('from_event');
|
$event_id = (int) get_parameter('from_event');
|
||||||
$incident_id_edit = (int) get_parameter('incident_id');
|
$incident_id_edit = (int) get_parameter('incident_id');
|
||||||
$create_incident = (bool) get_parameter('create_incident', 0);
|
$create_incident = (bool) get_parameter('create_incident', 0);
|
||||||
@ -88,6 +92,7 @@ $incident_owner = get_parameter('owner');
|
|||||||
$incident_type = (int) get_parameter('type');
|
$incident_type = (int) get_parameter('type');
|
||||||
$incident_creator = get_parameter('creator');
|
$incident_creator = get_parameter('creator');
|
||||||
$incident_status = (int) get_parameter('status');
|
$incident_status = (int) get_parameter('status');
|
||||||
|
$incident_resolution = (int) get_parameter('resolution');
|
||||||
$incident_title = events_get_field_value_by_event_id($event_id, get_parameter('incident_title'));
|
$incident_title = events_get_field_value_by_event_id($event_id, get_parameter('incident_title'));
|
||||||
$incident_content = events_get_field_value_by_event_id($event_id, get_parameter('incident_content'));
|
$incident_content = events_get_field_value_by_event_id($event_id, get_parameter('incident_content'));
|
||||||
$file_description = get_parameter('file_description');
|
$file_description = get_parameter('file_description');
|
||||||
@ -98,8 +103,13 @@ $incident_content = str_replace(',', ':::', $incident_content);
|
|||||||
|
|
||||||
// Perform action.
|
// Perform action.
|
||||||
if ($create_incident === true) {
|
if ($create_incident === true) {
|
||||||
|
// Disregard incident resolution unless status is 'closed'.
|
||||||
|
if ($incident_status !== 7) {
|
||||||
|
$incident_resolution = 0;
|
||||||
|
}
|
||||||
|
|
||||||
// Call Integria IMS API method to create an incident.
|
// Call Integria IMS API method to create an incident.
|
||||||
$result_api_call = integria_api_call(null, null, null, null, 'create_incident', [$incident_title, $incident_group_id, $incident_criticity_id, $incident_content, '', $incident_type, '', $incident_owner, '0', $incident_status], false, '', ',');
|
$result_api_call = integria_api_call(null, null, null, null, 'create_incident', [$incident_title, $incident_group_id, $incident_criticity_id, $incident_content, '', $incident_type, '', $incident_owner, '0', $incident_status, '', $incident_resolution], false, '', ',');
|
||||||
|
|
||||||
if ($userfile !== '' && $result_api_call !== false) {
|
if ($userfile !== '' && $result_api_call !== false) {
|
||||||
integriaims_upload_file('userfile', $result_api_call, $file_description);
|
integriaims_upload_file('userfile', $result_api_call, $file_description);
|
||||||
@ -114,8 +124,13 @@ if ($create_incident === true) {
|
|||||||
__('Could not be created in Integria IMS')
|
__('Could not be created in Integria IMS')
|
||||||
);
|
);
|
||||||
} else if ($update_incident === true) {
|
} else if ($update_incident === true) {
|
||||||
|
// Disregard incident resolution unless status is 'closed'.
|
||||||
|
if ($incident_status !== 7) {
|
||||||
|
$incident_resolution = 0;
|
||||||
|
}
|
||||||
|
|
||||||
// Call Integria IMS API method to update an incident.
|
// Call Integria IMS API method to update an incident.
|
||||||
$result_api_call = integria_api_call(null, null, null, null, 'update_incident', [$incident_id_edit, $incident_title, $incident_content, '', $incident_group_id, $incident_criticity_id, 0, $incident_status, $incident_owner, 0, $incident_type], false, '', ',');
|
$result_api_call = integria_api_call(null, null, null, null, 'update_incident', [$incident_id_edit, $incident_title, $incident_content, '', $incident_group_id, $incident_criticity_id, $incident_resolution, $incident_status, $incident_owner, 0, $incident_type], false, '', ',');
|
||||||
|
|
||||||
if ($userfile !== '') {
|
if ($userfile !== '') {
|
||||||
integriaims_upload_file('userfile', $incident_id_edit, $file_description);
|
integriaims_upload_file('userfile', $incident_id_edit, $file_description);
|
||||||
@ -161,8 +176,8 @@ $table->style[0] = 'width: 33%; padding-right: 50px; padding-left: 100px;';
|
|||||||
$table->style[1] = 'width: 33%; padding-right: 50px; padding-left: 50px;';
|
$table->style[1] = 'width: 33%; padding-right: 50px; padding-left: 50px;';
|
||||||
$table->style[2] = 'width: 33%; padding-right: 100px; padding-left: 50px;';
|
$table->style[2] = 'width: 33%; padding-right: 100px; padding-left: 50px;';
|
||||||
$table->colspan[0][0] = 2;
|
$table->colspan[0][0] = 2;
|
||||||
$table->colspan[3][0] = 3;
|
$table->colspan[4][0] = 3;
|
||||||
$table->colspan[5][0] = 3;
|
$table->colspan[6][0] = 3;
|
||||||
|
|
||||||
$help_macros = isset($_GET['from_event']) ? ui_print_help_icon('response_macros', true) : '';
|
$help_macros = isset($_GET['from_event']) ? ui_print_help_icon('response_macros', true) : '';
|
||||||
|
|
||||||
@ -174,6 +189,7 @@ if ($update) {
|
|||||||
$input_value_criticity = $incident_details[7];
|
$input_value_criticity = $incident_details[7];
|
||||||
$input_value_owner = $incident_details[5];
|
$input_value_owner = $incident_details[5];
|
||||||
$input_value_content = $incident_details[4];
|
$input_value_content = $incident_details[4];
|
||||||
|
$input_value_resolution = $incident_details[12];
|
||||||
} else if (isset($_GET['from_event'])) {
|
} else if (isset($_GET['from_event'])) {
|
||||||
$input_value_title = $config['cr_incident_title'];
|
$input_value_title = $config['cr_incident_title'];
|
||||||
$input_value_type = $config['cr_incident_type'];
|
$input_value_type = $config['cr_incident_type'];
|
||||||
@ -182,6 +198,7 @@ if ($update) {
|
|||||||
$input_value_criticity = $config['cr_default_criticity'];
|
$input_value_criticity = $config['cr_default_criticity'];
|
||||||
$input_value_owner = $config['cr_default_owner'];
|
$input_value_owner = $config['cr_default_owner'];
|
||||||
$input_value_content = $config['cr_incident_content'];
|
$input_value_content = $config['cr_incident_content'];
|
||||||
|
$input_value_resolution = 0;
|
||||||
} else {
|
} else {
|
||||||
$input_value_title = '';
|
$input_value_title = '';
|
||||||
$input_value_type = '';
|
$input_value_type = '';
|
||||||
@ -190,6 +207,7 @@ if ($update) {
|
|||||||
$input_value_criticity = '';
|
$input_value_criticity = '';
|
||||||
$input_value_owner = '';
|
$input_value_owner = '';
|
||||||
$input_value_content = '';
|
$input_value_content = '';
|
||||||
|
$input_value_resolution = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
$table->data[0][0] = '<div class="label_select"><p class="input_label">'.__('Title').': '.$help_macros.'</p>';
|
$table->data[0][0] = '<div class="label_select"><p class="input_label">'.__('Title').': '.$help_macros.'</p>';
|
||||||
@ -303,8 +321,26 @@ $table->data[2][2] .= '<div class="label_select_parent">'.html_print_autocomplet
|
|||||||
'w100p'
|
'w100p'
|
||||||
).'</div>';
|
).'</div>';
|
||||||
|
|
||||||
$table->data[3][0] = '<div class="label_select"><p class="input_label">'.__('Description').': '.$help_macros.'</p>';
|
|
||||||
$table->data[3][0] .= '<div class="label_select_parent">'.html_print_textarea(
|
$table->data[3][0] = '<div class="label_select"><p class="input_label">'.__('Resolution').': </p>';
|
||||||
|
|
||||||
|
$table->data[3][0] .= '<div class="label_select_parent">'.html_print_select(
|
||||||
|
$integria_resolution_values,
|
||||||
|
'resolution',
|
||||||
|
$input_value_resolution,
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
1,
|
||||||
|
true,
|
||||||
|
false,
|
||||||
|
true,
|
||||||
|
'',
|
||||||
|
false,
|
||||||
|
'width: 100%;'
|
||||||
|
).'</div>';
|
||||||
|
|
||||||
|
$table->data[4][0] = '<div class="label_select"><p class="input_label">'.__('Description').': '.$help_macros.'</p>';
|
||||||
|
$table->data[4][0] .= '<div class="label_select_parent">'.html_print_textarea(
|
||||||
'incident_content',
|
'incident_content',
|
||||||
3,
|
3,
|
||||||
20,
|
20,
|
||||||
@ -313,10 +349,10 @@ $table->data[3][0] .= '<div class="label_select_parent">'.html_print_textarea(
|
|||||||
true
|
true
|
||||||
).'</div>';
|
).'</div>';
|
||||||
|
|
||||||
$table->data[4][0] = '<div class="label_select"><p class="input_label">'.__('File name').':</p>';
|
$table->data[5][0] = '<div class="label_select"><p class="input_label">'.__('File name').':</p>';
|
||||||
$table->data[4][0] .= html_print_input_file('userfile', true);
|
$table->data[5][0] .= html_print_input_file('userfile', true);
|
||||||
$table->data[5][0] = '<div class="label_select"><p class="input_label">'.__('Attachment description').':</p>';
|
$table->data[6][0] = '<div class="label_select"><p class="input_label">'.__('Attachment description').':</p>';
|
||||||
$table->data[5][0] .= html_print_textarea(
|
$table->data[6][0] .= html_print_textarea(
|
||||||
'file_description',
|
'file_description',
|
||||||
3,
|
3,
|
||||||
20,
|
20,
|
||||||
@ -345,3 +381,32 @@ if ($update) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
|
?>
|
||||||
|
|
||||||
|
<script type="text/javascript">
|
||||||
|
$(document).ready(function () {
|
||||||
|
$('#add_alert_table-3').hide();
|
||||||
|
|
||||||
|
var input_value_status =
|
||||||
|
<?php
|
||||||
|
$status_value = ($input_value_status === '') ? 0 : $input_value_status;
|
||||||
|
echo $status_value;
|
||||||
|
?>
|
||||||
|
;
|
||||||
|
|
||||||
|
if (input_value_status === 7) {
|
||||||
|
$('#add_alert_table-3').show();
|
||||||
|
} else {
|
||||||
|
$('#add_alert_table-3').hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
$('#status').on('change', function() {
|
||||||
|
if ($(this).val() === '7') {
|
||||||
|
$('#add_alert_table-3').show();
|
||||||
|
} else {
|
||||||
|
$('#add_alert_table-3').hide();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|||||||
@ -48,7 +48,7 @@ if ($id_graph !== 0) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete module SQL code
|
// Delete module SQL code.
|
||||||
if ($delete_graph) {
|
if ($delete_graph) {
|
||||||
if (check_acl($config['id_user'], 0, 'AW')) {
|
if (check_acl($config['id_user'], 0, 'AW')) {
|
||||||
$res = db_process_sql_delete('tgraph_source', ['id_graph' => $id_graph]);
|
$res = db_process_sql_delete('tgraph_source', ['id_graph' => $id_graph]);
|
||||||
@ -239,7 +239,7 @@ if ($view_graph) {
|
|||||||
]
|
]
|
||||||
).'</a>';
|
).'</a>';
|
||||||
|
|
||||||
// In full screen, the manage options are not available
|
// In full screen, the manage options are not available.
|
||||||
$options = [
|
$options = [
|
||||||
'view' => $options['view'],
|
'view' => $options['view'],
|
||||||
'screen' => $options['screen'],
|
'screen' => $options['screen'],
|
||||||
@ -277,6 +277,12 @@ if ($view_graph) {
|
|||||||
'fullscale' => $fullscale,
|
'fullscale' => $fullscale,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
if ($stacked === CUSTOM_GRAPH_AREA || $stacked === CUSTOM_GRAPH_STACKED_AREA) {
|
||||||
|
$params['type_graph'] = 'area';
|
||||||
|
} else if ($stacked === CUSTOM_GRAPH_LINE || $stacked === CUSTOM_GRAPH_STACKED_LINE) {
|
||||||
|
$params['type_graph'] = 'line';
|
||||||
|
}
|
||||||
|
|
||||||
$params_combined = [
|
$params_combined = [
|
||||||
'stacked' => $stacked,
|
'stacked' => $stacked,
|
||||||
'id_graph' => $id_graph,
|
'id_graph' => $id_graph,
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_console
|
%define name pandorafms_console
|
||||||
%define version 7.0NG.758.1
|
%define version 7.0NG.758.1
|
||||||
%define release 211124
|
%define release 211125
|
||||||
|
|
||||||
# User and Group under which Apache is running
|
# User and Group under which Apache is running
|
||||||
%define httpd_name httpd
|
%define httpd_name httpd
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_console
|
%define name pandorafms_console
|
||||||
%define version 7.0NG.758.1
|
%define version 7.0NG.758.1
|
||||||
%define release 211124
|
%define release 211125
|
||||||
|
|
||||||
# User and Group under which Apache is running
|
# User and Group under which Apache is running
|
||||||
%define httpd_name httpd
|
%define httpd_name httpd
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_console
|
%define name pandorafms_console
|
||||||
%define version 7.0NG.758.1
|
%define version 7.0NG.758.1
|
||||||
%define release 211124
|
%define release 211125
|
||||||
%define httpd_name httpd
|
%define httpd_name httpd
|
||||||
# User and Group under which Apache is running
|
# User and Group under which Apache is running
|
||||||
%define httpd_name apache2
|
%define httpd_name apache2
|
||||||
|
|||||||
@ -134,9 +134,7 @@ sunshine
|
|||||||
hunter
|
hunter
|
||||||
4321
|
4321
|
||||||
buddy
|
buddy
|
||||||
porn
|
|
||||||
morgan
|
morgan
|
||||||
fuck
|
|
||||||
4128
|
4128
|
||||||
whatever
|
whatever
|
||||||
matrix
|
matrix
|
||||||
@ -164,7 +162,6 @@ charles
|
|||||||
thomas
|
thomas
|
||||||
casper
|
casper
|
||||||
jackie
|
jackie
|
||||||
cumshot
|
|
||||||
girls
|
girls
|
||||||
tigger
|
tigger
|
||||||
stupid
|
stupid
|
||||||
@ -172,7 +169,6 @@ monica
|
|||||||
boston
|
boston
|
||||||
booboo
|
booboo
|
||||||
robert
|
robert
|
||||||
shit
|
|
||||||
midnight
|
midnight
|
||||||
braves
|
braves
|
||||||
coffee
|
coffee
|
||||||
@ -212,11 +208,9 @@ sierra
|
|||||||
mercedes
|
mercedes
|
||||||
johnny
|
johnny
|
||||||
george
|
george
|
||||||
cumming
|
|
||||||
leather
|
leather
|
||||||
5150
|
5150
|
||||||
gandalf
|
gandalf
|
||||||
sexy
|
|
||||||
hunting
|
hunting
|
||||||
232323
|
232323
|
||||||
doggie
|
doggie
|
||||||
@ -279,8 +273,6 @@ member
|
|||||||
anthony
|
anthony
|
||||||
austin
|
austin
|
||||||
paul
|
paul
|
||||||
fucked
|
|
||||||
boobs
|
|
||||||
blowme
|
blowme
|
||||||
william
|
william
|
||||||
mine
|
mine
|
||||||
@ -419,13 +411,11 @@ freedom
|
|||||||
magnum
|
magnum
|
||||||
extreme
|
extreme
|
||||||
internet
|
internet
|
||||||
fucking
|
|
||||||
ginger
|
ginger
|
||||||
juice
|
juice
|
||||||
redskins
|
redskins
|
||||||
action
|
action
|
||||||
captain
|
captain
|
||||||
blowjob
|
|
||||||
abgrtyu
|
abgrtyu
|
||||||
erotic
|
erotic
|
||||||
carter
|
carter
|
||||||
@ -478,7 +468,6 @@ winner
|
|||||||
131313
|
131313
|
||||||
mistress
|
mistress
|
||||||
florida
|
florida
|
||||||
cock
|
|
||||||
samantha
|
samantha
|
||||||
123123
|
123123
|
||||||
phantom
|
phantom
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
package: pandorafms-server
|
package: pandorafms-server
|
||||||
Version: 7.0NG.758.1-211124
|
Version: 7.0NG.758.1-211125
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Section: admin
|
Section: admin
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
pandora_version="7.0NG.758.1-211124"
|
pandora_version="7.0NG.758.1-211125"
|
||||||
|
|
||||||
package_cpan=0
|
package_cpan=0
|
||||||
package_pandora=1
|
package_pandora=1
|
||||||
|
|||||||
@ -46,7 +46,7 @@ our @EXPORT = qw(
|
|||||||
|
|
||||||
# version: Defines actual version of Pandora Server for this module only
|
# version: Defines actual version of Pandora Server for this module only
|
||||||
my $pandora_version = "7.0NG.758.1";
|
my $pandora_version = "7.0NG.758.1";
|
||||||
my $pandora_build = "211124";
|
my $pandora_build = "211125";
|
||||||
our $VERSION = $pandora_version." ".$pandora_build;
|
our $VERSION = $pandora_version." ".$pandora_build;
|
||||||
|
|
||||||
# Setup hash
|
# Setup hash
|
||||||
|
|||||||
@ -929,9 +929,9 @@ sub PandoraFMS::Recon::Base::create_network_profile_modules($$) {
|
|||||||
|
|
||||||
# 2. Verify Private Enterprise Number matches (PEN)
|
# 2. Verify Private Enterprise Number matches (PEN)
|
||||||
if (defined($template->{'pen'})) {
|
if (defined($template->{'pen'})) {
|
||||||
my @penes = split(',', $template->{'pen'});
|
my @pens = split(',', $template->{'pen'});
|
||||||
|
|
||||||
next unless (is_in_array(\@penes, $self->get_pen($device)));
|
next unless (is_in_array(\@pens, $self->get_pen($device)));
|
||||||
}
|
}
|
||||||
|
|
||||||
# 3. Retrieve module list from target template.
|
# 3. Retrieve module list from target template.
|
||||||
|
|||||||
@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
|
|||||||
|
|
||||||
# version: Defines actual version of Pandora Server for this module only
|
# version: Defines actual version of Pandora Server for this module only
|
||||||
my $pandora_version = "7.0NG.758.1";
|
my $pandora_version = "7.0NG.758.1";
|
||||||
my $pandora_build = "211124";
|
my $pandora_build = "211125";
|
||||||
our $VERSION = $pandora_version." ".$pandora_build;
|
our $VERSION = $pandora_version." ".$pandora_build;
|
||||||
|
|
||||||
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_server
|
%define name pandorafms_server
|
||||||
%define version 7.0NG.758.1
|
%define version 7.0NG.758.1
|
||||||
%define release 211124
|
%define release 211125
|
||||||
|
|
||||||
Summary: Pandora FMS Server
|
Summary: Pandora FMS Server
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_server
|
%define name pandorafms_server
|
||||||
%define version 7.0NG.758.1
|
%define version 7.0NG.758.1
|
||||||
%define release 211124
|
%define release 211125
|
||||||
|
|
||||||
Summary: Pandora FMS Server
|
Summary: Pandora FMS Server
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
# **********************************************************************
|
# **********************************************************************
|
||||||
|
|
||||||
PI_VERSION="7.0NG.758.1"
|
PI_VERSION="7.0NG.758.1"
|
||||||
PI_BUILD="211124"
|
PI_BUILD="211125"
|
||||||
|
|
||||||
MODE=$1
|
MODE=$1
|
||||||
if [ $# -gt 1 ]; then
|
if [ $# -gt 1 ]; then
|
||||||
|
|||||||
@ -35,7 +35,7 @@ use PandoraFMS::Config;
|
|||||||
use PandoraFMS::DB;
|
use PandoraFMS::DB;
|
||||||
|
|
||||||
# version: define current version
|
# version: define current version
|
||||||
my $version = "7.0NG.758.1 Build 211124";
|
my $version = "7.0NG.758.1 Build 211125";
|
||||||
|
|
||||||
# Pandora server configuration
|
# Pandora server configuration
|
||||||
my %conf;
|
my %conf;
|
||||||
|
|||||||
@ -36,7 +36,7 @@ use Encode::Locale;
|
|||||||
Encode::Locale::decode_argv;
|
Encode::Locale::decode_argv;
|
||||||
|
|
||||||
# version: define current version
|
# version: define current version
|
||||||
my $version = "7.0NG.758.1 Build 211124";
|
my $version = "7.0NG.758.1 Build 211125";
|
||||||
|
|
||||||
# save program name for logging
|
# save program name for logging
|
||||||
my $progname = basename($0);
|
my $progname = basename($0);
|
||||||
@ -978,7 +978,7 @@ sub pandora_get_same_day_id ($$) {
|
|||||||
|
|
||||||
my $weeks = { 'monday' => 1, 'tuesday' => 2, 'wednesday' => 3, 'thursday' => 4, 'friday' => 5, 'saturday' => 6, 'sunday' => 7, 'holiday' => 8};
|
my $weeks = { 'monday' => 1, 'tuesday' => 2, 'wednesday' => 3, 'thursday' => 4, 'friday' => 5, 'saturday' => 6, 'sunday' => 7, 'holiday' => 8};
|
||||||
|
|
||||||
return defined ($weeks{$same_day}) ? $weeks{$same_day} : -1;
|
return defined ($weeks->{$same_day}) ? $weeks->{$same_day} : -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
##########################################################################
|
##########################################################################
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user