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

Resolve conflicts

This commit is contained in:
Tatiana Llorente 2020-01-08 15:44:59 +01:00
parent eb222cc82f
commit 7701ff7ad1
1 changed files with 116 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pandora_console/godmode/setup/setup.php
View File

@ -133,21 +133,17 @@ $buttons['notifications'] = [
'text' => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=notifications').'">'.html_print_image('images/alerts_template.png', true, ['title' => __('Notifications')]).'</a>', 'text' => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=notifications').'">'.html_print_image('images/alerts_template.png', true, ['title' => __('Notifications')]).'</a>',
]; ];
$buttons['gis'] = [
'active' => false,
'text' => '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=gis').'">'.html_print_image('images/gis_tab.png', true, ['title' => __('GIS Map connection')]).'</a>',
$buttons['websocket_engine'] = [ $buttons['websocket_engine'] = [
'active' => false, 'active' => false,
'text' => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=websocket_engine').'">'.html_print_image('images/websocket_small.png', true, ['title' => __('Websocket engine')]).'</a>', 'text' => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=websocket_engine').'">'.html_print_image('images/websocket_small.png', true, ['title' => __('Websocket engine')]).'</a>',
]; ];
$help_header = ''; $help_header = '';
if (enterprise_installed()) { if (enterprise_installed()) {
$subpage = setup_enterprise_add_subsection_main($section, $buttons, $help_header); $subpage = setup_enterprise_add_subsection_main($section, $buttons, $help_header);
} }
switch ($section) { switch ($section) {
case 'general': case 'general':
$buttons['general']['active'] = true; $buttons['general']['active'] = true;
$subpage = ' &raquo '.__('General'); $subpage = ' &raquo '.__('General');
@ -187,11 +183,6 @@ $buttons['websocket_engine'] = [
$help_header = 'setup_integria_tab'; $help_header = 'setup_integria_tab';
break; break;
case 'gis':
$buttons['gis']['active'] = true;
$subpage = ' &raquo '.__('Map conections GIS');
break;
case 'notifications': case 'notifications':
$buttons['notifications']['active'] = true; $buttons['notifications']['active'] = true;
$subpage = ' &raquo '.__('Notifications'); $subpage = ' &raquo '.__('Notifications');
@ -212,19 +203,19 @@ $buttons['websocket_engine'] = [
default: default:
// Default. // Default.
break; break;
} }
// Header. // Header.
ui_print_page_header( ui_print_page_header(
__('Configuration').$subpage, __('Configuration').$subpage,
'', '',
false, false,
$help_header, $help_header,
true, true,
$buttons $buttons
); );
if (isset($config['error_config_update_config'])) { if (isset($config['error_config_update_config'])) {
if ($config['error_config_update_config']['correct'] == false) { if ($config['error_config_update_config']['correct'] == false) {
ui_print_error_message($config['error_config_update_config']['message']); ui_print_error_message($config['error_config_update_config']['message']);
} else { } else {
@ -232,9 +223,9 @@ $buttons['websocket_engine'] = [
} }
unset($config['error_config_update_config']); unset($config['error_config_update_config']);
} }
switch ($section) { switch ($section) {
case 'general': case 'general':
include_once $config['homedir'].'/godmode/setup/setup_general.php'; include_once $config['homedir'].'/godmode/setup/setup_general.php';
break; break;
@ -263,10 +254,6 @@ $buttons['websocket_engine'] = [
include_once $config['homedir'].'/godmode/setup/setup_integria.php'; include_once $config['homedir'].'/godmode/setup/setup_integria.php';
break; break;
case 'gis':
include_once $config['homedir'].'/godmode/setup/gis.php';
break;
case 'notifications': case 'notifications':
include_once $config['homedir'].'/godmode/setup/setup_notifications.php'; include_once $config['homedir'].'/godmode/setup/setup_notifications.php';
break; break;
@ -278,4 +265,4 @@ $buttons['websocket_engine'] = [
default: default:
enterprise_hook('setup_enterprise_select_tab', [$section]); enterprise_hook('setup_enterprise_select_tab', [$section]);
break; break;
} }