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

2013-11-20 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_ui.php: removed the hack for metaconsole in the
	"ui_toggle", now this hack fails because it is fixed the images in
	the metaconsole.
	
	* operation/agentes/alerts_status.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9106 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-11-20 14:52:14 +00:00
parent f760ee7112
commit 58f58b0b50
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-11-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php: removed the hack for metaconsole in the
"ui_toggle", now this hack fails because it is fixed the images in
the metaconsole.
* operation/agentes/alerts_status.php: cleaned source code style.
2013-11-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/groups/configure_group.php, godmode/groups/group_list.php:

17
pandora_console/include/functions_ui.php
View File

@ -1524,6 +1524,7 @@ function ui_pagination ($count, $url = false, $offset = 0, $pagination = 0, $ret
return false;
}
// If exists more registers than I can put in a page, calculate index markers
$index_counter = ceil ($count /$pagination); // Number of blocks of block_size with data
$index_page = ceil ($offset / $pagination) - (ceil ($block_limit / 2)); // block to begin to show data;
@ -1918,25 +1919,21 @@ function ui_print_status_image ($type, $title = "", $return = false, $options =
*/
function ui_toggle($code, $name, $title = '', $hidden_default = true, $return = false) {
$hack_metaconsole = '';
if (defined('METACONSOLE'))
$hack_metaconsole = '../../';
// Generate unique Id
$uniqid = uniqid('');
// Options
if ($hidden_default) {
$style = 'display:none';
$image_a = html_print_image($hack_metaconsole . "images/down.png", true, false, true);
$image_b = html_print_image($hack_metaconsole . "images/go.png", true, false, true);
$original = $hack_metaconsole . "images/go.png";
$image_a = html_print_image("images/down.png", true, false, true);
$image_b = html_print_image("images/go.png", true, false, true);
$original = "images/go.png";
}
else {
$style = '';
$image_a = html_print_image($hack_metaconsole . "images/down.png", true, false, true);
$image_b = html_print_image($hack_metaconsole . "images/go.png", true, false, true);
$original = $hack_metaconsole . "images/down.png";
$image_a = html_print_image("images/down.png", true, false, true);
$image_b = html_print_image("images/go.png", true, false, true);
$original = "images/down.png";
}
// Link to toggle

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

@ -96,7 +96,7 @@ if ($idAgent != 0) {
echo "<h4 style='padding-top:0px !important;'>" .
__('Full list of alerts') . "</h4>";
}
}
}
else {
if (!check_acl ($config["id_user"], 0, "AR")) {
db_pandora_audit("ACL Violation","Trying to access alert view");