tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-04-25 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/modules/manage_network_components_form.php,
	godmode/servers/plugin.php, operation/search_users.getdata.php,
	operation/visual_console/render_view.php,
	operation/events/events_marquee.php,
	operation/events/events_list.php,
	operation/snmpconsole/snmp_view.php,
	operation/gis_maps/render_view.php,
	operation/integria_incidents/incident.files.php,
	operation/integria_incidents/incident.tracking.php,
	operation/integria_incidents/incident.list.php: fixed the old refr
	access for the config instead the get var.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8061 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-04-25 16:32:18 +00:00
parent 3ad9dd799d
commit 89d7e883bd
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/modules/manage_network_components_form.php
View File

@ -422,7 +422,7 @@ $(document).ready (function () {
$(this).attr('selected','selected');
});
});
if ($("#snmp_version").value == "3"){
if ($("#snmp_version").value == "3") {
$("input[name=snmp3_auth_user]").css({backgroundColor: '#fff'});
$("input[name=snmp3_auth_user]").removeAttr('disabled');

8
pandora_console/godmode/servers/plugin.php
View File

@ -275,7 +275,7 @@ if (($create != "") OR ($view != "")) {
echo '<table width="98%">';
echo '<tr><td align="right">';
if ($create != ""){
if ($create != "") {
echo "<input name='crtbutton' type='submit' class='sub wand' value='" .
__('Create') . "'>";
}
@ -295,7 +295,7 @@ else {
}
// Update plugin
if (isset($_GET["update_plugin"])){ // if modified any parameter
if (isset($_GET["update_plugin"])) { // if modified any parameter
$plugin_id = get_parameter ("update_plugin", 0);
$plugin_name = get_parameter ("form_name", "");
$plugin_description = get_parameter ("form_description", "");
@ -308,7 +308,7 @@ else {
// Get macros
$i = 1;
$macros = array();
while(1) {
while (1) {
$macro = (string)get_parameter ('field'.$i.'_macro');
if($macro == '') {
break;
@ -350,7 +350,7 @@ else {
}
// Create plugin
if (isset($_GET["create_plugin"])){
if (isset($_GET["create_plugin"])) {
$plugin_name = get_parameter ("form_name", "");
$plugin_description = get_parameter ("form_description", "");
$plugin_max_timeout = get_parameter ("form_max_timeout", "");

2
pandora_console/operation/events/events_list.php
View File

@ -718,7 +718,7 @@ $(document).ready( function() {
jQuery.each (data, function (i, val) {
s = js_html_entity_decode(val);
if (i == id_filter_save){
if (i == id_filter_save) {
$('#filter_id').append ($('<option selected="selected"></option>').html (s).attr ("value", i));
}
else {

2
pandora_console/operation/events/events_marquee.php
View File

@ -89,7 +89,7 @@ switch ($config["dbtype"]) {
$result = db_get_all_rows_sql ($sql);
foreach ($result as $row) {
$agente = "";
if ($row["id_agente"] != 0){
if ($row["id_agente"] != 0) {
$agente = db_get_sql ("SELECT nombre
FROM tagente
WHERE id_agente = ". $row["id_agente"]);

4
pandora_console/operation/gis_maps/render_view.php
View File

@ -87,11 +87,11 @@ $layers = gis_get_layers($idMap);
$buttons = array();
if ($config["pure"] == 0) {
$buttons[]['text'] = '<a href="index.php?sec=gismaps&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.$config["refr"].'&amp;pure=1">' .
$buttons[]['text'] = '<a href="index.php?sec=gismaps&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.((int)get_parameter('refr', 0)).'&amp;pure=1">' .
html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode'))) . "</a>";
}
else {
$buttons[]['text'] = '<a href="index.php?sec=gismaps&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.$config["refr"].'">' .
$buttons[]['text'] = '<a href="index.php?sec=gismaps&amp;sec2=operation/gis_maps/render_view&amp;map_id='.$idMap.'&amp;refr='.((int)get_parameter('refr', 0)).'">' .
html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode'))) . "</a>";
}

2
pandora_console/operation/integria_incidents/incident.files.php
View File

@ -47,7 +47,7 @@ $table->head[4] = __('Delete');
$table->data = array();
if(isset($result['file'][0]) && is_array($result['file'][0])){
if (isset($result['file'][0]) && is_array($result['file'][0])) {
$files = $result['file'];
}
else {

2
pandora_console/operation/integria_incidents/incident.list.php
View File

@ -68,7 +68,7 @@ echo '<td>';
html_print_select ($status, 'search_status', $search_status, '', '', 0, false);
echo '</td>';
echo '<td>';
if (isset($groups)){
if (isset($groups)) {
html_print_select ($groups, 'search_group', $search_group, '', '', 0, false, false, false);
}
echo '</td>';

4
pandora_console/operation/integria_incidents/incident.tracking.php
View File

@ -24,7 +24,7 @@ $table->head[2] = __('Date');
$table->data = array();
if(isset($result['tracking'][0]) && is_array($result['tracking'][0])){
if (isset($result['tracking'][0]) && is_array($result['tracking'][0])) {
$tracking = $result['tracking'];
}
else {
@ -32,7 +32,7 @@ else {
}
$row = 0;
foreach($tracking as $value) {
foreach ($tracking as $value) {
$table->data[$row][0] = $value['description'];
$table->data[$row][1] = $value['id_user'];

4
pandora_console/operation/search_users.getdata.php
View File

@ -146,11 +146,11 @@ if ($searchUsers) {
}
}
if($only_count) {
if ($only_count) {
unset($users);
}
if(!$users_id) {
if (!$users_id) {
$user_condition = "";
}
else {

4
pandora_console/operation/snmpconsole/snmp_view.php
View File

@ -354,7 +354,7 @@ $table->data[4][1] = '<strong>'.__('Type').'</strong>' . ui_print_help_tip(__('S
$trap_types = array(-1 => __('None'), 0 => __('Cold start (0)'), 1 => __('Warm start (1)'), 2 => __('Link down (2)'), 3 => __('Link up (3)'), 4 => __('Authentication failure (4)'), 5 => __('Other'));
$table->data[4][2] = html_print_select ($trap_types, 'trap_type', $trap_type, 'this.form.submit();', '', '', true, false, false);
$filter = '<form method="POST" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&refr='.$config["refr"].'&pure='.$config["pure"].'">';
$filter = '<form method="POST" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&refr='.((int)get_parameter('refr', 0)).'&pure='.$config["pure"].'">';
$filter .= html_print_table($table, true);
$filter .= '<div style="width: ' . $table->width . '; text-align: right;">';
$filter .= html_print_submit_button(__('Update'), 'search', false, 'class="sub upd"', true);
@ -371,7 +371,7 @@ $trapcount = db_get_sql ("SELECT COUNT(id_trap) FROM ttrap " . $whereSubquery);
$urlPagination = "index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&filter_agent=" . $filter_agent
. "&filter_oid=" . $filter_oid . "&filter_severity=" . $filter_severity
. "&filter_fired=" . $filter_fired . "&filter_status=" . $filter_status
. "&search_string=" . $search_string . "&pagination=".$pagination."&offset=".$offset."&refr=".$config["refr"]."&pure=".$config["pure"];
. "&search_string=" . $search_string . "&pagination=".$pagination."&offset=".$offset."&refr=".((int)get_parameter('refr', 0))."&pure=".$config["pure"];
ui_pagination ($trapcount, $urlPagination, $offset, $pagination);
echo '<form name="eventtable" method="POST" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&pagination='.$pagination.'&offset='.$offset.'">';

12
pandora_console/operation/visual_console/render_view.php
View File

@ -106,11 +106,11 @@ $options['view']['active'] = true;
if (!defined('METACONSOLE')) {
if ($config["pure"] == 0) {
$options['pure']['text'] = '<a href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr='.$config["refr"].'&amp;pure=1">' . html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode')))
$options['pure']['text'] = '<a href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr='.((int)get_parameter('refr', 0)).'&amp;pure=1">' . html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode')))
. "</a>";
}
else {
$options['pure']['text'] = '<a href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr='.$config["refr"].'">'
$options['pure']['text'] = '<a href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr='.((int)get_parameter('refr', 0)).'">'
. html_print_image ("images/normal_screen.png", true, array ("title" => __('Back to normal mode')))
. "</a>";
@ -161,7 +161,7 @@ if ($vc_refr) {
echo '<div style="height:30px">&nbsp;</div>';
if ($config['pure'] && $config["refr"] != 0) {
if ($config['pure'] && ((int)get_parameter('refr', 0)) != 0) {
echo '<div id="countdown"><br /></div>';
}
@ -180,7 +180,7 @@ else
html_print_table ($table);
echo '</form>';
if ($config["pure"] && $config["refr"] != 0) {
if ($config["pure"] && ((int)get_parameter('refr', 0)) != 0) {
ui_require_jquery_file ('countdown');
ui_require_css_file ('countdown');
}
@ -195,10 +195,10 @@ $(document).ready (function () {
});
<?php
if ($config["pure"] && $config["refr"] > 0) {
if ($config["pure"] && ((int)get_parameter('refr', 0)) > 0) {
?>
t = new Date();
t.setTime (t.getTime() + <?php echo $config["refr"] * 1000; ?>);
t.setTime (t.getTime() + <?php echo ((int)get_parameter('refr', 0)) * 1000; ?>);
$("#countdown").countdown({
until: t,
format: 'MS',