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

2012-04-21 Junichi Satoh <junichi@rworks.jp> 

* index.php: Fixed bug home screen is not shown when default language
	is set to non-English.

	* operation/users/user_edit.php: Fixed 'Default' in home screen menu
	is not translated.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6074 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2012-04-21 09:06:22 +00:00
parent 1d919c3edb
commit 54ea5ff0ff
3 changed files with 26 additions and 17 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 @@
2012-04-21 Junichi Satoh <junichi@rworks.jp>
* index.php: Fixed bug home screen is not shown when default language
is set to non-English.
* operation/users/user_edit.php: Fixed 'Default' in home screen menu
is not translated.
2012-04-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php: Setted last_reference database

33
pandora_console/index.php
View File

@ -182,34 +182,34 @@ elseif (! isset ($config['id_user']) && isset ($_GET["login"])) {
$home_url = $user_info['data_section'];
if ($home_page != '') {
switch($home_page) {
case __('Event list'):
case 'Event list':
$_GET["sec"] = "eventos";
$_GET["sec2"] = "operation/events/events";
break;
case __('Group view'):
case 'Group view':
$_GET["sec"] = "estado";
$_GET["sec2"] = "operation/agentes/group_view";
break;
case __('Alert detail'):
case 'Alert detail':
$_GET["sec"] = "estado";
$_GET["sec2"] = "operation/agentes/alerts_status";
break;
case __('Tactical view'):
case 'Tactical view':
$_GET["sec"] = "estado";
$_GET["sec2"] = "operation/agentes/tactical";
break;
case __('Default'):
case 'Default':
$_GET["sec"] = "general/logon_ok";
break;
case __('Dashboard'):
case 'Dashboard':
$_GET["sec"] = "dashboard";
$_GET["sec2"] = ENTERPRISE_DIR.'/dashboard/main_dashboard';
break;
case __('Visual console'):
case 'Visual console':
$_GET["sec"] = "visualc";
$_GET["sec2"] = "operation/visual_console/index";
break;
case __('Other'):
case 'Other':
$home_url = io_safe_output($home_url);
parse_str ($home_url, $res);
$_GET["sec"] = $res["sec"];
@ -333,22 +333,22 @@ else {
if ($home_page != '') {
switch($home_page) {
case __('Event list'):
case 'Event list':
require ('operation/events/events.php');
break;
case __('Group view'):
case 'Group view':
require ('operation/agentes/group_view.php');
break;
case __('Alert detail'):
case 'Alert detail':
require ('operation/agentes/alerts_status.php');
break;
case __('Tactical view'):
case 'Tactical view':
require ('operation/agentes/tactical.php');
break;
case __('Default'):
case 'Default':
require ('general/logon_ok.php');
break;
case __('Dashboard'):
case 'Dashboard':
$id_dashboard = db_get_value('id', 'tdashboard', 'name', $home_url);
$str = 'sec=visualc&sec2='.ENTERPRISE_DIR.'/dashboard/main_dashboard&id='.$id_dashboard;
parse_str($str, $res);
@ -357,7 +357,7 @@ else {
}
require(ENTERPRISE_DIR.'/dashboard/main_dashboard.php');
break;
case __('Visual console'):
case 'Visual console':
$id_visualc = db_get_value('id', 'tlayout', 'name', $home_url);
if (($home_url == '') || ($id_visualc == false)) {
$str = 'sec=visualc&sec2=operation/visual_console/index&refr=60';
@ -369,7 +369,7 @@ else {
}
require($_GET["sec2"].'.php');
break;
case __('Other'):
case 'Other':
$home_url = io_safe_output($home_url);
parse_str ($home_url, $res);
foreach ($res as $key => $param) {
@ -404,6 +404,7 @@ else {
echo "</div>"; // main_pure
}
if ($config["pure"] == 0) {
echo '<div id="foot">';
require ("general/footer.php");

2
pandora_console/operation/users/user_edit.php
View File

@ -242,7 +242,7 @@ echo html_print_checkbox('shortcut_bar', 1, $user_info["shortcut"], true);
echo '</td></tr><tr><td class="datos">'.__('Home screen'). ui_print_help_tip(__('
User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true) .'</td><td class="datos2">';
$values = array ('Default' => 'Default', 'Dashboard'=>__('Dashboard'), 'Visual console'=>__('Visual console'), 'Event list'=>__('Event list'),
$values = array ('Default' =>__('Default'), 'Dashboard'=>__('Dashboard'), 'Visual console'=>__('Visual console'), 'Event list'=>__('Event list'),
'Group view'=>__('Group view'), 'Tactical view'=>__('Tactical view'), 'Alert detail' => __('Alert detail'), 'Other'=>__('Other'));
echo html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false);
echo "&nbsp;&nbsp;";