tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2014-03-13 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* general/shortcut_bar.php, include/functions_ui.php: fixed the
	PHP warnings.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9577 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-03-13 11:00:12 +00:00
parent 84bc0b03ed
commit 6f96534060
3 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2014-03-13 Miguel de Dios <miguel.dedios@artica.es>
* general/shortcut_bar.php, include/functions_ui.php: fixed the
PHP warnings.
2014-03-13 Miguel de Dios <miguel.dedios@artica.es> 2014-03-13 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.main.php, * godmode/reporting/reporting_builder.main.php,

5
pandora_console/general/shortcut_bar.php
View File

@ -19,9 +19,10 @@ global $config;
// Login check // Login check
check_login (); check_login ();
if (is_ajax()) {
require_once("include/functions_reporting.php"); require_once("include/functions_reporting.php");
if (is_ajax()) {
$save_item_shorcut = get_parameter("save_item_shorcut", 0); $save_item_shorcut = get_parameter("save_item_shorcut", 0);
if ($save_item_shorcut) { if ($save_item_shorcut) {
@ -112,6 +113,8 @@ if (is_ajax()) {
return; return;
} }
$shortcut_state = db_get_value_filter('shortcut', 'tusuario', array('id_user' => $config['id_user'])); $shortcut_state = db_get_value_filter('shortcut', 'tusuario', array('id_user' => $config['id_user']));
// If shortcut bar is disabled return to index.php // If shortcut bar is disabled return to index.php

21
pandora_console/include/functions_ui.php
View File

@ -1197,14 +1197,24 @@ function ui_process_page_head ($string, $bitfield) {
$output = ''; $output = '';
$config_refr = -1;
if (isset($config["refr"]))
$config_refr = $config["refr"];
// If user is logged or displayed view is the public view of visual console // If user is logged or displayed view is the public view of visual console
if ($config["refr"] > 0 && (isset($config['id_user']) || $vc_public_view == 1)) { if ($config_refr > 0 &&
if ($config['enable_refr'] || $GET['sec2'] == "operation/agentes/estado_agente" || $GET['sec2'] == "operation/agentes/tactical"|| (isset($config['id_user']) || $vc_public_view == 1)) {
$_GET['sec2'] == "operation/agentes/group_view" || $_GET['sec2'] == 'operation/events/events' ||
if ($config['enable_refr'] ||
$_GET['sec2'] == "operation/agentes/estado_agente" ||
$_GET['sec2'] == "operation/agentes/tactical"||
$_GET['sec2'] == "operation/agentes/group_view" ||
$_GET['sec2'] == 'operation/events/events' ||
$_GET['sec2'] == "enterprise/dashboard/main_dashboard") { $_GET['sec2'] == "enterprise/dashboard/main_dashboard") {
$query = ui_get_url_refresh (false); $query = ui_get_url_refresh (false);
$output .= '<meta http-equiv="refresh" content="'.$config["refr"].'; URL=' . $query . '" />'; $output .= '<meta http-equiv="refresh" content="' .
$config_refr . '; URL=' . $query . '" />';
} }
} }
@ -1653,8 +1663,7 @@ function ui_print_session_action_icon ($action, $return = false) {
'dashboard' => 'images/dashboard_col.png', 'dashboard' => 'images/dashboard_col.png',
'api' => 'images/eye.png', 'api' => 'images/eye.png',
'db' => 'images/database.png', 'db' => 'images/database.png',
'setup' => 'images/cog.png' 'setup' => 'images/cog.png');
);
$output = ''; $output = '';
foreach($key_icon as $key => $icon) { foreach($key_icon as $key => $icon) {