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

2008-09-17 Evi Vanoost <vanooste@rcbi.rochester.edu> 

* operation/visual_console/render_view.php: Removed short tags.
        Used new functions for login check. Removed unnecessary global

        * operation/agentes/estado_alertas.php: Fixed a minor bug

        * godmode/reporting/map_builder.php: Removed short tags


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1098 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
guruevi 2008-09-17 17:04:52 +00:00
parent 7db29da666
commit a2a0bde820
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2008-09-17 Evi Vanoost <vanooste@rcbi.rochester.edu>
* operation/visual_console/render_view.php: Removed short tags.
Used new functions for login check. Removed unnecessary global
* operation/agentes/estado_alertas.php: Fixed a minor bug
* godmode/reporting/map_builder.php: Removed short tags
2008-09-16 Evi Vanoost <vanooste@rcbi.rochester.edu>
* operation/agentes/estado_alertas.php: Fixed a few bugs and made it

4
pandora_console/godmode/reporting/map_builder.php
View File

@ -451,7 +451,7 @@ function agent_changed (event, id_agent, selected) {
id_agent = this.value;
$('#form_layout_data_editor #module').attr ('disabled', 1);
$('#form_layout_data_editor #module').empty ();
$('#form_layout_data_editor #module').append (new Option ("<?=__('Loading')?>...", 0));
$('#form_layout_data_editor #module').append (new Option ("<?php echo __('Loading'); ?>...", 0));
jQuery.post ('ajax.php',
{page: "operation/agentes/ver_agente",
get_agent_modules_json: 1,
@ -554,7 +554,7 @@ $(document).ready (function () {
$("#form_layout_data_editor #hidden-update_layout_data").attr ('value', 1);
$("#form_layout_data_editor #hidden-create_layout_data").attr ('value', 0);
$("#form_layout_data_editor #hidden-id_layout_data").attr ('value', id);
$("#form_layout_data_editor #submit-create_layout_data_button").attr ('value', "<?=__('Update')?>").removeClass ('wand').addClass ('upd');
$("#form_layout_data_editor #submit-create_layout_data_button").attr ('value', "<?php echo __('Update'); ?>").removeClass ('wand').addClass ('upd');
$("#form_layout_data_editor #text-label_color").attr ('value', data['label_color']);
$(".ColorPickerDivSample").css ('background-color', data['label_color']);
agent_changed (null, data['id_agent'], data['id_agente_modulo']);

2
pandora_console/operation/agentes/estado_alertas.php
View File

@ -201,7 +201,7 @@ if (isset($_GET["id_agente"])){
$table->data[$idx][4] = human_time_comparation ($data["last_fired"]);
}
$table->data[$idx][5] = $data["times_fired"];
$tbl_idx++; //increment the index counter
$idx++; //increment the index counter
} //end foreach (data)
} //end foreach (agent)
if (!empty ($result) && !empty ($table->data)) {

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

@ -16,15 +16,10 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Login check
global $config;
global $REMOTE_ADDR;
require ('include/functions_visual_map.php');
if (comprueba_login () != 0) {
if (check_login () != 0) {
audit_db ($config["id_user"],$REMOTE_ADDR, "ACL Violation","Trying to access graph builder");
include ("general/noaccess.php");
exit;
@ -111,15 +106,15 @@ echo "</form>";
<link rel="stylesheet" href="include/styles/countdown.css" type="text/css" />
<script type="text/javascript" src="include/javascript/jquery.js"></script>
<script type="text/javascript" src="include/javascript/jquery.countdown.js"></script>
<script type="text/javascript" src="include/languages/countdown_<?=$config['language']?>.js"></script>
<script type="text/javascript" src="include/languages/countdown_<?php echo $config['language']?>.js"></script>
<script type="text/javascript" src="include/javascript/pandora_visual_console.js"></script>
<script language="javascript" type="text/javascript">
$(document).ready (function () {
<?php if ($refr) : ?>
t = new Date();
t.setTime (t.getTime() + <?=$refr * 1000?>);
$.countdown.setDefaults($.countdown.regional["<?=$config['language']?>"]);
$("#countdown").countdown({until: t, format: 'MS', description: '<?=__('Until refresh')?>'});
t.setTime (t.getTime() + <?php echo $refr * 1000; ?>);
$.countdown.setDefaults($.countdown.regional["<?php echo $config['language']; ?>"]);
$("#countdown").countdown({until: t, format: 'MS', description: '<?php echo __('Until refresh'); ?>'});
<?php endif; ?>
draw_lines (lines, 'layout_map');
});